From 144adac2b67eae995e853ad1d3d6d7d4ff5926ec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 九月 2020 17:38:20 +0800
Subject: [PATCH] 微信登录抽象
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index 3a0a886..5ec1e11 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -28,6 +28,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.*;
+import org.yeshi.utils.entity.wx.WeiXinUser;
import org.yeshi.utils.taobao.TbImgUtil;
import org.yeshi.utils.tencentcloud.COSManager;
@@ -59,7 +60,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
-import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.entity.bus.user.vip.GiveVIPApplyInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.common.AdminUser;
@@ -130,7 +130,7 @@
import com.yeshi.fanli.util.factory.OrderItemFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import com.yeshi.fanli.util.wx.WXLoginUtil;
+import com.yeshi.fanli.util.wx.MyWXLoginUtil;
import com.yeshi.fanli.vo.user.MineInfoVO;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -342,7 +342,7 @@
// WeiXinUserParam wxParam = null;
// 濡傛灉鏄井淇＄櫥闄嗭紝閭ｉ渶瑕佸厛鑾峰彇鍒板井淇＄殑unionid
WXAccountInfoDTO account = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),
+ WeiXinUser weiXinUser = MyWXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),
account.getAppSecret());
if (loginType == Constant.WEIXIN && StringUtil.isNullOrEmpty(form.getWxUnionId())) {
// wxParam = WXinUtil.getWxParam(code);
@@ -440,7 +440,7 @@
WXAccountInfoDTO account = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());
- WeiXinUser xinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),
+ WeiXinUser xinUser = MyWXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),
account.getAppSecret());
if (xinUser == null) {
out.print(JsonUtil.loadFalseResult("鐧诲綍澶辫触"));
@@ -696,7 +696,7 @@
int loginType = form.getLoginType();
if (loginType == Constant.WEIXIN) {
WXAccountInfoDTO account = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),
+ WeiXinUser weiXinUser = MyWXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),
account.getAppSecret());
if (weiXinUser == null) {
--
Gitblit v1.8.0