From e568e27540c6e3b346c32a1b44248acc2c5f3946 Mon Sep 17 00:00:00 2001 From: Odboy Date: Thu, 1 May 2025 13:41:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=8D=E5=A4=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/odboy/redis/RedisConfiguration.java | 12 +++++++++--- .../src/main/resources/application-dev.yml | 8 ++++++++ .../java/cn/odboy/core/api/system/SystemMenuApi.java | 2 +- .../core/api/system/impl/SystemMenuApiImpl.java | 2 +- .../odboy/core/controller/system/AuthController.java | 2 +- .../odboy/core/controller/system/MenuController.java | 2 +- .../odboy/core/controller/system/UserController.java | 2 +- .../core/dal/model/{system => }/MenuResponse.java | 2 +- .../{system => }/UpdateUserPasswordResponse.java | 2 +- .../dal/model/{system => }/UserInfoResponse.java | 2 +- 10 files changed, 25 insertions(+), 11 deletions(-) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/MenuResponse.java (95%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/UpdateUserPasswordResponse.java (87%) rename cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/{system => }/UserInfoResponse.java (93%) diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java index 257ebd7d..dbbd63dd 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java @@ -35,12 +35,18 @@ import java.util.Map; public class RedisConfiguration extends CachingConfigurerSupport { /** - * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） + * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）
+ * 未配置可能导致，登录失败，反复登录等问题 */ private static final String[] WHITELIST_STR = { "org.springframework", - "cn.odboy.core.controller.*.dto", - "cn.odboy.core.dal.dataobject", + "cn.odboy.core.dal.dataobject.job", + "cn.odboy.core.dal.dataobject.system", + "cn.odboy.core.dal.dataobject.tools", + "cn.odboy.core.dal.model", + "cn.odboy.core.framework.flow.dto", + "cn.odboy.core.service.system.dto", + "cn.odboy.core.service.tools.dto", }; /** diff --git a/cutejava/cutejava-starter/src/main/resources/application-dev.yml b/cutejava/cutejava-starter/src/main/resources/application-dev.yml index ee0dcc1f..2dc2f080 100644 --- a/cutejava/cutejava-starter/src/main/resources/application-dev.yml +++ b/cutejava/cutejava-starter/src/main/resources/application-dev.yml @@ -1,3 +1,5 @@ + + server: port: 8000 http2: @@ -228,3 +230,9 @@ app: captchaSetting: # 邮箱验证码有效时间/秒 expiration: 300 + +## 启用debug +#debug: true +#logging: +# level: +# root: debug diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemMenuApi.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemMenuApi.java index d2493f57..802d82f0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemMenuApi.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/SystemMenuApi.java @@ -1,7 +1,7 @@ package cn.odboy.core.api.system; import cn.odboy.core.dal.dataobject.system.Menu; -import cn.odboy.core.dal.model.system.MenuResponse; +import cn.odboy.core.dal.model.MenuResponse; import cn.odboy.core.service.system.dto.QueryMenuRequest; import java.util.List; import java.util.Set; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemMenuApiImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemMenuApiImpl.java index 0708cb15..4d7a0271 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemMenuApiImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/api/system/impl/SystemMenuApiImpl.java @@ -7,7 +7,7 @@ import cn.odboy.core.api.system.SystemMenuApi; import cn.odboy.core.api.system.SystemRoleApi; import cn.odboy.core.constant.SystemRedisKey; import cn.odboy.core.dal.dataobject.system.Menu; -import cn.odboy.core.dal.model.system.MenuResponse; +import cn.odboy.core.dal.model.MenuResponse; import cn.odboy.core.dal.dataobject.system.Role; import cn.odboy.core.dal.mysql.system.MenuMapper; import cn.odboy.core.service.system.SystemRoleService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java index e62f1db1..e13f14b6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/AuthController.java @@ -10,7 +10,7 @@ import cn.odboy.core.constant.SystemRedisKey; import cn.odboy.core.framework.permission.util.SecurityHelper; import cn.odboy.core.service.system.dto.UserJwtVo; import cn.odboy.core.service.system.dto.UserLoginRequest; -import cn.odboy.core.dal.model.system.UserInfoResponse; +import cn.odboy.core.dal.model.UserInfoResponse; import cn.odboy.core.framework.permission.TokenProvider; import cn.odboy.core.framework.permission.UserDetailsServiceImpl; import cn.odboy.core.cache.service.impl.SystemUserOnlineServiceImpl; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java index d9f2a65b..8c2d4bb9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/MenuController.java @@ -6,7 +6,7 @@ import cn.odboy.core.api.system.SystemMenuApi; import cn.odboy.core.framework.permission.util.SecurityHelper; import cn.odboy.core.service.system.dto.QueryMenuRequest; import cn.odboy.core.dal.dataobject.system.Menu; -import cn.odboy.core.dal.model.system.MenuResponse; +import cn.odboy.core.dal.model.MenuResponse; import cn.odboy.core.service.system.SystemMenuService; import cn.odboy.exception.BadRequestException; import cn.odboy.util.PageUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java index 2936211d..471304e6 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/system/UserController.java @@ -10,7 +10,7 @@ import cn.odboy.core.api.system.SystemUserApi; import cn.odboy.core.constant.CaptchaBizEnum; import cn.odboy.core.dal.dataobject.system.Dept; import cn.odboy.core.dal.dataobject.system.Role; -import cn.odboy.core.dal.model.system.UpdateUserPasswordResponse; +import cn.odboy.core.dal.model.UpdateUserPasswordResponse; import cn.odboy.core.dal.dataobject.system.User; import cn.odboy.core.framework.permission.util.SecurityHelper; import cn.odboy.core.framework.properties.AppProperties; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/MenuResponse.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/MenuResponse.java similarity index 95% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/MenuResponse.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/MenuResponse.java index 4643faa1..67bcaed8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/MenuResponse.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/MenuResponse.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.MyObject; import cn.odboy.core.service.system.dto.MenuMetaVo; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateUserPasswordResponse.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateUserPasswordResponse.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateUserPasswordResponse.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateUserPasswordResponse.java index c3ca0612..85b236c1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UpdateUserPasswordResponse.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UpdateUserPasswordResponse.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UserInfoResponse.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UserInfoResponse.java similarity index 93% rename from cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UserInfoResponse.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UserInfoResponse.java index 06f42938..26db343f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/system/UserInfoResponse.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/UserInfoResponse.java @@ -1,4 +1,4 @@ -package cn.odboy.core.dal.model.system; +package cn.odboy.core.dal.model; import cn.odboy.base.MyObject; import cn.odboy.core.service.system.dto.RoleCodeVo;