提交 46828174 authored 作者: 黄承天's avatar 黄承天

fix(user): findBySessionId方法更名为findNow并增加了无需参数的的重载

上级 8b375a32
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId> <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
...@@ -63,6 +67,7 @@ ...@@ -63,6 +67,7 @@
<artifactId>springfox-swagger-ui</artifactId> <artifactId>springfox-swagger-ui</artifactId>
<version>2.9.2</version> <version>2.9.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -37,7 +37,7 @@ public class UserController { ...@@ -37,7 +37,7 @@ public class UserController {
@GetMapping("/login/info") @GetMapping("/login/info")
public ResponseEntity<UserInfo> find(HttpServletRequest request) { public ResponseEntity<UserInfo> find(HttpServletRequest request) {
String sessionId = request.getSession().getId(); String sessionId = request.getSession().getId();
UserInfo userInfo = userService.findBySessionId(sessionId); UserInfo userInfo = userService.findNow(sessionId);
return ResponseEntity.ok(userInfo); return ResponseEntity.ok(userInfo);
} }
...@@ -45,7 +45,7 @@ public class UserController { ...@@ -45,7 +45,7 @@ public class UserController {
@GetMapping("/logout") @GetMapping("/logout")
public ResponseEntity<UserInfo> logout(HttpServletRequest request) { public ResponseEntity<UserInfo> logout(HttpServletRequest request) {
String sessionId = request.getSession().getId(); String sessionId = request.getSession().getId();
UserInfo userInfo = userService.findBySessionId(sessionId); UserInfo userInfo = userService.findNow(sessionId);
return ResponseEntity.ok(userInfo); return ResponseEntity.ok(userInfo);
} }
......
...@@ -13,6 +13,7 @@ import org.matrix.local.mapper.KsUserProjectMapper; ...@@ -13,6 +13,7 @@ import org.matrix.local.mapper.KsUserProjectMapper;
import org.matrix.local.util.MD5Util; import org.matrix.local.util.MD5Util;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import java.util.HashMap; import java.util.HashMap;
...@@ -69,12 +70,24 @@ public class UserService { ...@@ -69,12 +70,24 @@ public class UserService {
/** /**
* 查询当前登录的用户 * 查询当前登录的用户
* 输入sessionId 查出其当前登录的user的信息 * 根据sessionId查出其当前登录的user的信息
* sessionId从上下文中取 无数输入
*
* @return 当前登录的user的信息
*/
public UserInfo findNow() {
String sessionId = RequestContextHolder.currentRequestAttributes().getSessionId();
return findNow(sessionId);
}
/**
* 查询当前登录的用户
* 根据输入的sessionId查出其当前登录的user的信息
* *
* @param sessionId sessionId * @param sessionId sessionId
* @return 当前登录的user的信息 * @return 当前登录的user的信息
*/ */
public UserInfo findBySessionId(String sessionId) { public UserInfo findNow(String sessionId) {
boolean hasLogin = sessionMap.containsKey(sessionId); boolean hasLogin = sessionMap.containsKey(sessionId);
if (hasLogin) { if (hasLogin) {
Long userId = sessionMap.get(sessionId); Long userId = sessionMap.get(sessionId);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论