ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-21 04:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: continew-starter 2.1.0 => 2.1.1

Browse Source 
1、IpUtils 获取 IPv4 归属地方法重命名
2、CurrentUserProvider => WebSocketClientService
This commit is contained in:
Charles7c
2024-06-23 12:48:20 +08:00
parent 54bc832ba2
commit 737b6891dd
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/CurrentUserProviderImpl.java → continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java
View File

@@ -21,8 +21,7 @@ import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.stereotype.Component;
import top.continew.admin.common.model.dto.LoginUser;
import top.continew.admin.common.util.helper.LoginHelper;
import top.continew.starter.messaging.websocket.core.CurrentUserProvider;
import top.continew.starter.messaging.websocket.model.CurrentUser;
import top.continew.starter.messaging.websocket.core.WebSocketClientService;
/**
* 当前登录用户 Provider
@@ -31,15 +30,13 @@ import top.continew.starter.messaging.websocket.model.CurrentUser;
* @since 2024/6/4 22:13
*/
@Component
public class CurrentUserProviderImpl implements CurrentUserProvider {
public class WebSocketClientServiceImpl implements WebSocketClientService {
@Override
public CurrentUser getCurrentUser(ServletServerHttpRequest request) {
public String getClientId(ServletServerHttpRequest request) {
HttpServletRequest servletRequest = request.getServletRequest();
String token = servletRequest.getParameter("token");
LoginUser loginUser = LoginHelper.getLoginUser(token);
CurrentUser currentUser = new CurrentUser();
currentUser.setUserId(loginUser.getToken());
return currentUser;
return loginUser.getToken();
}
}

2
continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java
View File

@@ -55,7 +55,7 @@ public class LoginHelper {
// 记录登录信息
HttpServletRequest request = ServletUtils.getRequest();
loginUser.setIp(JakartaServletUtil.getClientIP(request));
loginUser.setAddress(IpUtils.getAddress(loginUser.getIp()));
loginUser.setAddress(ExceptionUtils.exToNull(() -> IpUtils.getIpv4Address(loginUser.getIp())));
loginUser.setBrowser(ServletUtils.getBrowser(request));
loginUser.setLoginTime(LocalDateTime.now());
loginUser.setOs(StrUtil.subBefore(ServletUtils.getOs(request), " or", false));