From 737b6891dd357857a156acb831ecf739443e1051 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 23 Jun 2024 12:48:20 +0800 Subject: [PATCH] chore: continew-starter 2.1.0 => 2.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、IpUtils 获取 IPv4 归属地方法重命名 2、CurrentUserProvider => WebSocketClientService --- .idea/icon.png | Bin 21885 -> 0 bytes README.md | 4 ++-- continew-admin-common/pom.xml | 12 ++++++------ ...mpl.java => WebSocketClientServiceImpl.java} | 11 ++++------- .../admin/common/util/helper/LoginHelper.java | 2 +- .../src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 7 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 .idea/icon.png rename continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/{CurrentUserProviderImpl.java => WebSocketClientServiceImpl.java} (75%) diff --git a/.idea/icon.png b/.idea/icon.png deleted file mode 100644 index cbe23af6f14e955b72ac26a865165b719bbfbdb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21885 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 diff --git a/README.md b/README.md index 8daca65f..e0a0e294 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Sonar Status -ContiNew Starter +ContiNew Starter Spring Boot @@ -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.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 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 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 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