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 | 15 +++++++++++----
1 files changed, 11 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 0e4a139..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
@@ -105,6 +105,12 @@
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();
}
@@ -211,15 +217,16 @@
@ApiOperation(value = "苹果登录", tags = {"APP端"})
@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"),
+ @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,
- @RequestParam(value = "device", required = true) String device
+ @RequestParam(value = "device", required = false) String device
) {
- AppLoginUser appLoginUser = sysLoginService.appleLogin(appleId,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){
--
Gitblit v1.7.1