From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 3d696bf..30510a6 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
@@ -10,9 +10,11 @@
import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.utils.JwtUtils;
import com.xinquan.common.core.utils.StringUtils;
+import com.xinquan.common.redis.service.RedisService;
import com.xinquan.common.security.auth.AuthUtil;
import com.xinquan.common.security.service.TokenService;
import com.xinquan.common.security.utils.SecurityUtils;
+import com.xinquan.meditation.api.feign.RemoteMeditationService;
import com.xinquan.system.api.domain.AppUser;
import com.xinquan.system.api.domain.SysMenu;
import com.xinquan.system.api.domain.SysRole;
@@ -62,6 +64,8 @@
private SysUserClient userClient;
@Resource
private RemoteAppUserService remoteAppUserService;
+ @Resource
+ private RemoteMeditationService remoteMeditationService;
/**
* 发送验证码
@@ -72,21 +76,11 @@
@ApiOperation(value = "发送验证码",tags = {"APP端"})
@ApiImplicitParams({
@ApiImplicitParam(name = "cellPhone", value = "手机号码", required = true, dataType = "String", paramType = "query"),
- @ApiImplicitParam(name = "type", value = "类型 1=注册 2=验证码登录 3=找回密码 4=第三方登录后验证手机 5=切换手机号 6= 添加银行卡", required = true, dataType = "Integer", paramType = "query")})
+ @ApiImplicitParam(name = "type", value = "类型 1=注册 2=验证码登录 3=找回密码 4=第三方登录后验证手机 5=切换手机号 6= 添加银行卡,7=管理后台修改密码", required = true, dataType = "Integer", paramType = "query")})
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){
@@ -107,7 +101,7 @@
}
if(type==3){
AppUser data = remoteAppUserService.getUserByPhone(cellPhone).getData();
- if (data!=null){
+ if (data==null){
return R.fail("当前手机号未注册");
}
}
@@ -124,6 +118,7 @@
@PostMapping("/app/register")
public R<AppLoginUser> appRegister(@RequestBody AppRegisterBody appRegisterBody)
{
+ System.err.println("controller传递的邀请人id"+(appRegisterBody.getInviteUserId()==null?"":appRegisterBody.getInviteUserId()));
// 用户注册
AppLoginUser appLoginUser = sysLoginService.appRegister(appRegisterBody);
return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
@@ -205,7 +200,9 @@
if (data.getUserStatus() == 2){
return R.fail("您的账号已被冻结");
}
- return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
+ AppLoginUser token4AppLoginUser = tokenService.createToken4AppLoginUser(appLoginUser);
+ System.err.println("微信登录token"+token4AppLoginUser.getAccessToken());
+ return R.ok(token4AppLoginUser);
}
/**
@@ -246,8 +243,9 @@
public R<?> verifyCellPhone(@Validated @RequestBody AppVerifyCellPhoneBody body) {
AppLoginUser appLoginUser = sysLoginService.verifyCellPhone(body);
- return R.ok(tokenService.createToken4AppLoginUser(
- appLoginUser));
+ AppLoginUser token4AppLoginUser = tokenService.createToken4AppLoginUser(appLoginUser);
+ System.err.println("校验手机号token"+token4AppLoginUser.getAccessToken());
+ return R.ok(token4AppLoginUser);
}
/**
--
Gitblit v1.7.1