From e1199724d209c29a7b640bc96d2ffa32acf381dc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 20 八月 2024 09:10:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 41c1531..91f7ab4 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
@@ -6,12 +6,9 @@
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
+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;
@@ -30,6 +27,7 @@
*
* @author ruoyi
*/
+@Slf4j
@RestController
public class TokenController
{
@@ -40,7 +38,7 @@
private SysLoginService sysLoginService;
@Resource
private SysUserClient userClient;
-
+
@@ -67,10 +65,6 @@
userClient.updateSysUser(sysUser);
return R.ok(map);
}
-
-
-
-
@DeleteMapping("logout")
public R<?> logout(HttpServletRequest request) {
@@ -85,6 +79,7 @@
}
return R.ok();
}
+
@PostMapping("refresh")
public R<?> refresh(HttpServletRequest request)
@@ -106,4 +101,5 @@
sysLoginService.register(registerBody.getUsername(), registerBody.getPassword(), request);
return R.ok();
}
+
}
--
Gitblit v1.7.1