Pre Merge pull request !86 from CoderKK/master

- 将 "亲~您操作的太快了，请稍等下再操作~" 修改为 "亲~您操作得太快了，请稍等下再操作~"
- 修正了文案中的语法错误，使表述更加准确
动词 + 得 + 补语

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java

@@ -22,7 +22,7 @@ public enum UserErrorCode implements ErrorCode {
 
     ALREADY_EXIST(30003, "数据已存在了呀~"),
 
-    REPEAT_SUBMIT(30004, "亲~您操作的太快了，请稍等下再操作~"),
+    REPEAT_SUBMIT(30004, "亲~您操作得太快了，请稍等下再操作~"),
 
     NO_PERMISSION(30005, "对不起，您没有权限访问此内容哦~"),
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/exception/BaseException.java

@@ -0,0 +1,33 @@
+package net.lab1024.sa.base.common.exception;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import net.lab1024.sa.base.common.code.ErrorCode;
+
+import java.io.Serial;
+
+/**
+ * 基础异常
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class BaseException extends RuntimeException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 错误码
+     */
+    private ErrorCode errorCode;
+
+    /**
+     * 错误消息
+     */
+    private String message;
+
+}

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/exception/BusinessException.java

@@ -1,38 +1,49 @@
 package net.lab1024.sa.base.common.exception;
 
 import net.lab1024.sa.base.common.code.ErrorCode;
+import net.lab1024.sa.base.common.code.SystemErrorCode;
 
 /**
- * 业务逻辑异常,全局异常拦截后统一返回ResponseCodeConst.SYSTEM_ERROR
+ * 业务逻辑异常,全局异常拦截后统一返回
  *
  * @Author 1024创新实验室: 罗伊
  * @Date 2020/8/25 21:57
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
-public class BusinessException extends RuntimeException {
+public class BusinessException extends BaseException {
 
     public BusinessException() {
+        super(SystemErrorCode.SYSTEM_ERROR, null);
     }
 
-    public BusinessException(ErrorCode errorCode) {
-        super(errorCode.getMsg());
-    }
-
+    /**
+     * 业务异常
+     *
+     * @param message 错误提示
+     */
     public BusinessException(String message) {
-        super(message);
+        super(SystemErrorCode.SYSTEM_ERROR, message);
     }
 
-    public BusinessException(String message, Throwable cause) {
-        super(message, cause);
+    /**
+     * 业务异常
+     *
+     * @param errorCode 错误码
+     */
+    public BusinessException(ErrorCode errorCode) {
+        super(errorCode, null);
     }
 
-    public BusinessException(Throwable cause) {
-        super(cause);
+    /**
+     * 业务异常
+     *
+     * @param errorCode 错误码
+     * @param message   错误提示
+     */
+    public BusinessException(ErrorCode errorCode, String message) {
+        super(errorCode, message);
     }
 
-    public BusinessException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
 }

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/handler/GlobalExceptionHandler.java

@@ -1,6 +1,7 @@
 package net.lab1024.sa.base.handler;
 
 import cn.dev33.satoken.exception.NotPermissionException;
+import cn.hutool.core.util.StrUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.code.SystemErrorCode;
@@ -99,7 +100,10 @@ public class GlobalExceptionHandler {
         if (!systemEnvironment.isProd()) {
             log.error("全局业务异常,URL:{}", getCurrentRequestUrl(), e);
         }
-        return ResponseDTO.error(SystemErrorCode.SYSTEM_ERROR, e.getMessage());
+        if (StrUtil.isNotEmpty(e.getMessage())) {
+            return ResponseDTO.error(e.getErrorCode(), e.getMessage());
+        }
+        return ResponseDTO.error(e.getErrorCode());
     }
 
     /**

smart-admin-api-java8-springboot2/pom.xml

@@ -48,7 +48,7 @@
         <ip2region.version>2.7.0</ip2region.version>
         <bcprov.version>1.80</bcprov.version>
         <smartdb.version>1.2.0</smartdb.version>
-        <redisson.version>3.50.0</redisson.version>
+        <redisson.version>3.25.0</redisson.version>
         <snakeyaml.version>2.4</snakeyaml.version>
         <freemarker.version>2.3.34</freemarker.version>
         <jsoup.version>1.21.1</jsoup.version>

sql/smart_admin_v3.sql

@@ -232,19 +232,20 @@ INSERT INTO `t_dict_data` VALUES (3, 1, 'ZHENG_ZHOU', '郑州', '', 0, 0, '2025-
 INSERT INTO `t_dict_data` VALUES (7, 1, 'BEI_JING', '北京', '', 0, 0, '2025-03-27 20:53:45', '2025-03-27 20:53:45');
 INSERT INTO `t_dict_data` VALUES (8, 1, 'SHANG_HAI', '上海', '', 0, 0, '2025-03-27 20:53:45', '2025-03-27 20:53:45');
 
+
 -- ----------------------------
 -- Table structure for t_employee
 -- ----------------------------
 DROP TABLE IF EXISTS `t_employee`;
 CREATE TABLE `t_employee`  (
   `employee_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `employee_uid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '员工uuid',
-  `login_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '登录帐号',
-  `login_pwd` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '登录密码',
-  `actual_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '员工名称',
+  `employee_uid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '员工uuid',
+  `login_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '登录帐号',
+  `login_pwd` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '登录密码',
+  `actual_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '员工名称',
   `avatar` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `gender` tinyint(1) NOT NULL DEFAULT 0 COMMENT '性别',
-  `phone` varchar(15) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号码',
+  `phone` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号码',
   `department_id` bigint(0) NOT NULL COMMENT '部门id',
   `position_id` bigint(0) NULL DEFAULT NULL COMMENT '职务ID',
   `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱',
@@ -274,6 +275,7 @@ INSERT INTO `t_employee`(`employee_id`, `employee_uid`, `login_name`, `login_pwd
 INSERT INTO `t_employee`(`employee_id`, `employee_uid`, `login_name`, `login_pwd`, `actual_name`, `avatar`, `gender`, `phone`, `department_id`, `position_id`, `email`, `disabled_flag`, `deleted_flag`, `administrator_flag`, `remark`, `update_time`, `create_time`) VALUES (68, '2aaf8c8c393c46b080aca86179388d7e', 'xuanpeng', '$argon2id$v=19$m=16384,t=2,p=1$ldHEjEwCWur/RnSy0JmFJQ$nlhVYiFMELToZ9nXI5QxG4maTV/L7pyPU0GRv3+s+tg', '玄朋', NULL, 1, '13123123124', 1, 3, NULL, 0, 0, 0, NULL, '2025-07-15 10:19:23', '2022-10-04 21:33:50');
 
 
+
 -- ----------------------------
 -- Table structure for t_feedback
 -- ----------------------------

sql/sql-update-log/v3.25.0.sql

@@ -4,13 +4,13 @@
 DROP TABLE IF EXISTS `t_employee`;
 CREATE TABLE `t_employee`  (
   `employee_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `employee_uid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '员工uuid',
-  `login_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '登录帐号',
-  `login_pwd` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '登录密码',
-  `actual_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '员工名称',
+  `employee_uid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '员工uuid',
+  `login_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '登录帐号',
+  `login_pwd` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '登录密码',
+  `actual_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '员工名称',
   `avatar` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `gender` tinyint(1) NOT NULL DEFAULT 0 COMMENT '性别',
-  `phone` varchar(15) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机号码',
+  `phone` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号码',
   `department_id` bigint(0) NOT NULL COMMENT '部门id',
   `position_id` bigint(0) NULL DEFAULT NULL COMMENT '职务ID',
   `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱',