From b3eaa44c7dc5262f9eec2336ace8a2ceae818010 Mon Sep 17 00:00:00 2001 From: Odboy Date: Thu, 5 Feb 2026 20:17:45 +0800 Subject: [PATCH] =?UTF-8?q?chore(deps):=20=E6=9B=B4=E6=96=B0Spring=20Boot?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=B9=B6=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将Spring Boot父版本从3.5.9升级到3.5.10 - 修复文件上传路径中用户名前缺少斜杠的问题 --- .../server/core/KitFileLocalUploadHelper.java | 2 +- .../websocket/context/KitWsServer.java | 8 ++--- .../controller/SystemMenuController.java | 8 +++++ .../src/main/java/cn/odboy/GenCode.java | 2 +- .../java/cn/odboy/util/KitDateUtilTest.java | 31 +++++++++++++++++++ .../java/cn/odboy/util/WorkTimeTests.java | 30 ++++++++++++++++++ cutejava-springboot3/pom.xml | 7 ++--- .../main/java/cn/odboy/base/KitPageArgs.java | 2 +- .../context/BeanLoadFinishListener.java | 1 + .../framework/context/BootApplication.java | 12 ++++--- .../ExecutionTimeStatisticsFaceAspect.java | 1 + .../service/KitHealthCheckPointService.java | 1 + .../mybatisplus/config/KitMpQTypeEnum.java | 1 + .../mybatisplus/config/KitMpQuery.java | 1 + .../config/MpCustomP6SpyLogger.java | 1 + .../config/MpInsertBatchSqlInjector.java | 1 + .../mybatisplus/config/MybatisPlusConfig.java | 1 + .../config/RemoveDruidAdConfig.java | 4 +++ .../framework/quartz/config/QuartzConfig.java | 1 + .../server/config/AsyncTheadPoolConfig.java | 1 + .../converters/DateStringToDateConverter.java | 1 + .../config/UndertowWebSocketConfig.java | 1 + .../config/WebSocketEndpointConfig.java | 1 + .../websocket/context/KitWsClientManager.java | 1 + .../websocket/context/KitWsMessage.java | 1 + .../framework/websocket/model/WsSidVo.java | 1 + .../websocket/util/WsMessageUtil.java | 1 + .../controller/SystemUserController.java | 1 - .../system/service/SystemAuthService.java | 3 +- .../src/main/java/cn/odboy/GenCode.java | 5 +-- .../java/cn/odboy/HealthCheckPointer.java | 1 + .../java/cn/odboy/MyBatisMapperTests.java | 4 +++ .../cn/odboy/util/KitDesEncryptUtilTest.java | 1 + .../java/cn/odboy/util/KitFileUtilTest.java | 1 + 34 files changed, 119 insertions(+), 20 deletions(-) create mode 100644 cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/util/KitDateUtilTest.java create mode 100644 cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/util/WorkTimeTests.java diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java index 8a74ca81..072b0c70 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java @@ -50,7 +50,7 @@ public class KitFileLocalUploadHelper { if (StrUtil.isBlank(currentUserName)) { return PATH_MAC.replace("${appName}", SystemConst.CURRENT_APP_NAME).replace("${username}", ""); } - return PATH_MAC.replace("${appName}", SystemConst.CURRENT_APP_NAME).replace("${username}", currentUserName); + return PATH_MAC.replace("${appName}", SystemConst.CURRENT_APP_NAME).replace("${username}", "/" + currentUserName); } return PATH_LINUX.replace("${appName}", SystemConst.CURRENT_APP_NAME); } diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsServer.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsServer.java index 3d4399b7..c02ae666 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsServer.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsServer.java @@ -62,12 +62,12 @@ public class KitWsServer { * @param message 客户端发送过来的消息 */ @OnMessage - public void onMessage(String message, Session session) { + public void onMessage(String message, Session session) throws IOException { KitWsMessage wsMessage = JSON.parseObject(message, KitWsMessage.class); String bizCode = wsMessage.getBizCode(); Object data = wsMessage.getData(); - log.info("收到来 sid={} 的信息: message={}, bizCode={}, data={}", sid, message, bizCode, - JSON.toJSONString(data)); + log.info("收到来 sid={} 的信息: message={}, bizCode={}, data={}", sid, message, bizCode, JSON.toJSONString(data)); + session.getBasicRemote().sendText(message); } /** @@ -102,7 +102,7 @@ public class KitWsServer { /** * 精准推送消息 */ - public void sendMessage(KitWsMessage message, @PathParam("sid") String sid) { + public void sendMessage(KitWsMessage message, @PathParam("sid") String sid) throws IOException { String body = JSON.toJSONString(message); // log.info("推送消息到{}, 推送内容:{}", sid, message); try { diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index de0f96dc..55d22beb 100644 --- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -71,6 +71,14 @@ public class SystemMenuController { return ResponseEntity.ok(systemMenuTbs); } + @ApiOperation("返回全部的菜单") + @PostMapping(value = "/listRoleMenuByPid") + @PreAuthorize("@el.check('menu:list','roles:list')") + public ResponseEntity> listRoleMenuByPid(@RequestParam Long pid) { + List systemMenuTbs = systemMenuService.listMenuByPid(pid, true); + return ResponseEntity.ok(systemMenuTbs); + } + @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID") @PostMapping(value = "/listChildMenuSetByMenuId") @PreAuthorize("@el.check('menu:list','roles:list')") diff --git a/cutejava-springboot3/cutejava-starter/src/main/java/cn/odboy/GenCode.java b/cutejava-springboot3/cutejava-starter/src/main/java/cn/odboy/GenCode.java index 551aa6d9..c3cb27a9 100644 --- a/cutejava-springboot3/cutejava-starter/src/main/java/cn/odboy/GenCode.java +++ b/cutejava-springboot3/cutejava-starter/src/main/java/cn/odboy/GenCode.java @@ -25,7 +25,7 @@ import java.util.List; public class GenCode { private static final String ADDR = "127.0.0.1"; - private static final Integer PORT = 23306; + private static final Integer PORT = 3306; private static final String DATABASE_NAME = "cutejava"; private static final String DATABASE_USER = "root"; private static final String DATABASE_PWD = "kd123456"; diff --git a/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/util/KitDateUtilTest.java b/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/util/KitDateUtilTest.java new file mode 100644 index 00000000..83defe42 --- /dev/null +++ b/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/util/KitDateUtilTest.java @@ -0,0 +1,31 @@ +/* + * Copyright 2021-2026 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.util; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.text.SimpleDateFormat; +import java.util.Date; +import org.junit.jupiter.api.Test; + +public class KitDateUtilTest { + + @Test + public void testGetWeekDay() { + SimpleDateFormat simpleDateformat = new SimpleDateFormat("E"); + assertEquals(simpleDateformat.format(new Date()), KitDateUtil.getWeekDay()); + } +} diff --git a/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/util/WorkTimeTests.java b/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/util/WorkTimeTests.java new file mode 100644 index 00000000..2dedc135 --- /dev/null +++ b/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/util/WorkTimeTests.java @@ -0,0 +1,30 @@ +/* + * Copyright 2021-2026 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.util; + +/** + * 钉钉 Teambition 实际工时数计算 + */ +public class WorkTimeTests { + + public static void main(String[] args) { + // 总工作时长（时） + double totalHour = 11; + // 实际工作时长（天），一天8小时工作制 + double actualHour = totalHour / 8.0; + System.err.println("actualHour=" + actualHour + " 天"); + } +} diff --git a/cutejava-springboot3/pom.xml b/cutejava-springboot3/pom.xml index cff96e70..4bdad150 100644 --- a/cutejava-springboot3/pom.xml +++ b/cutejava-springboot3/pom.xml @@ -19,8 +19,8 @@ org.springframework.boot spring-boot-starter-parent - - 3.5.9 + + 3.5.10 @@ -40,7 +40,6 @@ 2.3.22.Final 2.3.34 3.9.1 - 4.5.0 9.5.0 3.5.7 @@ -189,7 +188,7 @@ com.github.xiaoymin knife4j-openapi3-jakarta-spring-boot-starter - ${knife4j.version} + 4.5.0 diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/KitPageArgs.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/KitPageArgs.java index 542fae60..e55fa883 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/base/KitPageArgs.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/base/KitPageArgs.java @@ -19,7 +19,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; + import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BeanLoadFinishListener.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BeanLoadFinishListener.java index 2bf99e40..4a075027 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BeanLoadFinishListener.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BeanLoadFinishListener.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.context; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BootApplication.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BootApplication.java index d47b453b..a19447b9 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BootApplication.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/BootApplication.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.context; import cn.hutool.core.util.StrUtil; @@ -38,10 +39,13 @@ public class BootApplication { String port = env.getProperty("server.port"); String path = StrUtil.isEmpty(env.getProperty("config.servlet.context-path")) ? "" : env.getProperty("config.servlet.context-path"); - log.info("\n----------------------------------------------------------\n\t" + - "Application is running! Access URLs:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/\n\t" + - "External: \thttp://" + ip + ":" + port + path + "/\n\t" + "Swagger文档: \thttp://" + ip + ":" + port + - path + "/doc.html\n" + "----------------------------------------------------------"); + log.info( + "----------------------------------------------------------\n"+ + "\tApplication is running! Access URLs:\n"+ + "\tLocal: \t\thttp://localhost:{}{}\n"+ + "\tExternal: \thttp://{}:{}{}\n"+ + "\tSwagger文档: \thttp://{}:{}{}/doc.html\n"+ + "----------------------------------------------------------", port, path, ip, port, path, ip, port, path); } @Bean diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFaceAspect.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFaceAspect.java index 4e743fe9..f019ce5b 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFaceAspect.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFaceAspect.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.logging; import cn.hutool.core.date.TimeInterval; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/service/KitHealthCheckPointService.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/service/KitHealthCheckPointService.java index 81c393ec..1cd421f6 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/service/KitHealthCheckPointService.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/monitor/service/KitHealthCheckPointService.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.monitor.service; import org.springframework.http.ResponseEntity; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/KitMpQTypeEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/KitMpQTypeEnum.java index 0d1b7d4f..f015c01e 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/KitMpQTypeEnum.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/KitMpQTypeEnum.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.mybatisplus.config; /** diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/KitMpQuery.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/KitMpQuery.java index ee3e2547..e56ad5d3 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/KitMpQuery.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/KitMpQuery.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.mybatisplus.config; import java.lang.annotation.ElementType; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java index 55dfa2a0..7ba29349 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpCustomP6SpyLogger.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.mybatisplus.config; import cn.hutool.core.util.StrUtil; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpInsertBatchSqlInjector.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpInsertBatchSqlInjector.java index ac1a632f..12a81353 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpInsertBatchSqlInjector.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MpInsertBatchSqlInjector.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.mybatisplus.config; import com.baomidou.mybatisplus.annotation.FieldFill; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MybatisPlusConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MybatisPlusConfig.java index 09bfe6ad..d6f6227b 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MybatisPlusConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/MybatisPlusConfig.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.mybatisplus.config; import com.baomidou.mybatisplus.annotation.DbType; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java index 0b83d3c2..98a7e74e 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.mybatisplus.config; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; @@ -49,12 +50,15 @@ public class RemoveDruidAdConfig { */ @Bean public FilterRegistrationBean removeDruidAdFilterRegistrationBean(DruidStatProperties properties) { + // 获取web监控页面的参数 DruidStatProperties.StatViewServlet config = properties.getStatViewServlet(); // 提取common.js的配置路径 String pattern = config.getUrlPattern() != null ? config.getUrlPattern() : "/druid/*"; String commonJsPattern = pattern.replaceAll("\\*", "js/common.js"); + final String filePath = "support/http/resources/js/common.js"; + //创建filter进行过滤 Filter filter = new Filter() { @Override diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/config/QuartzConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/config/QuartzConfig.java index fe29bbe4..921594e0 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/config/QuartzConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/config/QuartzConfig.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.quartz.config; import lombok.extern.slf4j.Slf4j; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java index ffd246a7..ed36a01e 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/config/AsyncTheadPoolConfig.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.server.config; import cn.odboy.framework.properties.AppProperties; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringToDateConverter.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringToDateConverter.java index 899518b1..ff6e053f 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringToDateConverter.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/converters/DateStringToDateConverter.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.server.converters; import cn.hutool.core.util.StrUtil; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/UndertowWebSocketConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/UndertowWebSocketConfig.java index 0a9b18eb..69d3f475 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/UndertowWebSocketConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/UndertowWebSocketConfig.java @@ -47,6 +47,7 @@ public class UndertowWebSocketConfig implements WebServerFactoryCustomizer { WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo(); webSocketDeploymentInfo.setBuffers( diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WebSocketEndpointConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WebSocketEndpointConfig.java index 5e22be49..e68a13a8 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WebSocketEndpointConfig.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/config/WebSocketEndpointConfig.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.websocket.config; import org.springframework.context.annotation.Bean; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsClientManager.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsClientManager.java index 79ef9f3c..a3616a8f 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsClientManager.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsClientManager.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.websocket.context; import java.util.Collection; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsMessage.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsMessage.java index 39240ad0..74b5246f 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsMessage.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/context/KitWsMessage.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.websocket.context; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/model/WsSidVo.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/model/WsSidVo.java index 7273e324..1d3a3cbc 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/model/WsSidVo.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/model/WsSidVo.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.websocket.model; import cn.odboy.base.KitObject; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/util/WsMessageUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/util/WsMessageUtil.java index d7dffbfe..8e45cb9d 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/util/WsMessageUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/websocket/util/WsMessageUtil.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.framework.websocket.util; import cn.odboy.framework.exception.BadRequestException; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index bb64fd7e..b7e18978 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -17,7 +17,6 @@ package cn.odboy.system.controller; import cn.odboy.base.KitPageArgs; import cn.odboy.base.KitPageResult; -import cn.odboy.base.KitSelectOptionVo; import cn.odboy.system.dal.dataobject.SystemUserTb; import cn.odboy.system.dal.model.request.SystemQueryUserArgs; import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs; diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java index 37608f8c..74148f49 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java @@ -65,8 +65,7 @@ public class SystemAuthService { KitValidUtil.isNull(loginArgs); // 密码解密 - String password = - KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginArgs.getPassword()); + String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginArgs.getPassword()); // 校验验证码 systemCaptchaService.validate(loginArgs.getUuid(), loginArgs.getCode()); // 查询用户信息 diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java index 6836c9cb..bd173ced 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/GenCode.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy; import cn.odboy.framework.mybatisplus.core.KitMpCmdGenUtil; @@ -23,8 +24,8 @@ import java.util.List; */ public class GenCode { - private static final String ADDR = "192.168.100.128"; - private static final Integer PORT = 23306; + private static final String ADDR = "127.0.0.1"; + private static final Integer PORT = 3306; private static final String DATABASE_NAME = "cutejava"; private static final String DATABASE_USER = "root"; private static final String DATABASE_PWD = "kd123456"; diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java index b2bef407..99ef451d 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy; import cn.odboy.framework.monitor.service.KitHealthCheckPointService; diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/MyBatisMapperTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/MyBatisMapperTests.java index 14cb5d8e..a0b92404 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/MyBatisMapperTests.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/MyBatisMapperTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy; import cn.hutool.core.date.DateTime; @@ -35,12 +36,15 @@ public class MyBatisMapperTests { public void testMapper1() { // SELECT * FROM system_user WHERE (create_time > '2025-08-18T14:48:18.400+0800'); systemUserMapper.selectList(new LambdaQueryWrapper().gt(SystemUserTb::getCreateTime, new Date())); + // SELECT * FROM system_user WHERE (create_time > '2025-08-18T14:50:16.786+0800'); systemUserMapper.selectList( new LambdaQueryWrapper().gt(SystemUserTb::getCreateTime, DateTime.now())); + // SELECT * FROM system_user WHERE (create_time > '2025-08-18 14:53:46'); systemUserMapper.selectList(new LambdaQueryWrapper().gt(SystemUserTb::getCreateTime, DateUtil.formatDateTime(new Date()))); + // SELECT * FROM system_user WHERE (create_time > '2025-08-18'); systemUserMapper.selectList( new LambdaQueryWrapper().gt(SystemUserTb::getCreateTime, DateUtil.formatDate(new Date()))); diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/KitDesEncryptUtilTest.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/KitDesEncryptUtilTest.java index 2e8c0c4d..8dafe8c6 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/KitDesEncryptUtilTest.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/KitDesEncryptUtilTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.util; import static cn.odboy.util.KitDesEncryptUtil.desDecrypt; diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/KitFileUtilTest.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/KitFileUtilTest.java index 4c34e7f4..dfefcc96 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/KitFileUtilTest.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/KitFileUtilTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package cn.odboy.util; import static cn.odboy.util.KitFileUtil.getPrefix;