mitao
2024-09-07 2862c3e4da3adbb4bea43151514f0c43b86476d6
xinquan-auth/src/main/java/com/xinquan/auth/controller/TokenController.java
@@ -17,15 +17,14 @@
import com.xinquan.system.api.domain.SysUser;
import com.xinquan.system.api.feignClient.SysUserClient;
import com.xinquan.system.api.model.AppCaptchaBody;
import com.xinquan.system.api.model.AppLoginUser;
import com.xinquan.system.api.model.AppVerifyCellPhoneBody;
import com.xinquan.system.api.model.AppWXLoginBody;
import com.xinquan.system.api.model.AppleLoginUser;
import com.xinquan.system.api.model.LoginUser;
import com.xinquan.system.api.model.WXLoginUser;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -80,11 +79,11 @@
     */
    @ApiOperation(value = "注册账户",tags = {"APP端"})
    @PostMapping("/app/register")
    public R<?> appRegister(@Validated @RequestBody AppRegisterBody appRegisterBody)
    public R<AppLoginUser> appRegister(@Validated @RequestBody AppRegisterBody appRegisterBody)
    {
        // 用户注册
        sysLoginService.appRegister(appRegisterBody);
        return R.ok();
        AppLoginUser appLoginUser = sysLoginService.appRegister(appRegisterBody);
        return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
    }
    /**
@@ -95,9 +94,9 @@
     */
    @ApiOperation(value = "账号密码登录", tags = {"APP端"})
    @PostMapping("/app/login")
    public R<?> appLogin(@Validated @RequestBody AppLoginBody body) {
        LoginUser userInfo = sysLoginService.appLogin(body);
        return R.ok(tokenService.createToken(userInfo));
    public R<AppLoginUser> appLogin(@Validated @RequestBody AppLoginBody body) {
        AppLoginUser appLoginUser = sysLoginService.appLogin(body);
        return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
    }
    /**
@@ -108,9 +107,9 @@
     */
    @ApiOperation(value = "验证码登录", tags = {"APP端"})
    @PostMapping("/app/captchaLogin")
    public R<?> appCaptchaLogin(@Validated @RequestBody AppCaptchaBody body) {
        LoginUser userInfo = sysLoginService.appCaptchaLogin(body);
        return R.ok(tokenService.createToken(userInfo));
    public R<AppLoginUser> appCaptchaLogin(@Validated @RequestBody AppCaptchaBody body) {
        AppLoginUser appLoginUser = sysLoginService.appCaptchaLogin(body);
        return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
    }
    /**
@@ -146,9 +145,9 @@
     */
    @ApiOperation(value = "微信登录", tags = {"APP端"})
    @PostMapping("/app/wxLogin")
    public R<?> thirdLogin(@Validated @RequestBody AppWXLoginBody body) {
        WXLoginUser wxLoginUser = sysLoginService.wxLogin(body);
        return R.ok(tokenService.createToken4WXLoginUser(wxLoginUser));
    public R<AppLoginUser> thirdLogin(@Validated @RequestBody AppWXLoginBody body) {
        AppLoginUser appLoginUser = sysLoginService.wxLogin(body);
        return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
    }
    /**
@@ -161,9 +160,10 @@
    @PostMapping("/app/appleLogin")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "appleId", value = "苹果ID", required = true, dataType = "String", paramType = "query")})
    public R<?> appleLogin(@RequestParam(value = "appleId", required = true) String appleId) {
        AppleLoginUser appleLoginUser = sysLoginService.appleLogin(appleId);
        return R.ok(tokenService.createToken4WXLoginUser(appleLoginUser));
    public R<AppLoginUser> appleLogin(
            @RequestParam(value = "appleId", required = true) String appleId) {
        AppLoginUser appLoginUser = sysLoginService.appleLogin(appleId);
        return R.ok(tokenService.createToken4AppLoginUser(appLoginUser));
    }
    /**
@@ -175,7 +175,8 @@
    @ApiOperation(value = "微信苹果登录-验证手机号", tags = {"APP端"})
    @PostMapping("/app/verifyCellPhone")
    public R<?> verifyCellPhone(@Validated @RequestBody AppVerifyCellPhoneBody body) {
        return R.ok(tokenService.createToken4WXLoginUser(sysLoginService.verifyCellPhone(body)));
        return R.ok(tokenService.createToken4AppLoginUser(
                sysLoginService.verifyCellPhone(body)));
    }
    /**
@@ -202,7 +203,7 @@
        // 修改用户最后登录时间
        SysUser sysUser = new SysUser();
        sysUser.setUserId(userInfo.getSysUser().getUserId());
        sysUser.setLoginDate(new Date());
        sysUser.setLoginDate(LocalDateTime.now());
        System.out.println("修改用户登录时间"+sysUser);
        userClient.updateSysUser(sysUser);
        // 获取登录token