From 6284342349538cf3796828dce1935e001e539ea5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 14:34:32 +0800
Subject: [PATCH] 登录修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java | 6 +++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java | 7 +++++--
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java | 27 ++++++---------------------
3 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java
index 4c21021..9cc01a9 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java
@@ -18,6 +18,7 @@
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.service.TAppUserService;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUserApplet;
@@ -59,9 +60,12 @@
// AlipayUserInfoShareResponse userInfo = new AliAppletTools(aliProperties).getUserInfo(response.getAccessToken());
// 获取用户手机号
String phoneNumber = new AliAppletTools(aliProperties).getPhoneNumber(appletUserLogin.getToken());
+ if(StringUtils.isEmpty(phoneNumber)){
+ return AjaxResult.success();
+ }
log.info("获取支付宝用户信息:{}", phoneNumber);
// 用户信息封装
- return AjaxResult.ok(appUserService.aliLogin(response,phoneNumber));
+ return AjaxResult.success(appUserService.aliLogin(response,phoneNumber));
} else {
String diagnosisUrl = DiagnosisUtils.getDiagnosisUrl(response);
log.warn("诊断结果:{}",diagnosisUrl);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
index 2fcec55..a380e10 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
@@ -15,6 +15,7 @@
import com.ruoyi.account.wx.tools.WxAppletTools;
import com.ruoyi.account.wx.tools.WxUtils;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
@@ -22,7 +23,6 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
@@ -61,7 +61,10 @@
// WxUtils.verifySignature(data.getRawData(), sessionKey, data.getSignature());
// }
AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey, data.getIv());
+ if(StringUtils.isEmpty(appletUserDecodeData.getPhoneNumber())){
+ return AjaxResult.success();
+ }
appletUserDecodeData.setOpenId(openid);
- return AjaxResult.ok(appUserService.wxLogin(appletUserDecodeData));
+ return AjaxResult.success(appUserService.wxLogin(appletUserDecodeData));
}
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
index 1630c25..d3351ef 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
@@ -49,13 +49,8 @@
.eq(TAppUser::getPhone, appletUserDecodeData.getPhoneNumber())
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
- appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
- .eq(TAppUser::getWxOpenid, appletUserDecodeData.getOpenId())
- .last("LIMIT 1"));
- if(Objects.isNull(appUser)){
- appUser = new TAppUser();
- appUser.setPhone(appletUserDecodeData.getPhoneNumber());
- }
+ appUser = new TAppUser();
+ appUser.setPhone(appletUserDecodeData.getPhoneNumber());
}
}
if(Objects.nonNull(appUser.getStatus())){
@@ -84,13 +79,8 @@
.eq(TAppUser::getPhone, phone)
.last("LIMIT 1"));
if(Objects.isNull(appUser)){
- appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
- .eq(TAppUser::getAliOpenid, response.getOpenId())
- .last("LIMIT 1"));
- if(Objects.isNull(appUser)){
- appUser = new TAppUser();
- appUser.setPhone(phone);
- }
+ appUser = new TAppUser();
+ appUser.setPhone(phone);
}
}
if(Objects.nonNull(appUser.getStatus())){
@@ -114,13 +104,8 @@
// .eq(TAppUser::getPhone, userInfo.getMobile())
// .last("LIMIT 1"));
// if(Objects.isNull(appUser)){
-// appUser = this.getOne(Wrappers.lambdaQuery(TAppUser.class)
-// .eq(TAppUser::getAliOpenid, response.getOpenId())
-// .last("LIMIT 1"));
-// if(Objects.isNull(appUser)){
-// appUser = new TAppUser();
-// appUser.setPhone(userInfo.getMobile());
-// }
+// appUser = new TAppUser();
+// appUser.setPhone(userInfo.getMobile());
// }
// }
// if(Objects.nonNull(appUser.getStatus())){
--
Gitblit v1.7.1