修改bug

mitao

2024-07-17 53155df41c5cce8f7be814a25148efe9a7ea25c5

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

@@ -12,6 +12,7 @@
import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -26,6 +27,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
@@ -90,18 +92,22 @@
    {
        // 用户登录
        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
        SysUser sysUser1 = userInfo.getSysUser();
        HashMap<String, Object> map = new HashMap<>();
        map.put("token",tokenService.createToken(userInfo));
        List<SysRole> roles = userInfo.getSysUser().getRoles();
        if(CollectionUtils.isEmpty(roles)){
            return R.fail("请关联角色!");
        List<SysRole> roles = sysUser1.getRoles();
        if (Objects.equals("00", sysUser1.getUserType())) {
            if (CollectionUtils.isEmpty(roles)) {
                return R.fail("请关联角色!");
            }
            map.put("roleName", roles.get(0).getRoleName());
        }

        map.put("roleName",roles.get(0).getRoleName());
        map.put("info",userInfo);
        map.put("userType", sysUser1.getUserType());
        // 修改用户最后登录时间
        SysUser sysUser = new SysUser();
        sysUser.setUserId(userInfo.getSysUser().getUserId());
        sysUser.setUserId(sysUser1.getUserId());
        sysUser.setLoginDate(new Date());
        System.out.println("修改用户登录时间"+sysUser);
        userClient.updateSysUser(sysUser);
@@ -125,6 +131,19 @@
        return R.ok();
    }

    @InnerAuth
    @GetMapping("/inner/logout")
    @ApiOperation(value = "设置用户token失效")
    public R<?> logout(@RequestParam("") String token) {
        if (StringUtils.isNotEmpty(token)) {
            String username = JwtUtils.getUserName(token);
            // 删除用户缓存记录
            AuthUtil.logoutByToken(token);
            // 记录用户退出日志
            sysLoginService.logout(username);
        }
        return R.ok();
    }
    @PostMapping("refresh")
    @ApiOperation(value = "管理后台-刷新令牌有效期")
    public R<?> refresh(HttpServletRequest request)