From 1b43670626f48266efb898ec7cd7deedcab9ba10 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 17 八月 2024 15:31:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 85ebf14..8a06c5d 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -3,19 +3,16 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.core.constant.SecurityConstants;
-import com.ruoyi.system.api.RemoteUserService;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.feignClient.SysLoginLogClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import com.ruoyi.system.domain.SysLoginLog;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
@@ -27,9 +24,6 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.time.LocalDateTime;
import java.util.*;
/**
@@ -37,6 +31,7 @@
*
* @author ruoyi
*/
+@Slf4j
@RestController
public class TokenController
{
@@ -60,11 +55,11 @@
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("请关联角色!");
- }
+// 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);
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
@@ -74,10 +69,6 @@
userClient.updateSysUser(sysUser);
return R.ok(map);
}
-
-
-
-
@DeleteMapping("logout")
public R<?> logout(HttpServletRequest request) {
@@ -93,6 +84,17 @@
return R.ok();
}
+ @DeleteMapping("logoutApplet")
+ public R<?> logoutApplet(HttpServletRequest request) {
+ String token = SecurityUtils.getToken(request);
+ if (StringUtils.isNotEmpty(token))
+ {
+ // 删除用户缓存记录
+ AuthUtil.logoutByToken(token);
+ }
+ return R.ok();
+ }
+
@PostMapping("refresh")
public R<?> refresh(HttpServletRequest request)
{
--
Gitblit v1.7.1