suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
苏竹红
2023-07-06 10:24:32 +08:00
parent c42bd7717e f9dcea0ef2
commit e80dc8ad1a
8 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java
View File

@@ -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";
}

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java
View File

@@ -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("");

2
coolstore-partner-webb/src/main/resources/application-ab.properties
View File

@@ -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}

2
coolstore-partner-webb/src/main/resources/application-local.properties
View File

@@ -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

2
coolstore-partner-webb/src/main/resources/application-online.properties
View File

@@ -58,7 +58,7 @@ weixin.appId=wx6f984e535e571818
weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
signKey=d851f2a9ac90474abecdc2fbb148d4d7
fixMobileOpenid=HSAY4AF322E
#阿里云ak sk
aliyun.accessKeyId=
aliyun.accessKeySecret=

1
coolstore-partner-webc/src/main/resources/application-ab.properties
View File

@@ -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

1
coolstore-partner-webc/src/main/resources/application-local.properties
View File

@@ -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

2
coolstore-partner-webc/src/main/resources/application-online.properties
View File

@@ -55,7 +55,7 @@ weixin.appId=wxb2a0addf956ad4b7
weixin.appSecret=77abdcae754add92889566b543e5ad79
signKey=d851f2a9ac90474abecdc2fbb148d4d7
fixMobileOpenid=HSAY4AF322E
#阿里云ak sk
aliyun.accessKeyId=
aliyun.accessKeySecret=