From 2d249e449ddefdc1c4d0e4b55b3472a495caae69 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Fri, 26 Jun 2026 00:33:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8E=E5=AF=BC=E5=85=A5=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/youlai/boot/common/base/BaseQuery.java | 6 ++++++ .../common/exception/BusinessException.java | 8 ++++---- .../security/config/SecurityConfig.java | 2 +- .../boot/framework/web/aspect/LogAspect.java | 17 ++++++++++++++--- .../web/config/OperationLogExecutorConfig.java | 5 +++++ .../boot/system/controller/UserController.java | 5 ++--- .../boot/system/model/entity/SysUser.java | 4 ++-- .../system/service/impl/UserServiceImpl.java | 2 +- src/main/resources/logback-spring.xml | 2 +- 9 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/youlai/boot/common/base/BaseQuery.java b/src/main/java/com/youlai/boot/common/base/BaseQuery.java index 026d9673..7548937d 100644 --- a/src/main/java/com/youlai/boot/common/base/BaseQuery.java +++ b/src/main/java/com/youlai/boot/common/base/BaseQuery.java @@ -7,6 +7,12 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +/** + * 查询参数基类 + * + * @author Ray.Hao + * @since 0.0.1 + */ @Data @Schema public class BaseQuery implements Serializable { diff --git a/src/main/java/com/youlai/boot/common/exception/BusinessException.java b/src/main/java/com/youlai/boot/common/exception/BusinessException.java index 06467091..cd93205f 100644 --- a/src/main/java/com/youlai/boot/common/exception/BusinessException.java +++ b/src/main/java/com/youlai/boot/common/exception/BusinessException.java @@ -7,13 +7,13 @@ import org.slf4j.helpers.MessageFormatter; /** * 自定义业务异常 * - * @author Ray - * @since 2022/7/31 + * @author Ray.Hao + * @since 0.0.1 */ @Getter public class BusinessException extends RuntimeException { - public IResultCode resultCode; + private IResultCode resultCode; public BusinessException(IResultCode errorCode) { super(errorCode.getMsg()); @@ -21,7 +21,7 @@ public class BusinessException extends RuntimeException { } - public BusinessException(IResultCode errorCode,String message) { + public BusinessException(IResultCode errorCode, String message) { super(message); this.resultCode = errorCode; } diff --git a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java index c1b7c828..b64b6de0 100644 --- a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java +++ b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java @@ -1,8 +1,8 @@ package com.youlai.boot.framework.security.config; import cn.binarywang.wx.miniapp.api.WxMaService; -import com.youlai.boot.framework.captcha.service.CaptchaService; import cn.hutool.core.util.ArrayUtil; +import com.youlai.boot.framework.captcha.service.CaptchaService; import com.youlai.boot.framework.security.filter.CaptchaValidationFilter; import com.youlai.boot.framework.security.filter.TokenAuthenticationFilter; import com.youlai.boot.framework.security.handler.MyAccessDeniedHandler; diff --git a/src/main/java/com/youlai/boot/framework/web/aspect/LogAspect.java b/src/main/java/com/youlai/boot/framework/web/aspect/LogAspect.java index 6ecf00ee..6642a503 100644 --- a/src/main/java/com/youlai/boot/framework/web/aspect/LogAspect.java +++ b/src/main/java/com/youlai/boot/framework/web/aspect/LogAspect.java @@ -28,6 +28,9 @@ import java.util.concurrent.Executor; /** * 操作日志切面 *

@Log 标注的方法执行后异步写入 sys_log 表

+ * + * @author Ray.Hao + * @since 0.0.1 */ @Aspect @Component @@ -125,9 +128,17 @@ public class LogAspect { return new IpRegion(StrUtil.blankToDefault(parts[2], null), StrUtil.blankToDefault(parts[3], null)); } - private String getOs(UserAgent ua) { return Optional.ofNullable(ua).map(UserAgent::getOs).map(os -> os.getName()).orElse(null); } - private String getDevice(UserAgent ua) { return Optional.ofNullable(ua).map(UserAgent::getPlatform).map(p -> p.getName()).orElse(null); } - private String getBrowser(UserAgent ua) { return Optional.ofNullable(ua).map(UserAgent::getBrowser).map(b -> b.getName()).orElse(null); } + private String getOs(UserAgent ua) { + return Optional.ofNullable(ua).map(UserAgent::getOs).map(os -> os.getName()).orElse(null); + } + + private String getDevice(UserAgent ua) { + return Optional.ofNullable(ua).map(UserAgent::getPlatform).map(p -> p.getName()).orElse(null); + } + + private String getBrowser(UserAgent ua) { + return Optional.ofNullable(ua).map(UserAgent::getBrowser).map(b -> b.getName()).orElse(null); + } private record IpRegion(String province, String city) { static final IpRegion EMPTY = new IpRegion(null, null); diff --git a/src/main/java/com/youlai/boot/framework/web/config/OperationLogExecutorConfig.java b/src/main/java/com/youlai/boot/framework/web/config/OperationLogExecutorConfig.java index c4b5c646..88354e30 100644 --- a/src/main/java/com/youlai/boot/framework/web/config/OperationLogExecutorConfig.java +++ b/src/main/java/com/youlai/boot/framework/web/config/OperationLogExecutorConfig.java @@ -9,6 +9,11 @@ import java.util.concurrent.ThreadPoolExecutor; /** * 操作日志线程池 + *

core=1 确保日志按序写入，max=2 峰值扩容，queue=1000 缓冲突发流量， + * CallerRunsPolicy 保证满载时由调用线程兜底执行不丢数据。

+ * + * @author Ray.Hao + * @since 0.0.1 */ @Configuration public class OperationLogExecutorConfig { diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java index 528c1e20..f90e3f25 100644 --- a/src/main/java/com/youlai/boot/system/controller/UserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -14,10 +14,9 @@ import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; import com.youlai.boot.common.util.ExcelUtils; import com.youlai.boot.system.listener.UserImportListener; -import com.youlai.boot.system.model.vo.UserExportVO; -import com.youlai.boot.system.model.form.UserImportForm; -import com.youlai.boot.system.model.entity.SysUser; import com.youlai.boot.system.model.form.*; +import com.youlai.boot.system.model.vo.UserExportVO; +import com.youlai.boot.system.model.entity.SysUser; import com.youlai.boot.system.model.query.UserQuery; import com.youlai.boot.system.model.vo.CurrentUserVO; import com.youlai.boot.system.model.vo.UserPageVO; diff --git a/src/main/java/com/youlai/boot/system/model/entity/SysUser.java b/src/main/java/com/youlai/boot/system/model/entity/SysUser.java index 42cae8f3..916042d6 100644 --- a/src/main/java/com/youlai/boot/system/model/entity/SysUser.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysUser.java @@ -24,7 +24,7 @@ public class SysUser extends BaseEntity { private String nickname; /** - * 性别((1-男 2-女 0-保密) + * 性别(1-男 2-女 0-保密) */ private Integer gender; @@ -49,7 +49,7 @@ public class SysUser extends BaseEntity { private String mobile; /** - * 状态((1-正常 0-禁用) + * 状态(1-正常 0-禁用) */ private Integer status; diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java index 708afd26..8251829c 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java @@ -22,13 +22,13 @@ import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.boot.system.converter.UserConverter; import com.youlai.boot.system.enums.DictCodeEnum; import com.youlai.boot.system.mapper.UserMapper; +import com.youlai.boot.system.model.form.*; import com.youlai.boot.system.model.vo.CurrentUserVO; import com.youlai.boot.system.model.vo.UserExportVO; import com.youlai.boot.system.model.entity.Dept; import com.youlai.boot.system.model.entity.DictItem; import com.youlai.boot.system.model.entity.Role; import com.youlai.boot.system.model.entity.SysUser; -import com.youlai.boot.system.model.form.*; import com.youlai.boot.system.model.query.UserQuery; import com.youlai.boot.system.model.vo.UserPageVO; import com.youlai.boot.system.model.vo.UserProfileVO; diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index a424b782..9391b1a8 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -38,7 +38,7 @@ 10MB 30 - + 1GB