bug修改

无关风月

2025-04-03 b01f752252eaadd1fa31eda6a9ad43146660b721

 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){
@@ -97,6 +91,18 @@
            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);
@@ -112,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));
@@ -127,6 +134,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 +152,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,7 +195,14 @@
    @PostMapping("/app/wxLogin")
    public R<AppLoginUser> thirdLogin(@Validated @RequestBody AppWXLoginBody body) {
        AppLoginUser appLoginUser = sysLoginService.wxLogin(body);
        return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
        Long appUserId = appLoginUser.getAppUserId();
        AppUser data = remoteAppUserService.getAppUserById(appUserId + "").getData();
        if (data.getUserStatus() == 2){
            return R.fail("您的账号已被冻结");
        }
        AppLoginUser token4AppLoginUser = tokenService.createToken4AppLoginUser(appLoginUser);
        System.err.println("微信登录token"+token4AppLoginUser.getAccessToken());
        return R.ok(token4AppLoginUser);
    }

    /**
@@ -190,15 +214,21 @@
    @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){
            return R.fail("您的账号已被冻结");
        }
        return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
    }

@@ -213,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);
    }

    /**