diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/ApiUrlPrefixConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/ApiUrlPrefixConst.java
new file mode 100644
index 00000000..93d860b2
--- /dev/null
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/ApiUrlPrefixConst.java
@@ -0,0 +1,20 @@
+package net.lab1024.smartadmin.service.common.constant;
+
+/**
+ * [  ]
+ *
+ * @author luoyi
+ * @date 2021/9/26 17:50
+ */
+public class ApiUrlPrefixConst {
+
+    /**
+     * 基础 api 前缀
+     */
+    public static final String API_PREFIX_SUPPORT = "/support";
+
+    /**
+     * 后管 api 前缀
+     */
+    public static final String API_PREFIX_ADMIN = "/admin";
+}
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/CommonConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/CommonConst.java
index 4c28bab2..d825166b 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/CommonConst.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/CommonConst.java
@@ -1,9 +1,7 @@
 package net.lab1024.smartadmin.service.common.constant;
 
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;
-import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -44,16 +42,6 @@ public class CommonConst {
      */
     public static final String EMPTY_STR = "";
 
-    /**
-     * 空MaP
-     */
-    public static final Map EMPTY_MAP = Collections.unmodifiableMap(new HashMap<>(0));
-
-    /**
-     * 空 list
-     */
-    public static final List EMPTY_LIST = Collections.unmodifiableList(new ArrayList<>(0));
-
     /**
      * 全局通用 默认id
      */
@@ -74,233 +62,17 @@ public class CommonConst {
      */
     public static final Long DEFAULT_PARENT_ID = 0L;
 
+    /**
+     * 空MaP
+     */
+    public static final Map EMPTY_MAP = Collections.unmodifiableMap(new HashMap<>(0));
+
+    /**
+     * 空 list
+     */
+    public static final List EMPTY_LIST = Collections.unmodifiableList(new ArrayList<>(0));
+
     public static final Interner<String> STRING_POOL = Interners.newWeakInterner();
 
-    public static final class ApiUrl {
-        /**
-         * 基础 api 前缀
-         */
-        public static final String API_PREFIX_SUPPORT = "/support";
 
-        /**
-         * 后管 api 前缀
-         */
-        public static final String API_PREFIX_ADMIN = "/admin";
-
-        /**
-         * app 业务 api 前缀
-         */
-        public static final String API_PREFIX_APP = "/app";
-
-        /**
-         * PC 业务 api 前缀
-         */
-        public static final String API_PREFIX_PC = "/pc";
-
-        /**
-         * 开放平台 api 前缀
-         */
-        public static final String API_PREFIX_OPEN = "/open";
-
-    }
-
-    public static final String IGNORE_H5_URL_MAPPING = "/h5/api";
-
-    public static final class FileServiceConst {
-
-        /**
-         * 公用读取文件夹 public
-         */
-        public static final String FOLDER_PUBLIC = "pu";
-
-        /**
-         * 私有读取文件夹 private
-         */
-        public static final String FOLDER_PRIVATE = "pr";
-
-        /**
-         * 文件夹格式
-         */
-        public static final String FOLDER_FORMAT = "folder";
-    }
-
-    public static final class System {
-
-        /**
-         * oss url redis 过期时间
-         */
-        public static final int FILE_URL_EXPIRE_SECOND = 7100;
-
-        public static final int FILE_VO_EXPIRE_SECOND = 86400;
-
-        /**
-         * 系统 id
-         */
-        public static final Long SYSTEM_ID = 0L;
-
-        /**
-         * 系统 名称
-         */
-        public static final String SYSTEM_NAME = "小蜜蜂CRM系统";
-    }
-
-    /**
-     * 长度类常量
-     */
-    public static final class NumberLimit {
-
-        /**
-         * 用户昵称
-         */
-        public static final int USER_NICKNAME = 15;
-
-        /**
-         * 短信验证码长度
-         */
-        public static final int SMS_CODE = 6;
-
-        /**
-         * 短信发送间隔 秒
-         */
-        public static final int SMS_SEND_INTERVAL = 60;
-
-        /**
-         * 短信有效期 秒
-         */
-        public static final int SMS_VALID_SECOND = 300;
-
-        /**
-         * 验证码短信 每天的限制
-         */
-        public static final int SMS_DAY_LIMIT = 10;
-
-        /**
-         * 文件名称长度
-         */
-        public static final int FILE_NAME = 100;
-
-    }
-
-    public static final class Password {
-
-        public static final String DEFAULT = "123456";
-
-        public static final String SALT_FORMAT = "xiaomifeng_%s_crm";
-    }
-
-    public static final class CommonCollection {
-
-        public static final Set<String> IGNORE_URL = ImmutableSet.of("/swagger", "Excel");
-
-        public static final Set<String> IGNORE_URL_MAPPING = ImmutableSet.of(IGNORE_H5_URL_MAPPING);
-
-        public static Boolean contain(Set<String> ignores, String uri) {
-            if (CollectionUtils.isEmpty(ignores)) {
-                return false;
-            }
-            for (String ignoreUrl : ignores) {
-                if (uri.startsWith(ignoreUrl)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     * 用户类型
-     */
-    public static class UserType {
-
-        /**
-         * 用户
-         */
-        public static final Integer USER = 1;
-
-        /**
-         * 管理端
-         */
-        public static final Integer ADMIN = 3;
-
-        /**
-         * 系统
-         */
-        public static final Integer SYSTEM = 4;
-
-        /**
-         * 游客
-         */
-        public static final Integer NO_LOGIN = 5;
-    }
-
-    /**
-     * 请求头常量
-     */
-    public static class RequestHeader {
-
-        public static final String TOKEN = "x-access-token";
-
-        public static final String USER_AGENT = "user-agent";
-
-        /**
-         * 用户唯一标识
-         */
-        public static final String USER_IDENTITY = "user-identity";
-
-        /**
-         * 经纬度
-         */
-        public static final String USER_GEO = "user-geo";
-
-        /**
-         * 位置
-         */
-        public static final String USER_LOCATION = "user-location";
-
-    }
-
-    /**
-     * 系统类型
-     */
-    public static class SystemType {
-
-        public static final int XMF_CRM = 100;
-
-        public static final int REN_MIN = 200;
-
-        public static final int ZHI_KAO = 300;
-
-        public static final int XIAO_YING_YI = 400;
-
-    }
-
-    /**
-     * 支付方式
-     */
-    public static class PayType {
-
-        public static final int WX = 10;
-
-        public static final int ZFB = 15;
-
-        /**
-         * 20 线下支付
-         */
-        public static final int OFFLINE = 20;
-
-        /**
-         * 21 银行卡
-         */
-        public static final int BANK = 21;
-
-    }
-
-    public static final class Token {
-
-        public static final String DEFAULT_TOKEN = "default-token-id-";
-
-        public static final String INNER_TOKEN_NAME = "inner-token";
-
-        public static final String OUTER_TOKEN_NAME = "x-access-token";
-    }
 }
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/NumberLimitConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/NumberLimitConst.java
new file mode 100644
index 00000000..40040cf0
--- /dev/null
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/NumberLimitConst.java
@@ -0,0 +1,39 @@
+package net.lab1024.smartadmin.service.common.constant;
+
+/**
+ * [  ]
+ *
+ * @author luoyi
+ * @date 2021/9/26 17:45
+ */
+public class NumberLimitConst {
+    /**
+     * 用户昵称
+     */
+    public static final int USER_NICKNAME = 15;
+
+    /**
+     * 短信验证码长度
+     */
+    public static final int SMS_CODE = 6;
+
+    /**
+     * 短信发送间隔 秒
+     */
+    public static final int SMS_SEND_INTERVAL = 60;
+
+    /**
+     * 短信有效期 秒
+     */
+    public static final int SMS_VALID_SECOND = 300;
+
+    /**
+     * 验证码短信 每天的限制
+     */
+    public static final int SMS_DAY_LIMIT = 10;
+
+    /**
+     * 文件名称长度
+     */
+    public static final int FILE_NAME = 100;
+}
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RequestHeaderConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RequestHeaderConst.java
new file mode 100644
index 00000000..42045dd2
--- /dev/null
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/RequestHeaderConst.java
@@ -0,0 +1,29 @@
+package net.lab1024.smartadmin.service.common.constant;
+
+/**
+ * [  ]
+ *
+ * @author luoyi
+ * @date 2021/9/26 17:43
+ */
+public class RequestHeaderConst {
+
+    public static final String TOKEN = "x-access-token";
+
+    public static final String USER_AGENT = "user-agent";
+
+    /**
+     * 用户唯一标识
+     */
+    public static final String USER_IDENTITY = "user-identity";
+
+    /**
+     * 经纬度
+     */
+    public static final String USER_GEO = "user-geo";
+
+    /**
+     * 位置
+     */
+    public static final String USER_LOCATION = "user-location";
+}
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemConst.java
new file mode 100644
index 00000000..88cda58f
--- /dev/null
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemConst.java
@@ -0,0 +1,15 @@
+package net.lab1024.smartadmin.service.common.constant;
+
+/**
+ * @author 罗伊
+ * @date 2021-01-31 0:00
+ */
+public class SystemConst {
+
+    public static final class Password {
+
+        public static final String DEFAULT = "123456";
+
+        public static final String SALT_FORMAT = "smartAdmin_%s";
+    }
+}
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/AdminBaseController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/AdminBaseController.java
index 91b4cf5f..07a86b13 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/AdminBaseController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/AdminBaseController.java
@@ -1,6 +1,7 @@
 package net.lab1024.smartadmin.service.common.controller;
 
 import lombok.extern.slf4j.Slf4j;
+import net.lab1024.smartadmin.service.common.constant.ApiUrlPrefixConst;
 import net.lab1024.smartadmin.service.common.constant.CommonConst;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -9,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @create: 2020-03-31 08:54 PM from win10
  */
 @Slf4j
-@RequestMapping(CommonConst.ApiUrl.API_PREFIX_ADMIN)
+@RequestMapping(ApiUrlPrefixConst.API_PREFIX_ADMIN)
 public class AdminBaseController {
 
 }
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SupportBaseController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SupportBaseController.java
index c76d0db1..20f09906 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SupportBaseController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/controller/SupportBaseController.java
@@ -1,6 +1,6 @@
 package net.lab1024.smartadmin.service.common.controller;
 
-import net.lab1024.smartadmin.service.common.constant.CommonConst;
+import net.lab1024.smartadmin.service.common.constant.ApiUrlPrefixConst;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
@@ -9,6 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @author 胡克
  * @date 2019/10/18 11:51
  */
-@RequestMapping(CommonConst.ApiUrl.API_PREFIX_SUPPORT)
+@RequestMapping(ApiUrlPrefixConst.API_PREFIX_SUPPORT)
 public class SupportBaseController {
 }
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironmentBO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironmentBO.java
index d746523c..25d8f888 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironmentBO.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/domain/SystemEnvironmentBO.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.common.domain;
 
 
-import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
+import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
 
 /**
  *
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/BaseEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/BaseEnum.java
similarity index 97%
rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/BaseEnum.java
rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/BaseEnum.java
index 2d8c41c3..c5f033b5 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/BaseEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/BaseEnum.java
@@ -1,4 +1,4 @@
-package net.lab1024.smartadmin.service.common.constant;
+package net.lab1024.smartadmin.service.common.enumconst;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONAware;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/GenderEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java
similarity index 93%
rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/GenderEnum.java
rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java
index 439eb842..96cbdffa 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/GenderEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java
@@ -1,4 +1,4 @@
-package net.lab1024.smartadmin.service.common.constant;
+package net.lab1024.smartadmin.service.common.enumconst;
 
 /**
  * 性别枚举类
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemEnvironmentEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java
similarity index 95%
rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemEnvironmentEnum.java
rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java
index 448a0f37..af21758a 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SystemEnvironmentEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java
@@ -1,4 +1,4 @@
-package net.lab1024.smartadmin.service.common.constant;
+package net.lab1024.smartadmin.service.common.enumconst;
 
 
 /**
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityUrlMatchers.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityUrlMatchers.java
index a4b3daae..f8bd24fe 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityUrlMatchers.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/security/SmartSecurityUrlMatchers.java
@@ -3,6 +3,7 @@ package net.lab1024.smartadmin.service.common.security;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.smartadmin.service.common.anno.NoNeedLogin;
+import net.lab1024.smartadmin.service.common.constant.ApiUrlPrefixConst;
 import net.lab1024.smartadmin.service.common.constant.CommonConst;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -69,7 +70,7 @@ public class SmartSecurityUrlMatchers {
         ignoreUrl.add("/swagger-resources/**");
         ignoreUrl.add("/webjars/**");
         ignoreUrl.add("/*/api-docs");
-        ignoreUrl.add(CommonConst.ApiUrl.API_PREFIX_SUPPORT + "/**");
+        ignoreUrl.add(ApiUrlPrefixConst.API_PREFIX_SUPPORT + "/**");
         log.info("忽略URL：{}", ignoreUrl);
         return ignoreUrl;
     }
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/ApiModelPropertyEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/ApiModelPropertyEnum.java
index 616c3abc..cb20ad0e 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/ApiModelPropertyEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/ApiModelPropertyEnum.java
@@ -1,6 +1,6 @@
 package net.lab1024.smartadmin.service.common.swagger;
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerApiModelPropertyEnumPlugin.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerApiModelPropertyEnumPlugin.java
index afc5e670..ecf59d08 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerApiModelPropertyEnumPlugin.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerApiModelPropertyEnumPlugin.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.common.swagger;
 
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SwaggerTagConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerTagConst.java
similarity index 96%
rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SwaggerTagConst.java
rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerTagConst.java
index 8fe20ed2..e9b96b50 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/constant/SwaggerTagConst.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/swagger/SwaggerTagConst.java
@@ -1,4 +1,4 @@
-package net.lab1024.smartadmin.service.common.constant;
+package net.lab1024.smartadmin.service.common.swagger;
 
 /**
  * [  ]
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/CheckEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/CheckEnum.java
index e35e7757..e0aaa780 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/CheckEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/CheckEnum.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.common.validator.en;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/EnumValidator.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/EnumValidator.java
index ce1f948b..33cf83e7 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/EnumValidator.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/validator/en/EnumValidator.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.common.validator.en;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java
index fbf231b9..8581617c 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SwaggerConfig.java
@@ -7,9 +7,9 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.smartadmin.service.common.constant.CommonConst;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
-import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
+import net.lab1024.smartadmin.service.common.constant.RequestHeaderConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
 import net.lab1024.smartadmin.service.common.swagger.SwaggerApiModelPropertyEnumPlugin;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeansException;
@@ -221,35 +221,35 @@ public class SwaggerConfig implements EnvironmentAware, BeanDefinitionRegistryPo
      */
     private List<Parameter> generateParameter() {
         // 配置全局参数 token
-        Parameter token = new ParameterBuilder().name(CommonConst.RequestHeader.TOKEN)
+        Parameter token = new ParameterBuilder().name(RequestHeaderConst.TOKEN)
                 .description("token")
                 .modelRef(new ModelRef("string"))
                 .parameterType("header").defaultValue("1")
                 .required(false)
                 .build();
 
-        Parameter agent = new ParameterBuilder().name(CommonConst.RequestHeader.USER_AGENT)
+        Parameter agent = new ParameterBuilder().name(RequestHeaderConst.USER_AGENT)
                 .description("agent")
                 .modelRef(new ModelRef("string"))
                 .parameterType("header").defaultValue("")
                 .required(false)
                 .build();
 
-        Parameter identity = new ParameterBuilder().name(CommonConst.RequestHeader.USER_IDENTITY)
+        Parameter identity = new ParameterBuilder().name(RequestHeaderConst.USER_IDENTITY)
                 .description("用户唯一标识")
                 .modelRef(new ModelRef("string"))
                 .parameterType("header").defaultValue("")
                 .required(false)
                 .build();
 
-        Parameter geo = new ParameterBuilder().name(CommonConst.RequestHeader.USER_GEO)
+        Parameter geo = new ParameterBuilder().name(RequestHeaderConst.USER_GEO)
                 .description("定位")
                 .modelRef(new ModelRef("string"))
                 .parameterType("header").defaultValue("")
                 .required(false)
                 .build();
 
-        Parameter location = new ParameterBuilder().name(CommonConst.RequestHeader.USER_LOCATION)
+        Parameter location = new ParameterBuilder().name(RequestHeaderConst.USER_LOCATION)
                 .description("位置")
                 .modelRef(new ModelRef("string"))
                 .parameterType("header").defaultValue("")
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SystemEnvironmentConfig.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SystemEnvironmentConfig.java
index 01036a9b..f9a3ac25 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SystemEnvironmentConfig.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/config/SystemEnvironmentConfig.java
@@ -1,6 +1,6 @@
 package net.lab1024.smartadmin.service.config;
 
-import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
+import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
 import net.lab1024.smartadmin.service.common.domain.SystemEnvironmentBO;
 import net.lab1024.smartadmin.service.util.SmartBaseEnumUtil;
 import org.apache.commons.lang3.StringUtils;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/SmartGlobalExceptionHandler.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/SmartGlobalExceptionHandler.java
index c1165eb9..1dc67388 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/SmartGlobalExceptionHandler.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/handler/SmartGlobalExceptionHandler.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.handler;
 
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
-import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
+import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.common.domain.SystemEnvironmentBO;
 import net.lab1024.smartadmin.service.common.exception.SmartBusinessException;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java
index c2317d23..62767530 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.category;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.module.business.category.domain.*;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java
index b0225030..6bbfc7a1 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.business.category.constant;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * 分类类型 枚举
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java
index b87fda56..8e351cbb 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.goods;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java
index a4191753..dacd59b6 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.business.goods.constant;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * 商品类型 枚举
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java
index e62fbb6a..591bb531 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/notice/NoticeController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.notice;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.PageBaseDTO;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/annotation/FieldEnumValue.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/annotation/FieldEnumValue.java
index 6a72a594..858f0708 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/annotation/FieldEnumValue.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/beanrecord/annotation/FieldEnumValue.java
@@ -1,6 +1,6 @@
 package net.lab1024.smartadmin.service.module.support.beanrecord.annotation;
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java
index fed88483..bfb28ffb 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/captcha/CaptchaController.java
@@ -4,7 +4,7 @@ package net.lab1024.smartadmin.service.module.support.captcha;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.lab1024.smartadmin.service.common.anno.NoNeedLogin;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.module.support.captcha.domain.CaptchaVO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerController.java
index e2f35514..715015b7 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/DataTracerController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.datatracer;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java
index 319e7e32..56a61244 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.support.datatracer.constant;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * [ 数据业务类型 ]
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java
index 0a6de70f..b028421e 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.support.datatracer.constant;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * [  ]
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerDTO.java
index 920fdb19..c398e535 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerDTO.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/domain/DataTracerDTO.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.support.datatracer.domain;
 
 import lombok.Data;
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 import net.lab1024.smartadmin.service.module.support.datatracer.constant.DataTracerBusinessTypeEnum;
 
 import java.time.LocalDateTime;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileController.java
index 4f7fcc5f..8325f46f 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/FileController.java
@@ -1,6 +1,6 @@
 package net.lab1024.smartadmin.service.module.support.file;
 
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java
index 75af1166..75a282d8 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java
@@ -1,7 +1,6 @@
 package net.lab1024.smartadmin.service.module.support.file.domain;
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
-import net.lab1024.smartadmin.service.common.constant.CommonConst;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * 文件服务 文件夹位置类型枚举类
@@ -11,11 +10,26 @@ import net.lab1024.smartadmin.service.common.constant.CommonConst;
  */
 public enum FileFolderTypeEnum implements BaseEnum {
 
-    COMMON(1, CommonConst.FileServiceConst.FOLDER_PUBLIC + "/common/", "通用"),
+    COMMON(1, FileFolderTypeEnum.FOLDER_PUBLIC + "/common/", "通用"),
 
     ;
 
-    public static final String INFO = "201:erp货物";
+    /**
+     * 公用读取文件夹 public
+     */
+    public static final String FOLDER_PUBLIC = "pu";
+
+    /**
+     * 私有读取文件夹 private
+     */
+    public static final String FOLDER_PRIVATE = "pr";
+
+    /**
+     * 文件夹格式
+     */
+    public static final String FOLDER_FORMAT = "folder";
+
+    public static final String INFO = "1:通用";
 
     private Integer value;
 
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileService.java
index 420107ee..be62630e 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileService.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileService.java
@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
 import net.lab1024.smartadmin.service.common.codeconst.FileResponseCodeConst;
 import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
 import net.lab1024.smartadmin.service.common.constant.CommonConst;
+import net.lab1024.smartadmin.service.common.constant.NumberLimitConst;
 import net.lab1024.smartadmin.service.common.constant.RedisKeyConst;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
@@ -98,7 +99,7 @@ public class FileService {
         }
         // 校验文件名称
         String originalFilename = file.getOriginalFilename();
-        if (StringUtils.isBlank(originalFilename) || originalFilename.length() > CommonConst.NumberLimit.FILE_NAME) {
+        if (StringUtils.isBlank(originalFilename) || originalFilename.length() > NumberLimitConst.FILE_NAME) {
             return ResponseDTO.wrap(FileResponseCodeConst.FILE_NAME_ERROR);
         }
         // 校验文件大小
@@ -126,11 +127,11 @@ public class FileService {
             uploadVO.setFileId(fileEntity.getId());
             //添加缓存
             String redisKey = RedisKeyConst.Base.FILE_URL + uploadVO.getFileKey();
-            redisService.set(redisKey, uploadVO.getFileUrl(), CommonConst.System.FILE_URL_EXPIRE_SECOND);
+            redisService.set(redisKey, uploadVO.getFileUrl(), fileStorageService.cacheExpireSecond());
 
             String fileRedisKey = RedisKeyConst.Base.FILE_VO + uploadVO.getFileKey();
             FileVO fileVO = SmartBeanUtil.copy(fileEntity, FileVO.class);
-            redisService.set(fileRedisKey, fileVO, CommonConst.System.FILE_VO_EXPIRE_SECOND);
+            redisService.set(fileRedisKey, fileVO, fileStorageService.cacheExpireSecond());
         }
 
         return response;
@@ -156,7 +157,7 @@ public class FileService {
         if (fileVO == null) {
             fileVO = fileDao.getByFileKey(fileKey);
             if (fileVO != null) {
-                redisService.set(redisKey, fileVO, CommonConst.System.FILE_VO_EXPIRE_SECOND);
+                redisService.set(redisKey, fileVO, fileStorageService.cacheExpireSecond());
             }
         }
 
@@ -194,7 +195,7 @@ public class FileService {
             return null;
         }
         fileUrl = responseDTO.getData();
-        redisService.set(redisKey, fileUrl, CommonConst.System.FILE_URL_EXPIRE_SECOND);
+        redisService.set(redisKey, fileUrl, fileStorageService.cacheExpireSecond());
         return fileUrl;
     }
 
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileStorageCloudServiceImpl.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileStorageCloudServiceImpl.java
index dc26675e..7bc19bbf 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileStorageCloudServiceImpl.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/FileStorageCloudServiceImpl.java
@@ -10,6 +10,7 @@ import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
 import net.lab1024.smartadmin.service.common.constant.CommonConst;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.config.FileCloudConfig;
+import net.lab1024.smartadmin.service.module.support.file.domain.FileFolderTypeEnum;
 import net.lab1024.smartadmin.service.module.support.file.domain.dto.FileDownloadDTO;
 import net.lab1024.smartadmin.service.module.support.file.domain.dto.FileMetadataDTO;
 import net.lab1024.smartadmin.service.module.support.file.domain.vo.FileUploadVO;
@@ -121,7 +122,7 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
         if (StringUtils.isBlank(fileKey)) {
             return ResponseDTO.wrap(ResponseCodeConst.ERROR_PARAM);
         }
-        if (!fileKey.startsWith(CommonConst.FileServiceConst.FOLDER_PRIVATE)) {
+        if (!fileKey.startsWith(FileFolderTypeEnum.FOLDER_PRIVATE)) {
             // 不是私有的 都公共读
             return ResponseDTO.succData(cloudConfig.getPublicUrl() + fileKey);
         }
@@ -183,7 +184,7 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
      */
     private CannedAccessControlList getACL(String fileKey) {
         // 公用读
-        if (fileKey.contains(CommonConst.FileServiceConst.FOLDER_PUBLIC)) {
+        if (fileKey.contains(FileFolderTypeEnum.FOLDER_PUBLIC)) {
             return CannedAccessControlList.PublicRead;
         }
         // 其他默认私有读写
@@ -205,4 +206,9 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
     }
 
 
+    @Override
+    public Long cacheExpireSecond(){
+        return cloudConfig.getUrlExpire() - 1800;
+    }
+
 }
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/IFileStorageService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/IFileStorageService.java
index 683e4e64..f8f0e9fc 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/IFileStorageService.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/service/IFileStorageService.java
@@ -56,6 +56,15 @@ public interface IFileStorageService {
    ResponseDTO<String> delete(String fileKey);
 
 
+    /**
+     * 缓存过期秒数
+     * @return
+     */
+   default Long cacheExpireSecond(){
+       return 3600L;
+   }
+
+
     /**
      * 不带后缀名的文件名
      *
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java
index 83f53d06..cc61ad68 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/heartbeat/HeartBeatController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.heartbeat;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.domain.PageBaseDTO;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java
index 196ce638..ac9147c5 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorController.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.support.idgenerator;
 
 import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
 import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorEnum;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java
index 0b3c1b5b..d905b01f 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java
@@ -1,6 +1,6 @@
 package net.lab1024.smartadmin.service.module.support.idgenerator.constant;
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * @author Administrator
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java
index c3f0c487..924acc87 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.operatelog;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java
index 4b47ed42..4d27e05b 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/DataScopeController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.datascope;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.module.system.datascope.domain.dto.DataScopeAndViewTypeVO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java
index 2ef98b04..9451098b 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.system.datascope.constant;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * [  ]
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java
index 88a46038..10aa4573 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.system.datascope.constant;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * [  ]
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java
index dd995b4f..b454caa8 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.system.datascope.constant;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * [  ]
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentController.java
index 4a97233a..a964617b 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.department;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.module.system.department.domain.dto.DepartmentCreateDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java
index d4f1c2ed..46b06c96 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java
index 1447db7a..19a79766 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java
@@ -5,6 +5,7 @@ import com.google.common.collect.Lists;
 import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
 import net.lab1024.smartadmin.service.common.constant.CacheModuleConst;
 import net.lab1024.smartadmin.service.common.constant.CommonConst;
+import net.lab1024.smartadmin.service.common.constant.SystemConst;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.module.support.beancache.cache.IBeanCache;
@@ -488,8 +489,8 @@ public class EmployeeService {
      * @return
      */
     public static String getEncryptPwd(String pwd) {
-        pwd = StringUtils.isBlank(pwd) ? CommonConst.Password.DEFAULT : pwd;
-        return DigestUtils.md5Hex(String.format(CommonConst.Password.SALT_FORMAT, pwd));
+        pwd = StringUtils.isBlank(pwd) ? SystemConst.Password.DEFAULT : pwd;
+        return DigestUtils.md5Hex(String.format(SystemConst.Password.SALT_FORMAT, pwd));
     }
 
     public static void main(String[] args) {
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeAddDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeAddDTO.java
index b19307fd..5c0026a1 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeAddDTO.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/dto/EmployeeAddDTO.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.smartadmin.service.common.constant.GenderEnum;
+import net.lab1024.smartadmin.service.common.enumconst.GenderEnum;
 import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum;
 import net.lab1024.smartadmin.service.util.SmartVerificationUtil;
 import org.hibernate.validator.constraints.Length;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java
index 2b76ee78..3f5451b5 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import net.lab1024.smartadmin.service.common.enumconst.GenderEnum;
 
 import java.time.LocalDateTime;
 
@@ -38,7 +39,7 @@ public class EmployeeEntity {
     /**
      * 性别
      *
-     * @see net.lab1024.smartadmin.service.common.constant.GenderEnum
+     * @see GenderEnum
      */
     private Integer gender;
 
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java
index c123c0d0..913e64df 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.smartadmin.service.common.constant.GenderEnum;
+import net.lab1024.smartadmin.service.common.enumconst.GenderEnum;
 import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum;
 
 import java.time.LocalDateTime;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginController.java
index db6ffcec..208e9a59 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginController.java
@@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.login;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.lab1024.smartadmin.service.common.anno.NoNeedLogin;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.module.system.employee.domain.dto.EmployeeLoginDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginTokenService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginTokenService.java
index 0fafe309..3f936955 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginTokenService.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/EmployeeLoginTokenService.java
@@ -4,7 +4,7 @@ import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
+import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
 import net.lab1024.smartadmin.service.common.domain.SystemEnvironmentBO;
 import net.lab1024.smartadmin.service.module.system.employee.EmployeeService;
 import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginBO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/domain/EmployeeLoginInfoDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/domain/EmployeeLoginInfoDTO.java
index 499f29ab..e3aab712 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/domain/EmployeeLoginInfoDTO.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/domain/EmployeeLoginInfoDTO.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.login.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.lab1024.smartadmin.service.common.constant.GenderEnum;
+import net.lab1024.smartadmin.service.common.enumconst.GenderEnum;
 import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum;
 
 import java.util.List;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuController.java
index 025498b8..b068cb38 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.menu;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.module.system.menu.domain.*;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/RequestUrlService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/RequestUrlService.java
index d19990fd..1bdc0d8a 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/RequestUrlService.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/RequestUrlService.java
@@ -58,8 +58,8 @@ public class RequestUrlService {
                 }
             }
             //获取url的Set集合，一个方法可能对应多个url
-            Set<String> patterns = info.getPatternsCondition().getPatterns();
-            if (CollectionUtils.isEmpty(patterns)) {
+            Set<String> urlSet = info.getPatternsCondition().getPatterns();
+            if (CollectionUtils.isEmpty(urlSet)) {
                 return;
             }
             String className = handlerMethod.getMethod().getDeclaringClass().getName();
@@ -80,7 +80,6 @@ public class RequestUrlService {
                     methodComment = handlerMethod.getMethod().getName();
                 }
             }
-            Set<String> urlSet = this.getUrlSet(patterns);
             for (String url : urlSet) {
                 RequestUrlVO requestUrlVO = new RequestUrlVO();
                 requestUrlVO.setUrl(url);
@@ -91,21 +90,6 @@ public class RequestUrlService {
 
         });
     }
-
-    private Set<String> getUrlSet(Set<String> patterns) {
-        Set<String> urlSet = Sets.newHashSet();
-        for (String url : patterns) {
-            for (String ignoreUrl : CommonConst.CommonCollection.IGNORE_URL) {
-                if (url.startsWith(ignoreUrl)) {
-                    urlSet.add(url.substring(ignoreUrl.length() - 1));
-                } else {
-                    urlSet.add(url);
-                }
-            }
-        }
-        return urlSet;
-    }
-
     public List<RequestUrlVO> getPrivilegeList() {
         return this.requestUrlVOS;
     }
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java
index f15268c8..3cb01f39 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java
@@ -1,7 +1,7 @@
 package net.lab1024.smartadmin.service.module.system.menu.constant;
 
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * 菜单类型枚举
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleController.java
index e62b26c4..88edfa80 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/basic/RoleController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.role.basic;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleAddDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeController.java
index 021bea7c..8d3d8d05 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/roleemployee/RoleEmployeeController.java
@@ -4,7 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuController.java
index ecf79663..68d6ed14 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.role.rolemenu;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.service.module.system.role.rolemenu.domain.RoleMenuDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java
index 99963576..9417cd11 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigController.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.systemconfig;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
+import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
 import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
 import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
 import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigKeyEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigKeyEnum.java
index 73b000ff..8ea86a77 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigKeyEnum.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/systemconfig/SystemConfigKeyEnum.java
@@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.systemconfig;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 /**
  * [ 系统配置常量类 ]
diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBaseEnumUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBaseEnumUtil.java
index d67c7fd4..cb2c3211 100644
--- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBaseEnumUtil.java
+++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartBaseEnumUtil.java
@@ -1,6 +1,6 @@
 package net.lab1024.smartadmin.service.util;
 
-import net.lab1024.smartadmin.service.common.constant.BaseEnum;
+import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
 
 import java.util.List;
 import java.util.Objects;