From 41b9950b03bafeb5fa90770794faf9baeacade6b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 16:15:43 +0800
Subject: [PATCH] 代码提交
---
xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java | 13 +++++++++++--
1 files changed, 11 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 0654711..a33e4b7 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
@@ -93,6 +93,12 @@
return R.fail("当前手机号已被绑定");
}
}
+ if(type==4){
+ AppUser data = remoteAppUserService.getUserByPhone(cellPhone).getData();
+ if (data!=null && (data.getWxOpenId()!=null||data.getAppleId()!=null)){
+ return R.fail("当前手机号已被绑定");
+ }
+ }
sysLoginService.sendCaptchaCode(cellPhone, type);
return R.ok();
}
@@ -185,11 +191,14 @@
@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);
return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
}
--
Gitblit v1.7.1