From 53b22dad454d47fe07935daf2dfde8f8532c9d43 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 22 Jul 2020 19:55:52 +0800 Subject: [PATCH 1/3] mq mima --- mallinkCApi/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index fd5e53d00..6c2ae5c08 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -88,7 +88,7 @@ spring: host: 202.165.179.86 port: 5672 username: fumao - password: rqfm2020 + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / From 79facffd55e534dee91f70b92287ae0eb5ef8d86 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 22 Jul 2020 20:04:49 +0800 Subject: [PATCH 2/3] mq mima --- mallinkCApi/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 6c2ae5c08..fd5e53d00 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -88,7 +88,7 @@ spring: host: 202.165.179.86 port: 5672 username: fumao - password: f9l98&*%%u7flt33 + password: rqfm2020 publisher-confirms: true publisher-returns: false virtual-host: / From 679689293dadcd0e696d1f7e383a0c490e934665 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 22 Jul 2020 20:25:21 +0800 Subject: [PATCH 3/3] b_user-----parent_tenant_id --- .../main/java/com/iformall/controller/WxInfoController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index e8e1a43ee..46529afe2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -154,7 +154,7 @@ public class WxInfoController extends BaseController { String ipaddress = IPUtil.getIpAddr(request); WxBuser newUser = new WxBuser(); - newUser.updateTenantInfo(wxAuthorizerInfo); + newUser.updateTenantInfo(buUser); newUser.setAppId(appId); newUser.setOpenId(openId); if (boolHaveUnionId) { @@ -201,7 +201,7 @@ public class WxInfoController extends BaseController { wxBuserTokenService.saveOrUpdate(oldUser); } else { // 新用户 - newUser.updateTenantInfo(wxAuthorizerInfo); + newUser.updateTenantInfo(buUser); token = newUser.createToken(new Date()); newUser.setRegisterIp(ipaddress); newUser.setSessionKey(session_key);