若依 3.5.0

RuoYi

2022-04-11 d14f27e5eb3a804fa1c1f6cb5d471b63ed80f57a

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

@@ -7,10 +7,14 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.auth.form.LoginBody;

import com.ruoyi.auth.form.RegisterBody;

import com.ruoyi.auth.service.SysLoginService;

import com.ruoyi.common.core.domain.R;

import com.ruoyi.common.core.utils.JwtUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.security.auth.AuthUtil;

import com.ruoyi.common.security.service.TokenService;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.system.api.model.LoginUser;



/**

@@ -39,12 +43,12 @@
    @DeleteMapping("logout")

    public R<?> logout(HttpServletRequest request)

    {

        LoginUser loginUser = tokenService.getLoginUser(request);

        if (StringUtils.isNotNull(loginUser))

        String token = SecurityUtils.getToken(request);

        if (StringUtils.isNotEmpty(token))

        {

            String username = loginUser.getUsername();

            String username = JwtUtils.getUserName(token);

            // 删除用户缓存记录

            tokenService.delLoginUser(loginUser.getToken());

            AuthUtil.logoutByToken(token);

            // 记录用户退出日志

            sysLoginService.logout(username);

        }

@@ -58,8 +62,17 @@
        if (StringUtils.isNotNull(loginUser))

        {

            // 刷新令牌有效期

            return R.ok(tokenService.refreshToken(loginUser));

            tokenService.refreshToken(loginUser);

            return R.ok();

        }

        return R.ok();

    }



    @PostMapping("register")

    public R<?> register(@RequestBody RegisterBody registerBody)

    {

        // 用户注册

        sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());

        return R.ok();

    }

}