代码提交

xuhy

2024-11-09 9e5d3f634b52333c076eb443a64de873c5ddceed

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

@@ -13,6 +13,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.system.api.domain.SysMenu;
import com.xinquan.system.api.domain.SysRole;
import com.xinquan.system.api.domain.SysUser;
import com.xinquan.system.api.feignClient.SysUserClient;
@@ -27,6 +28,8 @@
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -68,6 +71,12 @@
    public R<?> sendCaptchaCode(
            @RequestParam(value = "cellPhone", required = true) String cellPhone,
            @RequestParam("type") Integer type) {
        if(type == 3){
            SysUser sysUser = userClient.queryUserByPhone(cellPhone).getData();
            if(Objects.isNull(sysUser)){
                return R.fail("该手机号未注册");
            }
        }
        sysLoginService.sendCaptchaCode(cellPhone, type);
        return R.ok();
    }
@@ -79,7 +88,7 @@
     */
    @ApiOperation(value = "注册账户",tags = {"APP端"})
    @PostMapping("/app/register")
    public R<AppLoginUser> appRegister(@Validated @RequestBody AppRegisterBody appRegisterBody)
    public R<AppLoginUser> appRegister(@RequestBody AppRegisterBody appRegisterBody)
    {
        // 用户注册
        AppLoginUser appLoginUser = sysLoginService.appRegister(appRegisterBody);
@@ -177,8 +186,10 @@
    @ApiOperation(value = "微信苹果登录-验证手机号", tags = {"APP端"})
    @PostMapping("/app/verifyCellPhone")
    public R<?> verifyCellPhone(@Validated @RequestBody AppVerifyCellPhoneBody body) {
        AppLoginUser appLoginUser = sysLoginService.verifyCellPhone(body);

        return R.ok(tokenService.createToken4AppLoginUser(
                sysLoginService.verifyCellPhone(body)));
                appLoginUser));
    }

    /**
@@ -195,19 +206,20 @@
        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
        HashMap<String, Object> map = new HashMap<>();
        map.put("token",tokenService.createToken(userInfo));
        List<SysRole> roles = userInfo.getSysUser().getRoles();
        Set<String> roles = userInfo.getRoles();

        if(CollectionUtils.isEmpty(roles)){
            return R.fail("请关联角色!");
        }

        map.put("roleName",roles.get(0).getRoleName());
        map.put("roleName",roles.stream().findFirst().get());
        map.put("info",userInfo);
        List<SysMenu> data = userClient.roleInfoFromUserId(userInfo.getUserid()).getData();
        map.put("menus",data);
        // 修改用户最后登录时间
        SysUser sysUser = new SysUser();
        sysUser.setUserId(userInfo.getSysUser().getUserId());
        sysUser.setLoginDate(LocalDateTime.now());
        System.out.println("修改用户登录时间"+sysUser);
        userClient.updateSysUser(sysUser);
        // 获取登录token
        return R.ok(map);
    }