cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

--hotfix修复微信改版导致小程序授权登录失败

Browse Source
This commit is contained in:
xuwenbo
2021-04-06 22:33:57 +08:00
parent 4d3e33bd7f
commit f73a38244e
4 changed files with 212 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
View File

@ -94,10 +94,10 @@ public class AuthService {
WxMaUserInfo wxMpUser = wxMaService.getUserService() WxMaUserInfo wxMpUser = wxMaService.getUserService()
.getUserInfo(session.getSessionKey(), encryptedData, iv); .getUserInfo(session.getSessionKey(), encryptedData, iv);
String openid = wxMpUser.getOpenId(); String openid = session.getOpenid();
//如果开启了UnionId //如果开启了UnionId
if (StrUtil.isNotBlank(wxMpUser.getUnionId())) { if (StrUtil.isNotBlank(session.getUnionid())) {
openid = wxMpUser.getUnionId(); openid = session.getUnionid();
} }
YxUser yxUser = userService.getOne(Wrappers.<YxUser>lambdaQuery() YxUser yxUser = userService.getOne(Wrappers.<YxUser>lambdaQuery()

2
yshop-common/pom.xml
View File

@ -12,7 +12,7 @@
<artifactId>yshop-common</artifactId> <artifactId>yshop-common</artifactId>
<name>公共模块</name> <name>公共模块</name>
<properties> <properties>
<weixin-java.version>4.0.0</weixin-java.version> <weixin-java.version>4.0.7.B</weixin-java.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

2
yshop-weixin/src/main/java/co/yixiang/modules/mp/service/WeiXinSubscribeService.java
View File

@ -153,7 +153,7 @@ public class WeiXinSubscribeService {
.templateId(templateId) .templateId(templateId)
.page(page) .page(page)
.build(); .build();
map.forEach( (k,v)-> { wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.Data(k, v));} ); map.forEach( (k,v)-> { wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData(k, v));} );
WxMaService wxMaService = WxMaConfiguration.getWxMaService(); WxMaService wxMaService = WxMaConfiguration.getWxMaService();
try { try {
wxMaService.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage); wxMaService.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage);

3
yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java
View File

@ -58,7 +58,8 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static cn.binarywang.wx.miniapp.api.WxMaLiveService.CREATE_ROOM; import static cn.binarywang.wx.miniapp.constant.WxMaApiUrlConstants.Broadcast.Room.CREATE_ROOM;
/** /**
* @author hupeng * @author hupeng