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

wexin-java升级4.0.0

Browse Source 
springboot升级2.4.1
This commit is contained in:
xuwenbo
2020-12-21 13:10:53 +08:00
parent 4222a6e41a
commit a9ae138f04
20 changed files with 48 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
yshop-shop/src/main/java/co/yixiang/modules/customer/rest/QrCodeController.java
View File

@ -13,11 +13,10 @@ import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.api.WxConsts;
import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
import me.chanjar.weixin.mp.bean.result.WxMpUser;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
@ -91,10 +90,10 @@ public class QrCodeController {
throw new IllegalArgumentException("未找到对应配置的服务，请核实！");
}
try {
WxMpOAuth2AccessToken wxMpOAuth2AccessToken = wxService.getOAuth2Service().getAccessToken(code);
WxMpUser wxMpUser = wxService.getOAuth2Service().getUserInfo(wxMpOAuth2AccessToken, "zh_CN");
RedisUtil.set("qrCode:" + key, wxMpOAuth2AccessToken.getOpenId() + ":" + wxMpUser.getNickname());
log.info("【微信网页授权】wxMpUser={}", wxMpUser);
WxOAuth2AccessToken wxOAuth2AccessToken = wxService.getOAuth2Service().getAccessToken(code);
WxOAuth2UserInfo wxOAuth2UserInfo = wxService.getOAuth2Service().getUserInfo(wxOAuth2AccessToken, "zh_CN");
RedisUtil.set("qrCode:" + key, wxOAuth2UserInfo.getOpenid() + ":" + wxOAuth2UserInfo.getNickname());
log.info("【微信网页授权】wxMpUser={}", wxOAuth2UserInfo);
} catch (WxErrorException e) {
log.info("【微信网页授权】{}", e);
throw new Exception(e.getError().getErrorMsg());
@ -114,4 +113,4 @@ public class QrCodeController {
}
return new ResponseEntity(HttpStatus.OK);
}
}
}

2
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java
View File

@ -55,7 +55,7 @@ public class SystemGroupDataController {
@PreAuthorize("hasAnyRole('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_SELECT')")
public ResponseEntity getYxSystemGroupDatas(YxSystemGroupDataQueryCriteria criteria,
Pageable pageable){
Sort sort = new Sort(Sort.Direction.DESC, "sort");
Sort sort = Sort.by(Sort.Direction.DESC, "sort");
Pageable pageableT = PageRequest.of(pageable.getPageNumber(),
pageable.getPageSize(),
sort);

2
yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserTaskController.java
View File

@ -48,7 +48,7 @@ public class SystemUserTaskController {
@PreAuthorize("hasAnyRole('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_SELECT')")
public ResponseEntity getYxSystemUserTasks(YxSystemUserTaskQueryCriteria criteria,
Pageable pageable){
Sort sort = new Sort(Sort.Direction.ASC, "level_id");
Sort sort = Sort.by(Sort.Direction.ASC, "level_id");
Pageable pageableT = PageRequest.of(pageable.getPageNumber(),
pageable.getPageSize(),
sort);