From ea73e0fcc705bd95c35ef95f17f98f482475a0dd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 13:50:52 +0800
Subject: [PATCH] 代码提交
---
xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 054a409..0e4a139 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
@@ -99,6 +99,12 @@
return R.fail("当前手机号已被绑定");
}
}
+ if(type==1){
+ AppUser data = remoteAppUserService.getUserByPhone(cellPhone).getData();
+ if (data!=null){
+ return R.fail("当前手机号已注册");
+ }
+ }
sysLoginService.sendCaptchaCode(cellPhone, type);
return R.ok();
}
@@ -127,6 +133,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));
}
@@ -140,6 +151,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));
}
@@ -178,6 +194,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));
}
@@ -191,11 +212,19 @@
@PostMapping("/app/appleLogin")
@ApiImplicitParams({
@ApiImplicitParam(name = "appleId", value = "苹果ID", required = true, dataType = "String", paramType = "query"),
+ @ApiImplicitParam(name = "device", value = "设备码", required = true, 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 = true) String device
+ ) {
+ AppLoginUser appLoginUser = sysLoginService.appleLogin(appleId,device);
+ Long appUserId = appLoginUser.getAppUserId();
+ AppUser data = remoteAppUserService.getAppUserById(appUserId + "").getData();
+ if (data.getUserStatus() == 2){
+ return R.fail("您的账号已被冻结");
+ }
return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
}
--
Gitblit v1.7.1