From f9dcea0ef22bc4346ff0d2ba0327e1170b2ddd52 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Thu, 6 Jul 2023 10:17:04 +0800 Subject: [PATCH] fixMobileOpenid --- .../main/java/com/cool/store/constants/CommonConstants.java | 4 +--- .../cool/store/service/impl/WechatMiniAppServiceImpl.java | 5 ++++- .../src/main/resources/application-ab.properties | 2 +- .../src/main/resources/application-local.properties | 2 +- .../src/main/resources/application-online.properties | 2 +- .../src/main/resources/application-ab.properties | 1 + .../src/main/resources/application-local.properties | 1 + .../src/main/resources/application-online.properties | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 0ecec8b2a..565f341e2 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -119,7 +119,5 @@ public class CommonConstants { public static final String ALLOCATION = "allocation"; public static final String TRANSFER = "transfer"; - - public static final String FIX_MOBILE_OPENID_TEST = "HSAY5531DA7"; - public static final String FIX_MOBILE_OPENID_ONLINE = "HSAY4AF322E"; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index a934431e9..042839a6b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -64,6 +64,9 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { @Value("${weixin.appSecret}") private String wxAppSecret; + @Value("${fixMobileOpenid}") + private String fixMobileOpenid; + @Override public PartnerUserInfoVO miniProgramLogin(MiniProgramLoginDTO param) { @@ -173,7 +176,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { @Override public PartnerUserInfoVO getUserInfo(String mobile, String openId) { PartnerUserInfoVO userInfoVO = new PartnerUserInfoVO(); - if(CommonConstants.FIX_MOBILE_OPENID_TEST.equals(mobile) || CommonConstants.FIX_MOBILE_OPENID_ONLINE.equals(mobile) ){ + if(fixMobileOpenid.equals(mobile)){ userInfoVO.setMobile(mobile); userInfoVO.setOpenid(mobile); userInfoVO.setPartnerId(""); diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index ddd3bd6c6..da322ce70 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -62,7 +62,7 @@ weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 signKey=77fea013c3a6459685b83c21a2fc3411 - +fixMobileOpenid=HSAY5531DA7 #xxljob配置 xxl.job.admin.addresses = http://10.7.53.224:10001/xxl-job-admin xxl.job.executor.appname = ${spring.application.name} diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 917b733fc..3350c3265 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -64,7 +64,7 @@ weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 signKey=77fea013c3a6459685b83c21a2fc3411 - +fixMobileOpenid=HSAY5531DA7 #MDM hs.mdm.baseUrl=http://10.56.21.30 hs.mdm.appkey = HSAYPartner diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-webb/src/main/resources/application-online.properties index 4fa84ad9e..3764060eb 100644 --- a/coolstore-partner-webb/src/main/resources/application-online.properties +++ b/coolstore-partner-webb/src/main/resources/application-online.properties @@ -58,7 +58,7 @@ weixin.appId=wx6f984e535e571818 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318 signKey=d851f2a9ac90474abecdc2fbb148d4d7 - +fixMobileOpenid=HSAY4AF322E #阿里云ak sk aliyun.accessKeyId= aliyun.accessKeySecret= diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties index ef55e653f..62c2e93e6 100644 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ b/coolstore-partner-webc/src/main/resources/application-ab.properties @@ -61,6 +61,7 @@ weixin.appId=wxb2a0addf956ad4b7 weixin.appSecret=77abdcae754add92889566b543e5ad79 signKey=77fea013c3a6459685b83c21a2fc3411 +fixMobileOpenid=HSAY5531DA7 #飞书通知 feishu.notice.link.url = https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index e6a23a115..94027cc8b 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -63,6 +63,7 @@ weixin.appId=wxb2a0addf956ad4b7 weixin.appSecret=77abdcae754add92889566b543e5ad79 signKey=77fea013c3a6459685b83c21a2fc3411 +fixMobileOpenid=HSAY5531DA7 #飞书通知 feishu.notice.link.url = https://applink.feishu.cn/client/web_app/open?appId=cli_a4f3e24dc73a100c&lk_target_url=https%3A%2F%2Ftest-hsay-web.coolstore.cn%2F%23%2Fwork%2Fbench diff --git a/coolstore-partner-webc/src/main/resources/application-online.properties b/coolstore-partner-webc/src/main/resources/application-online.properties index e7f0dcf4d..1ce5a8613 100644 --- a/coolstore-partner-webc/src/main/resources/application-online.properties +++ b/coolstore-partner-webc/src/main/resources/application-online.properties @@ -55,7 +55,7 @@ weixin.appId=wxb2a0addf956ad4b7 weixin.appSecret=77abdcae754add92889566b543e5ad79 signKey=d851f2a9ac90474abecdc2fbb148d4d7 - +fixMobileOpenid=HSAY4AF322E #阿里云ak sk aliyun.accessKeyId= aliyun.accessKeySecret=