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

升级weixin-java为4.1.0，springboot为2.4.6

Browse Source
This commit is contained in:
taozi
2021-06-05 15:22:11 +08:00
parent 18d746602e
commit 843134abe5
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.3</version> <version>2.4.6</version>
</parent> </parent>
<properties> <properties>

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

@ -136,10 +136,10 @@ public class AuthService {
} else { } else {
WechatUserDto wechatUser =yxUser.getWxProfile(); WechatUserDto wechatUser =yxUser.getWxProfile();
if ((StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(wxMpUser.getOpenId())) if ((StrUtil.isBlank(wechatUser.getRoutineOpenid()) && StrUtil.isNotBlank(session.getOpenid()))
|| (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(wxMpUser.getUnionId()))) { || (StrUtil.isBlank(wechatUser.getUnionId()) && StrUtil.isNotBlank(session.getUnionid()))) {
wechatUser.setRoutineOpenid(wxMpUser.getOpenId()); wechatUser.setRoutineOpenid(session.getOpenid());
wechatUser.setUnionId(wxMpUser.getUnionId()); wechatUser.setUnionId(session.getUnionid());
yxUser.setWxProfile(wechatUser); yxUser.setWxProfile(wechatUser);

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.7.B</weixin-java.version> <weixin-java.version>4.1.0</weixin-java.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>

1
yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java
View File

@ -35,7 +35,6 @@ import co.yixiang.modules.user.service.dto.WechatUserDto;
import co.yixiang.modules.user.service.dto.YxWechatUserDto; import co.yixiang.modules.user.service.dto.YxWechatUserDto;
import co.yixiang.utils.FileUtil; import co.yixiang.utils.FileUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;