From 06dad2095dbe4c465025e5bc6e0220521636e2c2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 15 十一月 2024 18:20:59 +0800
Subject: [PATCH] 代码提交
---
xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java b/xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java
index 9d77398..3d696bf 100644
--- a/xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java
+++ b/xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java
@@ -13,6 +13,7 @@
import com.xinquan.common.security.auth.AuthUtil;
import com.xinquan.common.security.service.TokenService;
import com.xinquan.common.security.utils.SecurityUtils;
+import com.xinquan.system.api.domain.AppUser;
import com.xinquan.system.api.domain.SysMenu;
import com.xinquan.system.api.domain.SysRole;
import com.xinquan.system.api.domain.SysUser;
@@ -22,13 +23,16 @@
import com.xinquan.system.api.model.AppVerifyCellPhoneBody;
import com.xinquan.system.api.model.AppWXLoginBody;
import com.xinquan.system.api.model.LoginUser;
+import com.xinquan.user.api.feign.RemoteAppUserService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -56,6 +60,8 @@
private SysLoginService sysLoginService;
@Autowired
private SysUserClient userClient;
+ @Resource
+ private RemoteAppUserService remoteAppUserService;
/**
* 发送验证码
@@ -70,6 +76,41 @@
public R<?> sendCaptchaCode(
@RequestParam(value = "cellPhone", required = true) String cellPhone,
@RequestParam("type") Integer type) {
+
+ if(type==5){
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ AppUser data1 = remoteAppUserService.getAppUserById(loginUser.getUserid() + "").getData();
+ if (!cellPhone.equals(data1.getCellPhone())){
+ return R.fail("手机号错误");
+ }
+ }
+ if(type==5){
+ AppUser data = remoteAppUserService.getUserByPhone(cellPhone).getData();
+ if (data!=null){
+ return R.fail("当前手机号已被绑定");
+ }
+ }
+ if(type==4){
+ AppUser data = remoteAppUserService.getUserByPhone(cellPhone).getData();
+ if (data!=null && (data.getWxOpenId()!=null||data.getAppleId()!=null)){
+ return R.fail("当前手机号已被绑定");
+ }
+ }
+ if(type==1){
+ AppUser data = remoteAppUserService.getUserByPhone(cellPhone).getData();
+ if (data!=null){
+ return R.fail("当前手机号已注册");
+ }
+ }
+ if(type==3){
+ AppUser data = remoteAppUserService.getUserByPhone(cellPhone).getData();
+ if (data!=null){
+ return R.fail("当前手机号未注册");
+ }
+ }
sysLoginService.sendCaptchaCode(cellPhone, type);
return R.ok();
}
@@ -98,6 +139,11 @@
@PostMapping("/app/login")
public R<AppLoginUser> appLogin(@Validated @RequestBody AppLoginBody body) {
AppLoginUser appLoginUser = sysLoginService.appLogin(body);
+ Long appUserId = appLoginUser.getAppUserId();
+ AppUser data = remoteAppUserService.getAppUserById(appUserId + "").getData();
+ if (data.getUserStatus() == 2){
+ return R.fail("您的账号已被冻结");
+ }
return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
}
@@ -111,6 +157,11 @@
@PostMapping("/app/captchaLogin")
public R<AppLoginUser> appCaptchaLogin(@Validated @RequestBody AppCaptchaBody body) {
AppLoginUser appLoginUser = sysLoginService.appCaptchaLogin(body);
+ Long appUserId = appLoginUser.getAppUserId();
+ AppUser data = remoteAppUserService.getAppUserById(appUserId + "").getData();
+ if (data.getUserStatus() == 2){
+ return R.fail("您的账号已被冻结");
+ }
return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
}
@@ -149,6 +200,11 @@
@PostMapping("/app/wxLogin")
public R<AppLoginUser> thirdLogin(@Validated @RequestBody AppWXLoginBody body) {
AppLoginUser appLoginUser = sysLoginService.wxLogin(body);
+ Long appUserId = appLoginUser.getAppUserId();
+ AppUser data = remoteAppUserService.getAppUserById(appUserId + "").getData();
+ if (data.getUserStatus() == 2){
+ return R.fail("您的账号已被冻结");
+ }
return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
}
@@ -161,12 +217,21 @@
@ApiOperation(value = "苹果登录", tags = {"APP端"})
@PostMapping("/app/appleLogin")
@ApiImplicitParams({
- @ApiImplicitParam(name = "appleId", value = "苹果ID", required = true, dataType = "String", paramType = "query"),
+ @ApiImplicitParam(name = "appleId", value = "苹果ID", required = true, dataType = "String", paramType = "query")
+// @ApiImplicitParam(name = "device", value = "设备码", required = false, dataType = "String", paramType = "query"),
}
)
public R<AppLoginUser> appleLogin(
- @RequestParam(value = "appleId", required = true) String appleId) {
- AppLoginUser appLoginUser = sysLoginService.appleLogin(appleId);
+ @RequestParam(value = "appleId", required = true) String appleId,
+ @RequestParam(value = "device", required = false) String device
+ ) {
+
+ AppLoginUser appLoginUser = sysLoginService.appleLogin(appleId, org.springframework.util.StringUtils.hasLength(device)?device:"");
+ Long appUserId = appLoginUser.getAppUserId();
+ AppUser data = remoteAppUserService.getAppUserById(appUserId + "").getData();
+ if (data.getUserStatus() == 2){
+ return R.fail("您的账号已被冻结");
+ }
return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
}
@@ -179,8 +244,10 @@
@ApiOperation(value = "微信苹果登录-验证手机号", tags = {"APP端"})
@PostMapping("/app/verifyCellPhone")
public R<?> verifyCellPhone(@Validated @RequestBody AppVerifyCellPhoneBody body) {
+ AppLoginUser appLoginUser = sysLoginService.verifyCellPhone(body);
+
return R.ok(tokenService.createToken4AppLoginUser(
- sysLoginService.verifyCellPhone(body)));
+ appLoginUser));
}
/**
--
Gitblit v1.7.1