chore: continew-starter 2.1.0 => 2.1.1

1、IpUtils 获取 IPv4 归属地方法重命名 2、CurrentUserProvider => WebSocketClientService
continew-org · Jun 23, 2024 · 737b689 · 737b689
1 parent 54bc832
commit 737b689
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/.idea/icon.png b/.idea/icon.png
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 <img src="https://sonarcloud.io/api/project_badges/measure?project=Charles7c_continew-admin&metric=alert_status" alt="Sonar Status" />
 </a>
 <a href="https://github.com/continew-org/continew-starter" target="_blank">
-<img src="https://img.shields.io/badge/ContiNew Starter-2.1.0-%236CB52D.svg" alt="ContiNew Starter" />
+<img src="https://img.shields.io/badge/ContiNew Starter-2.1.1-%236CB52D.svg" alt="ContiNew Starter" />
 </a>
 <a href="https://spring.io/projects/spring-boot" target="_blank">
 <img src="https://img.shields.io/badge/Spring Boot-3.1.11-%236CB52D.svg?logo=Spring-Boot" alt="Spring Boot" />
@@ -207,7 +207,7 @@ public class DeptController extends BaseController<DeptService, DeptResp, DeptDe
 | <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design</a> | 2.55.0       | 字节跳动推出的前端 UI 框架，年轻化的色彩和组件设计。         |
 | <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a> | 5.0.4        | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 |
 | <a href="https://cn.vitejs.dev/" target="_blank">Vite</a>    | 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 项目的灵活快速构建提供支持。 |
 | <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a> | 3.1.11       | 简化 Spring 应用的初始搭建和开发过程，基于“约定优于配置”的理念，使开发人员不再需要定义样板化的配置。（Spring Boot 3.0 开始，要求 Java 17 作为最低版本） |
 | <a href="https://undertow.io/" target="_blank">Undertow</a>  | 2.3.10.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 |
 | <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token + JWT</a> | 1.38.0       | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。             |

diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml
@@ -64,12 +64,6 @@
             <artifactId>continew-starter-auth-justauth</artifactId>
         </dependency>
 
-        <!-- ContiNew Starter 认证模块 - SaToken -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-auth-satoken</artifactId>
-        </dependency>
-
         <!-- ContiNew Starter 数据访问模块 - MyBatis Plus -->
         <dependency>
             <groupId>top.continew</groupId>
@@ -86,6 +80,12 @@
         <dependency>
             <groupId>top.continew</groupId>
             <artifactId>continew-starter-messaging-websocket</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- ContiNew Starter 消息模块 - 邮件 -->

diff --git a/...ig/websocket/CurrentUserProviderImpl.java → ...websocket/WebSocketClientServiceImpl.java b/...ig/websocket/CurrentUserProviderImpl.java → ...websocket/WebSocketClientServiceImpl.java
@@ -21,8 +21,7 @@
 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 @@
  * @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
@@ -55,7 +55,7 @@ public static String login(LoginUser loginUser) {
         // 记录登录信息
         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
@@ -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
@@ -13,7 +13,7 @@
     <parent>
         <groupId>top.continew</groupId>
         <artifactId>continew-starter</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </parent>
 
     <groupId>top.continew</groupId>