bug修改

无关风月

2025-04-03 b01f752252eaadd1fa31eda6a9ad43146660b721

 xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java

@@ -14,6 +14,7 @@
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;
@@ -63,7 +64,8 @@
    private SysUserClient userClient;
    @Resource
    private RemoteAppUserService remoteAppUserService;

    @Resource
    private RemoteMeditationService remoteMeditationService;

    /**
     * 发送验证码
@@ -99,7 +101,7 @@
        }
        if(type==3){
            AppUser data = remoteAppUserService.getUserByPhone(cellPhone).getData();
            if (data!=null){
            if (data==null){
                return R.fail("当前手机号未注册");
            }
        }
@@ -116,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));
@@ -197,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);
    }

    /**
@@ -238,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);
    }

    /**