diff --git a/.idea/icon.png b/.idea/icon.png
deleted file mode 100644
index cbe23af6..00000000
Binary files a/.idea/icon.png and /dev/null differ
diff --git a/README.md b/README.md
index 8daca65f..e0a0e294 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
-
+
@@ -207,7 +207,7 @@ public class DeptController extends BaseControllerArco Design | 2.55.0 | 字节跳动推出的前端 UI 框架,年轻化的色彩和组件设计。 |
| TypeScript | 5.0.4 | TypeScript 是微软开发的一个开源的编程语言,通过在 JavaScript 的基础上添加静态类型定义构建而成。 |
| Vite | 5.1.5 | 下一代的前端工具链,为开发提供极速响应。 |
-| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.1.0 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包(如 MyBatis-Plus、SaToken),可轻松集成到应用中,为开发人员减少手动引入依赖及配置的麻烦,为 Spring Boot Web 项目的灵活快速构建提供支持。 |
+| [ContiNew Starter](https://github.com/continew-org/continew-starter) | 2.1.1 | ContiNew Starter 包含了一系列经过企业实践优化的依赖包(如 MyBatis-Plus、SaToken),可轻松集成到应用中,为开发人员减少手动引入依赖及配置的麻烦,为 Spring Boot Web 项目的灵活快速构建提供支持。 |
| Spring Boot | 3.1.11 | 简化 Spring 应用的初始搭建和开发过程,基于“约定优于配置”的理念,使开发人员不再需要定义样板化的配置。(Spring Boot 3.0 开始,要求 Java 17 作为最低版本) |
| Undertow | 2.3.10.Final | 采用 Java 开发的灵活的高性能 Web 服务器,提供包括阻塞和基于 NIO 的非堵塞机制。 |
| Sa-Token + JWT | 1.38.0 | 轻量级 Java 权限认证框架,让鉴权变得简单、优雅。 |
diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml
index 119bd820..90b1f112 100644
--- a/continew-admin-common/pom.xml
+++ b/continew-admin-common/pom.xml
@@ -64,12 +64,6 @@
continew-starter-auth-justauth
-
-
- top.continew
- continew-starter-auth-satoken
-
-
top.continew
@@ -86,6 +80,12 @@
top.continew
continew-starter-messaging-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/CurrentUserProviderImpl.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java
similarity index 75%
rename from continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/CurrentUserProviderImpl.java
rename to continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java
index 3a941dc4..751567a7 100644
--- a/continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/CurrentUserProviderImpl.java
+++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java
@@ -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();
}
}
diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java
index 696781fd..fe3e0d5c 100644
--- a/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java
+++ b/continew-admin-common/src/main/java/top/continew/admin/common/util/helper/LoginHelper.java
@@ -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));
diff --git a/continew-admin-webapi/src/main/resources/banner.txt b/continew-admin-webapi/src/main/resources/banner.txt
index 8321f226..c5d0be5d 100644
--- a/continew-admin-webapi/src/main/resources/banner.txt
+++ b/continew-admin-webapi/src/main/resources/banner.txt
@@ -5,5 +5,5 @@
\____|\___/ |_| |_| \__||_||_| \_| \___| \_/\_/ /_/ \_\\__,_||_| |_| |_||_||_| |_|
:: ${project.name} :: v${project.version}
- :: ContiNew Starter :: v2.1.0
+ :: ContiNew Starter :: v2.1.1
:: Spring Boot :: v${spring-boot.version}
diff --git a/pom.xml b/pom.xml
index 78f1f926..18a8befc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
top.continew
continew-starter
- 2.1.0
+ 2.1.1
top.continew