diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml
index 20df993..1600d31 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml
@@ -4,13 +4,13 @@ spring:
     url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
     username: root
     password: SmartAdmin666
+    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
     initial-size: 2
     min-idle: 2
     max-active: 10
     max-wait: 60000
     time-between-eviction-runs-millis: 60000
     min-evictable-idle-time-millis: 300000
-    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
     filters: stat
     druid:
       username: druid
@@ -40,7 +40,7 @@ spring:
     host: smtp.163.com
     port: 465
     username: lab1024@163.com
-    password: 1024lab
+    password: LAB1024LAB
     properties:
       mail:
         smtp:
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml
index 9f66ae6..1600d31 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml
@@ -40,7 +40,7 @@ spring:
     host: smtp.163.com
     port: 465
     username: lab1024@163.com
-    password: 1024lab
+    password: LAB1024LAB
     properties:
       mail:
         smtp:
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml
index ea51a9a..b7429ba 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml
@@ -40,7 +40,7 @@ spring:
     host: smtp.163.com
     port: 465
     username: lab1024@163.com
-    password: 1024lab
+    password: LAB1024LAB
     properties:
       mail:
         smtp:
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml
index 9f66ae6..1600d31 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml
@@ -40,7 +40,7 @@ spring:
     host: smtp.163.com
     port: 465
     username: lab1024@163.com
-    password: 1024lab
+    password: LAB1024LAB
     properties:
       mail:
         smtp:
diff --git a/smart-admin-api-java8-springboot2/README.md b/smart-admin-api-java8-springboot2/README.md
new file mode 100644
index 0000000..d1dcc55
--- /dev/null
+++ b/smart-admin-api-java8-springboot2/README.md
@@ -0,0 +1 @@
+# Smart Admin API
\ No newline at end of file
diff --git a/smart-admin-api/pom.xml b/smart-admin-api-java8-springboot2/pom.xml
similarity index 100%
rename from smart-admin-api/pom.xml
rename to smart-admin-api-java8-springboot2/pom.xml
diff --git a/smart-admin-api/sa-admin/pom.xml b/smart-admin-api-java8-springboot2/sa-admin/pom.xml
similarity index 100%
rename from smart-admin-api/sa-admin/pom.xml
rename to smart-admin-api-java8-springboot2/sa-admin/pom.xml
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/AdminApplication.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/AdminApplication.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/AdminApplication.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/AdminApplication.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/OperateLogAspectConfig.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/config/OperateLogAspectConfig.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/config/OperateLogAspectConfig.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/config/OperateLogAspectConfig.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminCacheConst.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminCacheConst.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminCacheConst.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminCacheConst.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminRedisKeyConst.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminRedisKeyConst.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminRedisKeyConst.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminRedisKeyConst.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/constant/AdminSwaggerTagConst.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/listener/AdminStartupRunner.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/listener/AdminStartupRunner.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/listener/AdminStartupRunner.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/listener/AdminStartupRunner.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/constant/CategoryTypeEnum.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/constant/CategoryTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/constant/CategoryTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/constant/CategoryTypeEnum.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/controller/CategoryController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/dao/CategoryDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/dao/CategoryDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/dao/CategoryDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/dao/CategoryDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategoryBaseDTO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategorySimpleDTO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategorySimpleDTO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategorySimpleDTO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/dto/CategorySimpleDTO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/entity/CategoryEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/entity/CategoryEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/entity/CategoryEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/entity/CategoryEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryAddForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryTreeQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryTreeQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryTreeQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryTreeQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/form/CategoryUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryTreeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryTreeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryTreeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryTreeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/vo/CategoryVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/manager/CategoryCacheManager.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryQueryService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/constant/GoodsStatusEnum.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/constant/GoodsStatusEnum.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/constant/GoodsStatusEnum.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/constant/GoodsStatusEnum.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/dao/GoodsDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/dao/GoodsDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/dao/GoodsDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/dao/GoodsDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/entity/GoodsEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsAddForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsImportForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsImportForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsImportForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsImportForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/form/GoodsUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsExcelVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsExcelVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsExcelVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsExcelVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/domain/vo/GoodsVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/BankService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankCreateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/bank/domain/BankVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseEmployeeManager.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/constant/EnterpriseTypeEnum.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/constant/EnterpriseTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/constant/EnterpriseTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/constant/EnterpriseTypeEnum.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseEmployeeDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseEmployeeDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseEmployeeDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/dao/EnterpriseEmployeeDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEmployeeEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEmployeeEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEmployeeEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEmployeeEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/entity/EnterpriseEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseCreateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseEmployeeQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/form/EnterpriseUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseEmployeeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseEmployeeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseEmployeeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseEmployeeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseExcelVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseExcelVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseExcelVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseExcelVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseListVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseListVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseListVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseListVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/domain/vo/EnterpriseVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/InvoiceService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceAddForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/invoice/domain/InvoiceVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/constant/NoticeVisibleRangeDataTypeEnum.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/constant/NoticeVisibleRangeDataTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/constant/NoticeVisibleRangeDataTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/constant/NoticeVisibleRangeDataTypeEnum.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/controller/NoticeController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeTypeDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeTypeDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeTypeDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeTypeDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeTypeEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeTypeEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeTypeEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/entity/NoticeTypeEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeAddForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeEmployeeQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeEmployeeQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeEmployeeQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeEmployeeQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeViewRecordQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeVisibleRangeForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeDetailVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeEmployeeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeEmployeeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeEmployeeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeEmployeeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeTypeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeTypeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeTypeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeTypeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeUpdateFormVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeUpdateFormVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeUpdateFormVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeUpdateFormVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeViewRecordVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeViewRecordVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeViewRecordVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeViewRecordVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVisibleRangeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVisibleRangeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVisibleRangeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVisibleRangeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/manager/NoticeManager.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeTypeService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScope.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScope.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScope.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScope.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/DataScopeController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/MyBatisPlugin.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/MyBatisPlugin.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/MyBatisPlugin.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/MyBatisPlugin.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeTypeEnum.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeTypeEnum.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeViewTypeEnum.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeViewTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeViewTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeViewTypeEnum.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/constant/DataScopeWhereInTypeEnum.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeAndViewTypeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeAndViewTypeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeAndViewTypeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeAndViewTypeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeDTO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeDTO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeDTO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeDTO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeSqlConfig.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeSqlConfig.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeSqlConfig.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeSqlConfig.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeViewTypeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeViewTypeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeViewTypeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/domain/DataScopeViewTypeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeSqlConfigService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeViewService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeViewService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeViewService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/service/DataScopeViewService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/strategy/AbstractDataScopeStrategy.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/strategy/AbstractDataScopeStrategy.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/strategy/AbstractDataScopeStrategy.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/datascope/strategy/AbstractDataScopeStrategy.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/dao/DepartmentDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/dao/DepartmentDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/dao/DepartmentDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/dao/DepartmentDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentEmployeeTreeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentEmployeeTreeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentEmployeeTreeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentEmployeeTreeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentTreeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentTreeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentTreeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentTreeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/dao/EmployeeDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/entity/EmployeeEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeBatchUpdateDepartmentForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateAvatarForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateAvatarForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateAvatarForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateAvatarForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdatePasswordForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateRoleForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateRoleForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateRoleForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeUpdateRoleForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/vo/EmployeeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/vo/EmployeeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/vo/EmployeeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/vo/EmployeeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/manager/EmployeeManager.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/LoginResultVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuPermsTypeEnum.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuPermsTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuPermsTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuPermsTypeEnum.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuTypeEnum.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/constant/MenuTypeEnum.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/dao/MenuDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/dao/MenuDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/dao/MenuDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/dao/MenuDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/entity/MenuEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/entity/MenuEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/entity/MenuEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/entity/MenuEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuAddForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuAddForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuAddForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuBaseForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuBaseForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuBaseForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuBaseForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuPointsOperateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuPointsOperateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuPointsOperateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuPointsOperateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/form/MenuUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuSimpleTreeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuSimpleTreeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuSimpleTreeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuSimpleTreeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuTreeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuTreeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuTreeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuTreeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/domain/vo/MenuVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/controller/PositionController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/controller/PositionController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/controller/PositionController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/controller/PositionController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/dao/PositionDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/dao/PositionDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/dao/PositionDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/dao/PositionDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/entity/PositionEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionAddForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/form/PositionUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/domain/vo/PositionVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/manager/PositionManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/manager/PositionManager.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/manager/PositionManager.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/manager/PositionManager.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/service/PositionService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/service/PositionService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/service/PositionService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/service/PositionService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleDataScopeController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleEmployeeController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleMenuController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleDataScopeDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleDataScopeDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleDataScopeDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleDataScopeDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleEmployeeDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleEmployeeDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleEmployeeDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleEmployeeDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleMenuDao.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleMenuDao.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleMenuDao.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/dao/RoleMenuDao.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleDataScopeEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleDataScopeEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleDataScopeEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleDataScopeEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleEmployeeEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleEmployeeEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleEmployeeEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleEmployeeEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleMenuEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleMenuEntity.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleMenuEntity.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/entity/RoleMenuEntity.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleAddForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleAddForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleAddForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleDataScopeUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleDataScopeUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleDataScopeUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleDataScopeUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleMenuUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleMenuUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleMenuUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleMenuUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleQueryForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleQueryForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleUpdateForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleUpdateForm.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleDataScopeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleDataScopeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleDataScopeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleDataScopeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleEmployeeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleEmployeeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleEmployeeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleEmployeeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleMenuTreeVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleMenuTreeVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleMenuTreeVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleMenuTreeVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleSelectedVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleSelectedVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleSelectedVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleSelectedVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleVO.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleVO.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/vo/RoleVO.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleDataScopeManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleDataScopeManager.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleDataScopeManager.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleDataScopeManager.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleEmployeeManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleEmployeeManager.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleEmployeeManager.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleEmployeeManager.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleMenuManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleMenuManager.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleMenuManager.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/manager/RoleMenuManager.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleDataScopeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleDataScopeService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleDataScopeService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleDataScopeService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleMenuService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleService.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminApiEncryptController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminApiEncryptController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminApiEncryptController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminApiEncryptController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminCacheController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDataMaskingDemoController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDataMaskingDemoController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDataMaskingDemoController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDataMaskingDemoController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminLoginLogController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminOperateLogController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSmartJobController.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSmartJobController.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSmartJobController.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSmartJobController.java
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/util/AdminRequestUtil.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/util/AdminRequestUtil.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/util/AdminRequestUtil.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/util/AdminRequestUtil.java
diff --git a/smart-admin-api/sa-admin/src/main/resources/dev/application.yaml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/dev/application.yaml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/dev/application.yaml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/dev/application.yaml
diff --git a/smart-admin-api/sa-admin/src/main/resources/dev/log4j2-spring.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/dev/log4j2-spring.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/dev/log4j2-spring.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/dev/log4j2-spring.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/dev/spy.properties b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/dev/spy.properties
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/dev/spy.properties
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/dev/spy.properties
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/category/CategoryMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/category/CategoryMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/business/category/CategoryMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/category/CategoryMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/bank/BankMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/invoice/InvoiceMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/PositionMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/PositionMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/system/PositionMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/PositionMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/menu/MenuMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/menu/MenuMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/system/menu/MenuMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/menu/MenuMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleDataScopeMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/role/RoleDataScopeMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleDataScopeMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/role/RoleDataScopeMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/role/RoleEmployeeMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/role/RoleMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/role/RoleMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleMenuMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/role/RoleMenuMapper.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/mapper/system/role/RoleMenuMapper.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/role/RoleMenuMapper.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/pre/application.yaml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/pre/application.yaml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/pre/application.yaml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/pre/application.yaml
diff --git a/smart-admin-api/sa-admin/src/main/resources/pre/log4j2-spring.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/pre/log4j2-spring.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/pre/log4j2-spring.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/pre/log4j2-spring.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/prod/application.yaml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/prod/application.yaml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/prod/application.yaml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/prod/application.yaml
diff --git a/smart-admin-api/sa-admin/src/main/resources/prod/log4j2-spring.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/prod/log4j2-spring.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/prod/log4j2-spring.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/prod/log4j2-spring.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/test/application.yaml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/test/application.yaml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/test/application.yaml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/test/application.yaml
diff --git a/smart-admin-api/sa-admin/src/main/resources/test/log4j2-spring.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/test/log4j2-spring.xml
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/test/log4j2-spring.xml
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/test/log4j2-spring.xml
diff --git a/smart-admin-api/sa-admin/src/main/resources/test/spy.properties b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/test/spy.properties
similarity index 100%
rename from smart-admin-api/sa-admin/src/main/resources/test/spy.properties
rename to smart-admin-api-java8-springboot2/sa-admin/src/main/resources/test/spy.properties
diff --git a/smart-admin-api/sa-admin/src/test/java/net/lab1024/sa/admin/AdminApplicationTest.java b/smart-admin-api-java8-springboot2/sa-admin/src/test/java/net/lab1024/sa/admin/AdminApplicationTest.java
similarity index 100%
rename from smart-admin-api/sa-admin/src/test/java/net/lab1024/sa/admin/AdminApplicationTest.java
rename to smart-admin-api-java8-springboot2/sa-admin/src/test/java/net/lab1024/sa/admin/AdminApplicationTest.java
diff --git a/smart-admin-api/sa-base/pom.xml b/smart-admin-api-java8-springboot2/sa-base/pom.xml
similarity index 100%
rename from smart-admin-api/sa-base/pom.xml
rename to smart-admin-api-java8-springboot2/sa-base/pom.xml
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/annoation/NoNeedLogin.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/annoation/NoNeedLogin.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/annoation/NoNeedLogin.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/annoation/NoNeedLogin.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCode.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCode.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCode.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCode.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCodeRangeContainer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCodeRangeContainer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCodeRangeContainer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCodeRangeContainer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCodeRegister.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCodeRegister.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCodeRegister.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/ErrorCodeRegister.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/SystemErrorCode.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/SystemErrorCode.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/SystemErrorCode.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/SystemErrorCode.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/UnexpectedErrorCode.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/UnexpectedErrorCode.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/UnexpectedErrorCode.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/UnexpectedErrorCode.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/constant/RequestHeaderConst.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/constant/RequestHeaderConst.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/constant/RequestHeaderConst.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/constant/RequestHeaderConst.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/constant/StringConst.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/constant/StringConst.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/constant/StringConst.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/constant/StringConst.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/controller/SupportBaseController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/controller/SupportBaseController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/controller/SupportBaseController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/controller/SupportBaseController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/DataScopePlugin.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/DataScopePlugin.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/DataScopePlugin.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/DataScopePlugin.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/PageParam.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/PageParam.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/PageParam.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/PageParam.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/PageResult.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/PageResult.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/PageResult.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/PageResult.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/RequestUrlVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/RequestUrlVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/RequestUrlVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/RequestUrlVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/RequestUser.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/RequestUser.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/RequestUser.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/RequestUser.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ResponseDTO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ResponseDTO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ResponseDTO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ResponseDTO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/SystemEnvironment.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/SystemEnvironment.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/SystemEnvironment.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/SystemEnvironment.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/UserPermission.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/UserPermission.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/UserPermission.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/UserPermission.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateData.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateData.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateData.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateData.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateList.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateList.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateList.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/domain/ValidateList.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/BaseEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/BaseEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/BaseEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/BaseEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/DataTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/DataTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/DataTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/DataTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/GenderEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/GenderEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/GenderEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/GenderEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/SystemEnvironmentEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/SystemEnvironmentEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/SystemEnvironmentEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/SystemEnvironmentEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/UserTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/UserTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/UserTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/enumeration/UserTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/exception/BusinessException.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/exception/BusinessException.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/exception/BusinessException.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/exception/BusinessException.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/DictValueVoDeserializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/DictValueVoDeserializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/DictValueVoDeserializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/DictValueVoDeserializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/FileKeyVoDeserializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/FileKeyVoDeserializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/FileKeyVoDeserializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/FileKeyVoDeserializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/LongJsonDeserializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/LongJsonDeserializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/LongJsonDeserializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/deserializer/LongJsonDeserializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/BigDecimalNullZeroSerializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/BigDecimalNullZeroSerializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/BigDecimalNullZeroSerializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/BigDecimalNullZeroSerializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/DataMaskingSerializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/DataMaskingSerializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/DataMaskingSerializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/DataMaskingSerializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/DictValueVoSerializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/DictValueVoSerializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/DictValueVoSerializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/DictValueVoSerializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeySerializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeySerializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeySerializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeySerializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeyVoSerializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeyVoSerializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeyVoSerializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/FileKeyVoSerializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/LongJsonSerializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/LongJsonSerializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/LongJsonSerializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/LongJsonSerializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/enumeration/EnumSerialize.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/enumeration/EnumSerialize.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/enumeration/EnumSerialize.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/enumeration/EnumSerialize.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/enumeration/EnumSerializer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/enumeration/EnumSerializer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/enumeration/EnumSerializer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/json/serializer/enumeration/EnumSerializer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SchemaEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SchemaEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SchemaEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SchemaEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SchemaEnumPropertyCustomizer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SchemaEnumPropertyCustomizer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SchemaEnumPropertyCustomizer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SchemaEnumPropertyCustomizer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SmartOperationCustomizer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SmartOperationCustomizer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SmartOperationCustomizer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/swagger/SmartOperationCustomizer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartBeanUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartBeanUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartBeanUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartBeanUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartBigDecimalUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartBigDecimalUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartBigDecimalUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartBigDecimalUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartDateFormatterEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartDateFormatterEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartDateFormatterEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartDateFormatterEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartEnumUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartEnumUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartEnumUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartEnumUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartIpUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartIpUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartIpUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartIpUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartLocalDateUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartLocalDateUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartLocalDateUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartLocalDateUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartPageUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartRequestUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartRequestUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartRequestUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartRequestUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartResponseUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartResponseUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartResponseUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartResponseUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartStringUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartStringUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartStringUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartStringUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartVerificationUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartVerificationUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartVerificationUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartVerificationUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/CheckEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/CheckEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/CheckEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/CheckEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/EnumValidator.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/EnumValidator.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/EnumValidator.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/common/validator/enumeration/EnumValidator.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/AsyncConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/AsyncConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/AsyncConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/AsyncConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CorsFilterConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/HeartBeatConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/HeartBeatConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/HeartBeatConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/HeartBeatConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/JsonConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/JsonConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/JsonConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/JsonConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/MybatisPlusConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/MybatisPlusConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/MybatisPlusConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/MybatisPlusConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/RepeatSubmitConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RestTemplateConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/RestTemplateConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RestTemplateConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/RestTemplateConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/ScheduleConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/ScheduleConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/ScheduleConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/ScheduleConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/SwaggerConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/SwaggerConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/SwaggerConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/SwaggerConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/SystemEnvironmentConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/SystemEnvironmentConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/SystemEnvironmentConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/SystemEnvironmentConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/UrlConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/UrlConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/UrlConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/UrlConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/YamlProcessor.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/YamlProcessor.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/YamlProcessor.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/YamlProcessor.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/CacheKeyConst.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/CacheKeyConst.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/CacheKeyConst.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/CacheKeyConst.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/LoginDeviceEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/LoginDeviceEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/LoginDeviceEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/LoginDeviceEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/RedisKeyConst.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/RedisKeyConst.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/RedisKeyConst.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/RedisKeyConst.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/ReloadConst.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/ReloadConst.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/ReloadConst.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/ReloadConst.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/SwaggerTagConst.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/SwaggerTagConst.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/constant/SwaggerTagConst.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/constant/SwaggerTagConst.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/GlobalExceptionHandler.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/handler/GlobalExceptionHandler.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/GlobalExceptionHandler.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/handler/GlobalExceptionHandler.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/listener/Ip2RegionListener.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/listener/Ip2RegionListener.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/listener/Ip2RegionListener.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/listener/Ip2RegionListener.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/listener/LogVariableListener.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/listener/LogVariableListener.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/listener/LogVariableListener.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/listener/LogVariableListener.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/DecryptRequestAdvice.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/DecryptRequestAdvice.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/DecryptRequestAdvice.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/DecryptRequestAdvice.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/EncryptResponseAdvice.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/EncryptResponseAdvice.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/EncryptResponseAdvice.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/advice/EncryptResponseAdvice.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/annotation/ApiDecrypt.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/annotation/ApiDecrypt.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/annotation/ApiDecrypt.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/annotation/ApiDecrypt.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/annotation/ApiEncrypt.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/annotation/ApiEncrypt.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/annotation/ApiEncrypt.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/annotation/ApiEncrypt.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/domain/ApiEncryptForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/domain/ApiEncryptForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/domain/ApiEncryptForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/domain/ApiEncryptForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptServiceAesImpl.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptServiceAesImpl.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptServiceAesImpl.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptServiceAesImpl.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptServiceSmImpl.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptServiceSmImpl.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptServiceSmImpl.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/apiencrypt/service/ApiEncryptServiceSmImpl.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaColor.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaColor.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaColor.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaColor.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaNoise.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaNoise.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaNoise.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaNoise.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaWordRenderer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaWordRenderer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaWordRenderer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/config/CaptchaWordRenderer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/domain/CaptchaVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/constant/ChangeLogTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/constant/ChangeLogTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/constant/ChangeLogTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/constant/ChangeLogTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/controller/ChangeLogController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/controller/ChangeLogController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/controller/ChangeLogController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/controller/ChangeLogController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/dao/ChangeLogDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/dao/ChangeLogDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/dao/ChangeLogDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/dao/ChangeLogDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeDeleteEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeDeleteEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeDeleteEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeDeleteEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorPageTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorPageTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorPageTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorPageTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeQueryFieldQueryTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeQueryFieldQueryTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeQueryFieldQueryTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeQueryFieldQueryTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/dao/CodeGeneratorConfigDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/dao/CodeGeneratorConfigDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/dao/CodeGeneratorConfigDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/dao/CodeGeneratorConfigDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/dao/CodeGeneratorDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/dao/CodeGeneratorDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/dao/CodeGeneratorDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/dao/CodeGeneratorDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/entity/CodeGeneratorConfigEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/entity/CodeGeneratorConfigEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/entity/CodeGeneratorConfigEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/entity/CodeGeneratorConfigEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorPreviewForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorPreviewForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorPreviewForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorPreviewForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/TableQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/TableQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/TableQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/TableQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeBasic.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeBasic.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeBasic.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeBasic.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeDelete.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeDelete.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeDelete.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeDelete.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeField.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeField.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeField.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeField.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdate.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdate.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdate.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdate.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeQueryField.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeQueryField.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeQueryField.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeQueryField.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeTableField.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeTableField.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeTableField.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeTableField.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableConfigVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableConfigVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableConfigVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableConfigVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ControllerVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ControllerVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ControllerVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ControllerVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/DaoVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/DaoVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/DaoVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/DaoVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ManagerVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ManagerVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ManagerVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ManagerVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/MenuVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/MenuVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/MenuVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/MenuVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ServiceVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ServiceVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ServiceVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/ServiceVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ApiVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ApiVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ApiVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ApiVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ConstVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ConstVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ConstVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ConstVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/util/CodeGeneratorTool.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/util/CodeGeneratorTool.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/util/CodeGeneratorTool.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/util/CodeGeneratorTool.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigKeyEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigKeyEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigKeyEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigKeyEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/ConfigService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigAddForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigAddForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigAddForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigAddForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigUpdateForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/config/domain/ConfigVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/DataMasking.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/DataMasking.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/DataMasking.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/DataMasking.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/DataMaskingTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/DataMaskingTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/DataMaskingTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/DataMaskingTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/SmartDataMaskingUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/SmartDataMaskingUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/SmartDataMaskingUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datamasking/SmartDataMaskingUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldBigDecimal.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldBigDecimal.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldBigDecimal.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldBigDecimal.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldDict.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldDict.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldDict.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldDict.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldLabel.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldLabel.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldLabel.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldLabel.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldSql.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldSql.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldSql.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/annoation/DataTracerFieldSql.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/constant/DataTracerConst.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/constant/DataTracerConst.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/constant/DataTracerConst.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/constant/DataTracerConst.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/constant/DataTracerTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/constant/DataTracerTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/constant/DataTracerTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/constant/DataTracerTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/controller/DataTracerController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/controller/DataTracerController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/controller/DataTracerController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/controller/DataTracerController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/dao/DataTracerDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/dao/DataTracerDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/dao/DataTracerDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/dao/DataTracerDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/bo/DataTracerContentBO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/bo/DataTracerContentBO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/bo/DataTracerContentBO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/bo/DataTracerContentBO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/entity/DataTracerEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/entity/DataTracerEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/entity/DataTracerEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/entity/DataTracerEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/form/DataTracerQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/vo/DataTracerVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/vo/DataTracerVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/vo/DataTracerVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/domain/vo/DataTracerVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/manager/DataTracerManger.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/manager/DataTracerManger.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/manager/DataTracerManger.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/manager/DataTracerManger.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/controller/DictController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/controller/DictController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/controller/DictController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/controller/DictController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/dao/DictKeyDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/dao/DictKeyDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/dao/DictKeyDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/dao/DictKeyDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/dao/DictValueDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/dao/DictValueDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/dao/DictValueDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/dao/DictValueDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/entity/DictKeyEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/entity/DictKeyEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/entity/DictKeyEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/entity/DictKeyEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/entity/DictValueEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/entity/DictValueEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/entity/DictValueEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/entity/DictValueEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyAddForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyAddForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyAddForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyAddForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictKeyUpdateForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueAddForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueAddForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueAddForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueAddForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/form/DictValueUpdateForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictKeyVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictKeyVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictKeyVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictKeyVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictValueVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictValueVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictValueVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/domain/vo/DictValueVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictCacheService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictCacheService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictCacheService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictCacheService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/controller/FeedbackController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/controller/FeedbackController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/controller/FeedbackController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/controller/FeedbackController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/dao/FeedbackDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/dao/FeedbackDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/dao/FeedbackDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/dao/FeedbackDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackAddForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackAddForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackAddForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackAddForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/domain/FeedbackVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/service/FeedbackService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/service/FeedbackService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/service/FeedbackService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/feedback/service/FeedbackService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/constant/FileFolderTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/constant/FileFolderTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/constant/FileFolderTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/constant/FileFolderTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/controller/FileController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/controller/FileController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/controller/FileController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/controller/FileController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/dao/FileDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/dao/FileDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/dao/FileDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/dao/FileDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/entity/FileEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/entity/FileEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/entity/FileEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/entity/FileEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileUrlUploadForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileUrlUploadForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileUrlUploadForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/form/FileUrlUploadForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileDownloadVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileDownloadVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileDownloadVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileDownloadVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileMetadataVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileMetadataVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileMetadataVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileMetadataVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileUploadVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileUploadVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileUploadVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileUploadVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/domain/vo/FileVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageCloudServiceImpl.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/IFileStorageService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/IFileStorageService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/IFileStorageService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/IFileStorageService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordHandler.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordHandler.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordHandler.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatRecordHandler.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/HeartBeatService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatManager.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatManager.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatManager.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatManager.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatRecord.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatRecord.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatRecord.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatRecord.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatRunnable.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatRunnable.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatRunnable.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/HeartBeatRunnable.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/IHeartBeatRecordHandler.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/IHeartBeatRecordHandler.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/IHeartBeatRecordHandler.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/core/IHeartBeatRecordHandler.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/heartbeat/domain/HeartBeatRecordVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/controller/HelpDocController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/controller/HelpDocController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/controller/HelpDocController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/controller/HelpDocController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/dao/HelpDocCatalogDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/dao/HelpDocCatalogDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/dao/HelpDocCatalogDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/dao/HelpDocCatalogDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/dao/HelpDocDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/dao/HelpDocDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/dao/HelpDocDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/dao/HelpDocDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocAddForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocAddForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocAddForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocAddForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogAddForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogAddForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogAddForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogAddForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocCatalogUpdateForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocRelationForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocRelationForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocRelationForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocRelationForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocUpdateForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocViewRecordQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocViewRecordQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocViewRecordQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/form/HelpDocViewRecordQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocCatalogVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocCatalogVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocCatalogVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocCatalogVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocDetailVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocDetailVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocDetailVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocDetailVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocRecordVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocRecordVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocRecordVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocRecordVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocRelationVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocRelationVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocRelationVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocRelationVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocViewRecordVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocViewRecordVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocViewRecordVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/vo/HelpDocViewRecordVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/manager/HelpDocManager.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/manager/HelpDocManager.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/manager/HelpDocManager.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/manager/HelpDocManager.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocCatalogService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocCatalogService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocCatalogService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocCatalogService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocUserService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocUserService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocUserService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/service/HelpDocUserService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobClientManager.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobClientManager.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobClientManager.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobClientManager.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobEnabledUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobEnabledUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobEnabledUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobEnabledUpdateForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobExecuteForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobExecuteForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobExecuteForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobExecuteForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobLogQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobLogQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobLogQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobLogQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobLogVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobLogVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobLogVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobLogVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobMsg.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobMsg.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobMsg.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobMsg.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/config/SmartJobAutoConfiguration.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/config/SmartJobAutoConfiguration.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/config/SmartJobAutoConfiguration.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/config/SmartJobAutoConfiguration.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/config/SmartJobConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/config/SmartJobConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/config/SmartJobConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/config/SmartJobConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobConst.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobConst.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobConst.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobConst.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobTriggerTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobTriggerTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobTriggerTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobTriggerTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobUtil.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobUtil.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobUtil.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobUtil.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJob.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJob.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJob.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJob.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobExecutor.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobLauncher.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobLauncher.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobLauncher.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobLauncher.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobScheduler.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobScheduler.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobScheduler.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobScheduler.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobLogDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobLogDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobLogDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobLogDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobRepository.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobRepository.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobRepository.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobRepository.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/domain/SmartJobEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/domain/SmartJobEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/domain/SmartJobEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/domain/SmartJobEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/domain/SmartJobLogEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/domain/SmartJobLogEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/domain/SmartJobLogEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/domain/SmartJobLogEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/SmartJobSample1.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/SmartJobSample1.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/SmartJobSample1.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/SmartJobSample1.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/SmartJobSample2.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/SmartJobSample2.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/SmartJobSample2.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/SmartJobSample2.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/package-info.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/package-info.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/package-info.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/sample/package-info.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogResultEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogResultEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogResultEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogResultEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/LoginLogService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailTemplateDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailTemplateDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailTemplateDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailTemplateDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/constant/MailTemplateCodeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/constant/MailTemplateCodeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/constant/MailTemplateCodeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/constant/MailTemplateCodeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/constant/MailTemplateTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/constant/MailTemplateTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/constant/MailTemplateTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/constant/MailTemplateTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/domain/MailTemplateEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/domain/MailTemplateEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/domain/MailTemplateEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/domain/MailTemplateEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/constant/MessageTemplateEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/constant/MessageTemplateEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/constant/MessageTemplateEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/constant/MessageTemplateEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/constant/MessageTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/constant/MessageTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/constant/MessageTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/constant/MessageTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/controller/MessageController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/controller/MessageController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/controller/MessageController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/controller/MessageController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/dao/MessageDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/dao/MessageDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/dao/MessageDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/dao/MessageDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageSendForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageSendForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageSendForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageSendForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageManager.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageManager.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageManager.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageManager.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/service/MessageService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/OperateLogService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/annotation/OperateLog.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/annotation/OperateLog.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/annotation/OperateLog.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/annotation/OperateLog.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogConfig.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogConfig.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogConfig.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedisService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedisService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedisService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedisService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonPasswordConfigurationCustomizer.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonPasswordConfigurationCustomizer.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonPasswordConfigurationCustomizer.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonPasswordConfigurationCustomizer.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/redis/RedissonService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadCommand.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/ReloadService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/AbstractSmartReloadCommand.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/AbstractSmartReloadCommand.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/AbstractSmartReloadCommand.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/AbstractSmartReloadCommand.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/annoation/SmartReload.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/annoation/SmartReload.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/annoation/SmartReload.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/annoation/SmartReload.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadItem.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadItem.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadItem.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadItem.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadObject.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadObject.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadObject.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadObject.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadResult.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadResult.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadResult.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/domain/SmartReloadResult.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/thread/SmartReloadRunnable.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/thread/SmartReloadRunnable.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/thread/SmartReloadRunnable.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/thread/SmartReloadRunnable.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/dao/ReloadItemDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/dao/ReloadItemDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/dao/ReloadItemDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/dao/ReloadItemDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/dao/ReloadResultDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/dao/ReloadResultDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/dao/ReloadResultDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/dao/ReloadResultDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadItemEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadItemEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadItemEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadItemEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadItemVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadItemVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadItemVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadItemVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadResultEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadResultEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadResultEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadResultEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadResultVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadResultVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadResultVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/domain/ReloadResultVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/RepeatSubmitAspect.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/annoation/RepeatSubmit.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/annoation/RepeatSubmit.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/annoation/RepeatSubmit.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/annoation/RepeatSubmit.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/AbstractRepeatSubmitTicket.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/AbstractRepeatSubmitTicket.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/AbstractRepeatSubmitTicket.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/AbstractRepeatSubmitTicket.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitCaffeineTicket.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitCaffeineTicket.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitCaffeineTicket.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitCaffeineTicket.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitRedisTicket.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitRedisTicket.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitRedisTicket.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitRedisTicket.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/dao/LoginFailDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/dao/LoginFailDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/dao/LoginFailDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/dao/LoginFailDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/dao/PasswordLogDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/dao/PasswordLogDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/dao/PasswordLogDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/dao/PasswordLogDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/Level3ProtectConfigForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/Level3ProtectConfigForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/Level3ProtectConfigForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/Level3ProtectConfigForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailVO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailVO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailVO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/PasswordLogEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/PasswordLogEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/PasswordLogEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/PasswordLogEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityLoginService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/constant/SerialNumberIdEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/constant/SerialNumberIdEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/constant/SerialNumberIdEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/constant/SerialNumberIdEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/constant/SerialNumberRuleTypeEnum.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/constant/SerialNumberRuleTypeEnum.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/constant/SerialNumberRuleTypeEnum.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/constant/SerialNumberRuleTypeEnum.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/dao/SerialNumberDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/dao/SerialNumberDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/dao/SerialNumberDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/dao/SerialNumberDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/dao/SerialNumberRecordDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/dao/SerialNumberRecordDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/dao/SerialNumberRecordDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/dao/SerialNumberRecordDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateResultBO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateResultBO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateResultBO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberGenerateResultBO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberInfoBO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberInfoBO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberInfoBO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberInfoBO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberLastGenerateBO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberLastGenerateBO.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberLastGenerateBO.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberLastGenerateBO.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordQueryForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordQueryForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordQueryForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/domain/SerialNumberRecordQueryForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberRecordService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberRecordService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberRecordService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberRecordService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberInternService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberInternService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberInternService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberInternService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberMysqlService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberMysqlService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberMysqlService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberMysqlService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnController.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnController.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnController.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnController.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnDao.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnDao.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnDao.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnDao.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnService.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnService.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/TableColumnService.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnEntity.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnEntity.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnEntity.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnItemForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnItemForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnItemForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnItemForm.java
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnUpdateForm.java
similarity index 100%
rename from smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnUpdateForm.java
rename to smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/table/domain/TableColumnUpdateForm.java
diff --git a/smart-admin-api/sa-base/src/main/resources/META-INF/spring.factories b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/META-INF/spring.factories
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/META-INF/spring.factories
diff --git a/smart-admin-api/sa-base/src/main/resources/banner.txt b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/banner.txt
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/banner.txt
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/banner.txt
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/AddForm.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/form/AddForm.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/AddForm.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/form/AddForm.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/UpdateForm.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/form/UpdateForm.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/UpdateForm.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/form/UpdateForm.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/manager/Manager.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/manager/Manager.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/manager/Manager.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/manager/Manager.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/java/sql/Menu.sql.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/api.js.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/api.js.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/js/api.js.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/api.js.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/const.js.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/const.js.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/js/const.js.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/const.js.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/tools.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/tools.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/code-generator-template/tools.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/code-generator-template/tools.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/dev/sa-base.yaml
similarity index 99%
rename from smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/dev/sa-base.yaml
index 9e5a9d2..6137e6d 100644
--- a/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/dev/sa-base.yaml
@@ -39,7 +39,7 @@ spring:
     host: smtp.163.com
     port: 465
     username: lab1024@163.com
-    password: 1024lab
+    password: LAB1024LAB
     properties:
       mail:
         smtp:
diff --git a/smart-admin-api/sa-base/src/main/resources/ip2region.xdb b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/ip2region.xdb
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/ip2region.xdb
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/ip2region.xdb
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/ConfigMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ConfigMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/ConfigMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ConfigMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/DataTracerMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DataTracerMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/DataTracerMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DataTracerMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/DictKeyMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DictKeyMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/DictKeyMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DictKeyMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/DictValueMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DictValueMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/DictValueMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/DictValueMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/FeedbackMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/FeedbackMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/FeedbackMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/FeedbackMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/FileMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/FileMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/FileMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/FileMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/HeartBeatRecordMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/HeartBeatRecordMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/HeartBeatRecordMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/HeartBeatRecordMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/HelpDocDao.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/HelpDocDao.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/HelpDocDao.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/HelpDocDao.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/LoginFailMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/LoginFailMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/LoginFailMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/LoginFailMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/MessageMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/MessageMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/MessageMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/MessageMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/PasswordLogMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/PasswordLogMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/PasswordLogMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/PasswordLogMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/ReloadItemMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ReloadItemMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/ReloadItemMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ReloadItemMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/ReloadResultMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ReloadResultMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/ReloadResultMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ReloadResultMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/SerialNumberMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/SerialNumberMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/SerialNumberMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/SerialNumberMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/SerialNumberRecordMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/SerialNumberRecordMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/SerialNumberRecordMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/SerialNumberRecordMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/SmartJobLogMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/SmartJobLogMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/SmartJobLogMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/SmartJobLogMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/SmartJobMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/SmartJobMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/SmartJobMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/SmartJobMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/mapper/support/TableColumnMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/TableColumnMapper.xml
similarity index 100%
rename from smart-admin-api/sa-base/src/main/resources/mapper/support/TableColumnMapper.xml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/TableColumnMapper.xml
diff --git a/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/pre/sa-base.yaml
similarity index 99%
rename from smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/pre/sa-base.yaml
index 9e5a9d2..6137e6d 100644
--- a/smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/pre/sa-base.yaml
@@ -39,7 +39,7 @@ spring:
     host: smtp.163.com
     port: 465
     username: lab1024@163.com
-    password: 1024lab
+    password: LAB1024LAB
     properties:
       mail:
         smtp:
diff --git a/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml
similarity index 99%
rename from smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml
index fdda674..2aed100 100644
--- a/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml
@@ -38,7 +38,7 @@ spring:
     host: smtp.163.com
     port: 465
     username: lab1024@163.com
-    password: 1024lab
+    password: LAB1024LAB
     properties:
       mail:
         smtp:
diff --git a/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/test/sa-base.yaml
similarity index 99%
rename from smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml
rename to smart-admin-api-java8-springboot2/sa-base/src/main/resources/test/sa-base.yaml
index 9e5a9d2..6137e6d 100644
--- a/smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/test/sa-base.yaml
@@ -39,7 +39,7 @@ spring:
     host: smtp.163.com
     port: 465
     username: lab1024@163.com
-    password: 1024lab
+    password: LAB1024LAB
     properties:
       mail:
         smtp:
diff --git a/smart-admin-api/.gitignore b/smart-admin-api/.gitignore
deleted file mode 100644
index ab428af..0000000
--- a/smart-admin-api/.gitignore
+++ /dev/null
@@ -1,35 +0,0 @@
-HELP.md
-target/
-
-velocity.log
-
-!.mvn/wrapper/maven-wrapper.jar
-
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-.DS_Store
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-
-### VS Code ###
-.vscode/
diff --git a/smart-admin-web/javascript-ant-design-vue3/.env.development b/smart-admin-web-javascript/.env.development
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.env.development
rename to smart-admin-web-javascript/.env.development
diff --git a/smart-admin-web/javascript-ant-design-vue3/.env.localhost b/smart-admin-web-javascript/.env.localhost
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.env.localhost
rename to smart-admin-web-javascript/.env.localhost
diff --git a/smart-admin-web/javascript-ant-design-vue3/.env.pre b/smart-admin-web-javascript/.env.pre
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.env.pre
rename to smart-admin-web-javascript/.env.pre
diff --git a/smart-admin-web/javascript-ant-design-vue3/.env.production b/smart-admin-web-javascript/.env.production
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.env.production
rename to smart-admin-web-javascript/.env.production
diff --git a/smart-admin-web/javascript-ant-design-vue3/.env.test b/smart-admin-web-javascript/.env.test
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.env.test
rename to smart-admin-web-javascript/.env.test
diff --git a/smart-admin-web/javascript-ant-design-vue3/.eslintignore b/smart-admin-web-javascript/.eslintignore
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.eslintignore
rename to smart-admin-web-javascript/.eslintignore
diff --git a/smart-admin-web/javascript-ant-design-vue3/.eslintrc.cjs b/smart-admin-web-javascript/.eslintrc.cjs
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.eslintrc.cjs
rename to smart-admin-web-javascript/.eslintrc.cjs
diff --git a/smart-admin-web/javascript-ant-design-vue3/.gitignore b/smart-admin-web-javascript/.gitignore
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.gitignore
rename to smart-admin-web-javascript/.gitignore
diff --git a/smart-admin-web/javascript-ant-design-vue3/.prettierrc.cjs b/smart-admin-web-javascript/.prettierrc.cjs
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.prettierrc.cjs
rename to smart-admin-web-javascript/.prettierrc.cjs
diff --git a/smart-admin-web/javascript-ant-design-vue3/.stylelintignore b/smart-admin-web-javascript/.stylelintignore
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.stylelintignore
rename to smart-admin-web-javascript/.stylelintignore
diff --git a/smart-admin-web/javascript-ant-design-vue3/.stylelintrc.js b/smart-admin-web-javascript/.stylelintrc.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/.stylelintrc.js
rename to smart-admin-web-javascript/.stylelintrc.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/index.html b/smart-admin-web-javascript/index.html
similarity index 59%
rename from smart-admin-web/javascript-ant-design-vue3/index.html
rename to smart-admin-web-javascript/index.html
index c88dce4..8e6a6ec 100644
--- a/smart-admin-web/javascript-ant-design-vue3/index.html
+++ b/smart-admin-web-javascript/index.html
@@ -19,6 +19,20 @@
 </head>
 <body>
 <div id="app"></div>
+<script>
+    let url = window.location.href;
+    if(url.indexOf("1024lab") > -1){
+        location.href = "https://preview.smartadmin.vip";
+    }
+
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "https://hm.baidu.com/hm.js?5e12fadc47eb3aac662d848fd39ec07a";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
 <script type="module" src="/src/main.js"></script>
 </body>
 </html>
diff --git a/smart-admin-web/javascript-ant-design-vue3/jsconfig.json b/smart-admin-web-javascript/jsconfig.json
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/jsconfig.json
rename to smart-admin-web-javascript/jsconfig.json
diff --git a/smart-admin-web/javascript-ant-design-vue3/package.json b/smart-admin-web-javascript/package.json
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/package.json
rename to smart-admin-web-javascript/package.json
diff --git a/smart-admin-web/javascript-ant-design-vue3/postcss.config.cjs b/smart-admin-web-javascript/postcss.config.cjs
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/postcss.config.cjs
rename to smart-admin-web-javascript/postcss.config.cjs
diff --git a/smart-admin-web/javascript-ant-design-vue3/public/favicon.ico b/smart-admin-web-javascript/public/favicon.ico
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/public/favicon.ico
rename to smart-admin-web-javascript/public/favicon.ico
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/App.vue b/smart-admin-web-javascript/src/App.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/App.vue
rename to smart-admin-web-javascript/src/App.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/business/category/category-api.js b/smart-admin-web-javascript/src/api/business/category/category-api.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/business/category/category-api.js
rename to smart-admin-web-javascript/src/api/business/category/category-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/business/goods/goods-api.js b/smart-admin-web-javascript/src/api/business/goods/goods-api.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/business/goods/goods-api.js
rename to smart-admin-web-javascript/src/api/business/goods/goods-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/business/oa/bank-api.js b/smart-admin-web-javascript/src/api/business/oa/bank-api.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/business/oa/bank-api.js
rename to smart-admin-web-javascript/src/api/business/oa/bank-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/business/oa/enterprise-api.js b/smart-admin-web-javascript/src/api/business/oa/enterprise-api.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/business/oa/enterprise-api.js
rename to smart-admin-web-javascript/src/api/business/oa/enterprise-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/business/oa/invoice-api.js b/smart-admin-web-javascript/src/api/business/oa/invoice-api.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/business/oa/invoice-api.js
rename to smart-admin-web-javascript/src/api/business/oa/invoice-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/business/oa/notice-api.js b/smart-admin-web-javascript/src/api/business/oa/notice-api.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/business/oa/notice-api.js
rename to smart-admin-web-javascript/src/api/business/oa/notice-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/api-encrypt-api.js b/smart-admin-web-javascript/src/api/support/api-encrypt-api.js
similarity index 93%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/api-encrypt-api.js
rename to smart-admin-web-javascript/src/api/support/api-encrypt-api.js
index a682550..83f9ff4 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/api-encrypt-api.js
+++ b/smart-admin-web-javascript/src/api/support/api-encrypt-api.js
@@ -5,7 +5,7 @@
  * @Date:      2023-10-17 20:02:37
  * @Copyright  1024创新实验室
  */
-import { postRequest, postEncryptRequest } from '/src/lib/axios';
+import { postRequest, postEncryptRequest } from '/@/lib/axios';
 
 export const encryptApi = {
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/cache-api.js b/smart-admin-web-javascript/src/api/support/cache-api.js
similarity index 93%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/cache-api.js
rename to smart-admin-web-javascript/src/api/support/cache-api.js
index 58dad35..5cb4d37 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/cache-api.js
+++ b/smart-admin-web-javascript/src/api/support/cache-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import {getRequest} from '/src/lib/axios';
+import {getRequest} from '/@/lib/axios';
 
 export const cacheApi = {
   // 获取某个缓存的所有key @author 罗伊
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/change-log/change-log-api.js b/smart-admin-web-javascript/src/api/support/change-log-api.js
similarity index 96%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/change-log/change-log-api.js
rename to smart-admin-web-javascript/src/api/support/change-log-api.js
index 6a89f43..e5ce1cb 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/change-log/change-log-api.js
+++ b/smart-admin-web-javascript/src/api/support/change-log-api.js
@@ -11,7 +11,7 @@ export const changeLogApi = {
   /**
    * 分页查询  @author  卓大
    */
-   queryPage : (param) => {
+  queryPage: (param) => {
     return postRequest('/support/changeLog/queryPage', param);
   },
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/code-generator-api.js b/smart-admin-web-javascript/src/api/support/code-generator-api.js
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/code-generator-api.js
rename to smart-admin-web-javascript/src/api/support/code-generator-api.js
index 9bf2f36..7289b62 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/code-generator-api.js
+++ b/smart-admin-web-javascript/src/api/support/code-generator-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest, postRequest, getDownload } from '/src/lib/axios';
+import { getRequest, postRequest, getDownload } from '/@/lib/axios';
 
 export const codeGeneratorApi = {
   // 查询数据库的表 @author 卓大
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/config/config-api.js b/smart-admin-web-javascript/src/api/support/config-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/config/config-api.js
rename to smart-admin-web-javascript/src/api/support/config-api.js
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/data-masking/data-masking-api.js b/smart-admin-web-javascript/src/api/support/data-masking-api.js
similarity index 87%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/data-masking/data-masking-api.js
rename to smart-admin-web-javascript/src/api/support/data-masking-api.js
index 16e670b..8921186 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/data-masking/data-masking-api.js
+++ b/smart-admin-web-javascript/src/api/support/data-masking-api.js
@@ -5,7 +5,7 @@
  * @Date:      2024-07-31 21:02:37
  * @Copyright  1024创新实验室
  */
-import { getRequest } from '/src/lib/axios';
+import { getRequest } from '/@/lib/axios';
 
 export const dataMaskingApi = {
   /**
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/data-tracer/data-tracer-api.js b/smart-admin-web-javascript/src/api/support/data-tracer-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/data-tracer/data-tracer-api.js
rename to smart-admin-web-javascript/src/api/support/data-tracer-api.js
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/dict/dict-api.js b/smart-admin-web-javascript/src/api/support/dict-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/dict/dict-api.js
rename to smart-admin-web-javascript/src/api/support/dict-api.js
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/feedback/feedback-api.js b/smart-admin-web-javascript/src/api/support/feedback-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/feedback/feedback-api.js
rename to smart-admin-web-javascript/src/api/support/feedback-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/file-api.js b/smart-admin-web-javascript/src/api/support/file-api.js
similarity index 92%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/file-api.js
rename to smart-admin-web-javascript/src/api/support/file-api.js
index cb56652..2e47093 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/file-api.js
+++ b/smart-admin-web-javascript/src/api/support/file-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest, getDownload } from '/src/lib/axios';
+import { postRequest, getRequest, getDownload } from '/@/lib/axios';
 
 export const fileApi = {
   // 文件上传 @author 卓大
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/heart-beat/heart-beat-api.js b/smart-admin-web-javascript/src/api/support/heart-beat-api.js
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/heart-beat/heart-beat-api.js
rename to smart-admin-web-javascript/src/api/support/heart-beat-api.js
index f1c0a2b..0a1eab4 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/heart-beat/heart-beat-api.js
+++ b/smart-admin-web-javascript/src/api/support/heart-beat-api.js
@@ -13,5 +13,5 @@ export const heartBeatApi = {
   // 分页查询 @author 卓大
   queryList: (param) => {
     return postRequest('/support/heartBeat/query', param);
-  }
+  },
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/help-doc/help-doc-api.js b/smart-admin-web-javascript/src/api/support/help-doc-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/help-doc/help-doc-api.js
rename to smart-admin-web-javascript/src/api/support/help-doc-api.js
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/help-doc/help-doc-catalog-api.js b/smart-admin-web-javascript/src/api/support/help-doc-catalog-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/help-doc/help-doc-catalog-api.js
rename to smart-admin-web-javascript/src/api/support/help-doc-catalog-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/job-api.js b/smart-admin-web-javascript/src/api/support/job-api.js
similarity index 93%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/job-api.js
rename to smart-admin-web-javascript/src/api/support/job-api.js
index aeea96e..805cef3 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/job-api.js
+++ b/smart-admin-web-javascript/src/api/support/job-api.js
@@ -4,7 +4,7 @@
  * @Author:    huke
  * @Date:      2024/06/25
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const jobApi = {
   // 分页查询 @huke
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/level3-protect-api.js b/smart-admin-web-javascript/src/api/support/level3-protect-api.js
similarity index 90%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/level3-protect-api.js
rename to smart-admin-web-javascript/src/api/support/level3-protect-api.js
index c6be240..2e99db2 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/level3-protect-api.js
+++ b/smart-admin-web-javascript/src/api/support/level3-protect-api.js
@@ -5,7 +5,7 @@
  * @Date:      2024-07-31 21:02:37
  * @Copyright  1024创新实验室
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const level3ProtectApi = {
   /**
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/login-fail-api.js b/smart-admin-web-javascript/src/api/support/login-fail-api.js
similarity index 90%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/login-fail-api.js
rename to smart-admin-web-javascript/src/api/support/login-fail-api.js
index 7adaae9..42888d3 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/login-fail-api.js
+++ b/smart-admin-web-javascript/src/api/support/login-fail-api.js
@@ -5,7 +5,7 @@
  * @Date:      2023-10-17 18:02:37
  * @Copyright  1024创新实验室
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const loginFailApi = {
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/login-log-api.js b/smart-admin-web-javascript/src/api/support/login-log-api.js
similarity index 90%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/login-log-api.js
rename to smart-admin-web-javascript/src/api/support/login-log-api.js
index 1a631bd..d447c0b 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/login-log-api.js
+++ b/smart-admin-web-javascript/src/api/support/login-log-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const loginLogApi = {
   // 分页查询 @author 卓大
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/message-api.js b/smart-admin-web-javascript/src/api/support/message-api.js
similarity index 88%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/message-api.js
rename to smart-admin-web-javascript/src/api/support/message-api.js
index 71b70ce..b91b56b 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/message-api.js
+++ b/smart-admin-web-javascript/src/api/support/message-api.js
@@ -1,4 +1,4 @@
-import { getRequest, postRequest } from '/src/lib/axios';
+import { getRequest, postRequest } from '/@/lib/axios';
 
 export const messageApi = {
   // 通知消息-分页查询
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/operate-log-api.js b/smart-admin-web-javascript/src/api/support/operate-log-api.js
similarity index 92%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/operate-log-api.js
rename to smart-admin-web-javascript/src/api/support/operate-log-api.js
index ff613ec..8058942 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/operate-log-api.js
+++ b/smart-admin-web-javascript/src/api/support/operate-log-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const operateLogApi = {
   // 分页查询 @author 卓大
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/reload/reload-api.js b/smart-admin-web-javascript/src/api/support/reload-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/reload/reload-api.js
rename to smart-admin-web-javascript/src/api/support/reload-api.js
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/serial-number/serial-number-api.js b/smart-admin-web-javascript/src/api/support/serial-number-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/serial-number/serial-number-api.js
rename to smart-admin-web-javascript/src/api/support/serial-number-api.js
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/table/table-column-api.js b/smart-admin-web-javascript/src/api/support/table-column-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/table/table-column-api.js
rename to smart-admin-web-javascript/src/api/support/table-column-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/system/department-api.js b/smart-admin-web-javascript/src/api/system/department-api.js
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/system/department-api.js
rename to smart-admin-web-javascript/src/api/system/department-api.js
index 5fa8489..c34994c 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/system/department-api.js
+++ b/smart-admin-web-javascript/src/api/system/department-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest, postRequest } from '/src/lib/axios';
+import { getRequest, postRequest } from '/@/lib/axios';
 
 export const departmentApi = {
   /**
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/system/employee-api.js b/smart-admin-web-javascript/src/api/system/employee-api.js
similarity index 96%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/system/employee-api.js
rename to smart-admin-web-javascript/src/api/system/employee-api.js
index 3929911..304256a 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/system/employee-api.js
+++ b/smart-admin-web-javascript/src/api/system/employee-api.js
@@ -8,7 +8,7 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
 
-import { getRequest, postEncryptRequest, postRequest } from '/src/lib/axios';
+import { getRequest, postEncryptRequest, postRequest } from '/@/lib/axios';
 
 export const employeeApi = {
   /**
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/system/home-api.js b/smart-admin-web-javascript/src/api/system/home-api.js
similarity index 93%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/system/home-api.js
rename to smart-admin-web-javascript/src/api/system/home-api.js
index 9b2ffe0..2b71ecb 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/system/home-api.js
+++ b/smart-admin-web-javascript/src/api/system/home-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest } from '/src/lib/axios';
+import { getRequest } from '/@/lib/axios';
 
 export const homeApi = {
   /**
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/system/login-api.js b/smart-admin-web-javascript/src/api/system/login-api.js
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/system/login-api.js
rename to smart-admin-web-javascript/src/api/system/login-api.js
index 08fe20c..7cb5909 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/system/login-api.js
+++ b/smart-admin-web-javascript/src/api/system/login-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest, postRequest } from '/src/lib/axios';
+import { getRequest, postRequest } from '/@/lib/axios';
 
 export const loginApi = {
   /**
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/system/menu/menu-api.js b/smart-admin-web-javascript/src/api/system/menu-api.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/system/menu/menu-api.js
rename to smart-admin-web-javascript/src/api/system/menu-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/system/position-api.js b/smart-admin-web-javascript/src/api/system/position-api.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/system/position-api.js
rename to smart-admin-web-javascript/src/api/system/position-api.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/system/role-api.js b/smart-admin-web-javascript/src/api/system/role-api.js
similarity index 97%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/system/role-api.js
rename to smart-admin-web-javascript/src/api/system/role-api.js
index 01f869d..0b62bb6 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/system/role-api.js
+++ b/smart-admin-web-javascript/src/api/system/role-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest, postRequest } from '/src/lib/axios';
+import { getRequest, postRequest } from '/@/lib/axios';
 
 export const roleApi = {
   /**
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/system/role-menu-api.js b/smart-admin-web-javascript/src/api/system/role-menu-api.js
similarity index 91%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/system/role-menu-api.js
rename to smart-admin-web-javascript/src/api/system/role-menu-api.js
index b8f569c..37096a9 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/system/role-menu-api.js
+++ b/smart-admin-web-javascript/src/api/system/role-menu-api.js
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest, postRequest } from '/src/lib/axios';
+import { getRequest, postRequest } from '/@/lib/axios';
 export const roleMenuApi = {
   /**
    * @description: 获取角色关联菜单权限
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/1024lab/1024lab-gzh.jpg b/smart-admin-web-javascript/src/assets/images/1024lab/1024lab-gzh.jpg
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/1024lab/1024lab-gzh.jpg
rename to smart-admin-web-javascript/src/assets/images/1024lab/1024lab-gzh.jpg
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/1024lab/gzh.jpg b/smart-admin-web-javascript/src/assets/images/1024lab/gzh.jpg
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/1024lab/gzh.jpg
rename to smart-admin-web-javascript/src/assets/images/1024lab/gzh.jpg
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/1024lab/xiaozhen-gzh.jpg b/smart-admin-web-javascript/src/assets/images/1024lab/xiaozhen-gzh.jpg
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/1024lab/xiaozhen-gzh.jpg
rename to smart-admin-web-javascript/src/assets/images/1024lab/xiaozhen-gzh.jpg
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/1024lab/zhuoda-wechat.jpg b/smart-admin-web-javascript/src/assets/images/1024lab/zhuoda-wechat.jpg
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/1024lab/zhuoda-wechat.jpg
rename to smart-admin-web-javascript/src/assets/images/1024lab/zhuoda-wechat.jpg
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/ali-icon.png b/smart-admin-web-javascript/src/assets/images/login/ali-icon.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/ali-icon.png
rename to smart-admin-web-javascript/src/assets/images/login/ali-icon.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/blue-login-bg.png b/smart-admin-web-javascript/src/assets/images/login/blue-login-bg.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/blue-login-bg.png
rename to smart-admin-web-javascript/src/assets/images/login/blue-login-bg.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/douyin-icon.png b/smart-admin-web-javascript/src/assets/images/login/douyin-icon.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/douyin-icon.png
rename to smart-admin-web-javascript/src/assets/images/login/douyin-icon.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/feishu-icon.png b/smart-admin-web-javascript/src/assets/images/login/feishu-icon.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/feishu-icon.png
rename to smart-admin-web-javascript/src/assets/images/login/feishu-icon.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/google-icon.png b/smart-admin-web-javascript/src/assets/images/login/google-icon.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/google-icon.png
rename to smart-admin-web-javascript/src/assets/images/login/google-icon.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/left-bg1.png b/smart-admin-web-javascript/src/assets/images/login/left-bg1.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/left-bg1.png
rename to smart-admin-web-javascript/src/assets/images/login/left-bg1.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/left-bg2.png b/smart-admin-web-javascript/src/assets/images/login/left-bg2.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/left-bg2.png
rename to smart-admin-web-javascript/src/assets/images/login/left-bg2.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-bg.png b/smart-admin-web-javascript/src/assets/images/login/login-bg.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-bg.png
rename to smart-admin-web-javascript/src/assets/images/login/login-bg.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-bg2.png b/smart-admin-web-javascript/src/assets/images/login/login-bg2.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-bg2.png
rename to smart-admin-web-javascript/src/assets/images/login/login-bg2.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-bg3.png b/smart-admin-web-javascript/src/assets/images/login/login-bg3.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-bg3.png
rename to smart-admin-web-javascript/src/assets/images/login/login-bg3.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-bg4 .png b/smart-admin-web-javascript/src/assets/images/login/login-bg4 .png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-bg4 .png
rename to smart-admin-web-javascript/src/assets/images/login/login-bg4 .png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-form-open-eyes-close.png b/smart-admin-web-javascript/src/assets/images/login/login-form-open-eyes-close.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-form-open-eyes-close.png
rename to smart-admin-web-javascript/src/assets/images/login/login-form-open-eyes-close.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-form-open-eyes.png b/smart-admin-web-javascript/src/assets/images/login/login-form-open-eyes.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-form-open-eyes.png
rename to smart-admin-web-javascript/src/assets/images/login/login-form-open-eyes.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-qr.png b/smart-admin-web-javascript/src/assets/images/login/login-qr.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/login-qr.png
rename to smart-admin-web-javascript/src/assets/images/login/login-qr.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/qq-icon.png b/smart-admin-web-javascript/src/assets/images/login/qq-icon.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/qq-icon.png
rename to smart-admin-web-javascript/src/assets/images/login/qq-icon.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/wechat-icon.png b/smart-admin-web-javascript/src/assets/images/login/wechat-icon.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/wechat-icon.png
rename to smart-admin-web-javascript/src/assets/images/login/wechat-icon.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/weibo-icon.png b/smart-admin-web-javascript/src/assets/images/login/weibo-icon.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/login/weibo-icon.png
rename to smart-admin-web-javascript/src/assets/images/login/weibo-icon.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/logo/logo-min.png b/smart-admin-web-javascript/src/assets/images/logo/logo-min.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/logo/logo-min.png
rename to smart-admin-web-javascript/src/assets/images/logo/logo-min.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/logo/logo.png b/smart-admin-web-javascript/src/assets/images/logo/logo.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/logo/logo.png
rename to smart-admin-web-javascript/src/assets/images/logo/logo.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/logo/smart-admin-logo-white.png b/smart-admin-web-javascript/src/assets/images/logo/smart-admin-logo-white.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/logo/smart-admin-logo-white.png
rename to smart-admin-web-javascript/src/assets/images/logo/smart-admin-logo-white.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/logo/smart-admin-logo.png b/smart-admin-web-javascript/src/assets/images/logo/smart-admin-logo.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/logo/smart-admin-logo.png
rename to smart-admin-web-javascript/src/assets/images/logo/smart-admin-logo.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/notice/edit_icon.png b/smart-admin-web-javascript/src/assets/images/notice/edit_icon.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/notice/edit_icon.png
rename to smart-admin-web-javascript/src/assets/images/notice/edit_icon.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/assets/images/notice/file_icon.png b/smart-admin-web-javascript/src/assets/images/notice/file_icon.png
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/assets/images/notice/file_icon.png
rename to smart-admin-web-javascript/src/assets/images/notice/file_icon.png
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/business/category-tree-select/index.vue b/smart-admin-web-javascript/src/components/business/category-tree-select/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/business/category-tree-select/index.vue
rename to smart-admin-web-javascript/src/components/business/category-tree-select/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/business/oa/enterprise-bank-select/index.vue b/smart-admin-web-javascript/src/components/business/oa/enterprise-bank-select/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/business/oa/enterprise-bank-select/index.vue
rename to smart-admin-web-javascript/src/components/business/oa/enterprise-bank-select/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/business/oa/enterprise-invoice-select/index.vue b/smart-admin-web-javascript/src/components/business/oa/enterprise-invoice-select/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/business/oa/enterprise-invoice-select/index.vue
rename to smart-admin-web-javascript/src/components/business/oa/enterprise-invoice-select/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/business/oa/enterprise-select/index.vue b/smart-admin-web-javascript/src/components/business/oa/enterprise-select/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/business/oa/enterprise-select/index.vue
rename to smart-admin-web-javascript/src/components/business/oa/enterprise-select/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/area-cascader/index.vue b/smart-admin-web-javascript/src/components/framework/area-cascader/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/area-cascader/index.vue
rename to smart-admin-web-javascript/src/components/framework/area-cascader/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/area-cascader/province-city-district.js b/smart-admin-web-javascript/src/components/framework/area-cascader/province-city-district.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/area-cascader/province-city-district.js
rename to smart-admin-web-javascript/src/components/framework/area-cascader/province-city-district.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/area-cascader/province-city.js b/smart-admin-web-javascript/src/components/framework/area-cascader/province-city.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/area-cascader/province-city.js
rename to smart-admin-web-javascript/src/components/framework/area-cascader/province-city.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/boolean-select/index.vue b/smart-admin-web-javascript/src/components/framework/boolean-select/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/boolean-select/index.vue
rename to smart-admin-web-javascript/src/components/framework/boolean-select/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/icon-select/index.vue b/smart-admin-web-javascript/src/components/framework/icon-select/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/icon-select/index.vue
rename to smart-admin-web-javascript/src/components/framework/icon-select/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/iframe/iframe-index.vue b/smart-admin-web-javascript/src/components/framework/iframe/iframe-index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/iframe/iframe-index.vue
rename to smart-admin-web-javascript/src/components/framework/iframe/iframe-index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/iframe/route-default-component.vue b/smart-admin-web-javascript/src/components/framework/iframe/route-default-component.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/iframe/route-default-component.vue
rename to smart-admin-web-javascript/src/components/framework/iframe/route-default-component.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/smart-enum-checkbox/index.vue b/smart-admin-web-javascript/src/components/framework/smart-enum-checkbox/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/smart-enum-checkbox/index.vue
rename to smart-admin-web-javascript/src/components/framework/smart-enum-checkbox/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/smart-enum-radio/index.vue b/smart-admin-web-javascript/src/components/framework/smart-enum-radio/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/smart-enum-radio/index.vue
rename to smart-admin-web-javascript/src/components/framework/smart-enum-radio/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/smart-enum-select/index.vue b/smart-admin-web-javascript/src/components/framework/smart-enum-select/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/smart-enum-select/index.vue
rename to smart-admin-web-javascript/src/components/framework/smart-enum-select/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/smart-loading/index.js b/smart-admin-web-javascript/src/components/framework/smart-loading/index.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/smart-loading/index.js
rename to smart-admin-web-javascript/src/components/framework/smart-loading/index.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue b/smart-admin-web-javascript/src/components/framework/wangeditor/index.vue
similarity index 91%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue
rename to smart-admin-web-javascript/src/components/framework/wangeditor/index.vue
index 2ecdeac..0f14590 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/framework/wangeditor/index.vue
+++ b/smart-admin-web-javascript/src/components/framework/wangeditor/index.vue
@@ -1,11 +1,11 @@
-<!-- 
+<!--
   * 编辑器
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 15:34:33 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 15:34:33
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -24,7 +24,7 @@
 <script setup>
   import { shallowRef, onBeforeUnmount, watch, ref } from 'vue';
   import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
-  import { fileApi } from '/src/api/support/file-api';
+  import { fileApi } from '/@/api/support/file-api';
   import '@wangeditor/editor/dist/css/style.css';
   import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/data-tracer/data-tracer-table.vue b/smart-admin-web-javascript/src/components/support/data-tracer/data-tracer-table.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/data-tracer/data-tracer-table.vue
rename to smart-admin-web-javascript/src/components/support/data-tracer/data-tracer-table.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/data-tracer/data-tracer-timeline.vue b/smart-admin-web-javascript/src/components/support/data-tracer/data-tracer-timeline.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/data-tracer/data-tracer-timeline.vue
rename to smart-admin-web-javascript/src/components/support/data-tracer/data-tracer-timeline.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/data-tracer/index.vue b/smart-admin-web-javascript/src/components/support/data-tracer/index.vue
similarity index 95%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/data-tracer/index.vue
rename to smart-admin-web-javascript/src/components/support/data-tracer/index.vue
index 9c73a3b..d807227 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/data-tracer/index.vue
+++ b/smart-admin-web-javascript/src/components/support/data-tracer/index.vue
@@ -1,11 +1,11 @@
 <!--
   *  数据变动记录 表格 组件
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-12 21:01:52 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-12 21:01:52
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -65,7 +65,7 @@
   import 'diff2html/bundles/css/diff2html.min.css';
   import uaparser from 'ua-parser-js';
   import { nextTick, reactive, ref, watch } from 'vue';
-  import { dataTracerApi } from '/src/api/support/data-tracer-api';
+  import { dataTracerApi } from '/@/api/support/data-tracer-api';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
   import DataTracerTimeline from './data-tracer-timeline.vue';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-key-select/index.vue b/smart-admin-web-javascript/src/components/support/dict-key-select/index.vue
similarity index 90%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-key-select/index.vue
rename to smart-admin-web-javascript/src/components/support/dict-key-select/index.vue
index 2fd3eb2..a37fba6 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-key-select/index.vue
+++ b/smart-admin-web-javascript/src/components/support/dict-key-select/index.vue
@@ -1,11 +1,11 @@
 <!---
   * 字典key 下拉选择框
-  * 
+  *
   * @Author:    1024创新实验室：罗伊
-  * @Date:      2022-09-12 22:06:45 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Date:      2022-09-12 22:06:45
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -28,7 +28,7 @@
 
 <script setup>
   import { computed, onMounted, ref, watch, defineExpose } from 'vue';
-  import { dictApi } from '/src/api/support/dict-api';
+  import { dictApi } from '/@/api/support/dict-api';
 
   defineExpose({
     queryDict,
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue b/smart-admin-web-javascript/src/components/support/dict-select/index.vue
similarity index 97%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue
rename to smart-admin-web-javascript/src/components/support/dict-select/index.vue
index 72963a8..840c441 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue
+++ b/smart-admin-web-javascript/src/components/support/dict-select/index.vue
@@ -29,7 +29,7 @@
 
 <script setup>
   import { computed, onMounted, ref, watch } from 'vue';
-  import { dictApi } from '/src/api/support/dict-api';
+  import { dictApi } from '/@/api/support/dict-api';
 
   const props = defineProps({
     keyCode: String,
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue b/smart-admin-web-javascript/src/components/support/file-preview-modal/index.vue
similarity index 90%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue
rename to smart-admin-web-javascript/src/components/support/file-preview-modal/index.vue
index d42d2ef..03f46ca 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview-modal/index.vue
+++ b/smart-admin-web-javascript/src/components/support/file-preview-modal/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 文件预览 弹窗
-  * 
+  *
   * @Author:    1024创新实验室：善逸
-  * @Date:      2022-09-02 20:19:39 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Date:      2022-09-02 20:19:39
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -24,7 +24,7 @@
 
 <script setup>
   import { ref } from 'vue';
-  import { fileApi } from '/src/api/support/file-api';
+  import { fileApi } from '/@/api/support/file-api';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { SmartLoading } from '/@/components/framework/smart-loading';
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview/index.vue b/smart-admin-web-javascript/src/components/support/file-preview/index.vue
similarity index 91%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview/index.vue
rename to smart-admin-web-javascript/src/components/support/file-preview/index.vue
index d595455..665708c 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-preview/index.vue
+++ b/smart-admin-web-javascript/src/components/support/file-preview/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 文件预览
-  * 
+  *
   * @Author:    1024创新实验室：善逸
-  * @Date:      2022-07-19 23:19:39 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Date:      2022-07-19 23:19:39
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -32,7 +32,7 @@
 </template>
 <script setup>
   import { ref } from 'vue';
-  import { fileApi } from '/src/api/support/file-api';
+  import { fileApi } from '/@/api/support/file-api';
 
   let props = defineProps({
     fileList: {
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-upload/index.vue b/smart-admin-web-javascript/src/components/support/file-upload/index.vue
similarity index 97%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/file-upload/index.vue
rename to smart-admin-web-javascript/src/components/support/file-upload/index.vue
index d7d8e9c..da4997f 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/file-upload/index.vue
+++ b/smart-admin-web-javascript/src/components/support/file-upload/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 文件上传
-  * 
+  *
   * @Author:    1024创新实验室：善逸
-  * @Date:      2022-08-12 20:19:39 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Date:      2022-08-12 20:19:39
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -45,7 +45,7 @@
 <script setup>
   import { computed, ref, watch } from 'vue';
   import { Modal } from 'ant-design-vue';
-  import { fileApi } from '/src/api/support/file-api';
+  import { fileApi } from '/@/api/support/file-api';
   import { useUserStore } from '/@/store/modules/system/user';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/table-operator/index.vue b/smart-admin-web-javascript/src/components/support/table-operator/index.vue
similarity index 98%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/table-operator/index.vue
rename to smart-admin-web-javascript/src/components/support/table-operator/index.vue
index a3facbb..174cf77 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/table-operator/index.vue
+++ b/smart-admin-web-javascript/src/components/support/table-operator/index.vue
@@ -37,7 +37,7 @@
 
 <script setup>
   import _ from 'lodash';
-  import { tableColumnApi } from '/src/api/support/table-column-api';
+  import { tableColumnApi } from '/@/api/support/table-column-api';
   import { onMounted, reactive, ref, watch } from 'vue';
   import SmartTableColumnModal from './smart-table-column-modal.vue';
   import { message } from 'ant-design-vue';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/table-operator/smart-table-column-merge.js b/smart-admin-web-javascript/src/components/support/table-operator/smart-table-column-merge.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/table-operator/smart-table-column-merge.js
rename to smart-admin-web-javascript/src/components/support/table-operator/smart-table-column-merge.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/table-operator/smart-table-column-modal.vue b/smart-admin-web-javascript/src/components/support/table-operator/smart-table-column-modal.vue
similarity index 97%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/support/table-operator/smart-table-column-modal.vue
rename to smart-admin-web-javascript/src/components/support/table-operator/smart-table-column-modal.vue
index a24940f..35f9f11 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/table-operator/smart-table-column-modal.vue
+++ b/smart-admin-web-javascript/src/components/support/table-operator/smart-table-column-modal.vue
@@ -1,11 +1,11 @@
 <!--
   *  表格列设置
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-26 23:45:51 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-26 23:45:51
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -54,7 +54,7 @@
 </template>
 <script setup>
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { tableColumnApi } from '/src/api/support/table-column-api';
+  import { tableColumnApi } from '/@/api/support/table-column-api';
   import { nextTick, ref } from 'vue';
   import _ from 'lodash';
   import Sortable from 'sortablejs';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/system/department-tree-select/index.vue b/smart-admin-web-javascript/src/components/system/department-tree-select/index.vue
similarity index 82%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/system/department-tree-select/index.vue
rename to smart-admin-web-javascript/src/components/system/department-tree-select/index.vue
index 64f5647..e9de799 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/system/department-tree-select/index.vue
+++ b/smart-admin-web-javascript/src/components/system/department-tree-select/index.vue
@@ -1,11 +1,11 @@
-<!-- 
+<!--
   * 部门 树形选择框
 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 23:05:43 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 23:05:43
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -26,7 +26,7 @@
 <script setup>
   import { onMounted, ref } from 'vue';
   import _ from 'lodash';
-  import { departmentApi } from '/src/api/system/department-api';
+  import { departmentApi } from '/@/api/system/department-api';
 
   const props = defineProps({
     // 绑定值
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-select/index.vue b/smart-admin-web-javascript/src/components/system/employee-select/index.vue
similarity index 88%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-select/index.vue
rename to smart-admin-web-javascript/src/components/system/employee-select/index.vue
index bfd98c6..c963957 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-select/index.vue
+++ b/smart-admin-web-javascript/src/components/system/employee-select/index.vue
@@ -1,11 +1,11 @@
 <!--
-  * 员工下拉选择框 
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 15:09:02 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * 员工下拉选择框
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 15:09:02
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-select
@@ -26,7 +26,7 @@
 
 <script setup>
   import { onMounted, ref, watch } from 'vue';
-  import { employeeApi } from '/src/api/system/employee-api';
+  import { employeeApi } from '/@/api/system/employee-api';
   import { smartSentry } from '/@/lib/smart-sentry';
 
   // =========== 属性定义 和 事件方法暴露 =============
@@ -81,7 +81,7 @@
   onMounted(query);
 
   // =========== 选择 监听、事件 =============
-  
+
   const selectValue = ref(props.value);
   watch(
     () => props.value,
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue b/smart-admin-web-javascript/src/components/system/employee-table-select-modal/index.vue
similarity index 95%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue
rename to smart-admin-web-javascript/src/components/system/employee-table-select-modal/index.vue
index 352d9b2..b68dfc3 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue
+++ b/smart-admin-web-javascript/src/components/system/employee-table-select-modal/index.vue
@@ -1,11 +1,11 @@
 <!--
-  * 员工 表格 弹窗 选择框 
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-19 23:09:02 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * 员工 表格 弹窗 选择框
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-19 23:09:02
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-modal v-model:open="visible" :width="900" title="选择人员" @cancel="closeModal" @ok="onSelectEmployee">
@@ -80,7 +80,7 @@
 <script setup>
   import { message } from 'ant-design-vue';
   import { computed, reactive, ref } from 'vue';
-  import { employeeApi } from '/src/api/system/employee-api';
+  import { employeeApi } from '/@/api/system/employee-api';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/system/menu-tree-select/index.vue b/smart-admin-web-javascript/src/components/system/menu-tree-select/index.vue
similarity index 89%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/system/menu-tree-select/index.vue
rename to smart-admin-web-javascript/src/components/system/menu-tree-select/index.vue
index 4939188..e7b1b62 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/system/menu-tree-select/index.vue
+++ b/smart-admin-web-javascript/src/components/system/menu-tree-select/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 菜单 树形 下拉选择框
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-01 23:14:49 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-01 23:14:49
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-tree-select
@@ -25,7 +25,7 @@
 <script setup>
   import { onMounted, ref } from 'vue';
   import _ from 'lodash';
-  import { menuApi } from '/src/api/system/menu-api';
+  import { menuApi } from '/@/api/system/menu-api';
   import { buildMenuTableTree } from '/@/views/system/menu/menu-data-handler';
   import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/system/position-select/index.vue b/smart-admin-web-javascript/src/components/system/position-select/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/components/system/position-select/index.vue
rename to smart-admin-web-javascript/src/components/system/position-select/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/config/app-config.js b/smart-admin-web-javascript/src/config/app-config.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/config/app-config.js
rename to smart-admin-web-javascript/src/config/app-config.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/business/erp/category-const.js b/smart-admin-web-javascript/src/constants/business/erp/category-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/business/erp/category-const.js
rename to smart-admin-web-javascript/src/constants/business/erp/category-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/business/erp/goods-const.js b/smart-admin-web-javascript/src/constants/business/erp/goods-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/business/erp/goods-const.js
rename to smart-admin-web-javascript/src/constants/business/erp/goods-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/business/message/message-const.js b/smart-admin-web-javascript/src/constants/business/message/message-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/business/message/message-const.js
rename to smart-admin-web-javascript/src/constants/business/message/message-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/business/oa/enterprise-const.js b/smart-admin-web-javascript/src/constants/business/oa/enterprise-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/business/oa/enterprise-const.js
rename to smart-admin-web-javascript/src/constants/business/oa/enterprise-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/business/oa/notice-const.js b/smart-admin-web-javascript/src/constants/business/oa/notice-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/business/oa/notice-const.js
rename to smart-admin-web-javascript/src/constants/business/oa/notice-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/common-const.js b/smart-admin-web-javascript/src/constants/common-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/common-const.js
rename to smart-admin-web-javascript/src/constants/common-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/index.js b/smart-admin-web-javascript/src/constants/index.js
similarity index 96%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/index.js
rename to smart-admin-web-javascript/src/constants/index.js
index ff49eb0..f858dff 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/constants/index.js
+++ b/smart-admin-web-javascript/src/constants/index.js
@@ -20,7 +20,7 @@ import enterprise from './business/oa/enterprise-const';
 import message from './business/message/message-const';
 import codeGeneratorConst from './support/code-generator-const';
 import changeLogConst from './support/change-log-const';
-import jobConst from './support/job-const.js';
+import jobConst from './support/job-const';
 
 export default {
   FLAG_NUMBER_ENUM,
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/layout-const.js b/smart-admin-web-javascript/src/constants/layout-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/layout-const.js
rename to smart-admin-web-javascript/src/constants/layout-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js b/smart-admin-web-javascript/src/constants/local-storage-key-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/local-storage-key-const.js
rename to smart-admin-web-javascript/src/constants/local-storage-key-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/regular-const.js b/smart-admin-web-javascript/src/constants/regular-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/regular-const.js
rename to smart-admin-web-javascript/src/constants/regular-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/support/change-log-const.js b/smart-admin-web-javascript/src/constants/support/change-log-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/support/change-log-const.js
rename to smart-admin-web-javascript/src/constants/support/change-log-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/support/code-generator-const.js b/smart-admin-web-javascript/src/constants/support/code-generator-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/support/code-generator-const.js
rename to smart-admin-web-javascript/src/constants/support/code-generator-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/support/data-tracer-const.js b/smart-admin-web-javascript/src/constants/support/data-tracer-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/support/data-tracer-const.js
rename to smart-admin-web-javascript/src/constants/support/data-tracer-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/support/file-const.js b/smart-admin-web-javascript/src/constants/support/file-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/support/file-const.js
rename to smart-admin-web-javascript/src/constants/support/file-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/support/job-const.js b/smart-admin-web-javascript/src/constants/support/job-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/support/job-const.js
rename to smart-admin-web-javascript/src/constants/support/job-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/support/login-log-const.js b/smart-admin-web-javascript/src/constants/support/login-log-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/support/login-log-const.js
rename to smart-admin-web-javascript/src/constants/support/login-log-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/support/table-id-const.js b/smart-admin-web-javascript/src/constants/support/table-id-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/support/table-id-const.js
rename to smart-admin-web-javascript/src/constants/support/table-id-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/system/employee-const.js b/smart-admin-web-javascript/src/constants/system/employee-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/system/employee-const.js
rename to smart-admin-web-javascript/src/constants/system/employee-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/system/home-const.js b/smart-admin-web-javascript/src/constants/system/home-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/system/home-const.js
rename to smart-admin-web-javascript/src/constants/system/home-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/system/login-device-const.js b/smart-admin-web-javascript/src/constants/system/login-device-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/system/login-device-const.js
rename to smart-admin-web-javascript/src/constants/system/login-device-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/constants/system/menu-const.js b/smart-admin-web-javascript/src/constants/system/menu-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/constants/system/menu-const.js
rename to smart-admin-web-javascript/src/constants/system/menu-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/directives/privilege.js b/smart-admin-web-javascript/src/directives/privilege.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/directives/privilege.js
rename to smart-admin-web-javascript/src/directives/privilege.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/i18n/index.js b/smart-admin-web-javascript/src/i18n/index.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/i18n/index.js
rename to smart-admin-web-javascript/src/i18n/index.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/en-US/index.js b/smart-admin-web-javascript/src/i18n/lang/en-US/index.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/en-US/index.js
rename to smart-admin-web-javascript/src/i18n/lang/en-US/index.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/zh-CN/index.js b/smart-admin-web-javascript/src/i18n/lang/zh-CN/index.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/i18n/lang/zh-CN/index.js
rename to smart-admin-web-javascript/src/i18n/lang/zh-CN/index.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/change-password/regular-change-password-modal.vue b/smart-admin-web-javascript/src/layout/components/change-password/regular-change-password-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/change-password/regular-change-password-modal.vue
rename to smart-admin-web-javascript/src/layout/components/change-password/regular-change-password-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue b/smart-admin-web-javascript/src/layout/components/header-user-space/header-avatar.vue
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue
rename to smart-admin-web-javascript/src/layout/components/header-user-space/header-avatar.vue
index 7540c1b..509b6c3 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue
+++ b/smart-admin-web-javascript/src/layout/components/header-user-space/header-avatar.vue
@@ -9,7 +9,7 @@
 -->
 
 <template>
-  <a-dropdown class="header-trigger">
+  <a-dropdown class="header-trigger" :get-popup-container="getPopupContainer">
     <div class="wrapper">
       <img class="avatar-image" :src="avatar" v-if="avatar" />
       <a-avatar v-else style="margin: 0 5px" :size="20" id="smartAdminAvatar">
@@ -35,7 +35,7 @@
 </template>
 <script setup>
   import { computed, ref, onMounted } from 'vue';
-  import { loginApi } from '/src/api/system/login-api';
+  import { loginApi } from '/@/api/system/login-api';
   import { useUserStore } from '/@/store/modules/system/user';
   import { smartSentry } from '/@/lib/smart-sentry';
   import HeaderResetPassword from './header-reset-password-modal/index.vue';
@@ -66,6 +66,10 @@
     });
   }
 
+  function getPopupContainer() {
+    return document.body;
+  }
+
   // ------------------------ 修改密码 ------------------------
   const resetPasswordRef = ref();
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue b/smart-admin-web-javascript/src/layout/components/header-user-space/header-message-detail-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message-detail-modal.vue
rename to smart-admin-web-javascript/src/layout/components/header-user-space/header-message-detail-modal.vue
diff --git a/smart-admin-web-javascript/src/layout/components/header-user-space/header-message.vue b/smart-admin-web-javascript/src/layout/components/header-user-space/header-message.vue
new file mode 100644
index 0000000..aa3de6d
--- /dev/null
+++ b/smart-admin-web-javascript/src/layout/components/header-user-space/header-message.vue
@@ -0,0 +1,262 @@
+<!--
+  * 消息通知
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:17:18
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+
+<template>
+  <div>
+    <a-popover v-model:open="show" trigger="click" placement="bottomLeft" :getPopupContainer="getPopupContainer">
+      <a-button type="text" @click="showMessage" style="padding: 4px 5px">
+        <a-badge :count="unreadMessageCount + toBeDoneCount">
+          <div style="width: 26px; height: 26px">
+            <BellOutlined :style="{ fontSize: '16px' }" />
+          </div>
+        </a-badge>
+      </a-button>
+
+      <template #content>
+        <a-spin :spinning="loading">
+          <a-tabs class="dropdown-tabs" centered :tabBarStyle="{ textAlign: 'center' }" style="width: 300px; z-index: 1030">
+            <a-tab-pane key="message">
+              <template #tab>
+                未读消息
+                <a-badge :count="unreadMessageCount" :show-zero="false" :offset="[-5, -15]" />
+              </template>
+              <a-list class="tab-pane" size="small">
+                <a-list-item v-for="item in messageList" :key="item.messageId">
+                  <a-list-item-meta>
+                    <template #title>
+                      <div class="title">
+                        <a-badge status="error" />
+                        <a @click="showMessageDetail(item)">{{ item.title }}</a>
+                      </div>
+                    </template>
+                    <template #description>
+                      <span> {{ timeago(item.createTime) }}</span>
+                    </template>
+                  </a-list-item-meta>
+                </a-list-item>
+                <a-list-item v-if="unreadMessageCount > 3">
+                  <a-button type="link" @click="gotoMessage" style="margin: 0 auto"> 查看更多</a-button>
+                </a-list-item>
+              </a-list>
+            </a-tab-pane>
+            <a-tab-pane key="to_be_done">
+              <template #tab>
+                待办工作
+                <a-badge :count="toBeDoneCount" :show-zero="false" :offset="[-5, -15]" />
+              </template>
+              <a-list class="tab-pane" size="small" :locale="{ emptyText: '暂无待办' }">
+                <a-list-item v-for="(item, index) in toBeDoneList" :key="index">
+                  <a-list-item-meta>
+                    <template #title>
+                      <a-badge status="error" />
+                      <a-tag v-if="item.starFlag" color="red">重要</a-tag>
+                      <span>{{ item.title }}</span>
+                    </template>
+                  </a-list-item-meta>
+                </a-list-item>
+              </a-list>
+            </a-tab-pane>
+          </a-tabs>
+        </a-spin>
+      </template>
+    </a-popover>
+    <MessageDetailModal ref="messageDetailModalRef" @refresh="queryMessage" />
+  </div>
+</template>
+
+<script setup>
+  import { computed, ref } from 'vue';
+  import { BellOutlined } from '@ant-design/icons-vue';
+  import { useUserStore } from '/@/store/modules/system/user.js';
+  import { smartSentry } from '/@/lib/smart-sentry.js';
+  import { messageApi } from '/@/api/support/message-api.js';
+  import dayjs from 'dayjs';
+  import { theme } from 'ant-design-vue';
+  import { useRouter } from 'vue-router';
+  import MessageDetailModal from './header-message-detail-modal.vue';
+  import localKey from '/@/constants/local-storage-key-const';
+  import { localRead } from '/@/utils/local-util';
+
+  const { useToken } = theme;
+  const { token } = useToken();
+
+  function getPopupContainer() {
+    return document.body;
+  }
+
+  const loading = ref(false);
+  const show = ref(false);
+
+  // 点击按钮打开消息气泡卡片的同时刷新消息
+  function showMessage() {
+    show.value = true;
+    queryMessage();
+    loadToBeDoneList();
+  }
+
+  function closeMessage() {
+    show.value = false;
+  }
+
+  // ------------------------- 查询消息  -------------------------
+
+  // 未读消息
+  const unreadMessageCount = computed(() => {
+    return useUserStore().unreadMessageCount;
+  });
+
+  // 消息列表
+  const messageList = ref([]);
+
+  // 查询我的未读消息
+  async function queryMessage() {
+    try {
+      loading.value = true;
+      let responseModel = await messageApi.queryMessage({
+        pageNum: 1,
+        pageSize: 3,
+        readFlag: false,
+      });
+      messageList.value = responseModel.data.list;
+      // 若中途有新消息了 打开列表也能及时更新未读数量
+      useUserStore().queryUnreadMessageCount();
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      loading.value = false;
+    }
+  }
+
+  const messageDetailModalRef = ref();
+
+  function showMessageDetail(data) {
+    messageDetailModalRef.value.show(data);
+    closeMessage();
+  }
+
+  const router = useRouter();
+
+  function gotoMessage() {
+    show.value = false;
+    router.push({ path: '/account', query: { menuId: 'message' } });
+  }
+
+  // ------------------------- 待办工作  -------------------------
+
+  // 待办工作数
+  const toBeDoneCount = computed(() => {
+    return useUserStore().toBeDoneCount;
+  });
+
+  // 待办工作列表
+  const toBeDoneList = ref([]);
+
+  const loadToBeDoneList = async () => {
+    try {
+      loading.value = true;
+      let localToBeDoneList = localRead(localKey.TO_BE_DONE);
+      if (localToBeDoneList) {
+        toBeDoneList.value = JSON.parse(localToBeDoneList).filter((e) => !e.doneFlag);
+      }
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      loading.value = false;
+    }
+  };
+
+  // ------------------------- 时间计算  -------------------------
+  function timeago(dateStr) {
+    let dateTimeStamp = dayjs(dateStr).toDate().getTime();
+    let result = '';
+    let minute = 1000 * 60; //把分，时，天，周，半个月，一个月用毫秒表示
+    let hour = minute * 60;
+    let day = hour * 24;
+    let week = day * 7;
+    let month = day * 30;
+    let now = new Date().getTime(); //获取当前时间毫秒
+    let diffValue = now - dateTimeStamp; //时间差
+
+    if (diffValue < 0) {
+      return '刚刚';
+    }
+    let minC = diffValue / minute; //计算时间差的分，时，天，周，月
+    let hourC = diffValue / hour;
+    let dayC = diffValue / day;
+    let weekC = diffValue / week;
+    let monthC = diffValue / month;
+    if (monthC >= 1 && monthC <= 3) {
+      result = ' ' + parseInt(monthC) + '月前';
+    } else if (weekC >= 1 && weekC <= 3) {
+      result = ' ' + parseInt(weekC) + '周前';
+    } else if (dayC >= 1 && dayC <= 6) {
+      result = ' ' + parseInt(dayC) + '天前';
+    } else if (hourC >= 1 && hourC <= 23) {
+      result = ' ' + parseInt(hourC) + '小时前';
+    } else if (minC >= 1 && minC <= 59) {
+      result = ' ' + parseInt(minC) + '分钟前';
+    } else if (diffValue >= 0 && diffValue <= minute) {
+      result = '刚刚';
+    } else {
+      let datetime = new Date();
+      datetime.setTime(dateTimeStamp);
+      let year = datetime.getFullYear();
+      let month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1;
+      let date = datetime.getDate() < 10 ? '0' + datetime.getDate() : datetime.getDate();
+      result = year + '-' + month + '-' + date;
+    }
+    return result;
+  }
+</script>
+
+<style lang="less" scoped>
+  @smart-page-tag-operate-width: 40px;
+  @color-primary: v-bind('token.colorPrimary');
+
+  .message-icon-div {
+    cursor: pointer;
+    height: 32px;
+    width: 42px;
+    padding-left: 10px;
+  }
+
+  .message-icon-div:hover {
+    background: @hover-bg-color !important;
+  }
+
+  .header-notice {
+    display: inline-block;
+    transition: all 0.3s;
+
+    span {
+      vertical-align: initial;
+    }
+
+    .notice-badge {
+      color: inherit;
+    }
+  }
+
+  .title {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    cursor: pointer;
+  }
+
+  .dropdown-tabs {
+    background-color: @base-bg-color;
+    border-radius: 4px;
+  }
+
+  .tab-pane {
+    height: auto;
+  }
+</style>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-reset-password-modal/index.vue b/smart-admin-web-javascript/src/layout/components/header-user-space/header-reset-password-modal/index.vue
similarity index 97%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-reset-password-modal/index.vue
rename to smart-admin-web-javascript/src/layout/components/header-user-space/header-reset-password-modal/index.vue
index 4166733..53fd9d5 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-reset-password-modal/index.vue
+++ b/smart-admin-web-javascript/src/layout/components/header-user-space/header-reset-password-modal/index.vue
@@ -25,7 +25,7 @@
 <script setup>
   import { ref, reactive } from 'vue';
   import { message } from 'ant-design-vue';
-  import { employeeApi } from '/src/api/system/employee-api';
+  import { employeeApi } from '/@/api/system/employee-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { smartSentry } from '/@/lib/smart-sentry';
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue b/smart-admin-web-javascript/src/layout/components/header-user-space/header-setting.vue
similarity index 98%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
rename to smart-admin-web-javascript/src/layout/components/header-user-space/header-setting.vue
index 9fdbbc3..d77f547 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
+++ b/smart-admin-web-javascript/src/layout/components/header-user-space/header-setting.vue
@@ -154,7 +154,7 @@
 
     Modal.success({
       title: '复制成功',
-      content: h('div', {}, [h('p', '可以直接修改 /src/config/app-config.js 文件保存此配置')]),
+      content: h('div', {}, [h('p', '可以直接修改 /@/config/app-config.js 文件保存此配置')]),
     });
   }
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue b/smart-admin-web-javascript/src/layout/components/header-user-space/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/index.vue
rename to smart-admin-web-javascript/src/layout/components/header-user-space/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/menu-location-breadcrumb/index.vue b/smart-admin-web-javascript/src/layout/components/menu-location-breadcrumb/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/menu-location-breadcrumb/index.vue
rename to smart-admin-web-javascript/src/layout/components/menu-location-breadcrumb/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/components/antd-tab.vue b/smart-admin-web-javascript/src/layout/components/page-tag/components/antd-tab.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/components/antd-tab.vue
rename to smart-admin-web-javascript/src/layout/components/page-tag/components/antd-tab.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/components/default-tab.vue b/smart-admin-web-javascript/src/layout/components/page-tag/components/default-tab.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/components/default-tab.vue
rename to smart-admin-web-javascript/src/layout/components/page-tag/components/default-tab.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue b/smart-admin-web-javascript/src/layout/components/page-tag/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
rename to smart-admin-web-javascript/src/layout/components/page-tag/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/index.vue b/smart-admin-web-javascript/src/layout/components/side-expand-menu/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/index.vue
rename to smart-admin-web-javascript/src/layout/components/side-expand-menu/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue b/smart-admin-web-javascript/src/layout/components/side-expand-menu/recursion-menu.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue
rename to smart-admin-web-javascript/src/layout/components/side-expand-menu/recursion-menu.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/side-expand-menu-mitt.js b/smart-admin-web-javascript/src/layout/components/side-expand-menu/side-expand-menu-mitt.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/side-expand-menu-mitt.js
rename to smart-admin-web-javascript/src/layout/components/side-expand-menu/side-expand-menu-mitt.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue b/smart-admin-web-javascript/src/layout/components/side-expand-menu/sub-menu.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue
rename to smart-admin-web-javascript/src/layout/components/side-expand-menu/sub-menu.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue b/smart-admin-web-javascript/src/layout/components/side-expand-menu/top-menu.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue
rename to smart-admin-web-javascript/src/layout/components/side-expand-menu/top-menu.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/components/contact-modal.vue b/smart-admin-web-javascript/src/layout/components/side-help-doc/components/contact-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/components/contact-modal.vue
rename to smart-admin-web-javascript/src/layout/components/side-help-doc/components/contact-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/components/feedback-modal.vue b/smart-admin-web-javascript/src/layout/components/side-help-doc/components/feedback-modal.vue
similarity index 89%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/components/feedback-modal.vue
rename to smart-admin-web-javascript/src/layout/components/side-help-doc/components/feedback-modal.vue
index b279bdf..0cfdc0e 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/components/feedback-modal.vue
+++ b/smart-admin-web-javascript/src/layout/components/side-help-doc/components/feedback-modal.vue
@@ -1,11 +1,11 @@
 <!--
-  *  意见反馈提交弹窗 
+  *  意见反馈提交弹窗
   *
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:40:16 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:40:16
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-modal :open="visible" title="意见反馈" :closable="false" :maskClosable="true" >
@@ -34,7 +34,7 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import { SmartLoading } from '/@/components/framework/smart-loading';
-import { feedbackApi } from '/src/api/support/feedback-api';
+import { feedbackApi } from '/@/api/support/feedback-api';
 import { message } from 'ant-design-vue';
 import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
 import Upload from '/@/components/support/file-upload/index.vue';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/index.vue b/smart-admin-web-javascript/src/layout/components/side-help-doc/index.vue
similarity index 95%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/index.vue
rename to smart-admin-web-javascript/src/layout/components/side-help-doc/index.vue
index b665e0f..8770f84 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-help-doc/index.vue
+++ b/smart-admin-web-javascript/src/layout/components/side-help-doc/index.vue
@@ -1,11 +1,11 @@
 <!--
-  *  帮助文档 
+  *  帮助文档
   *
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:40:16 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:40:16
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <div class="help-doc-wrapper">
@@ -59,11 +59,11 @@
   import { onMounted, ref, watch, reactive } from 'vue';
   import { useRoute } from 'vue-router';
   import _ from 'lodash';
-  import { helpDocApi } from '/src/api/support/help-doc-api';
+  import { helpDocApi } from '/@/api/support/help-doc-api';
   import ContactModal from './components/contact-modal.vue';
   import FeedbackModal from './components/feedback-modal.vue';
   import { useAppConfigStore } from '/@/store/modules/system/app-config';
-  import { feedbackApi } from '/src/api/support/feedback-api';
+  import { feedbackApi } from '/@/api/support/feedback-api';
   import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
   import { smartSentry } from '/@/lib/smart-sentry';
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/index.vue b/smart-admin-web-javascript/src/layout/components/side-menu/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/index.vue
rename to smart-admin-web-javascript/src/layout/components/side-menu/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/recursion-menu.vue b/smart-admin-web-javascript/src/layout/components/side-menu/recursion-menu.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/recursion-menu.vue
rename to smart-admin-web-javascript/src/layout/components/side-menu/recursion-menu.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/sub-menu.vue b/smart-admin-web-javascript/src/layout/components/side-menu/sub-menu.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/side-menu/sub-menu.vue
rename to smart-admin-web-javascript/src/layout/components/side-menu/sub-menu.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-footer/index.vue b/smart-admin-web-javascript/src/layout/components/smart-footer/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-footer/index.vue
rename to smart-admin-web-javascript/src/layout/components/smart-footer/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-keep-alive.js b/smart-admin-web-javascript/src/layout/components/smart-keep-alive.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/smart-keep-alive.js
rename to smart-admin-web-javascript/src/layout/components/smart-keep-alive.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/index.vue b/smart-admin-web-javascript/src/layout/components/top-menu/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/index.vue
rename to smart-admin-web-javascript/src/layout/components/top-menu/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/recursion-menu.vue b/smart-admin-web-javascript/src/layout/components/top-menu/recursion-menu.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/recursion-menu.vue
rename to smart-admin-web-javascript/src/layout/components/top-menu/recursion-menu.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/sub-menu.vue b/smart-admin-web-javascript/src/layout/components/top-menu/sub-menu.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/components/top-menu/sub-menu.vue
rename to smart-admin-web-javascript/src/layout/components/top-menu/sub-menu.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/help-doc-layout.vue b/smart-admin-web-javascript/src/layout/help-doc-layout.vue
similarity index 98%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/help-doc-layout.vue
rename to smart-admin-web-javascript/src/layout/help-doc-layout.vue
index 59757be..2e52637 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/help-doc-layout.vue
+++ b/smart-admin-web-javascript/src/layout/help-doc-layout.vue
@@ -67,8 +67,8 @@
   import { smartSentry } from '../lib/smart-sentry';
   import { useAppConfigStore } from '../store/modules/system/app-config';
   import SmartFooter from './components/smart-footer/index.vue';
-  import { helpDocApi } from '/src/api/support/help-doc-api';
-  import { helpDocCatalogApi } from '/src/api/support/help-doc-catalog-api';
+  import { helpDocApi } from '/@/api/support/help-doc-api';
+  import { helpDocCatalogApi } from '/@/api/support/help-doc-catalog-api';
   import logoImg from '/@/assets/images/logo/smart-admin-logo-white.png';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/index.vue b/smart-admin-web-javascript/src/layout/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/index.vue
rename to smart-admin-web-javascript/src/layout/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/layout-const.js b/smart-admin-web-javascript/src/layout/layout-const.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/layout-const.js
rename to smart-admin-web-javascript/src/layout/layout-const.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/side-expand-layout.vue b/smart-admin-web-javascript/src/layout/side-expand-layout.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/side-expand-layout.vue
rename to smart-admin-web-javascript/src/layout/side-expand-layout.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/side-layout.vue b/smart-admin-web-javascript/src/layout/side-layout.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/side-layout.vue
rename to smart-admin-web-javascript/src/layout/side-layout.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/top-layout.vue b/smart-admin-web-javascript/src/layout/top-layout.vue
similarity index 98%
rename from smart-admin-web/javascript-ant-design-vue3/src/layout/top-layout.vue
rename to smart-admin-web-javascript/src/layout/top-layout.vue
index 9ca6010..35c88f8 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/top-layout.vue
+++ b/smart-admin-web-javascript/src/layout/top-layout.vue
@@ -132,8 +132,8 @@
       height: 48px;
       line-height: 48px;
       width: 100%;
-      z-index: 1051;
-      right: 0px;
+      z-index: 3;
+      right: 0;
       position: fixed;
       background-color: v-bind('color.background');
     }
@@ -155,7 +155,7 @@
         width: v-bind(pageWidth);
         height: 40px;
         line-height: 40px;
-        z-index: 1051;
+        z-index: 3;
       }
     }
   }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js b/smart-admin-web-javascript/src/lib/axios.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/lib/axios.js
rename to smart-admin-web-javascript/src/lib/axios.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/default-time-ranges.js b/smart-admin-web-javascript/src/lib/default-time-ranges.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/lib/default-time-ranges.js
rename to smart-admin-web-javascript/src/lib/default-time-ranges.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/encrypt.js b/smart-admin-web-javascript/src/lib/encrypt.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/lib/encrypt.js
rename to smart-admin-web-javascript/src/lib/encrypt.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/highlight-line-number.js b/smart-admin-web-javascript/src/lib/highlight-line-number.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/lib/highlight-line-number.js
rename to smart-admin-web-javascript/src/lib/highlight-line-number.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/smart-sentry.js b/smart-admin-web-javascript/src/lib/smart-sentry.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/lib/smart-sentry.js
rename to smart-admin-web-javascript/src/lib/smart-sentry.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/smart-watermark.js b/smart-admin-web-javascript/src/lib/smart-watermark.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/lib/smart-watermark.js
rename to smart-admin-web-javascript/src/lib/smart-watermark.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/lib/table-auto-height.js b/smart-admin-web-javascript/src/lib/table-auto-height.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/lib/table-auto-height.js
rename to smart-admin-web-javascript/src/lib/table-auto-height.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/main.js b/smart-admin-web-javascript/src/main.js
similarity index 98%
rename from smart-admin-web/javascript-ant-design-vue3/src/main.js
rename to smart-admin-web-javascript/src/main.js
index 3bc0d06..e9eeeb2 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/main.js
+++ b/smart-admin-web-javascript/src/main.js
@@ -16,7 +16,7 @@ import JsonViewer from 'vue3-json-viewer';
 import 'vue3-json-viewer/dist/index.css';
 import App from './App.vue';
 import { smartSentry } from '/@/lib/smart-sentry';
-import { loginApi } from '/src/api/system/login-api';
+import { loginApi } from '/@/api/system/login-api';
 import constantsInfo from '/@/constants/index';
 import { privilegeDirective } from '/@/directives/privilege';
 import i18n from '/@/i18n/index';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/plugins/privilege-plugin.js b/smart-admin-web-javascript/src/plugins/privilege-plugin.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/plugins/privilege-plugin.js
rename to smart-admin-web-javascript/src/plugins/privilege-plugin.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/plugins/smart-enums-plugin.js b/smart-admin-web-javascript/src/plugins/smart-enums-plugin.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/plugins/smart-enums-plugin.js
rename to smart-admin-web-javascript/src/plugins/smart-enums-plugin.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/router/index.js b/smart-admin-web-javascript/src/router/index.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/router/index.js
rename to smart-admin-web-javascript/src/router/index.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/router/routers.js b/smart-admin-web-javascript/src/router/routers.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/router/routers.js
rename to smart-admin-web-javascript/src/router/routers.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/router/support/help-doc.js b/smart-admin-web-javascript/src/router/support/help-doc.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/router/support/help-doc.js
rename to smart-admin-web-javascript/src/router/support/help-doc.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/router/system/home.js b/smart-admin-web-javascript/src/router/system/home.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/router/system/home.js
rename to smart-admin-web-javascript/src/router/system/home.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/router/system/login.js b/smart-admin-web-javascript/src/router/system/login.js
similarity index 85%
rename from smart-admin-web/javascript-ant-design-vue3/src/router/system/login.js
rename to smart-admin-web-javascript/src/router/system/login.js
index 178625d..1c1b30a 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/router/system/login.js
+++ b/smart-admin-web-javascript/src/router/system/login.js
@@ -12,7 +12,7 @@ export const loginRouters = [
   {
     path: '/login',
     name: 'Login',
-    component: () => import('/@/views/system/login/login.vue'),
+    component: () => import('/@/views/system/login3/login.vue'),
     meta: {
       title: '登录',
       hideInMenu: true,
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/store/index.js b/smart-admin-web-javascript/src/store/index.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/store/index.js
rename to smart-admin-web-javascript/src/store/index.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/app-config.js b/smart-admin-web-javascript/src/store/modules/system/app-config.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/app-config.js
rename to smart-admin-web-javascript/src/store/modules/system/app-config.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/role.js b/smart-admin-web-javascript/src/store/modules/system/role.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/role.js
rename to smart-admin-web-javascript/src/store/modules/system/role.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/spin.js b/smart-admin-web-javascript/src/store/modules/system/spin.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/spin.js
rename to smart-admin-web-javascript/src/store/modules/system/spin.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js b/smart-admin-web-javascript/src/store/modules/system/user.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/store/modules/system/user.js
rename to smart-admin-web-javascript/src/store/modules/system/user.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/theme/color.js b/smart-admin-web-javascript/src/theme/color.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/theme/color.js
rename to smart-admin-web-javascript/src/theme/color.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/theme/custom-variables.js b/smart-admin-web-javascript/src/theme/custom-variables.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/theme/custom-variables.js
rename to smart-admin-web-javascript/src/theme/custom-variables.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/theme/index.less b/smart-admin-web-javascript/src/theme/index.less
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/theme/index.less
rename to smart-admin-web-javascript/src/theme/index.less
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/theme/smart-admin.less b/smart-admin-web-javascript/src/theme/smart-admin.less
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/theme/smart-admin.less
rename to smart-admin-web-javascript/src/theme/smart-admin.less
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/utils/local-util.js b/smart-admin-web-javascript/src/utils/local-util.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/utils/local-util.js
rename to smart-admin-web-javascript/src/utils/local-util.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/utils/str-util.js b/smart-admin-web-javascript/src/utils/str-util.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/utils/str-util.js
rename to smart-admin-web-javascript/src/utils/str-util.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/catalog/components/category-form-modal.vue b/smart-admin-web-javascript/src/views/business/erp/catalog/components/category-form-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/catalog/components/category-form-modal.vue
rename to smart-admin-web-javascript/src/views/business/erp/catalog/components/category-form-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/catalog/components/category-tree-table.vue b/smart-admin-web-javascript/src/views/business/erp/catalog/components/category-tree-table.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/catalog/components/category-tree-table.vue
rename to smart-admin-web-javascript/src/views/business/erp/catalog/components/category-tree-table.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/catalog/custom-catalog.vue b/smart-admin-web-javascript/src/views/business/erp/catalog/custom-catalog.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/catalog/custom-catalog.vue
rename to smart-admin-web-javascript/src/views/business/erp/catalog/custom-catalog.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/catalog/goods-catalog.vue b/smart-admin-web-javascript/src/views/business/erp/catalog/goods-catalog.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/catalog/goods-catalog.vue
rename to smart-admin-web-javascript/src/views/business/erp/catalog/goods-catalog.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/components/goods-form-modal.vue b/smart-admin-web-javascript/src/views/business/erp/goods/components/goods-form-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/components/goods-form-modal.vue
rename to smart-admin-web-javascript/src/views/business/erp/goods/components/goods-form-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/goods-list.vue b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/erp/goods/goods-list.vue
rename to smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-list.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
rename to smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
rename to smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-employee-list.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
rename to smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
rename to smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
rename to smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
rename to smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/enterprise-detail.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue
rename to smart-admin-web-javascript/src/views/business/oa/enterprise/enterprise-detail.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/enterprise-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue
rename to smart-admin-web-javascript/src/views/business/oa/enterprise/enterprise-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-drawer.vue b/smart-admin-web-javascript/src/views/business/oa/notice/components/notice-form-drawer.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-drawer.vue
rename to smart-admin-web-javascript/src/views/business/oa/notice/components/notice-form-drawer.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-modal.vue b/smart-admin-web-javascript/src/views/business/oa/notice/components/notice-form-visible-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-modal.vue
rename to smart-admin-web-javascript/src/views/business/oa/notice/components/notice-form-visible-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue b/smart-admin-web-javascript/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue
rename to smart-admin-web-javascript/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue b/smart-admin-web-javascript/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue
rename to smart-admin-web-javascript/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-view-record-list.vue b/smart-admin-web-javascript/src/views/business/oa/notice/components/notice-view-record-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/components/notice-view-record-list.vue
rename to smart-admin-web-javascript/src/views/business/oa/notice/components/notice-view-record-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue b/smart-admin-web-javascript/src/views/business/oa/notice/notice-detail.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue
rename to smart-admin-web-javascript/src/views/business/oa/notice/notice-detail.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue b/smart-admin-web-javascript/src/views/business/oa/notice/notice-employee-detail.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue
rename to smart-admin-web-javascript/src/views/business/oa/notice/notice-employee-detail.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-list.vue b/smart-admin-web-javascript/src/views/business/oa/notice/notice-employee-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-employee-list.vue
rename to smart-admin-web-javascript/src/views/business/oa/notice/notice-employee-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue b/smart-admin-web-javascript/src/views/business/oa/notice/notice-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue
rename to smart-admin-web-javascript/src/views/business/oa/notice/notice-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/api-encrypt/api-encrypt-index.vue b/smart-admin-web-javascript/src/views/support/api-encrypt/api-encrypt-index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/api-encrypt/api-encrypt-index.vue
rename to smart-admin-web-javascript/src/views/support/api-encrypt/api-encrypt-index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/cache/cache-list.vue b/smart-admin-web-javascript/src/views/support/cache/cache-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/cache/cache-list.vue
rename to smart-admin-web-javascript/src/views/support/cache/cache-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-form.vue b/smart-admin-web-javascript/src/views/support/change-log/change-log-form.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-form.vue
rename to smart-admin-web-javascript/src/views/support/change-log/change-log-form.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-list.vue b/smart-admin-web-javascript/src/views/support/change-log/change-log-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-list.vue
rename to smart-admin-web-javascript/src/views/support/change-log/change-log-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue b/smart-admin-web-javascript/src/views/support/change-log/change-log-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue
rename to smart-admin-web-javascript/src/views/support/change-log/change-log-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-list.vue b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-list.vue
rename to smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
rename to smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue
rename to smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
rename to smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
rename to smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
rename to smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
rename to smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue
rename to smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
rename to smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
rename to smart-admin-web-javascript/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/config/config-form-modal.vue b/smart-admin-web-javascript/src/views/support/config/config-form-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/config/config-form-modal.vue
rename to smart-admin-web-javascript/src/views/support/config/config-form-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/config/config-list.vue b/smart-admin-web-javascript/src/views/support/config/config-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/config/config-list.vue
rename to smart-admin-web-javascript/src/views/support/config/config-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/dict/components/dict-key-operate-modal.vue b/smart-admin-web-javascript/src/views/support/dict/components/dict-key-operate-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/dict/components/dict-key-operate-modal.vue
rename to smart-admin-web-javascript/src/views/support/dict/components/dict-key-operate-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/dict/components/dict-value-modal.vue b/smart-admin-web-javascript/src/views/support/dict/components/dict-value-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/dict/components/dict-value-modal.vue
rename to smart-admin-web-javascript/src/views/support/dict/components/dict-value-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/dict/components/dict-value-operate-modal.vue b/smart-admin-web-javascript/src/views/support/dict/components/dict-value-operate-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/dict/components/dict-value-operate-modal.vue
rename to smart-admin-web-javascript/src/views/support/dict/components/dict-value-operate-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/dict/index.vue b/smart-admin-web-javascript/src/views/support/dict/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/dict/index.vue
rename to smart-admin-web-javascript/src/views/support/dict/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue b/smart-admin-web-javascript/src/views/support/feedback/feedback-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/feedback/feedback-list.vue
rename to smart-admin-web-javascript/src/views/support/feedback/feedback-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/file/file-list.vue b/smart-admin-web-javascript/src/views/support/file/file-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/file/file-list.vue
rename to smart-admin-web-javascript/src/views/support/file/file-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/heart-beat/heart-beat-list.vue b/smart-admin-web-javascript/src/views/support/heart-beat/heart-beat-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/heart-beat/heart-beat-list.vue
rename to smart-admin-web-javascript/src/views/support/heart-beat/heart-beat-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue b/smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue
rename to smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue b/smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue
rename to smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue b/smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue
rename to smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-form-drawer.vue b/smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-form-drawer.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-form-drawer.vue
rename to smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-form-drawer.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-list.vue b/smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-list.vue
rename to smart-admin-web-javascript/src/views/support/help-doc/management/components/help-doc-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/help-doc-manage-list.vue b/smart-admin-web-javascript/src/views/support/help-doc/management/help-doc-manage-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/help-doc-manage-list.vue
rename to smart-admin-web-javascript/src/views/support/help-doc/management/help-doc-manage-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/help-doc-mitt.js b/smart-admin-web-javascript/src/views/support/help-doc/management/help-doc-mitt.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/help-doc-mitt.js
rename to smart-admin-web-javascript/src/views/support/help-doc/management/help-doc-mitt.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue b/smart-admin-web-javascript/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
rename to smart-admin-web-javascript/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/user-view/help-doc-user-view.vue b/smart-admin-web-javascript/src/views/support/help-doc/user-view/help-doc-user-view.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/user-view/help-doc-user-view.vue
rename to smart-admin-web-javascript/src/views/support/help-doc/user-view/help-doc-user-view.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/job/components/job-form-modal.vue b/smart-admin-web-javascript/src/views/support/job/components/job-form-modal.vue
similarity index 96%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/job/components/job-form-modal.vue
rename to smart-admin-web-javascript/src/views/support/job/components/job-form-modal.vue
index cf35073..2648c18 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/job/components/job-form-modal.vue
+++ b/smart-admin-web-javascript/src/views/support/job/components/job-form-modal.vue
@@ -119,10 +119,10 @@
 <script setup>
   import { message } from 'ant-design-vue';
   import { reactive, ref } from 'vue';
-  import { jobApi } from '/src/api/support/job-api';
-  import { smartSentry } from '/src/lib/smart-sentry';
-  import { SmartLoading } from '/src/components/framework/smart-loading/index.js';
-  import { TRIGGER_TYPE_ENUM } from '/src/constants/support/job-const.js';
+  import { jobApi } from '/@/api/support/job-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
+  import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
 
   // emit
   const emit = defineEmits(['reloadList']);
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/job/components/job-log-list-modal.vue b/smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/job/components/job-log-list-modal.vue
rename to smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue
index 0bb7c80..4dacc77 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/support/job/components/job-log-list-modal.vue
+++ b/smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue
@@ -80,11 +80,11 @@
 </template>
 <script setup>
   import { reactive, ref } from 'vue';
-  import { jobApi } from '/src/api/support/job-api';
-  import { PAGE_SIZE_OPTIONS } from '/src/constants/common-const';
-  import { smartSentry } from '/src/lib/smart-sentry';
-  import TableOperator from '/src/components/support/table-operator/index.vue';
-  import { TABLE_ID_CONST } from '/src/constants/support/table-id-const';
+  import { jobApi } from '/@/api/support/job-api';
+  import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
 
   const showFlag = ref(false);
   const title = ref('');
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/job/job-list.vue b/smart-admin-web-javascript/src/views/support/job/job-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/job/job-list.vue
rename to smart-admin-web-javascript/src/views/support/job/job-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/level3protect/data-masking-list.vue b/smart-admin-web-javascript/src/views/support/level3protect/data-masking-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/level3protect/data-masking-list.vue
rename to smart-admin-web-javascript/src/views/support/level3protect/data-masking-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/level3protect/level3-protect-config-index.vue b/smart-admin-web-javascript/src/views/support/level3protect/level3-protect-config-index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/level3protect/level3-protect-config-index.vue
rename to smart-admin-web-javascript/src/views/support/level3protect/level3-protect-config-index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/login-fail/login-fail-list.vue b/smart-admin-web-javascript/src/views/support/login-fail/login-fail-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/login-fail/login-fail-list.vue
rename to smart-admin-web-javascript/src/views/support/login-fail/login-fail-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/login-log/login-log-list.vue b/smart-admin-web-javascript/src/views/support/login-log/login-log-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/login-log/login-log-list.vue
rename to smart-admin-web-javascript/src/views/support/login-log/login-log-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue b/smart-admin-web-javascript/src/views/support/operate-log/operate-log-detail-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue
rename to smart-admin-web-javascript/src/views/support/operate-log/operate-log-detail-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-list.vue b/smart-admin-web-javascript/src/views/support/operate-log/operate-log-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/operate-log/operate-log-list.vue
rename to smart-admin-web-javascript/src/views/support/operate-log/operate-log-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/reload/do-reload-form-modal.vue b/smart-admin-web-javascript/src/views/support/reload/do-reload-form-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/reload/do-reload-form-modal.vue
rename to smart-admin-web-javascript/src/views/support/reload/do-reload-form-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/reload/reload-list.vue b/smart-admin-web-javascript/src/views/support/reload/reload-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/reload/reload-list.vue
rename to smart-admin-web-javascript/src/views/support/reload/reload-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/reload/reload-result-list.vue b/smart-admin-web-javascript/src/views/support/reload/reload-result-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/reload/reload-result-list.vue
rename to smart-admin-web-javascript/src/views/support/reload/reload-result-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/serial-number/serial-number-generate-form-modal.vue b/smart-admin-web-javascript/src/views/support/serial-number/serial-number-generate-form-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/serial-number/serial-number-generate-form-modal.vue
rename to smart-admin-web-javascript/src/views/support/serial-number/serial-number-generate-form-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/serial-number/serial-number-list.vue b/smart-admin-web-javascript/src/views/support/serial-number/serial-number-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/serial-number/serial-number-list.vue
rename to smart-admin-web-javascript/src/views/support/serial-number/serial-number-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/support/serial-number/serial-number-record-list.vue b/smart-admin-web-javascript/src/views/support/serial-number/serial-number-record-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/support/serial-number/serial-number-record-list.vue
rename to smart-admin-web-javascript/src/views/support/serial-number/serial-number-record-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/403.vue b/smart-admin-web-javascript/src/views/system/40X/403.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/403.vue
rename to smart-admin-web-javascript/src/views/system/40X/403.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/404.vue b/smart-admin-web-javascript/src/views/system/40X/404.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/40X/404.vue
rename to smart-admin-web-javascript/src/views/system/40X/404.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/account-menu.js b/smart-admin-web-javascript/src/views/system/account/account-menu.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/account/account-menu.js
rename to smart-admin-web-javascript/src/views/system/account/account-menu.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/center/index.vue b/smart-admin-web-javascript/src/views/system/account/components/center/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/center/index.vue
rename to smart-admin-web-javascript/src/views/system/account/components/center/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/login-log/index.vue b/smart-admin-web-javascript/src/views/system/account/components/login-log/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/login-log/index.vue
rename to smart-admin-web-javascript/src/views/system/account/components/login-log/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/components/message-detail.vue b/smart-admin-web-javascript/src/views/system/account/components/message/components/message-detail.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/components/message-detail.vue
rename to smart-admin-web-javascript/src/views/system/account/components/message/components/message-detail.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue b/smart-admin-web-javascript/src/views/system/account/components/message/index.vue
similarity index 98%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
rename to smart-admin-web-javascript/src/views/system/account/components/message/index.vue
index 4156bcc..06f9fb1 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/message/index.vue
+++ b/smart-admin-web-javascript/src/views/system/account/components/message/index.vue
@@ -84,7 +84,7 @@
 </template>
 <script setup>
   import { reactive, ref, onMounted } from 'vue';
-  import { messageApi } from '/src/api/support/message-api';
+  import { messageApi } from '/@/api/support/message-api';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select//index.vue';
   import { smartSentry } from '/@/lib/smart-sentry.js';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/notice/index.vue b/smart-admin-web-javascript/src/views/system/account/components/notice/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/notice/index.vue
rename to smart-admin-web-javascript/src/views/system/account/components/notice/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/operate-log/index.vue b/smart-admin-web-javascript/src/views/system/account/components/operate-log/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/operate-log/index.vue
rename to smart-admin-web-javascript/src/views/system/account/components/operate-log/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/password/index.vue b/smart-admin-web-javascript/src/views/system/account/components/password/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/account/components/password/index.vue
rename to smart-admin-web-javascript/src/views/system/account/components/password/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/account/index.vue b/smart-admin-web-javascript/src/views/system/account/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/account/index.vue
rename to smart-admin-web-javascript/src/views/system/account/index.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/department-form-modal/index.vue b/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/department-form-modal/index.vue
rename to smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
index e4333f4..c2a245c 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/department-form-modal/index.vue
+++ b/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
@@ -25,10 +25,10 @@
     </a-form>
   </a-modal>
 </template>
-<script setup lang="ts">
+<script setup>
   import message from 'ant-design-vue/lib/message';
   import { reactive, ref } from 'vue';
-  import { departmentApi } from '/@/api/system/department/department-api';
+  import { departmentApi } from '/@/api/system/department-api';
   import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
   import EmployeeSelect from '/@/components/system/employee-select/index.vue';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/department/department-list.vue b/smart-admin-web-javascript/src/views/system/department/department-list.vue
similarity index 99%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/department/department-list.vue
rename to smart-admin-web-javascript/src/views/system/department/department-list.vue
index 89d656a..68773e7 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/department/department-list.vue
+++ b/smart-admin-web-javascript/src/views/system/department/department-list.vue
@@ -66,7 +66,7 @@
 
 <script setup>
   import { onMounted, reactive, ref, watch, createVNode } from 'vue';
-  import { departmentApi } from '/@/api/system/department/department-api';
+  import { departmentApi } from '/@/api/system/department-api';
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import _ from 'lodash';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/department-children/index.vue b/smart-admin-web-javascript/src/views/system/employee/components/department-children/index.vue
similarity index 96%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/department-children/index.vue
rename to smart-admin-web-javascript/src/views/system/employee/components/department-children/index.vue
index 4cc8c50..9e1262a 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/department-children/index.vue
+++ b/smart-admin-web-javascript/src/views/system/employee/components/department-children/index.vue
@@ -28,7 +28,7 @@
   </a-card>
 </template>
 <script setup>
-  import emitter from '../../department-mitt.js';
+  import emitter from '../../department-mitt';
 
   const props = defineProps({
     breadcrumb: Array,
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/department-tree/index.vue b/smart-admin-web-javascript/src/views/system/employee/components/department-tree/index.vue
similarity index 98%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/department-tree/index.vue
rename to smart-admin-web-javascript/src/views/system/employee/components/department-tree/index.vue
index 65cd590..9c6875b 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/department-tree/index.vue
+++ b/smart-admin-web-javascript/src/views/system/employee/components/department-tree/index.vue
@@ -37,9 +37,9 @@
 <script setup>
   import { onMounted, onUnmounted, ref, watch } from 'vue';
   import _ from 'lodash';
-  import { departmentApi } from '/src/api/system/department-api';
+  import { departmentApi } from '/@/api/system/department-api';
   import departmentEmitter from '../../department-mitt';
-  import { smartSentry } from '/src/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   const DEPARTMENT_PARENT_ID = 0;
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-department-form-modal/index.vue b/smart-admin-web-javascript/src/views/system/employee/components/employee-department-form-modal/index.vue
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-department-form-modal/index.vue
rename to smart-admin-web-javascript/src/views/system/employee/components/employee-department-form-modal/index.vue
index b18991c..431f21e 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-department-form-modal/index.vue
+++ b/smart-admin-web-javascript/src/views/system/employee/components/employee-department-form-modal/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 部门 员工 弹窗
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
+  *
+  * @Author:    1024创新实验室-主任：卓大
   * @Date:      2022-08-08 20:46:18
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-modal v-model:open="visible" title="调整部门" :footer="null" destroyOnClose>
@@ -16,7 +16,7 @@
     </div>
   </a-modal>
 </template>
-<script setup lang="ts">
+<script setup>
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
   import { ref } from 'vue';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-form-modal/index.vue b/smart-admin-web-javascript/src/views/system/employee/components/employee-form-modal/index.vue
similarity index 92%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-form-modal/index.vue
rename to smart-admin-web-javascript/src/views/system/employee/components/employee-form-modal/index.vue
index 25a0aff..d09c256 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-form-modal/index.vue
+++ b/smart-admin-web-javascript/src/views/system/employee/components/employee-form-modal/index.vue
@@ -32,6 +32,9 @@
         <a-input v-model:value.trim="form.loginName" placeholder="请输入登录名" />
         <p class="hint">初始密码默认为：随机</p>
       </a-form-item>
+      <a-form-item label="邮箱" name="email">
+        <a-input v-model:value.trim="form.email" placeholder="请输入邮箱" />
+      </a-form-item>
       <a-form-item label="性别" name="gender">
         <smart-enum-select style="width: 100%" v-model:value="form.gender" placeholder="请选择性别" enum-name="GENDER_ENUM" />
       </a-form-item>
@@ -41,6 +44,10 @@
           <a-select-option :value="1">禁用</a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item label="职务" name="positionId">
+        <PositionSelect v-model:value="form.positionId" placeholder="请选择职务" />
+      </a-form-item>
+
       <a-form-item label="角色" name="roleIdList">
         <a-select mode="multiple" v-model:value="form.roleIdList" optionFilterProp="title" placeholder="请选择角色">
           <a-select-option v-for="item in roleList" :key="item.roleId" :title="item.roleName">{{ item.roleName }}</a-select-option>
@@ -58,10 +65,11 @@
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
   import { nextTick, reactive, ref } from 'vue';
-  import { employeeApi } from '/@/api/system/employee/employee-api';
-  import { roleApi } from '/@/api/system/role/role-api';
+  import { employeeApi } from '/@/api/system/employee-api';
+  import { roleApi } from '/@/api/system/role-api';
   import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
+  import PositionSelect from '/@/components/system/position-select/index.vue';
   import { GENDER_ENUM } from '/@/constants/common-const';
   import { regular } from '/@/constants/regular-const';
   import { SmartLoading } from '/@/components/framework/smart-loading';
@@ -101,7 +109,7 @@
 
   const formRef = ref(); // 组件ref
   const formDefault = {
-    id: undefined,
+    employeeId: undefined,
     actualName: undefined,
     departmentId: undefined,
     disabledFlag: 0,
@@ -110,6 +118,7 @@
     loginName: undefined,
     phone: undefined,
     roleIdList: undefined,
+    positionId: undefined,
   };
 
   let form = reactive(_.cloneDeep(formDefault));
@@ -137,6 +146,7 @@
     departmentId: [{ required: true, message: '部门不能为空' }],
     disabledFlag: [{ required: true, message: '状态不能为空' }],
     leaveFlag: [{ required: true, message: '在职状态不能为空' }],
+    email: [{ required: true, message: '请输入邮箱' }],
   };
 
   // 校验表单
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-list/index.vue b/smart-admin-web-javascript/src/views/system/employee/components/employee-list/index.vue
similarity index 96%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-list/index.vue
rename to smart-admin-web-javascript/src/views/system/employee/components/employee-list/index.vue
index 024155d..75a6099 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-list/index.vue
+++ b/smart-admin-web-javascript/src/views/system/employee/components/employee-list/index.vue
@@ -52,7 +52,7 @@
       :data-source="tableData"
       :pagination="false"
       :loading="tableLoading"
-      :scroll="{ x: 1200 }"
+      :scroll="{ x: 1500 }"
       row-key="employeeId"
       bordered
     >
@@ -103,12 +103,12 @@
     <EmployeePasswordDialog ref="employeePasswordDialog" />
   </a-card>
 </template>
-<script setup lang="ts">
+<script setup>
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import { message, Modal } from 'ant-design-vue';
   import _ from 'lodash';
   import { computed, createVNode, reactive, ref, watch } from 'vue';
-  import { employeeApi } from '/@/api/system/employee/employee-api';
+  import { employeeApi } from '/@/api/system/employee-api';
   import { PAGE_SIZE } from '/@/constants/common-const';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import EmployeeFormModal from '../employee-form-modal/index.vue';
@@ -140,21 +140,27 @@
       dataIndex: 'actualName',
       width: 85,
     },
-    {
-      title: '手机号',
-      dataIndex: 'phone',
-      width: 80,
-    },
     {
       title: '性别',
       dataIndex: 'gender',
-      width: 40,
+      width: 70,
     },
     {
       title: '登录账号',
       dataIndex: 'loginName',
       width: 100,
     },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      width: 85,
+    },
+    {
+      title: '邮箱',
+      dataIndex: 'email',
+      width: 100,
+      ellipsis: true,
+    },
     {
       title: '超管',
       dataIndex: 'administratorFlag',
@@ -165,6 +171,12 @@
       dataIndex: 'disabledFlag',
       width: 60,
     },
+    {
+      title: '职务',
+      dataIndex: 'positionName',
+      width: 100,
+      ellipsis: true,
+    },
     {
       title: '角色',
       dataIndex: 'roleNameList',
@@ -179,7 +191,7 @@
     {
       title: '操作',
       dataIndex: 'operate',
-      width: 120,
+      width: 140,
     },
   ]);
   const tableData = ref();
@@ -231,6 +243,9 @@
       params.pageNum = 1;
       params.departmentId = allDepartment ? undefined : props.departmentId;
       let res = await employeeApi.queryEmployee(params);
+      for (const item of res.data.list) {
+        item.roleNameList = _.join(item.roleNameList, ',');
+      }
       tableData.value = res.data.list;
       total.value = res.data.total;
       // 清除选中
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-password-dialog/index.vue b/smart-admin-web-javascript/src/views/system/employee/components/employee-password-dialog/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-password-dialog/index.vue
rename to smart-admin-web-javascript/src/views/system/employee/components/employee-password-dialog/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/department-mitt.js b/smart-admin-web-javascript/src/views/system/employee/department-mitt.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/department-mitt.js
rename to smart-admin-web-javascript/src/views/system/employee/department-mitt.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/index.vue b/smart-admin-web-javascript/src/views/system/employee/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/index.vue
rename to smart-admin-web-javascript/src/views/system/employee/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/ad-modal.vue b/smart-admin-web-javascript/src/views/system/home/ad-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/ad-modal.vue
rename to smart-admin-web-javascript/src/views/system/home/ad-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/changelog-card.vue b/smart-admin-web-javascript/src/views/system/home/components/changelog-card.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/changelog-card.vue
rename to smart-admin-web-javascript/src/views/system/home/components/changelog-card.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue b/smart-admin-web-javascript/src/views/system/home/components/default-home-card.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/default-home-card.vue
rename to smart-admin-web-javascript/src/views/system/home/components/default-home-card.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/echarts/category.vue b/smart-admin-web-javascript/src/views/system/home/components/echarts/category.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/echarts/category.vue
rename to smart-admin-web-javascript/src/views/system/home/components/echarts/category.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/echarts/gauge.vue b/smart-admin-web-javascript/src/views/system/home/components/echarts/gauge.vue
similarity index 97%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/echarts/gauge.vue
rename to smart-admin-web-javascript/src/views/system/home/components/echarts/gauge.vue
index 252cfba..7ac6e5f 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/echarts/gauge.vue
+++ b/smart-admin-web-javascript/src/views/system/home/components/echarts/gauge.vue
@@ -4,7 +4,7 @@
  * @LastEditTime: 2022-06-11
  * @LastEditors: zhuoda
  * @Description:
- * @FilePath: /smart-admin/src/views/system/home/components/gauge.vue
+ * @FilePath: /smart-admin/@/views/system/home/components/gauge.vue
 -->
 <template>
   <default-home-card icon="Rocket" title="业绩完成度">
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/echarts/gradient.vue b/smart-admin-web-javascript/src/views/system/home/components/echarts/gradient.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/echarts/gradient.vue
rename to smart-admin-web-javascript/src/views/system/home/components/echarts/gradient.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/echarts/pie.vue b/smart-admin-web-javascript/src/views/system/home/components/echarts/pie.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/echarts/pie.vue
rename to smart-admin-web-javascript/src/views/system/home/components/echarts/pie.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/official-account-card.vue b/smart-admin-web-javascript/src/views/system/home/components/official-account-card.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/official-account-card.vue
rename to smart-admin-web-javascript/src/views/system/home/components/official-account-card.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue b/smart-admin-web-javascript/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue
rename to smart-admin-web-javascript/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry.vue b/smart-admin-web-javascript/src/views/system/home/components/quick-entry/home-quick-entry.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry.vue
rename to smart-admin-web-javascript/src/views/system/home/components/quick-entry/home-quick-entry.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/quick-entry/init-quick-entry-list.js b/smart-admin-web-javascript/src/views/system/home/components/quick-entry/init-quick-entry-list.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/quick-entry/init-quick-entry-list.js
rename to smart-admin-web-javascript/src/views/system/home/components/quick-entry/init-quick-entry-list.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue b/smart-admin-web-javascript/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
rename to smart-admin-web-javascript/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue b/smart-admin-web-javascript/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
rename to smart-admin-web-javascript/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/heart-sentence.js b/smart-admin-web-javascript/src/views/system/home/heart-sentence.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/heart-sentence.js
rename to smart-admin-web-javascript/src/views/system/home/heart-sentence.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/home-header.vue b/smart-admin-web-javascript/src/views/system/home/home-header.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/home-header.vue
rename to smart-admin-web-javascript/src/views/system/home/home-header.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/home-notice.vue b/smart-admin-web-javascript/src/views/system/home/home-notice.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/home-notice.vue
rename to smart-admin-web-javascript/src/views/system/home/home-notice.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/index.less b/smart-admin-web-javascript/src/views/system/home/index.less
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/index.less
rename to smart-admin-web-javascript/src/views/system/home/index.less
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/home/index.vue b/smart-admin-web-javascript/src/views/system/home/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/home/index.vue
rename to smart-admin-web-javascript/src/views/system/home/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login/login.less b/smart-admin-web-javascript/src/views/system/login/login.less
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/login/login.less
rename to smart-admin-web-javascript/src/views/system/login/login.less
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login/login.vue b/smart-admin-web-javascript/src/views/system/login/login.vue
similarity index 99%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/login/login.vue
rename to smart-admin-web-javascript/src/views/system/login/login.vue
index 7ed0c88..fd29eb6 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login/login.vue
+++ b/smart-admin-web-javascript/src/views/system/login/login.vue
@@ -171,7 +171,7 @@
             type: 'primary',
             target: '_blank',
             size: 'small',
-            href: 'https://smartadmin.vip/views/v3/front/Login.html',
+            href: 'https://smartadmin.vip/views/doc/front/Login.html',
             onClick: () => {},
           },
           { default: () => '去看看' }
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login2/login.less b/smart-admin-web-javascript/src/views/system/login2/login.less
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/login2/login.less
rename to smart-admin-web-javascript/src/views/system/login2/login.less
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login2/login.vue b/smart-admin-web-javascript/src/views/system/login2/login.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/login2/login.vue
rename to smart-admin-web-javascript/src/views/system/login2/login.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login3/login.less b/smart-admin-web-javascript/src/views/system/login3/login.less
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/login3/login.less
rename to smart-admin-web-javascript/src/views/system/login3/login.less
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/login3/login.vue b/smart-admin-web-javascript/src/views/system/login3/login.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/login3/login.vue
rename to smart-admin-web-javascript/src/views/system/login3/login.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue b/smart-admin-web-javascript/src/views/system/menu/components/menu-operate-modal.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue
rename to smart-admin-web-javascript/src/views/system/menu/components/menu-operate-modal.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-tree-select.vue b/smart-admin-web-javascript/src/views/system/menu/components/menu-tree-select.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-tree-select.vue
rename to smart-admin-web-javascript/src/views/system/menu/components/menu-tree-select.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/menu-data-handler.js b/smart-admin-web-javascript/src/views/system/menu/menu-data-handler.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/menu-data-handler.js
rename to smart-admin-web-javascript/src/views/system/menu/menu-data-handler.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/menu-list-table-columns.js b/smart-admin-web-javascript/src/views/system/menu/menu-list-table-columns.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/menu-list-table-columns.js
rename to smart-admin-web-javascript/src/views/system/menu/menu-list-table-columns.js
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/menu-list.vue b/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/menu-list.vue
rename to smart-admin-web-javascript/src/views/system/menu/menu-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/position/position-form.vue b/smart-admin-web-javascript/src/views/system/position/position-form.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/position/position-form.vue
rename to smart-admin-web-javascript/src/views/system/position/position-form.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/position/position-list.vue b/smart-admin-web-javascript/src/views/system/position/position-list.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/position/position-list.vue
rename to smart-admin-web-javascript/src/views/system/position/position-list.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-data-scope/index.vue b/smart-admin-web-javascript/src/views/system/role/components/role-data-scope/index.vue
similarity index 97%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-data-scope/index.vue
rename to smart-admin-web-javascript/src/views/system/role/components/role-data-scope/index.vue
index db8219c..5280dd8 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-data-scope/index.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-data-scope/index.vue
@@ -46,8 +46,8 @@
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
   import { inject, onMounted, ref, watch } from 'vue';
-  import { roleApi } from '/src/api/system/role-api';
-  import { smartSentry } from '/src/lib/smart-sentry';
+  import { roleApi } from '/@/api/system/role-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   const props = defineProps({
     value: Number,
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-employee-list/index.vue b/smart-admin-web-javascript/src/views/system/role/components/role-employee-list/index.vue
similarity index 95%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-employee-list/index.vue
rename to smart-admin-web-javascript/src/views/system/role/components/role-employee-list/index.vue
index e2dc08b..6a7b93d 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-employee-list/index.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-employee-list/index.vue
@@ -79,11 +79,11 @@
   import { message, Modal } from 'ant-design-vue';
   import _ from 'lodash';
   import { computed, inject, onMounted, reactive, ref, watch } from 'vue';
-  import { roleApi } from '/src/api/system/role-api';
-  import { PAGE_SIZE, showTableTotal, PAGE_SIZE_OPTIONS } from '/src/constants/common-const';
-  import { SmartLoading } from '/src/components/framework/smart-loading';
-  import EmployeeTableSelectModal from '/src/components/system/employee-table-select-modal/index.vue';
-  import { smartSentry } from '/src/lib/smart-sentry';
+  import { roleApi } from '/@/api/system/role-api';
+  import { PAGE_SIZE, showTableTotal, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import EmployeeTableSelectModal from '/@/components/system/employee-table-select-modal/index.vue';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   // ----------------------- 以下是字段定义 emits props ---------------------
   let selectRoleId = inject('selectRoleId');
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-form-modal/index.vue b/smart-admin-web-javascript/src/views/system/role/components/role-form-modal/index.vue
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-form-modal/index.vue
rename to smart-admin-web-javascript/src/views/system/role/components/role-form-modal/index.vue
index 9049d92..aa19737 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-form-modal/index.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-form-modal/index.vue
@@ -32,9 +32,9 @@
 <script setup>
   import { message } from 'ant-design-vue';
   import { reactive, ref } from 'vue';
-  import { roleApi } from '/src/api/system/role-api';
-  import { smartSentry } from '/src/lib/smart-sentry';
-  import { SmartLoading } from '/src/components/framework/smart-loading';
+  import { roleApi } from '/@/api/system/role-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
   // ----------------------- 以下是字段定义 emits props ---------------------
   let emits = defineEmits(['refresh']);
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-list/index.vue b/smart-admin-web-javascript/src/views/system/role/components/role-list/index.vue
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-list/index.vue
rename to smart-admin-web-javascript/src/views/system/role/components/role-list/index.vue
index 86884b8..8c97c16 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-list/index.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-list/index.vue
@@ -33,10 +33,10 @@
   import { message, Modal } from 'ant-design-vue';
   import _ from 'lodash';
   import { computed, onMounted, ref } from 'vue';
-  import { roleApi } from '/src/api/system/role-api';
-  import { SmartLoading } from '/src/components/framework/smart-loading';
+  import { roleApi } from '/@/api/system/role-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
   import RoleFormModal from '../role-form-modal/index.vue';
-  import { smartSentry } from '/src/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   // ----------------------- 角色列表显示 ---------------------
   const roleList = ref([]);
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-setting/index.vue b/smart-admin-web-javascript/src/views/system/role/components/role-setting/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-setting/index.vue
rename to smart-admin-web-javascript/src/views/system/role/components/role-setting/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/index.less b/smart-admin-web-javascript/src/views/system/role/components/role-tree/index.less
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/index.less
rename to smart-admin-web-javascript/src/views/system/role/components/role-tree/index.less
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/index.vue b/smart-admin-web-javascript/src/views/system/role/components/role-tree/index.vue
similarity index 88%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/index.vue
rename to smart-admin-web-javascript/src/views/system/role/components/role-tree/index.vue
index 25643e9..5f05d85 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/index.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-tree/index.vue
@@ -23,10 +23,10 @@
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
   import RoleTreeCheckbox from './role-tree-checkbox.vue';
-  import { roleMenuApi } from '/src/api/system/role-menu-api';
-  import { useRoleStore } from '/src/store/modules/system/role';
-  import { SmartLoading } from '/src/components/framework/smart-loading';
-  import { smartSentry } from '/src/lib/smart-sentry';
+  import { roleMenuApi } from '/@/api/system/role-menu-api';
+  import { useRoleStore } from '/@/store/modules/system/role';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   let roleStore = useRoleStore();
   let tree = ref();
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/role-tree-checkbox.vue b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/role-tree-checkbox.vue
rename to smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
index 5cc160b..c126e42 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/role-tree-checkbox.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
@@ -23,7 +23,7 @@
 </template>
 <script setup>
   import { ref, watch } from 'vue';
-  import { useRoleStore } from '/src/store/modules/system/role';
+  import { useRoleStore } from '/@/store/modules/system/role';
   import RoleTreeMenu from './role-tree-menu.vue';
 
   let props = defineProps({
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/role-tree-menu.vue b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-menu.vue
similarity index 93%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/role-tree-menu.vue
rename to smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-menu.vue
index d56b68b..02e40b7 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/role-tree-menu.vue
+++ b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-menu.vue
@@ -22,8 +22,8 @@
   </li>
 </template>
 <script setup>
-  import { MENU_TYPE_ENUM } from '/src/constants/system/menu-const';
-  import { useRoleStore } from '/src/store/modules/system/role';
+  import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
+  import { useRoleStore } from '/@/store/modules/system/role';
   import RoleTreePoint from './role-tree-point.vue';
   import RoleTreeMenu from './role-tree-menu.vue';
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/role-tree-point.vue b/smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-point.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-tree/role-tree-point.vue
rename to smart-admin-web-javascript/src/views/system/role/components/role-tree/role-tree-point.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/role/index.vue b/smart-admin-web-javascript/src/views/system/role/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/role/index.vue
rename to smart-admin-web-javascript/src/views/system/role/index.vue
diff --git a/smart-admin-web/javascript-ant-design-vue3/vite.config.js b/smart-admin-web-javascript/vite.config.js
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/vite.config.js
rename to smart-admin-web-javascript/vite.config.js
diff --git a/smart-admin-web-typescript/.env.development b/smart-admin-web-typescript/.env.development
new file mode 100644
index 0000000..7ae8066
--- /dev/null
+++ b/smart-admin-web-typescript/.env.development
@@ -0,0 +1,3 @@
+NODE_ENV=development
+VITE_APP_TITLE='SmartAdmin 开发环境(Dev)'
+VITE_APP_API_URL='http://127.0.0.1:1024'
\ No newline at end of file
diff --git a/smart-admin-web-typescript/.env.localhost b/smart-admin-web-typescript/.env.localhost
new file mode 100644
index 0000000..3694390
--- /dev/null
+++ b/smart-admin-web-typescript/.env.localhost
@@ -0,0 +1,3 @@
+NODE_ENV=development
+VITE_APP_TITLE='SmartAdmin 本地环境(Local)'
+VITE_APP_API_URL='http://127.0.0.1:1024'
diff --git a/smart-admin-web-typescript/.env.pre b/smart-admin-web-typescript/.env.pre
new file mode 100644
index 0000000..98cda31
--- /dev/null
+++ b/smart-admin-web-typescript/.env.pre
@@ -0,0 +1,3 @@
+NODE_ENV=production
+VITE_APP_TITLE='SmartAdmin 预发布环境(Pre)'
+VITE_APP_API_URL='https://preview.smartadmin.vip/smart-admin-api'
\ No newline at end of file
diff --git a/smart-admin-web-typescript/.env.production b/smart-admin-web-typescript/.env.production
new file mode 100644
index 0000000..9230d6d
--- /dev/null
+++ b/smart-admin-web-typescript/.env.production
@@ -0,0 +1,3 @@
+NODE_ENV=production
+VITE_APP_TITLE='SmartAdmin V3.X'
+VITE_APP_API_URL='https://preview.smartadmin.vip/smart-admin-api'
\ No newline at end of file
diff --git a/smart-admin-web-typescript/.env.test b/smart-admin-web-typescript/.env.test
new file mode 100644
index 0000000..66243b3
--- /dev/null
+++ b/smart-admin-web-typescript/.env.test
@@ -0,0 +1,3 @@
+NODE_ENV=production
+VITE_APP_TITLE='SmartAdmin 测试环境(Test)'
+VITE_APP_API_URL='http://127.0.0.1:1024'
diff --git a/smart-admin-web/typescript-ant-design-vue3/.eslintignore b/smart-admin-web-typescript/.eslintignore
similarity index 91%
rename from smart-admin-web/typescript-ant-design-vue3/.eslintignore
rename to smart-admin-web-typescript/.eslintignore
index 6869ab5..78e1638 100644
--- a/smart-admin-web/typescript-ant-design-vue3/.eslintignore
+++ b/smart-admin-web-typescript/.eslintignore
@@ -12,6 +12,7 @@ public
 /docs
 .husky
 .local
+.localhost
 /bin
 Dockerfile
 src/assets
diff --git a/smart-admin-web-typescript/.eslintrc.cjs b/smart-admin-web-typescript/.eslintrc.cjs
new file mode 100644
index 0000000..81e7acc
--- /dev/null
+++ b/smart-admin-web-typescript/.eslintrc.cjs
@@ -0,0 +1,66 @@
+/*
+ * @Description:
+ * @Author: zhuoda
+ * @Date: 2021-11-05
+ * @LastEditTime: 2022-07-05
+ * @LastEditors: zhuoda
+ */
+module.exports = {
+  root: true, //此项是用来告诉eslint找当前配置文件不能往父级查找
+  env: {
+    browser: true,
+    es2021: true,
+    node: true,
+  },
+  parser: 'vue-eslint-parser', //使用vue-eslint-parser 来解析vue文件中的 template和script
+  parserOptions: {
+    ecmaVersion: 12, // 默认情况下，ESLint使用的是ECMAScript5语法，此处我们设置的选项是 es12
+    sourceType: 'module', // 指定js导入的方式
+  },
+  extends: ['plugin:vue/vue3-essential', 'eslint:recommended', 'plugin:vue/base'],
+  globals: {
+    defineProps: 'readonly',
+    defineEmits: 'readonly',
+    defineExpose: 'readonly',
+    withDefaults: 'readonly',
+  },
+  plugins: ['vue'],
+  rules: {
+    'no-unused-vars': [
+      'error',
+      // we are only using this rule to check for unused arguments since TS
+      // catches unused variables but not args.
+      { varsIgnorePattern: '.*', args: 'none' },
+    ],
+    'space-before-function-paren': 'off',
+
+    'vue/attributes-order': 'off',
+    'vue/one-component-per-file': 'off',
+    'vue/html-closing-bracket-newline': 'off',
+    'vue/max-attributes-per-line': 'off',
+    'vue/multiline-html-element-content-newline': 'off',
+    'vue/singleline-html-element-content-newline': 'off',
+    'vue/attribute-hyphenation': 'off',
+    'vue/require-default-prop': 'off',
+    'vue/multi-word-component-names': [
+      'error',
+      {
+        ignores: ['index'], //需要忽略的组件名
+      },
+    ],
+    'vue/html-self-closing': [
+      'error',
+      {
+        html: {
+          void: 'always',
+          normal: 'never',
+          component: 'always',
+        },
+        svg: 'always',
+        math: 'always',
+      },
+    ],
+    // Enable vue/script-setup-uses-vars rule
+    'vue/script-setup-uses-vars': 'error',
+  },
+};
diff --git a/smart-admin-web/typescript-ant-design-vue3/.gitignore b/smart-admin-web-typescript/.gitignore
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/.gitignore
rename to smart-admin-web-typescript/.gitignore
diff --git a/smart-admin-web-typescript/.prettierrc.cjs b/smart-admin-web-typescript/.prettierrc.cjs
new file mode 100644
index 0000000..d1c4ba8
--- /dev/null
+++ b/smart-admin-web-typescript/.prettierrc.cjs
@@ -0,0 +1,30 @@
+/*
+ * 代码格式化配置
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-09-12 14:44:18
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+module.exports = {
+  printWidth: 150, // 每行代码长度（默认80）
+  tabWidth: 2, // 缩进空格数
+  useTabs: false, //不用tab缩进
+  semi: true, //// 在语句末尾打印分号
+  singleQuote: true, // 使用单引号而不是双引号
+  vueIndentScriptAndStyle: true, //Vue文件脚本和样式标签缩进
+  quoteProps: 'as-needed', // 更改引用对象属性的时间 可选值"<as-needed|consistent|preserve>"
+  jsxSingleQuote: true, // 在JSX中使用单引号而不是双引号
+  trailingComma: 'es5', //多行时尽可能打印尾随逗号。（例如，单行数组永远不会出现逗号结尾。） 可选值"<none|es5|all>"，默认none
+  bracketSpacing: true, // 在对象文字中的括号之间打印空格
+  jsxBracketSameLine: false, //jsx 标签的反尖括号需要换行
+  arrowParens: 'always', // 在单独的箭头函数参数周围包括括号 always：(x) => x \ avoid：x => x
+  rangeStart: 0, // 这两个选项可用于格式化以给定字符偏移量（分别包括和不包括）开始和结束的代码
+  rangeEnd: Infinity,
+  requirePragma: false, // 指定要使用的解析器，不需要写文件开头的 @prettier
+  insertPragma: false, // 不需要自动在文件开头插入 @prettier
+  proseWrap: 'preserve', // 使用默认的折行标准 always\never\preserve
+  htmlWhitespaceSensitivity: 'css', // 指定HTML文件的全局空格敏感度 css\strict\ignore
+  endOfLine: 'auto', // 因为prettier的规范和eslint的换行规则不同，所以这个必须配置。要不然每次打开文件都会有一堆的警告;换行符使用 lf 结尾是 可选值"<auto|lf|crlf|cr
+};
diff --git a/smart-admin-web/typescript-ant-design-vue3/.stylelintignore b/smart-admin-web-typescript/.stylelintignore
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/.stylelintignore
rename to smart-admin-web-typescript/.stylelintignore
diff --git a/smart-admin-web/typescript-ant-design-vue3/.stylelintrc.js b/smart-admin-web-typescript/.stylelintrc.js
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/.stylelintrc.js
rename to smart-admin-web-typescript/.stylelintrc.js
diff --git a/smart-admin-web-typescript/index.html b/smart-admin-web-typescript/index.html
new file mode 100644
index 0000000..4951e56
--- /dev/null
+++ b/smart-admin-web-typescript/index.html
@@ -0,0 +1,21 @@
+<!--
+ * @Description:
+ * @Author: zhuoda
+ * @Date: 2021-08-03
+ * @LastEditTime: 2022-03-01
+ * @LastEditors: zhuoda
+-->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <link rel="icon" href="/favicon.ico">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title> %VITE_APP_TITLE%</title>
+</head>
+<body>
+<div id="app"></div>
+<script type="module" src="/src/main.ts"></script>
+</body>
+</html>
+
diff --git a/smart-admin-web/typescript-ant-design-vue3/package.json b/smart-admin-web-typescript/package.json
similarity index 62%
rename from smart-admin-web/typescript-ant-design-vue3/package.json
rename to smart-admin-web-typescript/package.json
index 1af29dc..07f6b09 100644
--- a/smart-admin-web/typescript-ant-design-vue3/package.json
+++ b/smart-admin-web-typescript/package.json
@@ -1,37 +1,35 @@
 {
-  "name": "SmartAdmin",
+  "name": "smartadmin",
   "version": "3.0.0",
   "author": {
     "name": "1024创新实验室（1024lab）",
     "email": "lab1024@163.com",
-    "url": "https://1024lab.net"
+    "url": "https://www.1024lab.net"
   },
   "license": "MIT",
   "homepage": "https://smartadmin.1024lab.net",
   "scripts": {
-    "dev": "vite",
-    "test": "vite build  --mode test",
-    "pre": "vite build  --mode pre",
-    "prod": "vite build  --mode production",
     "localhost": "vite --mode localhost",
-    "build": "vue-tsc --noEmit && vite build",
-    "serve": "vite preview"
+    "dev": "vite",
+    "build:test": "vite build  --base=/admin/ --mode test",
+    "build:pre": "vite build  --mode pre",
+    "build:prod": "vite build  --mode production"
   },
+  "type": "module",
   "dependencies": {
     "@ant-design/icons-vue": "^6.1.0",
-    "@types/js-cookie": "^2.2.7",
     "@wangeditor/editor": "5.1.14",
     "@wangeditor/editor-for-vue": "5.1.12",
-    "ant-design-vue": "4.2.1",
+    "ant-design-vue": "4.2.5",
     "axios": "1.6.8",
     "clipboard": "2.0.11",
     "crypto-js": "4.1.1",
+    "dayjs": "1.10.5",
     "decimal.js": "10.3.1",
     "diff": "5.2.0",
     "diff2html": "3.4.47",
     "echarts": "5.4.3",
     "highlight.js": "11.8.0",
-    "js-cookie": "^2.2.1",
     "lodash": "4.17.21",
     "lunar-javascript": "1.6.12",
     "mitt": "3.0.1",
@@ -48,19 +46,14 @@
     "vue3-tabs-chrome": "^0.3.3"
   },
   "devDependencies": {
-    "@types/crypto-js": "^4.2.2",
-    "@types/lodash": "^4.14.186",
-    "@types/nprogress": "^0.2.0",
-    "@types/sm-crypto": "^0.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.40.1",
-    "@typescript-eslint/parser": "^5.40.1",
-    "@vitejs/plugin-legacy": "5.4.1",
-    "@vitejs/plugin-vue": "5.0.4",
-    "@vue/compiler-sfc": "3.4.27",
-    "eslint": "^8.16.0",
-    "eslint-config-prettier": "~9.0.0",
+    "@vitejs/plugin-vue": "5.1.4",
+    "@vitejs/plugin-vue-jsx": "4.0.1",
+    "@vue/eslint-config-prettier": "^10.0.0",
+    "@vue/eslint-config-typescript": "^14.1.1",
+    "@vue/tsconfig": "0.5.1",
+    "eslint": "^9.13.0",
     "eslint-plugin-prettier": "~5.0.0",
-    "eslint-plugin-vue": "~9.17.0",
+    "eslint-plugin-vue": "^9.29.0",
     "less": "~4.2.0",
     "less-loader": "~11.1.3",
     "prettier": "~3.0.2",
@@ -70,12 +63,10 @@
     "stylelint-config-standard": "~25.0.0",
     "stylelint-order": "~5.0.0",
     "terser": "~5.29.2",
-    "typescript": "^4.6.4",
+    "typescript": "5.6.3",
     "vite": "5.2.12",
-    "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-style-import": "^2.0.0",
     "vue-eslint-parser": "~9.4.2",
-    "vue-tsc": "^1.0.9"
+    "vue-tsc": "^2.1.6"
   },
   "engines": {
     "node": ">=18"
diff --git a/smart-admin-web/typescript-ant-design-vue3/public/favicon.ico b/smart-admin-web-typescript/public/favicon.ico
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/public/favicon.ico
rename to smart-admin-web-typescript/public/favicon.ico
diff --git a/smart-admin-web-typescript/src/App.vue b/smart-admin-web-typescript/src/App.vue
new file mode 100644
index 0000000..763ba87
--- /dev/null
+++ b/smart-admin-web-typescript/src/App.vue
@@ -0,0 +1,100 @@
+<!--
+  * 主应用页面
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 23:46:47
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+
+<template>
+  <a-config-provider
+    :locale="antdLocale"
+    :theme="{
+      algorithm: compactFlag ? theme.compactAlgorithm : theme.defaultAlgorithm,
+      token: {
+        colorPrimary: themeColors[colorIndex].primaryColor,
+        colorLink: themeColors[colorIndex].primaryColor,
+        colorLinkActive: themeColors[colorIndex].activeColor,
+        colorLinkHover: themeColors[colorIndex].hoverColor,
+        colorIcon: themeColors[colorIndex].primaryColor,
+        borderRadius: borderRadius,
+      },
+      components: {
+        Button: {
+          colorLink: themeColors[colorIndex].primaryColor,
+          colorLinkActive: themeColors[colorIndex].activeColor,
+          colorLinkHover: themeColors[colorIndex].hoverColor,
+        },
+        Icon: {
+          colorIcon: themeColors[colorIndex].primaryColor,
+        },
+      },
+    }"
+    :getPopupContainer="getPopupContainer"
+  >
+    <!---全局loading--->
+    <a-spin :spinning="spinning" tip="稍等片刻，我在拼命加载中..." size="large">
+      <!--- 路由 -->
+      <RouterView />
+    </a-spin>
+  </a-config-provider>
+</template>
+
+<script setup lang="ts">
+  import dayjs from 'dayjs';
+  import { computed } from 'vue';
+  import { messages } from '/@/i18n';
+  import { useAppConfigStore } from '/@/store/modules/system/app-config';
+  import { useSpinStore } from '/@/store/modules/system/spin';
+  import { theme } from 'ant-design-vue';
+  import { themeColors } from '/@/theme/color.js';
+  import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
+  import { LAYOUT_ELEMENT_IDS } from '/@/layout/layout-const.js';
+
+  const antdLocale = computed(() => messages[useAppConfigStore().language].antdLocale);
+  const dayjsLocale = computed(() => messages[useAppConfigStore().language].dayjsLocale);
+  dayjs.locale(dayjsLocale);
+
+  // 全局loading
+  let spinStore = useSpinStore();
+  const spinning = computed(() => spinStore.loading);
+  // 是否紧凑
+  const compactFlag = computed(() => useAppConfigStore().compactFlag);
+  // 主题颜色
+  const colorIndex = computed(() => {
+    return useAppConfigStore().colorIndex;
+  });
+  // 圆角
+  const borderRadius = computed(() => {
+    return useAppConfigStore().borderRadius;
+  });
+
+  function getPopupContainer(node, dialogContext) {
+    let fullScreenFlag = useAppConfigStore().$state.fullScreenFlag;
+    if(fullScreenFlag){
+      return getFullScreenContainer(node, dialogContext);
+    }else{
+      return getNotFullScreenContainer(node, dialogContext);
+    }
+  }
+
+  function getFullScreenContainer(node, dialogContext) {
+    if (node === document.body) {
+      return document.getElementById(LAYOUT_ELEMENT_IDS.content);
+    }else if (node) {
+      return node.parentNode;
+    } else {
+      return document.getElementById(LAYOUT_ELEMENT_IDS.content);
+    }
+  }
+
+  function getNotFullScreenContainer(node, dialogContext) {
+    if (node) {
+      return node.parentNode;
+    } else {
+      return document.body;
+    }
+  }
+</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/base-model/page-param-model.ts b/smart-admin-web-typescript/src/api/base-model/page-param-model.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/base-model/page-param-model.ts
rename to smart-admin-web-typescript/src/api/base-model/page-param-model.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/base-model/page-result-model.ts b/smart-admin-web-typescript/src/api/base-model/page-result-model.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/base-model/page-result-model.ts
rename to smart-admin-web-typescript/src/api/base-model/page-result-model.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/base-model/response-model.ts b/smart-admin-web-typescript/src/api/base-model/response-model.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/base-model/response-model.ts
rename to smart-admin-web-typescript/src/api/base-model/response-model.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/base-model/sort-item-model.ts b/smart-admin-web-typescript/src/api/base-model/sort-item-model.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/base-model/sort-item-model.ts
rename to smart-admin-web-typescript/src/api/base-model/sort-item-model.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/business/category/category-api.js b/smart-admin-web-typescript/src/api/business/category/category-api.ts
similarity index 86%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/business/category/category-api.js
rename to smart-admin-web-typescript/src/api/business/category/category-api.ts
index 24a3b18..5eb80d2 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/business/category/category-api.js
+++ b/smart-admin-web-typescript/src/api/business/category/category-api.ts
@@ -27,8 +27,4 @@ export const categoryApi = {
   updateCategory: (param) => {
     return postRequest('/category/update', param);
   },
-  // 查询类目详情 @author 卓大
-  getCategory: (categoryId) => {
-    return getRequest(`/category/${categoryId}`);
-  },
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/business/goods/goods-api.js b/smart-admin-web-typescript/src/api/business/goods/goods-api.ts
similarity index 72%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/business/goods/goods-api.js
rename to smart-admin-web-typescript/src/api/business/goods/goods-api.ts
index e3ad959..007029b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/business/goods/goods-api.js
+++ b/smart-admin-web-typescript/src/api/business/goods/goods-api.ts
@@ -5,7 +5,7 @@
  * @LastEditTime: 2022-06-23
  * @LastEditors: zhuoda
  */
-import { postRequest, getRequest } from '/@/lib/axios';
+import {postRequest, getRequest, getDownload} from '/@/lib/axios';
 
 export const goodsApi = {
   // 添加商品 @author zhuoda
@@ -28,4 +28,14 @@ export const goodsApi = {
   updateGoods: (param) => {
     return postRequest('/goods/update', param);
   },
+
+  // 导入 @author 卓大
+  importGoods : (file) =>{
+    return postRequest('/goods/importGoods',file);
+  },
+
+  // 导出 @author 卓大
+  exportGoods : () =>{
+    return getDownload('/goods/exportGoods');
+  }
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/business/oa/bank-api.js b/smart-admin-web-typescript/src/api/business/oa/bank-api.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/business/oa/bank-api.js
rename to smart-admin-web-typescript/src/api/business/oa/bank-api.ts
diff --git a/smart-admin-web-typescript/src/api/business/oa/enterprise-api.ts b/smart-admin-web-typescript/src/api/business/oa/enterprise-api.ts
new file mode 100644
index 0000000..5c2ad68
--- /dev/null
+++ b/smart-admin-web-typescript/src/api/business/oa/enterprise-api.ts
@@ -0,0 +1,69 @@
+/*
+ * 企业信息
+ *
+ * @Author:    开云
+ * @Date:      2022-09-03 21:47:28
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+import {postRequest, getRequest, postDownload} from '/@/lib/axios';
+
+export const enterpriseApi = {
+    // 新建企业 @author 开云
+    create: (param) => {
+        return postRequest('/oa/enterprise/create', param);
+    },
+
+    // 删除企业 @author 开云
+    delete: (enterpriseId) => {
+        return getRequest(`/oa/enterprise/delete/${enterpriseId}`);
+    },
+
+    // 查询企业详情 @author 开云
+    detail: (enterpriseId) => {
+        return getRequest(`/oa/enterprise/get/${enterpriseId}`);
+    },
+
+    // 分页查询企业模块 @author 开云
+    pageQuery: (param) => {
+        return postRequest('/oa/enterprise/page/query', param);
+    },
+
+    // 导出企业数据excel @author 卓大
+    exportExcel: (param) => {
+        return postDownload('/oa/enterprise/exportExcel', param);
+    },
+
+    //企业列表查询 含数据范围 @author 开云
+    queryList: (type) => {
+        let query = '';
+        if (type) {
+            query = `?type=${type}`;
+        }
+        return getRequest(`/oa/enterprise/query/list${query}`);
+    },
+
+    // 编辑企业 @author 开云
+    update: (param) => {
+        return postRequest('/oa/enterprise/update', param);
+    },
+    // 企业全部员工List @author yandy
+    employeeList: (param) => {
+        return postRequest('/oa/enterprise/employee/list', param);
+    },
+    // 分页查询企业员工List @author 卓大
+    queryPageEmployeeList: (param) => {
+        return postRequest('/oa/enterprise/employee/queryPage', param);
+    },
+    // 添加员工 @author yandy
+    addEmployee: (param) => {
+        return postRequest('/oa/enterprise/employee/add', param);
+    },
+
+    // 删除员工 @author yandy
+    deleteEmployee: (param) => {
+        return postRequest('/oa/enterprise/employee/delete', param);
+    },
+
+};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/business/oa/invoice-api.js b/smart-admin-web-typescript/src/api/business/oa/invoice-api.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/business/oa/invoice-api.js
rename to smart-admin-web-typescript/src/api/business/oa/invoice-api.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/business/oa/notice-api.js b/smart-admin-web-typescript/src/api/business/oa/notice-api.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/business/oa/notice-api.js
rename to smart-admin-web-typescript/src/api/business/oa/notice-api.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/api-encrypt/api-encrypt-api.js b/smart-admin-web-typescript/src/api/support/api-encrypt-api.ts
similarity index 93%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/api-encrypt/api-encrypt-api.js
rename to smart-admin-web-typescript/src/api/support/api-encrypt-api.ts
index a682550..83f9ff4 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/api-encrypt/api-encrypt-api.js
+++ b/smart-admin-web-typescript/src/api/support/api-encrypt-api.ts
@@ -5,7 +5,7 @@
  * @Date:      2023-10-17 20:02:37
  * @Copyright  1024创新实验室
  */
-import { postRequest, postEncryptRequest } from '/src/lib/axios';
+import { postRequest, postEncryptRequest } from '/@/lib/axios';
 
 export const encryptApi = {
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/cache/cache-api.js b/smart-admin-web-typescript/src/api/support/cache-api.ts
similarity index 91%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/cache/cache-api.js
rename to smart-admin-web-typescript/src/api/support/cache-api.ts
index dbe61c7..5cb4d37 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/cache/cache-api.js
+++ b/smart-admin-web-typescript/src/api/support/cache-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/@/lib/axios';
+import {getRequest} from '/@/lib/axios';
 
 export const cacheApi = {
   // 获取某个缓存的所有key @author 罗伊
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/change-log-api.js b/smart-admin-web-typescript/src/api/support/change-log-api.ts
similarity index 93%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/change-log-api.js
rename to smart-admin-web-typescript/src/api/support/change-log-api.ts
index e4f9376..e5ce1cb 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/change-log-api.js
+++ b/smart-admin-web-typescript/src/api/support/change-log-api.ts
@@ -5,7 +5,7 @@
  * @Date:      2022-09-26 14:53:50
  * @Copyright  1024创新实验室
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const changeLogApi = {
   /**
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/code-generator/code-generator-api.js b/smart-admin-web-typescript/src/api/support/code-generator-api.ts
similarity index 88%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/code-generator/code-generator-api.js
rename to smart-admin-web-typescript/src/api/support/code-generator-api.ts
index 8407eab..7289b62 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/code-generator/code-generator-api.js
+++ b/smart-admin-web-typescript/src/api/support/code-generator-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest, postRequest,download } from '/@/lib/axios';
+import { getRequest, postRequest, getDownload } from '/@/lib/axios';
 
 export const codeGeneratorApi = {
   // 查询数据库的表 @author 卓大
@@ -41,6 +41,6 @@ export const codeGeneratorApi = {
 
   // 下载代码 @author 卓大
   downloadCode: (tableName) => {
-    return download(`${tableName}.zip`,`/support/codeGenerator/code/download/${tableName}`);
+    return getDownload(`/support/codeGenerator/code/download/${tableName}`);
   },
 };
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/config-api.js b/smart-admin-web-typescript/src/api/support/config-api.ts
similarity index 92%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/config-api.js
rename to smart-admin-web-typescript/src/api/support/config-api.ts
index 54169d8..c5e5397 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/config-api.js
+++ b/smart-admin-web-typescript/src/api/support/config-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const configApi = {
   // 分页查询 @author 卓大
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/data-masking-api.js b/smart-admin-web-typescript/src/api/support/data-masking-api.ts
similarity index 87%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/data-masking-api.js
rename to smart-admin-web-typescript/src/api/support/data-masking-api.ts
index 16e670b..8921186 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/data-masking-api.js
+++ b/smart-admin-web-typescript/src/api/support/data-masking-api.ts
@@ -5,7 +5,7 @@
  * @Date:      2024-07-31 21:02:37
  * @Copyright  1024创新实验室
  */
-import { getRequest } from '/src/lib/axios';
+import { getRequest } from '/@/lib/axios';
 
 export const dataMaskingApi = {
   /**
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/data-tracer-api.js b/smart-admin-web-typescript/src/api/support/data-tracer-api.ts
similarity index 89%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/data-tracer-api.js
rename to smart-admin-web-typescript/src/api/support/data-tracer-api.ts
index 7325f24..afa75f8 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/data-tracer-api.js
+++ b/smart-admin-web-typescript/src/api/support/data-tracer-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest } from '/src/lib/axios';
+import { postRequest } from '/@/lib/axios';
 
 export const dataTracerApi = {
   // 分页查询业务操作日志 - @author 卓大
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/dict-api.js b/smart-admin-web-typescript/src/api/support/dict-api.ts
similarity index 96%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/dict-api.js
rename to smart-admin-web-typescript/src/api/support/dict-api.ts
index 851ed4b..701d361 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/dict-api.js
+++ b/smart-admin-web-typescript/src/api/support/dict-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const dictApi = {
   // 分页查询数据字典KEY - @author 卓大
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/feedback-api.js b/smart-admin-web-typescript/src/api/support/feedback-api.ts
similarity index 91%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/feedback-api.js
rename to smart-admin-web-typescript/src/api/support/feedback-api.ts
index 2072a66..c951b8a 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/feedback-api.js
+++ b/smart-admin-web-typescript/src/api/support/feedback-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest } from '/src/lib/axios';
+import { postRequest } from '/@/lib/axios';
 
 export const feedbackApi = {
   // 意见反馈-新增
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/file/file-api.js b/smart-admin-web-typescript/src/api/support/file-api.ts
similarity index 88%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/file/file-api.js
rename to smart-admin-web-typescript/src/api/support/file-api.ts
index ec001f2..2e47093 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/file/file-api.js
+++ b/smart-admin-web-typescript/src/api/support/file-api.ts
@@ -32,7 +32,7 @@ export const fileApi = {
   /**
    * 下载文件流（根据fileKey） @author 胡克
    */
-  downLoadFile: (fileName, fileKey) => {
-    return getDownload(fileName, '/support/file/downLoad', { fileKey });
+  downLoadFile: (fileKey) => {
+    return getDownload('/support/file/downLoad', { fileKey });
   },
 };
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/heart-beat-api.js b/smart-admin-web-typescript/src/api/support/heart-beat-api.ts
similarity index 89%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/heart-beat-api.js
rename to smart-admin-web-typescript/src/api/support/heart-beat-api.ts
index 763afc4..0a1eab4 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/heart-beat-api.js
+++ b/smart-admin-web-typescript/src/api/support/heart-beat-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest } from '/src/lib/axios';
+import { postRequest } from '/@/lib/axios';
 
 export const heartBeatApi = {
   // 分页查询 @author 卓大
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/help-doc-api.js b/smart-admin-web-typescript/src/api/support/help-doc-api.ts
similarity index 96%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/help-doc-api.js
rename to smart-admin-web-typescript/src/api/support/help-doc-api.ts
index 9c7c20a..dc4fac4 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/help-doc-api.js
+++ b/smart-admin-web-typescript/src/api/support/help-doc-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const helpDocApi = {
   // 【管理】帮助文档-分页查询 @author zhuoda
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/help-doc-catalog-api.js b/smart-admin-web-typescript/src/api/support/help-doc-catalog-api.ts
similarity index 93%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/help-doc-catalog-api.js
rename to smart-admin-web-typescript/src/api/support/help-doc-catalog-api.ts
index eb2bd91..a8fd6c6 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/help-doc-catalog-api.js
+++ b/smart-admin-web-typescript/src/api/support/help-doc-catalog-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const helpDocCatalogApi = {
   //帮助文档目录-获取全部 @author zhuoda
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/job/job-api.js b/smart-admin-web-typescript/src/api/support/job-api.ts
similarity index 80%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/job/job-api.js
rename to smart-admin-web-typescript/src/api/support/job-api.ts
index 24b8684..805cef3 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/job/job-api.js
+++ b/smart-admin-web-typescript/src/api/support/job-api.ts
@@ -4,13 +4,17 @@
  * @Author:    huke
  * @Date:      2024/06/25
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const jobApi = {
   // 分页查询 @huke
   queryJob: (param) => {
     return postRequest('/support/job/query', param);
   },
+  // 定时任务-查询详情 @huke
+  queryJobInfo: (param) => {
+    return getRequest(`/support/job/${param}`);
+  },
   // 执行任务 @huke
   executeJob: (param) => {
     return postRequest('/support/job/execute', param);
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/level3-protect/level3-protect-api.js b/smart-admin-web-typescript/src/api/support/level3-protect-api.ts
similarity index 90%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/level3-protect/level3-protect-api.js
rename to smart-admin-web-typescript/src/api/support/level3-protect-api.ts
index c6be240..2e99db2 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/level3-protect/level3-protect-api.js
+++ b/smart-admin-web-typescript/src/api/support/level3-protect-api.ts
@@ -5,7 +5,7 @@
  * @Date:      2024-07-31 21:02:37
  * @Copyright  1024创新实验室
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const level3ProtectApi = {
   /**
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/login-fail/login-fail-api.js b/smart-admin-web-typescript/src/api/support/login-fail-api.ts
similarity index 77%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/login-fail/login-fail-api.js
rename to smart-admin-web-typescript/src/api/support/login-fail-api.ts
index 0419242..42888d3 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/login-fail/login-fail-api.js
+++ b/smart-admin-web-typescript/src/api/support/login-fail-api.ts
@@ -5,22 +5,22 @@
  * @Date:      2023-10-17 18:02:37
  * @Copyright  1024创新实验室
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const loginFailApi = {
-  
+
   /**
    * 分页查询  @author  1024创新实验室-主任-卓大
    */
   queryPage : (param) => {
     return postRequest('/support/protect/loginFail/queryPage', param);
   },
-  
+
   /**
    * 批量删除  @author  1024创新实验室-主任-卓大
    */
   batchDelete: (idList) => {
-    return postRequest('/support/protect/loginFail/batchDelete', idList);
+      return postRequest('/support/protect/loginFail/batchDelete', idList);
   },
-  
+
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/login-log/login-log-api.js b/smart-admin-web-typescript/src/api/support/login-log-api.ts
similarity index 74%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/login-log/login-log-api.js
rename to smart-admin-web-typescript/src/api/support/login-log-api.ts
index 3c48fe7..d447c0b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/login-log/login-log-api.js
+++ b/smart-admin-web-typescript/src/api/support/login-log-api.ts
@@ -14,4 +14,8 @@ export const loginLogApi = {
   queryList: (param) => {
     return postRequest('/support/loginLog/page/query', param);
   },
+  // 分页查询当前登录人信息 @author 善逸
+  queryListLogin: (param) => {
+    return postRequest('/support/loginLog/page/query/login', param);
+  },
 };
diff --git a/smart-admin-web-typescript/src/api/support/message-api.ts b/smart-admin-web-typescript/src/api/support/message-api.ts
new file mode 100644
index 0000000..b91b56b
--- /dev/null
+++ b/smart-admin-web-typescript/src/api/support/message-api.ts
@@ -0,0 +1,16 @@
+import { getRequest, postRequest } from '/@/lib/axios';
+
+export const messageApi = {
+  // 通知消息-分页查询
+  queryMessage: (param) => {
+    return postRequest('/support/message/queryMyMessage', param);
+  },
+  // 通知消息-查询未读消息数
+  queryUnreadCount: () => {
+    return getRequest('/support/message/getUnreadCount');
+  },
+  // 通知消息-标记已读
+  updateReadFlag: (messageId) => {
+    return getRequest(`/support/message/read/${messageId}`);
+  },
+};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/support/operate-log/operate-log-api.js b/smart-admin-web-typescript/src/api/support/operate-log-api.ts
similarity index 78%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/support/operate-log/operate-log-api.js
rename to smart-admin-web-typescript/src/api/support/operate-log-api.ts
index b2f421d..8058942 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/support/operate-log/operate-log-api.js
+++ b/smart-admin-web-typescript/src/api/support/operate-log-api.ts
@@ -18,4 +18,8 @@ export const operateLogApi = {
   detail: (id) => {
     return getRequest(`/support/operateLog/detail/${id}`);
   },
+  // 分页查询当前登录人信息 @author 善逸
+  queryListLogin: (param) => {
+    return postRequest('/support/operateLog/page/query/login', param);
+  },
 };
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/reload-api.js b/smart-admin-web-typescript/src/api/support/reload-api.ts
similarity index 92%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/reload-api.js
rename to smart-admin-web-typescript/src/api/support/reload-api.ts
index 840ed95..721d563 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/reload-api.js
+++ b/smart-admin-web-typescript/src/api/support/reload-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const reloadApi = {
   // 查询reload列表 @author 卓大
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/serial-number-api.js b/smart-admin-web-typescript/src/api/support/serial-number-api.ts
similarity index 92%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/serial-number-api.js
rename to smart-admin-web-typescript/src/api/support/serial-number-api.ts
index 9da0cb6..b9ae35a 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/serial-number-api.js
+++ b/smart-admin-web-typescript/src/api/support/serial-number-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const serialNumberApi = {
   // 生成单号 @author 卓大
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/support/table-column-api.js b/smart-admin-web-typescript/src/api/support/table-column-api.ts
similarity index 91%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/support/table-column-api.js
rename to smart-admin-web-typescript/src/api/support/table-column-api.ts
index 4668d1a..7223ab9 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/support/table-column-api.js
+++ b/smart-admin-web-typescript/src/api/support/table-column-api.ts
@@ -6,7 +6,7 @@
  * @LastEditors: zhuoda
  * @LastEditTime: 2022-08-21
  */
-import { postRequest, getRequest } from '/src/lib/axios';
+import { postRequest, getRequest } from '/@/lib/axios';
 
 export const tableColumnApi = {
   // 修改表格列 @author zhuoda
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/system/department/department-api.js b/smart-admin-web-typescript/src/api/system/department-api.ts
similarity index 60%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/system/department/department-api.js
rename to smart-admin-web-typescript/src/api/system/department-api.ts
index 05449ee..c34994c 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/system/department/department-api.js
+++ b/smart-admin-web-typescript/src/api/system/department-api.ts
@@ -11,45 +11,35 @@ import { getRequest, postRequest } from '/@/lib/axios';
 
 export const departmentApi = {
   /**
-   * @description: 查询部门列表 @author 卓大
-   * @param {*}
-   * @return {*}
+   * 查询部门列表 @author 卓大
    */
   queryAllDepartment: () => {
     return getRequest('/department/listAll');
   },
-  
+
   /**
-   * @description: 查询部门树形列表 @author 卓大
-   * @param {*}
-   * @return {*}
+   * 查询部门树形列表 @author 卓大
    */
   queryDepartmentTree: () => {
     return getRequest('/department/treeList');
   },
-  
+
   /**
-   * @description: 添加部门 @author 卓大
-   * @param {*}
-   * @return {*}
+   * 添加部门 @author 卓大
    */
   addDepartment: (param) => {
     return postRequest('/department/add', param);
   },
   /**
-   * @description: 更新部门信息 @author 卓大
-   * @param {*}
-   * @return {*}
+   * 更新部门信息 @author 卓大
    */
   updateDepartment: (param) => {
     return postRequest('/department/update', param);
   },
   /**
-   * @description: 获取校区列表 @author 卓大
-   * @param {*}
-   * @return {*}
+   * 删除
    */
   deleteDepartment: (departmentId) => {
-    return getRequest(`/department/delete/${ departmentId }`);
-  }
+    return getRequest(`/department/delete/${departmentId}`);
+  },
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/system/employee/employee-api.js b/smart-admin-web-typescript/src/api/system/employee-api.ts
similarity index 59%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/system/employee/employee-api.js
rename to smart-admin-web-typescript/src/api/system/employee-api.ts
index cddb95d..304256a 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/system/employee/employee-api.js
+++ b/smart-admin-web-typescript/src/api/system/employee-api.ts
@@ -8,90 +8,93 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
 
-import { getRequest, postRequest } from '/@/lib/axios';
+import { getRequest, postEncryptRequest, postRequest } from '/@/lib/axios';
 
 export const employeeApi = {
   /**
-   * @description: 查询所有员工 @author 卓大
-   * @param {*}
-   * @return {*}
+   * 查询所有员工 @author 卓大
    */
   queryAll: () => {
     return getRequest('/employee/queryAll');
   },
   /**
-   * @description: 员工管理查询
-   * @param {*}
-   * @return {*}
+   * 员工管理查询
    */
   queryEmployee: (params) => {
     return postRequest('/employee/query', params);
   },
   /**
-   * @description: 添加员工
-   * @param {EmployeeAddDto} params
-   * @return {*}
+   * 添加员工
    */
   addEmployee: (params) => {
     return postRequest('/employee/add', params);
   },
   /**
-   * @description: 更新员工信息
-   * @param {EmployeeUpdateDto} params
-   * @return {*}
+   * 更新员工信息
    */
   updateEmployee: (params) => {
     return postRequest('/employee/update', params);
   },
   /**
-   * @description: 删除员工
-   * @param {number} employeeId
-   * @return {*}
+   * 更新登录人信息
+   */
+  updateByLogin: (params) => {
+    return postRequest('/employee/update/login', params);
+  },
+  /**
+   * 更新登录人头像
+   */
+  updateAvatar: (params) => {
+    return postRequest('/employee/update/avatar', params);
+  },
+  /**
+   * 删除员工
    */
   deleteEmployee: (employeeId) => {
     return getRequest(`/employee/delete/${employeeId}`);
   },
   /**
-   * @description: 批量删除员工
-   * @param {number} employeeIdList
-   * @return {*}
+   * 批量删除员工
    */
   batchDeleteEmployee: (employeeIdList) => {
     return postRequest('/employee/update/batch/delete', employeeIdList);
   },
   /**
-   * @description: 批量调整员工部门
-   * @return {*}
+   * 批量调整员工部门
    */
   batchUpdateDepartmentEmployee: (updateParam) => {
     return postRequest('/employee/update/batch/department', updateParam);
   },
   /**
-   * @description: 重置员工密码
-   * @param {number} employeeId
-   * @return {*}
+   * 重置员工密码
    */
   resetPassword: (employeeId) => {
     return getRequest(`/employee/update/password/reset/${employeeId}`);
   },
   /**
-   * @description: 修改面面
-   * @param {number} employeeId
-   * @return {*}
+   * 修改密码
    */
   updateEmployeePassword: (param) => {
-    return postRequest('/employee/update/password',param);
+    return postEncryptRequest('/employee/update/password', param);
   },
+
   /**
-   * @description: 更新员工禁用状态
-   * @param {number} employeeId
-   * @return {*}
+   * 获取密码复杂度
+   */
+  getPasswordComplexityEnabled: () => {
+    return getRequest('/employee/getPasswordComplexityEnabled');
+  },
+
+  /**
+   * 更新员工禁用状态
    */
   updateDisabled: (employeeId) => {
     return getRequest(`/employee/update/disabled/${employeeId}`);
   },
 
-  // 查询员工-根据部门id
+  /**
+   * 查询员工-根据部门id
+   */
   queryEmployeeByDeptId: (departmentId) => {
     return getRequest(`/employee/query/dept/${departmentId}`);
   },
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/system/home/home-api.js b/smart-admin-web-typescript/src/api/system/home-api.ts
similarity index 90%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/system/home/home-api.js
rename to smart-admin-web-typescript/src/api/system/home-api.ts
index 6452fcb..2b71ecb 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/system/home/home-api.js
+++ b/smart-admin-web-typescript/src/api/system/home-api.ts
@@ -12,16 +12,12 @@ import { getRequest } from '/@/lib/axios';
 export const homeApi = {
   /**
    * @description: 首页-金额统计（业绩、收款、订单数等） @author 卓大
-   * @param {*}
-   * @return {*}
    */
   homeAmountStatistics: () => {
     return getRequest('/home/amount/statistics');
   },
   /**
    * @description: 首页-待办信息 @author 卓大
-   * @param {*}
-   * @return {*}
    */
   homeWaitHandle: () => {
     return getRequest('home/wait/handle');
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/system/login/login-api.js b/smart-admin-web-typescript/src/api/system/login-api.ts
similarity index 81%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/system/login/login-api.js
rename to smart-admin-web-typescript/src/api/system/login-api.ts
index bf1c103..7cb5909 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/system/login/login-api.js
+++ b/smart-admin-web-typescript/src/api/system/login-api.ts
@@ -12,7 +12,6 @@ import { getRequest, postRequest } from '/@/lib/axios';
 export const loginApi = {
   /**
    * 登录 @author 卓大
-   * @param param
    */
   login: (param) => {
     return postRequest('/login', param);
@@ -20,7 +19,6 @@ export const loginApi = {
 
   /**
    * 退出登录 @author 卓大
-   * @param param
    */
   logout: () => {
     return getRequest('/login/logout');
@@ -28,7 +26,6 @@ export const loginApi = {
 
   /**
    * 获取验证码 @author 卓大
-   * @param param
    */
   getCaptcha: () => {
     return getRequest('/login/getCaptcha');
@@ -36,26 +33,18 @@ export const loginApi = {
 
   /**
    * 获取登录信息 @author 卓大
-   * @param param
    */
   getLoginInfo: () => {
     return getRequest('/login/getLoginInfo');
   },
 
-  /**
-   * 刷新用户信息（包含用户基础信息、权限信息等等）   @author 卓大
-   */
-  refresh: () => {
-    return getRequest('/login/refresh');
-  },
-  
   /**
    * 获取邮箱登录验证码 @author 卓大
    */
   sendLoginEmailCode: (loginName) => {
     return getRequest(`/login/sendEmailCode/${loginName}`);
   },
-  
+
   /**
    * 获取双因子登录标识 @author 卓大
    */
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/api/system/menu-api.js b/smart-admin-web-typescript/src/api/system/menu-api.ts
similarity index 94%
rename from smart-admin-web/javascript-ant-design-vue3/src/api/system/menu-api.js
rename to smart-admin-web-typescript/src/api/system/menu-api.ts
index e786128..43c8872 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/api/system/menu-api.js
+++ b/smart-admin-web-typescript/src/api/system/menu-api.ts
@@ -7,7 +7,7 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import { getRequest, postRequest } from '/src/lib/axios';
+import { getRequest, postRequest } from '/@/lib/axios';
 
 export const menuApi = {
   /**
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/system/position/position-api.js b/smart-admin-web-typescript/src/api/system/position-api.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/system/position/position-api.js
rename to smart-admin-web-typescript/src/api/system/position-api.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/system/role/role-api.js b/smart-admin-web-typescript/src/api/system/role-api.ts
similarity index 81%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/system/role/role-api.js
rename to smart-admin-web-typescript/src/api/system/role-api.ts
index f836dee..0b62bb6 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/system/role/role-api.js
+++ b/smart-admin-web-typescript/src/api/system/role-api.ts
@@ -12,97 +12,72 @@ import { getRequest, postRequest } from '/@/lib/axios';
 export const roleApi = {
   /**
    * @description: 获取所有角色
-   * @param {*}
-   * @return {*}
    */
   queryAll: () => {
     return getRequest('/role/getAll');
   },
   /**
    * @description:添加角色
-   * @param {*}
-   * @return {*}
    */
   addRole: (data) => {
     return postRequest('/role/add', data);
   },
   /**
    * @description:更新角色
-   * @param {*}
-   * @return {*}
    */
   updateRole: (data) => {
     return postRequest('/role/update', data);
   },
   /**
    * @description: 删除角色
-   * @param {number} roleId
-   * @return {*}
    */
   deleteRole: (roleId) => {
     return getRequest(`/role/delete/${roleId}`);
   },
   /**
    * @description: 批量设置某角色数据范围
-   * @param {DataScopeBatchSetRoleDto} data
-   * @return {*}
    */
   updateDataScope: (data) => {
     return postRequest('/role/dataScope/updateRoleDataScopeList', data);
   },
   /**
    * @description: 获取当前系统所配置的所有数据范围
-   * @param {*}
-   * @return {*}
    */
   getDataScopeList: () => {
     return getRequest('/dataScope/list');
   },
   /**
    * @description: 获取某角色所设置的数据范围
-   * @param {number} roleId
-   * @return {*}
    */
   getDataScopeByRoleId: (roleId) => {
     return getRequest(`/role/dataScope/getRoleDataScopeList/${roleId}`);
   },
   /**
    * @description: 获取角色成员-员工列表
-   * @param {*}
-   * @return {*}
    */
   queryRoleEmployee: (params) => {
     return postRequest('/role/employee/queryEmployee', params);
   },
   /**
    * @description: 从角色成员列表中移除员工
-   * @param {number} employeeId
-   * @param {number} roleId
-   * @return {*}
    */
   deleteEmployeeRole: (employeeId, roleId) => {
     return getRequest('/role/employee/removeEmployee?employeeId=' + employeeId + '&roleId=' + roleId);
   },
   /**
    * @description: 从角色成员列表中批量移除员工
-   * @param {RoleEmployeeBatchDto} data
-   * @return {*}
    */
   batchRemoveRoleEmployee: (data) => {
     return postRequest('/role/employee/batchRemoveRoleEmployee', data);
   },
   /**
    * @description: 根据角色id获取角色员工列表(无分页)
-   * @param {*}
-   * @return {*}
    */
   getRoleAllEmployee: (roleId) => {
     return getRequest(`/role/employee/getAllEmployeeByRoleId/${roleId}`);
   },
   /**
    * @description: 角色成员列表中批量添加员工
-   * @param  data
-   * @return {*}
    */
   batchAddRoleEmployee: (data) => {
     return postRequest('/role/employee/batchAddRoleEmployee', data);
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/system/role-menu/role-menu-api.js b/smart-admin-web-typescript/src/api/system/role-menu-api.ts
similarity index 90%
rename from smart-admin-web/typescript-ant-design-vue3/src/api/system/role-menu/role-menu-api.js
rename to smart-admin-web-typescript/src/api/system/role-menu-api.ts
index 9d0cc21..37096a9 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/system/role-menu/role-menu-api.js
+++ b/smart-admin-web-typescript/src/api/system/role-menu-api.ts
@@ -11,16 +11,12 @@ import { getRequest, postRequest } from '/@/lib/axios';
 export const roleMenuApi = {
   /**
    * @description: 获取角色关联菜单权限
-   * @param {*}
-   * @return {*}
    */
   getRoleSelectedMenu: (roleId) => {
     return getRequest(`role/menu/getRoleSelectedMenu/${roleId}`);
   },
   /**
    * @description: 更新角色权限
-   * @param {*}
-   * @return {*}
    */
   updateRoleMenu: (data) => {
     return postRequest('role/menu/updateRoleMenu', data);
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/1024lab/1024lab-gzh.jpg b/smart-admin-web-typescript/src/assets/images/1024lab/1024lab-gzh.jpg
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/1024lab/1024lab-gzh.jpg
rename to smart-admin-web-typescript/src/assets/images/1024lab/1024lab-gzh.jpg
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/1024lab/gzh.jpg b/smart-admin-web-typescript/src/assets/images/1024lab/gzh.jpg
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/1024lab/gzh.jpg
rename to smart-admin-web-typescript/src/assets/images/1024lab/gzh.jpg
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/1024lab/xiaozhen-gzh.jpg b/smart-admin-web-typescript/src/assets/images/1024lab/xiaozhen-gzh.jpg
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/1024lab/xiaozhen-gzh.jpg
rename to smart-admin-web-typescript/src/assets/images/1024lab/xiaozhen-gzh.jpg
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/1024lab/zhuoda-wechat.jpg b/smart-admin-web-typescript/src/assets/images/1024lab/zhuoda-wechat.jpg
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/1024lab/zhuoda-wechat.jpg
rename to smart-admin-web-typescript/src/assets/images/1024lab/zhuoda-wechat.jpg
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/ali-icon.png b/smart-admin-web-typescript/src/assets/images/login/ali-icon.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/ali-icon.png
rename to smart-admin-web-typescript/src/assets/images/login/ali-icon.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/blue-login-bg.png b/smart-admin-web-typescript/src/assets/images/login/blue-login-bg.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/blue-login-bg.png
rename to smart-admin-web-typescript/src/assets/images/login/blue-login-bg.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/douyin-icon.png b/smart-admin-web-typescript/src/assets/images/login/douyin-icon.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/douyin-icon.png
rename to smart-admin-web-typescript/src/assets/images/login/douyin-icon.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/feishu-icon.png b/smart-admin-web-typescript/src/assets/images/login/feishu-icon.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/feishu-icon.png
rename to smart-admin-web-typescript/src/assets/images/login/feishu-icon.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/google-icon.png b/smart-admin-web-typescript/src/assets/images/login/google-icon.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/google-icon.png
rename to smart-admin-web-typescript/src/assets/images/login/google-icon.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/left-bg1.png b/smart-admin-web-typescript/src/assets/images/login/left-bg1.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/left-bg1.png
rename to smart-admin-web-typescript/src/assets/images/login/left-bg1.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/left-bg2.png b/smart-admin-web-typescript/src/assets/images/login/left-bg2.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/left-bg2.png
rename to smart-admin-web-typescript/src/assets/images/login/left-bg2.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-bg.png b/smart-admin-web-typescript/src/assets/images/login/login-bg.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-bg.png
rename to smart-admin-web-typescript/src/assets/images/login/login-bg.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-bg2.png b/smart-admin-web-typescript/src/assets/images/login/login-bg2.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-bg2.png
rename to smart-admin-web-typescript/src/assets/images/login/login-bg2.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-bg3.png b/smart-admin-web-typescript/src/assets/images/login/login-bg3.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-bg3.png
rename to smart-admin-web-typescript/src/assets/images/login/login-bg3.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-bg4 .png b/smart-admin-web-typescript/src/assets/images/login/login-bg4 .png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-bg4 .png
rename to smart-admin-web-typescript/src/assets/images/login/login-bg4 .png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-form-open-eyes-close.png b/smart-admin-web-typescript/src/assets/images/login/login-form-open-eyes-close.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-form-open-eyes-close.png
rename to smart-admin-web-typescript/src/assets/images/login/login-form-open-eyes-close.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-form-open-eyes.png b/smart-admin-web-typescript/src/assets/images/login/login-form-open-eyes.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-form-open-eyes.png
rename to smart-admin-web-typescript/src/assets/images/login/login-form-open-eyes.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-qr.png b/smart-admin-web-typescript/src/assets/images/login/login-qr.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/login-qr.png
rename to smart-admin-web-typescript/src/assets/images/login/login-qr.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/qq-icon.png b/smart-admin-web-typescript/src/assets/images/login/qq-icon.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/qq-icon.png
rename to smart-admin-web-typescript/src/assets/images/login/qq-icon.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/wechat-icon.png b/smart-admin-web-typescript/src/assets/images/login/wechat-icon.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/wechat-icon.png
rename to smart-admin-web-typescript/src/assets/images/login/wechat-icon.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/weibo-icon.png b/smart-admin-web-typescript/src/assets/images/login/weibo-icon.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/login/weibo-icon.png
rename to smart-admin-web-typescript/src/assets/images/login/weibo-icon.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/logo/logo-min.png b/smart-admin-web-typescript/src/assets/images/logo/logo-min.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/logo/logo-min.png
rename to smart-admin-web-typescript/src/assets/images/logo/logo-min.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/logo/logo.png b/smart-admin-web-typescript/src/assets/images/logo/logo.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/logo/logo.png
rename to smart-admin-web-typescript/src/assets/images/logo/logo.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/logo/smart-admin-logo-white.png b/smart-admin-web-typescript/src/assets/images/logo/smart-admin-logo-white.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/logo/smart-admin-logo-white.png
rename to smart-admin-web-typescript/src/assets/images/logo/smart-admin-logo-white.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/logo/smart-admin-logo.png b/smart-admin-web-typescript/src/assets/images/logo/smart-admin-logo.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/logo/smart-admin-logo.png
rename to smart-admin-web-typescript/src/assets/images/logo/smart-admin-logo.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/notice/edit_icon.png b/smart-admin-web-typescript/src/assets/images/notice/edit_icon.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/notice/edit_icon.png
rename to smart-admin-web-typescript/src/assets/images/notice/edit_icon.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/assets/images/notice/file_icon.png b/smart-admin-web-typescript/src/assets/images/notice/file_icon.png
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/assets/images/notice/file_icon.png
rename to smart-admin-web-typescript/src/assets/images/notice/file_icon.png
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/business/category-tree-select/index.vue b/smart-admin-web-typescript/src/components/business/category-tree-select/index.vue
similarity index 87%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/business/category-tree-select/index.vue
rename to smart-admin-web-typescript/src/components/business/category-tree-select/index.vue
index 618c79e..21fe818 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/business/category-tree-select/index.vue
+++ b/smart-admin-web-typescript/src/components/business/category-tree-select/index.vue
@@ -1,20 +1,21 @@
 <!--
   *  目录 树形选择组件
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-12 21:01:52 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-12 21:01:52
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
   <a-tree-select
     v-model:value="selectValue"
     :style="`width:${width}`"
-    :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+    :dropdown-style="{ maxHeight: '400px', overflowX: 'auto' }"
     :tree-data="categoryTreeData"
     :placeholder="placeholder"
+    :allowClear="true"
     tree-default-expand-all
     @change="onChange"
   />
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/business/oa/enterprise-bank-select/index.vue b/smart-admin-web-typescript/src/components/business/oa/enterprise-bank-select/index.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/business/oa/enterprise-bank-select/index.vue
rename to smart-admin-web-typescript/src/components/business/oa/enterprise-bank-select/index.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/business/oa/enterprise-invoice-select/index.vue b/smart-admin-web-typescript/src/components/business/oa/enterprise-invoice-select/index.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/business/oa/enterprise-invoice-select/index.vue
rename to smart-admin-web-typescript/src/components/business/oa/enterprise-invoice-select/index.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/business/oa/enterprise-select/index.vue b/smart-admin-web-typescript/src/components/business/oa/enterprise-select/index.vue
similarity index 85%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/business/oa/enterprise-select/index.vue
rename to smart-admin-web-typescript/src/components/business/oa/enterprise-select/index.vue
index 617c4e6..67303c4 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/business/oa/enterprise-select/index.vue
+++ b/smart-admin-web-typescript/src/components/business/oa/enterprise-select/index.vue
@@ -1,11 +1,11 @@
 <!--
-  * 企业列表 下拉选择框
-  *
-  * @Author:    1024创新实验室-主任：卓大
-  * @Date:      2022-08-26 19:16:24
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+  * 企业列表 下拉选择框 
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-08-26 19:16:24 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
   *
 -->
 <template>
@@ -29,7 +29,7 @@
 
 <script setup lang="ts">
   import { onMounted, ref, watch } from 'vue';
-  import { enterpriseApi } from '/src/api/business/oa/enterprise-api';
+  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
 
   const props = defineProps({
     value: [Number, String, Object],
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/area-cascader/index.vue b/smart-admin-web-typescript/src/components/framework/area-cascader/index.vue
similarity index 59%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/area-cascader/index.vue
rename to smart-admin-web-typescript/src/components/framework/area-cascader/index.vue
index 1327fde..9383c46 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/area-cascader/index.vue
+++ b/smart-admin-web-typescript/src/components/framework/area-cascader/index.vue
@@ -22,14 +22,13 @@
 </template>
 
 <script setup lang="ts">
-  import { PROVINCE_CITY_DISTRICT } from "./province-city-district";
-  import { PROVINCE_CITY } from "./province-city";
-  import { ref, toRaw, watch } from "vue";
+  import { PROVINCE_CITY_DISTRICT } from './province-city-district';
+  import { PROVINCE_CITY } from './province-city';
+  import { ref, toRaw, watch } from 'vue';
 
   // ============ 组件属性 ============
 
-  const TYPE_PROVINCE_CITY_DISTRICT = "province_city_district";
-  const TYPE_PROVINCE_CITY = "province_city";
+  const TYPE_PROVINCE_CITY_DISTRICT = 'province_city_district';
 
   const props = defineProps({
     type: String,
@@ -55,22 +54,21 @@
   const emit = defineEmits(['update:value', 'change']);
 
   // ============ 组件业务 ============
-  const areaOptionData =
-    props.type === TYPE_PROVINCE_CITY_DISTRICT ? PROVINCE_CITY_DISTRICT : PROVINCE_CITY;
+  const areaOptionData = props.type === TYPE_PROVINCE_CITY_DISTRICT ? PROVINCE_CITY_DISTRICT : PROVINCE_CITY;
 
   // 绑定地区数据
   const areaValue = ref([]);
   // 监听value变化
   watch(
-      () => props.value,
-      (newValue) => {
-        if (newValue) {
-          let array = [];
-          for (let index = 0; index < 3; index++) {
-            if (newValue[index]) {
-              array.push(newValue[index].value);
-            }
+    () => props.value,
+    (newValue) => {
+      if (newValue) {
+        let array = [];
+        for (let index = 0; index < 3; index++) {
+          if (newValue[index]) {
+            array.push(newValue[index].value);
           }
+        }
         areaValue.value = array;
       } else {
         areaValue.value = [];
@@ -78,14 +76,12 @@
     }
   );
 
-  function handleChange(value, selectedOptions){
-    emit("update:value", toRaw(selectedOptions));
-    emit("change", value, toRaw(selectedOptions));
+  function handleChange(value, selectedOptions) {
+    emit('update:value', toRaw(selectedOptions));
+    emit('change', value, toRaw(selectedOptions));
   }
 
   const filter = (inputValue, path) => {
-    return path.some(
-      (option) => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1
-    );
+    return path.some((option) => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
   };
 </script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/area-cascader/province-city-district.ts b/smart-admin-web-typescript/src/components/framework/area-cascader/province-city-district.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/area-cascader/province-city-district.ts
rename to smart-admin-web-typescript/src/components/framework/area-cascader/province-city-district.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/area-cascader/province-city.ts b/smart-admin-web-typescript/src/components/framework/area-cascader/province-city.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/area-cascader/province-city.ts
rename to smart-admin-web-typescript/src/components/framework/area-cascader/province-city.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/boolean-select/index.vue b/smart-admin-web-typescript/src/components/framework/boolean-select/index.vue
similarity index 87%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/boolean-select/index.vue
rename to smart-admin-web-typescript/src/components/framework/boolean-select/index.vue
index f72b42c..24b8951 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/boolean-select/index.vue
+++ b/smart-admin-web-typescript/src/components/framework/boolean-select/index.vue
@@ -1,11 +1,11 @@
 <!--
   *  布尔 树形选择组件
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-12 21:01:52 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-12 21:01:52
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -17,7 +17,6 @@
     :allowClear="true"
     :size="size"
     @change="handleChange"
-    @deselect="handleChange"
   >
     <a-select-option v-for="item in $smartEnumPlugin.getValueDescList('FLAG_NUMBER_ENUM')" :key="item.value" :value="item.value">
       {{ item.desc }}
@@ -73,7 +72,7 @@
     console.log('boolean enum select', value);
     let booleanResult = null;
     if (!_.isUndefined(value)) {
-      booleanResult = value === 1 ? true : false;
+      booleanResult = value === 1;
     }
     emit('update:value', booleanResult);
     emit('change', booleanResult);
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/icon-select/index.vue b/smart-admin-web-typescript/src/components/framework/icon-select/index.vue
similarity index 92%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/icon-select/index.vue
rename to smart-admin-web-typescript/src/components/framework/icon-select/index.vue
index 5cc7824..8cda026 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/icon-select/index.vue
+++ b/smart-admin-web-typescript/src/components/framework/icon-select/index.vue
@@ -1,26 +1,26 @@
 <!--
-  * 图标 选择 
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-01 23:14:49 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * 图标 选择
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-01 23:14:49
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <div>
     <a-popover v-model:open="visible" placement="bottomLeft" trigger="click">
       <template #title>
-        <a-form-item-rest>
+        <a-form-item>
           <a-radio-group @change="updateSelectIconArray" v-model:value="iconStyle" style="margin: 8px">
             <a-radio-button value="outlined">线框风格</a-radio-button>
             <a-radio-button value="filled">实底风格</a-radio-button>
             <a-radio-button value="twoTone">双色风格</a-radio-button>
           </a-radio-group>
-        </a-form-item-rest>
-        <a-form-item-rest>
+        </a-form-item>
+        <a-form-item>
           <a-input-search v-model:value="searchValue" placeholder="输入英文关键词进行搜索" @change="updateSelectIconArray" />
-        </a-form-item-rest>
+        </a-form-item>
       </template>
 
       <template #content>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/iframe/iframe-index.vue b/smart-admin-web-typescript/src/components/framework/iframe/iframe-index.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/iframe/iframe-index.vue
rename to smart-admin-web-typescript/src/components/framework/iframe/iframe-index.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/iframe/route-default-component.vue b/smart-admin-web-typescript/src/components/framework/iframe/route-default-component.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/iframe/route-default-component.vue
rename to smart-admin-web-typescript/src/components/framework/iframe/route-default-component.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/smart-enum-checkbox/index.vue b/smart-admin-web-typescript/src/components/framework/smart-enum-checkbox/index.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/smart-enum-checkbox/index.vue
rename to smart-admin-web-typescript/src/components/framework/smart-enum-checkbox/index.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/smart-enum-radio/index.vue b/smart-admin-web-typescript/src/components/framework/smart-enum-radio/index.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/smart-enum-radio/index.vue
rename to smart-admin-web-typescript/src/components/framework/smart-enum-radio/index.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/smart-enum-select/index.vue b/smart-admin-web-typescript/src/components/framework/smart-enum-select/index.vue
similarity index 86%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/smart-enum-select/index.vue
rename to smart-admin-web-typescript/src/components/framework/smart-enum-select/index.vue
index f15a65d..06792c2 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/smart-enum-select/index.vue
+++ b/smart-admin-web-typescript/src/components/framework/smart-enum-select/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 枚举 下拉框
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-08 20:32:30 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-08 20:32:30
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -17,7 +17,6 @@
     :allowClear="true"
     :size="size"
     @change="handleChange"
-    @deselect="handleChange"
     :disabled="disabled"
   >
     <a-select-option v-for="item in $smartEnumPlugin.getValueDescList(props.enumName)" :key="item.value" :value="item.value">
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/smart-loading/index.ts b/smart-admin-web-typescript/src/components/framework/smart-loading/index.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/smart-loading/index.ts
rename to smart-admin-web-typescript/src/components/framework/smart-loading/index.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/wangeditor/index.vue b/smart-admin-web-typescript/src/components/framework/wangeditor/index.vue
similarity index 90%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/framework/wangeditor/index.vue
rename to smart-admin-web-typescript/src/components/framework/wangeditor/index.vue
index 9158bed..c27e68d 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/framework/wangeditor/index.vue
+++ b/smart-admin-web-typescript/src/components/framework/wangeditor/index.vue
@@ -1,11 +1,11 @@
-<!-- 
+<!--
   * 编辑器
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 15:34:33 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 15:34:33
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -24,7 +24,7 @@
 <script setup lang="ts">
   import { shallowRef, onBeforeUnmount, watch, ref } from 'vue';
   import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
-  import { fileApi } from '/@/api/support/file/file-api';
+  import { fileApi } from '/@/api/support/file-api';
   import '@wangeditor/editor/dist/css/style.css';
   import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
   import { smartSentry } from '/@/lib/smart-sentry';
@@ -61,7 +61,6 @@
   watch(
     () => props.modelValue,
     (nVal) => {
-      console.log(nVal);
       editorHtml.value = nVal;
     },
     {
diff --git a/smart-admin-web-typescript/src/components/support/data-tracer/data-tracer-table.vue b/smart-admin-web-typescript/src/components/support/data-tracer/data-tracer-table.vue
new file mode 100644
index 0000000..528d138
--- /dev/null
+++ b/smart-admin-web-typescript/src/components/support/data-tracer/data-tracer-table.vue
@@ -0,0 +1,97 @@
+<!--
+  * 数据变更记录，以table形式显示
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-08-12 21:01:52 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <a-table size="small" :dataSource="tableData" :columns="columns" rowKey="dataTracerId" :pagination="false" bordered>
+    <template #bodyCell="{ record, index, column }">
+      <template v-if="column.dataIndex === 'dataTracerId'">
+        <div>{{ index + 1 }}</div>
+      </template>
+      <template v-if="column.dataIndex === 'userName'">
+        <div>{{ record.userName }} ({{ $smartEnumPlugin.getDescByValue('USER_TYPE_ENUM', record.userType) }})</div>
+      </template>
+      <template v-if="column.dataIndex === 'userAgent'">
+        <div>{{ record.browser }} / {{ record.os }} / {{ record.device }}</div>
+      </template>
+      <template v-if="column.dataIndex === 'content'">
+        <div class="operate-content" v-html="record.content"></div>
+      </template>
+      <template v-else-if="column.dataIndex === 'action'">
+        <a-button v-if="record.diffOld || record.diffNew" @click="showDetail(record)" type="link">详情 </a-button>
+      </template>
+    </template>
+  </a-table>
+</template>
+<script setup lang="ts">
+  import { reactive } from 'vue';
+
+  const props = defineProps({
+    tableData: {
+      type: Array,
+    },
+  });
+
+  const emit = defineEmits(['showDetail']);
+  function showDetail(record) {
+    emit('showDetail', record);
+  }
+
+  const columns = reactive([
+    {
+      title: '序号',
+      dataIndex: 'dataTracerId',
+      width: 50,
+    },
+    {
+      title: '操作时间',
+      dataIndex: 'createTime',
+      width: 150,
+    },
+    {
+      title: '操作人',
+      dataIndex: 'userName',
+      width: 100,
+      ellipsis: true,
+    },
+    {
+      title: 'IP',
+      dataIndex: 'ip',
+      ellipsis: true,
+      width: 100,
+    },
+    {
+      title: 'IP地区',
+      dataIndex: 'ipRegion',
+      ellipsis: true,
+      width: 100,
+    },
+    {
+      title: '客户端',
+      dataIndex: 'userAgent',
+      ellipsis: true,
+      width: 150,
+    },
+    {
+      title: '操作内容',
+      dataIndex: 'content',
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      fixed: 'right',
+      width: 80,
+    },
+  ]);
+</script>
+<style scoped lang="less">
+  .operate-content {
+    font-size: 14px;
+    display: inline;
+  }
+</style>
diff --git a/smart-admin-web-typescript/src/components/support/data-tracer/data-tracer-timeline.vue b/smart-admin-web-typescript/src/components/support/data-tracer/data-tracer-timeline.vue
new file mode 100644
index 0000000..369c776
--- /dev/null
+++ b/smart-admin-web-typescript/src/components/support/data-tracer/data-tracer-timeline.vue
@@ -0,0 +1,50 @@
+<!--
+  * 数据变更记录，以 timeline 形式显示
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-08-12 21:01:52 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <a-timeline>
+    <a-timeline-item v-for="record in tableData" :key="record.dataTracerId">
+      <div class="trace-div">
+        <div>
+          <!-- <div class="operate-content" >{{ record.content }}</div> -->
+          <div class="operate-content" v-html="record.content"></div>
+          <a href="javascript:void(0)" v-if="record.diffOld || record.diffNew" @click="showDetail(record)">（查看修改）</a>
+        </div>
+        <div class="ip-font">
+          {{ record.createTime }} | {{ record.userName }} | {{ record.ipRegion }} | {{ record.ip }} | {{ record.browser }} | {{ record.os }}
+        </div>
+      </div>
+    </a-timeline-item>
+  </a-timeline>
+</template>
+<script setup lang="ts">
+  const props = defineProps({
+    tableData: {
+      type: Array,
+    },
+  });
+
+  const emit = defineEmits(['showDetail']);
+  function showDetail(record) {
+    emit('showDetail', record);
+  }
+</script>
+<style scoped lang="less">
+  .operate-content {
+    font-size: 14px;
+    display: inline;
+  }
+
+  .ip-font {
+    margin-top: 5px;
+    font-size: 12px;
+    color: #999;
+    display: block;
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/support/data-tracer/index.vue b/smart-admin-web-typescript/src/components/support/data-tracer/index.vue
similarity index 57%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/support/data-tracer/index.vue
rename to smart-admin-web-typescript/src/components/support/data-tracer/index.vue
index de74e4e..97f2425 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/support/data-tracer/index.vue
+++ b/smart-admin-web-typescript/src/components/support/data-tracer/index.vue
@@ -1,11 +1,11 @@
 <!--
   *  数据变动记录 表格 组件
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-12 21:01:52 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-12 21:01:52
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -35,41 +35,25 @@
   </a-form>
 
   <a-card size="small" :bordered="false">
-    <a-table size="small" :dataSource="tableData" :columns="columns" rowKey="dataTracerId" :pagination="false" bordered>
-      <template #bodyCell="{ record, index, column }">
-        <template v-if="column.dataIndex === 'dataTracerId'">
-          <div>{{ index + 1 }}</div>
-        </template>
-        <template v-if="column.dataIndex === 'userName'">
-          <div>{{record.userName}} ({{ $smartEnumPlugin.getDescByValue('USER_TYPE_ENUM', record.userType) }})</div>
-        </template>
-        <template v-if="column.dataIndex === 'userAgent'">
-          <div>{{ record.browser }} / {{ record.os }} / {{ record.device }}</div>
-        </template>
-        <template v-if="column.dataIndex === 'content'">
-          <div class="operate-content" v-html="record.content"></div>
-        </template>
-        <template v-else-if="column.dataIndex === 'action'">
-          <a-button v-if="record.diffOld || record.diffNew" @click="showDetail(record)" type="link">详情 </a-button>
-        </template>
-      </template>
-    </a-table>
+    <!---以表格形式 显示-->
+    <!-- <DataTracerTable :tableData="tableData" @showDetail="showDetail" /> -->
 
-    <div class="smart-query-table-page">
-      <a-pagination
-        showSizeChanger
-        showQuickJumper
-        show-less-items
-        :pageSizeOptions="PAGE_SIZE_OPTIONS"
-        :defaultPageSize="queryForm.pageSize"
-        v-model:current="queryForm.pageNum"
-        v-model:pageSize="queryForm.pageSize"
-        :total="total"
-        @change="onSearch"
-        @showSizeChange="onSearch"
-        :show-total="(total) => `共${total}条`"
-      />
-    </div>
+    <!---以 timeline 时间轴形式 显示-->
+    <DataTracerTimeline :tableData="tableData" @showDetail="showDetail" />
+
+    <a-pagination
+      showSizeChanger
+      showQuickJumper
+      show-less-items
+      :pageSizeOptions="PAGE_SIZE_OPTIONS"
+      :defaultPageSize="queryForm.pageSize"
+      v-model:current="queryForm.pageNum"
+      v-model:pageSize="queryForm.pageSize"
+      :total="total"
+      @change="ajaxQuery"
+      @showSizeChange="ajaxQuery"
+      :show-total="(total) => `共${total}条`"
+    />
     <a-modal v-model:open="visibleDiff" width="90%" title="数据比对" :footer="null">
       <div v-html="prettyHtml"></div>
     </a-modal>
@@ -80,10 +64,11 @@
   import * as Diff2Html from 'diff2html';
   import 'diff2html/bundles/css/diff2html.min.css';
   import uaparser from 'ua-parser-js';
-  import { nextTick,  reactive, ref, watch } from 'vue';
-  import { dataTracerApi } from '/@/api/support/data-tracer/data-tracer-api';
+  import { nextTick, reactive, ref, watch } from 'vue';
+  import { dataTracerApi } from '/@/api/support/data-tracer-api';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
+  import DataTracerTimeline from './data-tracer-timeline.vue';
 
   let props = defineProps({
     // 数据id
@@ -96,47 +81,6 @@
     },
   });
 
-  const columns = reactive([
-    {
-      title: '序号',
-      dataIndex: 'dataTracerId',
-      width: 50,
-    },
-    {
-      title: '操作时间',
-      dataIndex: 'createTime',
-      width: 150,
-    },
-    {
-      title: '操作人',
-      dataIndex: 'userName',
-      width: 100,
-      ellipsis: true,
-    },
-    {
-      title: 'IP',
-      dataIndex: 'ip',
-      ellipsis: true,
-      width: 100,
-    },
-    {
-      title: '客户端',
-      dataIndex: 'userAgent',
-      ellipsis: true,
-      width: 150,
-    },
-    {
-      title: '操作内容',
-      dataIndex: 'content',
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      fixed: 'right',
-      width: 80,
-    },
-  ]);
-
   // --------------- 查询表单、查询方法 ---------------
 
   const queryFormState = {
@@ -155,7 +99,12 @@
     onSearch();
   }
 
-  async function onSearch() {
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
+  async function ajaxQuery() {
     try {
       tableLoading.value = true;
       let responseModel = await dataTracerApi.queryList(Object.assign({}, queryForm, { dataId: props.dataId, type: props.type }));
@@ -163,6 +112,7 @@
         if (!e.userAgent) {
           continue;
         }
+        // e.content = e.content.replaceAll('<br/>','；');
         let ua = uaparser(e.userAgent);
         e.browser = ua.browser.name;
         e.os = ua.os.name;
@@ -190,17 +140,14 @@
     { immediate: true }
   );
 
-
   // --------------- diff 特效 ---------------
   // diff
   const visibleDiff = ref(false);
   let prettyHtml = ref('');
   function showDetail(record) {
     visibleDiff.value = true;
-    let diffOld = record.diffOld.replaceAll('<br/>','\r\n');
-    let diffNew = record.diffNew.replaceAll('<br/>','\r\n');
-    console.log(diffOld)
-    console.log(diffNew)
+    let diffOld = record.diffOld.replaceAll('<br/>', '\r\n');
+    let diffNew = record.diffNew.replaceAll('<br/>', '\r\n');
     const args = ['', diffOld, diffNew, '变更前', '变更后'];
 
     let diffPatch = Diff.createPatch(...args);
@@ -218,12 +165,12 @@
         let left = diffDiv[0],
           right = diffDiv[1];
         left.addEventListener('scroll', function (e) {
-          if (left.scrollLeft != right.scrollLeft) {
+          if (left.scrollLeft !== right.scrollLeft) {
             right.scrollLeft = left.scrollLeft;
           }
         });
         right.addEventListener('scroll', function (e) {
-          if (left.scrollLeft != right.scrollLeft) {
+          if (left.scrollLeft !== right.scrollLeft) {
             left.scrollLeft = right.scrollLeft;
           }
         });
@@ -231,9 +178,3 @@
     });
   }
 </script>
-<style scoped lang="less">
-  .operate-content {
-    line-height: 20px;
-    margin: 5px 0px;
-  }
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/support/dict-key-select/index.vue b/smart-admin-web-typescript/src/components/support/dict-key-select/index.vue
similarity index 85%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/support/dict-key-select/index.vue
rename to smart-admin-web-typescript/src/components/support/dict-key-select/index.vue
index 15c5814..1c6ad2e 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/support/dict-key-select/index.vue
+++ b/smart-admin-web-typescript/src/components/support/dict-key-select/index.vue
@@ -1,11 +1,11 @@
 <!---
   * 字典key 下拉选择框
-  * 
+  *
   * @Author:    1024创新实验室：罗伊
-  * @Date:      2022-09-12 22:06:45 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Date:      2022-09-12 22:06:45
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -27,8 +27,12 @@
 </template>
 
 <script setup lang="ts">
-  import { computed, onMounted, ref, watch } from 'vue';
-  import { dictApi } from '/@/api/support/dict/dict-api';
+  import { computed, onMounted, ref, watch, defineExpose } from 'vue';
+  import { dictApi } from '/@/api/support/dict-api';
+
+  defineExpose({
+    queryDict,
+  });
 
   const props = defineProps({
     value: [Array, String],
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/support/dict-select/index.vue b/smart-admin-web-typescript/src/components/support/dict-select/index.vue
similarity index 61%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/support/dict-select/index.vue
rename to smart-admin-web-typescript/src/components/support/dict-select/index.vue
index 332b3ad..d611b19 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/support/dict-select/index.vue
+++ b/smart-admin-web-typescript/src/components/support/dict-select/index.vue
@@ -1,11 +1,11 @@
 <!---
   * 字段 下拉选择框
-  * 
+  *
   * @Author:    1024创新实验室：罗伊
-  * @Date:      2022-09-12 22:06:45 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Date:      2022-09-12 22:06:45
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -29,7 +29,7 @@
 
 <script setup lang="ts">
   import { computed, onMounted, ref, watch } from 'vue';
-  import { dictApi } from '/@/api/support/dict/dict-api';
+  import { dictApi } from '/@/api/support/dict-api';
 
   const props = defineProps({
     keyCode: String,
@@ -64,24 +64,6 @@
     dictValueList.value = res.data;
   }
 
-  const values = computed(() => {
-    if (!props.value) {
-      return [];
-    }
-    if (!Array.isArray(props.value)) {
-      console.error('valueList is not array!!!');
-      return [];
-    }
-    let res = [];
-    if (props.value && props.value.length > 0) {
-      props.value.forEach((element) => {
-        res.push(element.valueCode);
-      });
-      return res;
-    }
-    return res;
-  });
-
   onMounted(queryDict);
 
   // -------------------------- 选中 相关、事件 --------------------------
@@ -96,21 +78,16 @@
 
   const emit = defineEmits(['update:value', 'change']);
   function onChange(value) {
-    let selected = [];
     if (!value) {
-      emit('update:value', selected);
-      emit('change', selected);
-      return selected;
+      emit('update:value', []);
+      emit('change', []);
     }
-    if (Array.isArray(props.value)) {
-      let valueList = dictValueList.value.filter((e) => value.includes(e.valueCode));
-      valueList = valueList.map((e) => e.valueCode);
-      emit('update:value', valueList);
-      emit('change', valueList);
+    if (Array.isArray(value)) {
+      emit('update:value', value);
+      emit('change', value);
     } else {
-      let findValue = dictValueList.value.find((e) => e.valueCode == value);
-      emit('update:value', findValue.valueCode);
-      emit('change', findValue.valueCode);
+      emit('update:value', [value]);
+      emit('change', [value]);
     }
   }
 </script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/support/file-preview-modal/index.vue b/smart-admin-web-typescript/src/components/support/file-preview-modal/index.vue
similarity index 91%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/support/file-preview-modal/index.vue
rename to smart-admin-web-typescript/src/components/support/file-preview-modal/index.vue
index 2171813..f429bfe 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/support/file-preview-modal/index.vue
+++ b/smart-admin-web-typescript/src/components/support/file-preview-modal/index.vue
@@ -24,13 +24,13 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
-  import { fileApi } from '/@/api/support/file/file-api';
+  import { fileApi } from '/@/api/support/file-api';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { SmartLoading } from '/@/components/framework/smart-loading';
 
   const imgFileType = ['jpg', 'jpeg', 'png', 'gif'];
   const previewUrl = ref();
-  
+
   function showPreview(fileItem) {
     if (!fileItem.fileUrl) {
       (async () => {
@@ -49,12 +49,12 @@
       showFile(fileItem);
     }
   }
-  
+
   const visible = ref(false);
   const setVisible = (value) => {
     visible.value = value;
   };
-  
+
   function showFile(fileItem) {
     if (isImg(fileItem.fileType)) {
       previewUrl.value = fileItem.fileUrl;
@@ -63,21 +63,21 @@
     }
     fileApi.downLoadFile(fileItem.fileKey);
   }
-  
+
   // 判断图片类型
   function isImg(fileType) {
     return imgFileType.includes(fileType);
   }
-  
+
   defineExpose({
     showPreview,
   });
 </script>
 
 <style lang="less" scoped>
-.container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
+  .container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/support/file-preview/index.vue b/smart-admin-web-typescript/src/components/support/file-preview/index.vue
similarity index 87%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/support/file-preview/index.vue
rename to smart-admin-web-typescript/src/components/support/file-preview/index.vue
index 7b5e500..3cf9198 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/support/file-preview/index.vue
+++ b/smart-admin-web-typescript/src/components/support/file-preview/index.vue
@@ -9,11 +9,11 @@
   *
 -->
 <template>
-  <div >
-    <template v-if="type == 'text'">
+  <div>
+    <template v-if="type === 'text'">
       <a v-for="(item, index) in fileList" :key="index" @click="preview(item, index)">
         {{ item.fileName }}
-        <span v-if="index != fileList.length - 1" v-html="separator"></span>
+        <span v-if="index !== fileList.length - 1" v-html="separator"></span>
       </a>
     </template>
     <a-space>
@@ -32,7 +32,7 @@
 </template>
 <script setup lang="ts">
   import { ref } from 'vue';
-  import { download } from '/@/lib/axios';
+  import { fileApi } from '/@/api/support/file-api';
 
   let props = defineProps({
     fileList: {
@@ -46,7 +46,7 @@
       type: String,
       default: 'text',
     },
-    // image宽度
+    // image 宽度
     width: {
       type: Number,
       default: 100,
@@ -65,7 +65,7 @@
       previewCurrent.value = index;
       visible.value = true;
     } else {
-      download(file.fileName, file.fileUrl);
+      fileApi.downLoadFile(file.fileKey);
     }
   }
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/support/file-upload/index.vue b/smart-admin-web-typescript/src/components/support/file-upload/index.vue
similarity index 74%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/support/file-upload/index.vue
rename to smart-admin-web-typescript/src/components/support/file-upload/index.vue
index 6daa0f9..abe047b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/support/file-upload/index.vue
+++ b/smart-admin-web-typescript/src/components/support/file-upload/index.vue
@@ -1,16 +1,17 @@
 <!--
   * 文件上传
-  * 
+  *
   * @Author:    1024创新实验室：善逸
-  * @Date:      2022-08-12 20:19:39 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Date:      2022-08-12 20:19:39
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
   <div class="clearfix">
     <a-upload
+      multiple
       :accept="props.accept"
       :before-upload="beforeUpload"
       :customRequest="customRequest"
@@ -22,13 +23,13 @@
       @remove="handleRemove"
     >
       <div v-if="fileList.length < props.maxUploadSize">
-        <template v-if="listType == 'picture-card'">
+        <template v-if="listType === 'picture-card'">
           <PlusOutlined />
           <div class="ant-upload-text">
             {{ buttonText }}
           </div>
         </template>
-        <template v-if="listType == 'text'">
+        <template v-if="listType === 'text'">
           <a-button>
             <upload-outlined />
             {{ buttonText }}
@@ -43,12 +44,11 @@
 </template>
 <script setup lang="ts">
   import { computed, ref, watch } from 'vue';
-  import { message } from 'ant-design-vue';
-  import { fileApi } from '/@/api/support/file/file-api';
+  import { Modal } from 'ant-design-vue';
+  import { fileApi } from '/@/api/support/file-api';
   import { useUserStore } from '/@/store/modules/system/user';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
-  import { download } from '/@/lib/axios';
   import { smartSentry } from '/@/lib/smart-sentry';
   const props = defineProps({
     value: String,
@@ -149,9 +149,9 @@
   function handleChange(info) {
     let fileStatus = info.file.status;
     let file = info.file;
-    if (fileStatus == 'removed') {
-      let index = fileList.value.findIndex((e) => e.fileId == file.fileId);
-      if (index != -1) {
+    if (fileStatus === 'removed') {
+      let index = fileList.value.findIndex((e) => e.fileId === file.fileId);
+      if (index !== -1) {
         fileList.value.splice(index, 1);
         emit('change', fileList.value);
       }
@@ -162,14 +162,44 @@
     console.log(fileList.value);
   }
 
-  function beforeUpload(file) {
+  function beforeUpload(file, files) {
+    if (fileList.value.length + files.length > props.maxUploadSize) {
+      showErrorMsgOnce(`最多支持上传 ${props.maxUploadSize} 个文件哦！`);
+      return false;
+    }
+
+    if (props.accept) {
+      const suffixIndex = file.name.lastIndexOf('.');
+      const fileSuffix = file.name.substring(suffixIndex <= -1 ? 0 : suffixIndex);
+      if (props.accept.indexOf(fileSuffix) === -1) {
+        showErrorMsgOnce(`只支持上传 ${props.accept.replaceAll(',', ' ')} 格式的文件`);
+        return false;
+      }
+    }
+
     const isLimitSize = file.size / 1024 / 1024 < props.maxSize;
     if (!isLimitSize) {
-      return message.error(`上传的文件必须小于${props.maxSize}Mb`);
+      showErrorMsgOnce(`单个文件大小必须小于 ${props.maxSize} Mb`);
     }
     return isLimitSize;
   }
 
+  const showErrorModalFlag = ref(true);
+  const showErrorMsgOnce = (content) => {
+    if (showErrorModalFlag.value) {
+      Modal.error({
+        title: '提示',
+        content: content,
+        okType: 'danger',
+        centered: true,
+        onOk() {
+          showErrorModalFlag.value = true;
+        },
+      });
+      showErrorModalFlag.value = false;
+    }
+  };
+
   function handleCancel() {
     previewVisible.value = false;
   }
@@ -179,7 +209,7 @@
       previewUrl.value = file.url || file.preview;
       previewVisible.value = true;
     } else {
-      download(file.fileName, file.fileUrl);
+      fileApi.downLoadFile(file.fileKey);
     }
   };
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/support/table-operator/index.vue b/smart-admin-web-typescript/src/components/support/table-operator/index.vue
similarity index 63%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/support/table-operator/index.vue
rename to smart-admin-web-typescript/src/components/support/table-operator/index.vue
index 86c1c0d..fbad25b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/support/table-operator/index.vue
+++ b/smart-admin-web-typescript/src/components/support/table-operator/index.vue
@@ -1,23 +1,23 @@
 <!--
   *  表格列设置
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-26 23:45:51 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-26 23:45:51
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 
 <template>
   <span>
     <a-tooltip title="全屏" v-if="!fullScreenFlag">
-      <a-button type="text" @click="fullScreen" size="small">
+      <a-button type="text" @click="onFullScreen" size="small">
         <template #icon><fullscreen-outlined /></template>
       </a-button>
     </a-tooltip>
     <a-tooltip title="取消全屏" v-if="fullScreenFlag">
-      <a-button type="text" @click="fullScreen" size="small">
+      <a-button type="text" @click="onFullScreen" size="small">
         <template #icon><fullscreen-exit-outlined /></template>
       </a-button>
     </a-tooltip>
@@ -37,17 +37,19 @@
 
 <script setup lang="ts">
   import _ from 'lodash';
-  import { tableColumnApi } from '/@/api/support/table/table-column-api';
+  import { tableColumnApi } from '/@/api/support/table-column-api';
   import { onMounted, reactive, ref, watch } from 'vue';
   import SmartTableColumnModal from './smart-table-column-modal.vue';
   import { message } from 'ant-design-vue';
   import { mergeColumn } from './smart-table-column-merge';
   import { smartSentry } from '/@/lib/smart-sentry';
+  import { LAYOUT_ELEMENT_IDS } from '/@/layout/layout-const.js';
+  import { useAppConfigStore } from '/@/store/modules/system/app-config.js';
   const props = defineProps({
     // 表格列数组
     modelValue: {
       type: Array,
-      default: new Array(),
+      default: [],
     },
     // 刷新表格函数
     refresh: {
@@ -93,20 +95,39 @@
 
   // ----------------- 全屏 -------------------
   const fullScreenFlag = ref(false);
-  function fullScreen() {
+
+  function onFullScreen() {
     if (fullScreenFlag.value) {
-      //取消全屏
-      exitFullscreen(document.querySelector('#smartAdminLayoutContent'));
-      fullScreenFlag.value = false;
+      // 退出全屏
+      handleExitFullScreen();
+      exitElementFullscreen(document.getElementById(LAYOUT_ELEMENT_IDS.content));
     } else {
       //全屏
-      launchFullScreen(document.querySelector('#smartAdminLayoutContent'));
+      message.config({
+        getContainer: () => document.getElementById(LAYOUT_ELEMENT_IDS.content),
+      });
       fullScreenFlag.value = true;
+      useAppConfigStore().startFullScreen();
+      launchElementFullScreen(document.getElementById(LAYOUT_ELEMENT_IDS.content));
     }
   }
 
+  // 处理退出全屏
+  function handleExitFullScreen(){
+    //取消全屏
+    message.config({
+      getContainer: () => document.body,
+    });
+    fullScreenFlag.value = false;
+    useAppConfigStore().exitFullScreen();
+    document.removeEventListener('fullscreenchange', handleFullscreenChange);
+    document.removeEventListener('mozfullscreenchange', handleFullscreenChange); // Firefox
+    document.removeEventListener('webkitfullscreenchange', handleFullscreenChange); // Chrome, Safari and Opera
+    document.removeEventListener('MSFullscreenChange', handleFullscreenChange); // Internet Explorer and Edge
+  }
+
   //判断各种浏览器 -全屏
-  function launchFullScreen(element) {
+  function launchElementFullScreen(element) {
     if (element.requestFullscreen) {
       element.requestFullscreen();
     } else if (element.mozRequestFullScreen) {
@@ -118,9 +139,23 @@
     } else {
       message.error('当前浏览器不支持部分全屏！');
     }
+    document.addEventListener('fullscreenchange', handleFullscreenChange);
+    document.addEventListener('mozfullscreenchange', handleFullscreenChange); // Firefox
+    document.addEventListener('webkitfullscreenchange', handleFullscreenChange); // Chrome, Safari and Opera
+    document.addEventListener('MSFullscreenChange', handleFullscreenChange); // Internet Explorer and Edge
   }
+
+  function handleFullscreenChange() {
+    if (document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement) {
+      console.log('进入全屏模式');
+    } else {
+      console.log('退出全屏模式');
+      handleExitFullScreen();
+    }
+  }
+
   //判断各种浏览器 -退出全屏
-  function exitFullscreen(element) {
+  function exitElementFullscreen(element) {
     if (document.exitFullscreen) {
       document.exitFullscreen();
     } else if (document.mozCancelFullScreen) {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/support/table-operator/smart-table-column-merge.ts b/smart-admin-web-typescript/src/components/support/table-operator/smart-table-column-merge.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/support/table-operator/smart-table-column-merge.ts
rename to smart-admin-web-typescript/src/components/support/table-operator/smart-table-column-merge.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/support/table-operator/smart-table-column-modal.vue b/smart-admin-web-typescript/src/components/support/table-operator/smart-table-column-modal.vue
similarity index 95%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/support/table-operator/smart-table-column-modal.vue
rename to smart-admin-web-typescript/src/components/support/table-operator/smart-table-column-modal.vue
index e489d29..00a46e2 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/support/table-operator/smart-table-column-modal.vue
+++ b/smart-admin-web-typescript/src/components/support/table-operator/smart-table-column-modal.vue
@@ -1,11 +1,11 @@
 <!--
   *  表格列设置
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-26 23:45:51 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-26 23:45:51
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -54,8 +54,8 @@
 </template>
 <script setup lang="ts">
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { tableColumnApi } from '/@/api/support/table/table-column-api';
-  import { ref, reactive, nextTick, computed } from 'vue';
+  import { tableColumnApi } from '/@/api/support/table-column-api';
+  import { nextTick, ref } from 'vue';
   import _ from 'lodash';
   import Sortable from 'sortablejs';
   import { message, Modal } from 'ant-design-vue';
@@ -107,7 +107,6 @@
     for (const item of tableData.value) {
       if (item.showFlag) {
         selectedRowKeyList.value.push(item.columnKey);
-        continue;
       }
     }
 
@@ -148,7 +147,7 @@
       chosenClass: 'smart-ghost-class', //设置选中样式类名
       handle: '.handle',
       onEnd({ newIndex, oldIndex }) {
-        if (newIndex == oldIndex) {
+        if (newIndex === oldIndex) {
           return;
         }
         moveTableData(oldIndex, newIndex);
@@ -240,7 +239,7 @@
         if (item.width) {
           column.width = item.width;
         }
-        column.showFlag = selectedRowKeyList.value.indexOf(item.columnKey) > -1 ? true : false;
+        column.showFlag = selectedRowKeyList.value.indexOf(item.columnKey) > -1;
         columnList.push(column);
       }
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/system/department-tree-select/index.vue b/smart-admin-web-typescript/src/components/system/department-tree-select/index.vue
similarity index 82%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/system/department-tree-select/index.vue
rename to smart-admin-web-typescript/src/components/system/department-tree-select/index.vue
index 985f9f8..7648c57 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/system/department-tree-select/index.vue
+++ b/smart-admin-web-typescript/src/components/system/department-tree-select/index.vue
@@ -1,11 +1,11 @@
-<!-- 
+<!--
   * 部门 树形选择框
 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 23:05:43 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 23:05:43
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -26,7 +26,7 @@
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
   import _ from 'lodash';
-  import { departmentApi } from '/@/api/system/department/department-api';
+  import { departmentApi } from '/@/api/system/department-api';
 
   const props = defineProps({
     // 绑定值
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/system/employee-select/index.vue b/smart-admin-web-typescript/src/components/system/employee-select/index.vue
similarity index 88%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/system/employee-select/index.vue
rename to smart-admin-web-typescript/src/components/system/employee-select/index.vue
index e773fc0..20349b1 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/system/employee-select/index.vue
+++ b/smart-admin-web-typescript/src/components/system/employee-select/index.vue
@@ -1,11 +1,11 @@
 <!--
-  * 员工下拉选择框 
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 15:09:02 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * 员工下拉选择框
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 15:09:02
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-select
@@ -26,7 +26,7 @@
 
 <script setup lang="ts">
   import { onMounted, ref, watch } from 'vue';
-  import { employeeApi } from '/@/api/system/employee/employee-api';
+  import { employeeApi } from '/@/api/system/employee-api';
   import { smartSentry } from '/@/lib/smart-sentry';
 
   // =========== 属性定义 和 事件方法暴露 =============
@@ -81,7 +81,7 @@
   onMounted(query);
 
   // =========== 选择 监听、事件 =============
-  
+
   const selectValue = ref(props.value);
   watch(
     () => props.value,
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue b/smart-admin-web-typescript/src/components/system/employee-table-select-modal/index.vue
similarity index 83%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue
rename to smart-admin-web-typescript/src/components/system/employee-table-select-modal/index.vue
index edc347f..6a7329f 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue
+++ b/smart-admin-web-typescript/src/components/system/employee-table-select-modal/index.vue
@@ -1,11 +1,11 @@
 <!--
-  * 员工 表格 弹窗 选择框 
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-19 23:09:02 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * 员工 表格 弹窗 选择框
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-19 23:09:02
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-modal v-model:open="visible" :width="900" title="选择人员" @cancel="closeModal" @ok="onSelectEmployee">
@@ -24,7 +24,7 @@
           </a-select>
         </a-form-item>
         <a-form-item class="smart-query-form-item smart-margin-left10">
-          <a-button type="primary" @click="queryEmployee">
+          <a-button type="primary" @click="onSearch">
             <template #icon>
               <SearchOutlined />
             </template>
@@ -40,7 +40,7 @@
       </a-row>
     </a-form>
     <a-table
-      :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+      :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange, getCheckboxProps: getCheckboxProps }"
       :loading="tableLoading"
       size="small"
       :columns="columns"
@@ -80,13 +80,13 @@
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
   import { computed, reactive, ref } from 'vue';
-  import { employeeApi } from '/@/api/system/employee/employee-api';
+  import { employeeApi } from '/@/api/system/employee-api';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
   import { smartSentry } from '/@/lib/smart-sentry';
 
   // ----------------------- 以下是字段定义 emits props ---------------------
-  const emits = defineEmits('selectData');
+  const emits = defineEmits(['selectData']);
   defineExpose({
     showModal,
   });
@@ -95,9 +95,10 @@
 
   const visible = ref(false);
   async function showModal(selectEmployeeId) {
+    originalRowKeyList.value = selectEmployeeId || [];
     selectedRowKeyList.value = selectEmployeeId || [];
     visible.value = true;
-    queryEmployee();
+    onSearch();
   }
   function closeModal() {
     Object.assign(params, defaultParams);
@@ -124,6 +125,12 @@
     Object.assign(params, defaultParams);
     queryEmployee();
   }
+
+  function onSearch() {
+    params.pageNum = 1;
+    queryEmployee();
+  }
+
   async function queryEmployee() {
     tableLoading.value = true;
     try {
@@ -138,8 +145,9 @@
   }
 
   // ----------------------- 员工表格选择 ---------------------
+  const originalRowKeyList = ref([]);
   let selectedRowKeyList = ref([]);
-  const hasSelected = computed(() => selectedRowKeyList.value.length > 0);
+  const hasSelected = computed(() => selectedRowKeyList.value.length !== originalRowKeyList.value.length);
 
   function onSelectChange(selectedRowKeys) {
     selectedRowKeyList.value = selectedRowKeys;
@@ -150,10 +158,19 @@
       message.warning('请选择角色人员');
       return;
     }
-    emits('selectData', selectedRowKeyList.value);
+    // 过滤出新选择的人员id
+    const newEmployeeIdList = selectedRowKeyList.value.filter((id) => !originalRowKeyList.value.includes(id));
+    emits('selectData', newEmployeeIdList);
     closeModal();
   }
 
+  function getCheckboxProps(record) {
+    return {
+      // 角色员工列表的添加员工弹窗中 禁止添加选择已存在该角色的员工
+      disabled: originalRowKeyList.value.includes(record.employeeId),
+    };
+  }
+
   // ----------------------- 员工表格渲染 ---------------------
   const tableData = ref([]);
   //字段
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/components/system/menu-tree-select/index.vue b/smart-admin-web-typescript/src/components/system/menu-tree-select/index.vue
similarity index 89%
rename from smart-admin-web/typescript-ant-design-vue3/src/components/system/menu-tree-select/index.vue
rename to smart-admin-web-typescript/src/components/system/menu-tree-select/index.vue
index 250c84a..af3b9e3 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/components/system/menu-tree-select/index.vue
+++ b/smart-admin-web-typescript/src/components/system/menu-tree-select/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 菜单 树形 下拉选择框
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-01 23:14:49 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-01 23:14:49
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-tree-select
@@ -25,7 +25,7 @@
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
   import _ from 'lodash';
-  import { menuApi } from '/@/api/system/menu/menu-api';
+  import { menuApi } from '/@/api/system/menu-api';
   import { buildMenuTableTree } from '/@/views/system/menu/menu-data-handler';
   import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
 
diff --git a/smart-admin-web-typescript/src/components/system/position-select/index.vue b/smart-admin-web-typescript/src/components/system/position-select/index.vue
new file mode 100644
index 0000000..df14d14
--- /dev/null
+++ b/smart-admin-web-typescript/src/components/system/position-select/index.vue
@@ -0,0 +1,79 @@
+<!--
+  * 职位
+  *
+  * @Author:    开云
+  * @Date:      2024-06-27 23:09:02
+  * @Wechat:    kaiyun
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <a-select
+    v-model:value="selectValue"
+    :style="`width: ${width}`"
+    :placeholder="props.placeholder"
+    :showSearch="true"
+    :allowClear="true"
+    :size="size"
+    @change="onChange"
+  >
+    <a-select-option v-for="item in positionList" :key="item.positionId" :value="item.positionId">
+      {{ item.positionName }}
+    </a-select-option>
+  </a-select>
+</template>
+
+<script setup lang="ts">
+  import { onMounted, ref, watch } from 'vue';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import { positionApi } from '/@/api/system/position-api.js';
+
+  // =========== 属性定义 和 事件方法暴露 =============
+
+  const props = defineProps({
+    value: [Number, Array],
+    placeholder: {
+      type: String,
+      default: '请选择',
+    },
+    width: {
+      type: String,
+      default: '100%',
+    },
+    size: {
+      type: String,
+      default: 'default',
+    },
+  });
+
+  const emit = defineEmits(['update:value', 'change']);
+
+  // =========== 查询数据 =============
+
+  //员工列表数据
+  const positionList = ref([]);
+  async function query() {
+    try {
+      let resp = await positionApi.queryList();
+      positionList.value = resp.data;
+    } catch (e) {
+      smartSentry.captureError(e);
+    }
+  }
+  onMounted(query);
+
+  // =========== 选择 监听、事件 =============
+
+  const selectValue = ref(props.value);
+  watch(
+    () => props.value,
+    (newValue) => {
+      selectValue.value = newValue;
+    }
+  );
+
+  function onChange(value) {
+    emit('update:value', value);
+    emit('change', value);
+  }
+</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/config/app-config.ts b/smart-admin-web-typescript/src/config/app-config.ts
similarity index 95%
rename from smart-admin-web/typescript-ant-design-vue3/src/config/app-config.ts
rename to smart-admin-web-typescript/src/config/app-config.ts
index bb3d23f..f68daeb 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/config/app-config.ts
+++ b/smart-admin-web-typescript/src/config/app-config.ts
@@ -38,6 +38,8 @@ export const appDefaultConfig: AppConfig = {
   footerFlag: true,
   // 帮助文档
   helpDocFlag: true,
+  // 帮助文档默认展开
+  helpDocExpandFlag: true,
   // 水印
   watermarkFlag: true,
   // 网站名称
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/business/erp/category-const.ts b/smart-admin-web-typescript/src/constants/business/erp/category-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/business/erp/category-const.ts
rename to smart-admin-web-typescript/src/constants/business/erp/category-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/business/erp/goods-const.ts b/smart-admin-web-typescript/src/constants/business/erp/goods-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/business/erp/goods-const.ts
rename to smart-admin-web-typescript/src/constants/business/erp/goods-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/business/message/message-const.ts b/smart-admin-web-typescript/src/constants/business/message/message-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/business/message/message-const.ts
rename to smart-admin-web-typescript/src/constants/business/message/message-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/business/oa/enterprise-const.ts b/smart-admin-web-typescript/src/constants/business/oa/enterprise-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/business/oa/enterprise-const.ts
rename to smart-admin-web-typescript/src/constants/business/oa/enterprise-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/business/oa/notice-const.ts b/smart-admin-web-typescript/src/constants/business/oa/notice-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/business/oa/notice-const.ts
rename to smart-admin-web-typescript/src/constants/business/oa/notice-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/common-const.ts b/smart-admin-web-typescript/src/constants/common-const.ts
similarity index 86%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/common-const.ts
rename to smart-admin-web-typescript/src/constants/common-const.ts
index 135e24e..d745a50 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/constants/common-const.ts
+++ b/smart-admin-web-typescript/src/constants/common-const.ts
@@ -11,10 +11,12 @@ import { SmartEnum } from '/@/types/smart-enum';
 
 export const PAGE_SIZE = 10;
 
-export const PAGE_SIZE_OPTIONS = ['10', '15', '20', '30', '40', '50', '75', '100', '150', '200', '300', '500'];
+export const PAGE_SIZE_OPTIONS = ['5', '10', '15', '20', '30', '40', '50', '75', '100', '150', '200', '300', '500'];
 
 //登录页面名字
 export const PAGE_PATH_LOGIN = '/login';
+//首页页面名字
+export const HOME_PAGE_PATH  = '/home';
 
 //404页面名字
 export const PAGE_PATH_404 = '/404';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/index.ts b/smart-admin-web-typescript/src/constants/index.ts
similarity index 95%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/index.ts
rename to smart-admin-web-typescript/src/constants/index.ts
index b15b091..f858dff 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/constants/index.ts
+++ b/smart-admin-web-typescript/src/constants/index.ts
@@ -20,6 +20,7 @@ import enterprise from './business/oa/enterprise-const';
 import message from './business/message/message-const';
 import codeGeneratorConst from './support/code-generator-const';
 import changeLogConst from './support/change-log-const';
+import jobConst from './support/job-const';
 
 export default {
   FLAG_NUMBER_ENUM,
@@ -37,4 +38,5 @@ export default {
   ...message,
   ...codeGeneratorConst,
   ...changeLogConst,
+  ...jobConst,
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/layout-const.ts b/smart-admin-web-typescript/src/constants/layout-const.ts
similarity index 86%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/layout-const.ts
rename to smart-admin-web-typescript/src/constants/layout-const.ts
index fb44238..ffac17b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/constants/layout-const.ts
+++ b/smart-admin-web-typescript/src/constants/layout-const.ts
@@ -11,13 +11,17 @@
 import { SmartEnum } from '/@/types/smart-enum';
 
 export const LAYOUT_ENUM: SmartEnum<string> = {
-  SIDE_EXPAND: {
-    value: 'side-expand',
-    desc: '展开菜单',
-  },
   SIDE: {
     value: 'side',
-    desc: '传统菜单',
+    desc: '传统',
+  },
+  SIDE_EXPAND: {
+    value: 'side-expand',
+    desc: '展开',
+  },
+  TOP: {
+    value: 'top',
+    desc: '顶部',
   },
 };
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/local-storage-key-const.ts b/smart-admin-web-typescript/src/constants/local-storage-key-const.ts
similarity index 93%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/local-storage-key-const.ts
rename to smart-admin-web-typescript/src/constants/local-storage-key-const.ts
index 384c6e7..b48a1f6 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/constants/local-storage-key-const.ts
+++ b/smart-admin-web-typescript/src/constants/local-storage-key-const.ts
@@ -18,8 +18,6 @@ const KEY_PREFIX = 'smart_admin_';
 export default {
   // 用户token
   USER_TOKEN: `${KEY_PREFIX}user_token`,
-  // 用户信息
-  USER_INFO: `${KEY_PREFIX}user_info`,
   // 用户权限点
   USER_POINTS: `${KEY_PREFIX}user_points`,
   // 用户的tag列表
@@ -30,4 +28,6 @@ export default {
   HOME_QUICK_ENTRY: `${KEY_PREFIX}home_quick_entry`,
   // 通知信息已读
   NOTICE_READ: `${KEY_PREFIX}notice_read`,
+  // 待办
+  TO_BE_DONE: `${KEY_PREFIX}to_be_done`,
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/regular-const.ts b/smart-admin-web-typescript/src/constants/regular-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/regular-const.ts
rename to smart-admin-web-typescript/src/constants/regular-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/support/change-log-const.ts b/smart-admin-web-typescript/src/constants/support/change-log-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/support/change-log-const.ts
rename to smart-admin-web-typescript/src/constants/support/change-log-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/support/code-generator-const.ts b/smart-admin-web-typescript/src/constants/support/code-generator-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/support/code-generator-const.ts
rename to smart-admin-web-typescript/src/constants/support/code-generator-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/support/data-tracer-const.ts b/smart-admin-web-typescript/src/constants/support/data-tracer-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/support/data-tracer-const.ts
rename to smart-admin-web-typescript/src/constants/support/data-tracer-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/support/file-const.ts b/smart-admin-web-typescript/src/constants/support/file-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/support/file-const.ts
rename to smart-admin-web-typescript/src/constants/support/file-const.ts
diff --git a/smart-admin-web-typescript/src/constants/support/job-const.ts b/smart-admin-web-typescript/src/constants/support/job-const.ts
new file mode 100644
index 0000000..2ea08f1
--- /dev/null
+++ b/smart-admin-web-typescript/src/constants/support/job-const.ts
@@ -0,0 +1,20 @@
+import {SmartEnum} from "/@/types/smart-enum";
+
+/**
+ * job 常量
+ * @type {{CRON: {value: number, desc: string}, FIXED_DELAY: {value: number, desc: string}}}
+ */
+export const TRIGGER_TYPE_ENUM:SmartEnum<string> = {
+  CRON: {
+    value: 'cron',
+    desc: 'cron表达式',
+  },
+  FIXED_DELAY: {
+    value: 'fixed_delay',
+    desc: '固定间隔',
+  },
+};
+
+export default {
+  TRIGGER_TYPE_ENUM,
+};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/support/login-log-const.ts b/smart-admin-web-typescript/src/constants/support/login-log-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/support/login-log-const.ts
rename to smart-admin-web-typescript/src/constants/support/login-log-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/support/table-id-const.ts b/smart-admin-web-typescript/src/constants/support/table-id-const.ts
similarity index 91%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/support/table-id-const.ts
rename to smart-admin-web-typescript/src/constants/support/table-id-const.ts
index 00076b3..572a27d 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/constants/support/table-id-const.ts
+++ b/smart-admin-web-typescript/src/constants/support/table-id-const.ts
@@ -40,6 +40,7 @@ export const TABLE_ID_CONST = {
   SYSTEM: {
     EMPLOYEE: systemInitTableId + 1, //员工
     MENU: systemInitTableId + 2, //菜单
+    POSITION:systemInitTableId + 3, //职位
   },
   /**
    * 支撑
@@ -53,5 +54,7 @@ export const TABLE_ID_CONST = {
     LOGIN_LOG: supportInitTableId + 6, //登录日志
     RELOAD: supportInitTableId + 7, //reload
     HELP_DOC: supportInitTableId + 8, //帮助文档
+    JOB: supportInitTableId + 9, //Job
+    JOB_LOG: supportInitTableId + 10, //JobLog
   },
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/system/employee-const.ts b/smart-admin-web-typescript/src/constants/system/employee-const.ts
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/system/employee-const.ts
rename to smart-admin-web-typescript/src/constants/system/employee-const.ts
index 9dc4d46..cc17446 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/constants/system/employee-const.ts
+++ b/smart-admin-web-typescript/src/constants/system/employee-const.ts
@@ -23,8 +23,8 @@ export const GENDER_ENUM: SmartEnum<number> = {
     value: 2,
     desc: '女',
   },
-};
+}
 
 export default {
   GENDER_ENUM,
-};
+}
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/system/home-const.ts b/smart-admin-web-typescript/src/constants/system/home-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/system/home-const.ts
rename to smart-admin-web-typescript/src/constants/system/home-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/system/login-device-const.ts b/smart-admin-web-typescript/src/constants/system/login-device-const.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/system/login-device-const.ts
rename to smart-admin-web-typescript/src/constants/system/login-device-const.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/constants/system/menu-const.ts b/smart-admin-web-typescript/src/constants/system/menu-const.ts
similarity index 84%
rename from smart-admin-web/typescript-ant-design-vue3/src/constants/system/menu-const.ts
rename to smart-admin-web-typescript/src/constants/system/menu-const.ts
index 344ddee..2d769fa 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/constants/system/menu-const.ts
+++ b/smart-admin-web-typescript/src/constants/system/menu-const.ts
@@ -29,14 +29,10 @@ export const MENU_TYPE_ENUM: SmartEnum<number> = {
  * 权限类型
  */
 export const MENU_PERMS_TYPE_ENUM: SmartEnum<number> = {
-  SPRING_SECURITY: {
+  SA_TOKEN: {
     value: 1,
-    desc: 'Security模式',
-  },
-  URL: {
-    value: 2,
-    desc: 'URL模式',
-  },
+    desc: 'Sa-Token模式',
+  }
 };
 
 /**
@@ -46,5 +42,5 @@ export const MENU_DEFAULT_PARENT_ID = 0;
 
 export default {
   MENU_TYPE_ENUM,
-  MENU_PERMS_TYPE_ENUM,
+  MENU_PERMS_TYPE_ENUM
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/directives/privilege.ts b/smart-admin-web-typescript/src/directives/privilege.ts
similarity index 80%
rename from smart-admin-web/typescript-ant-design-vue3/src/directives/privilege.ts
rename to smart-admin-web-typescript/src/directives/privilege.ts
index 3e75966..918a409 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/directives/privilege.ts
+++ b/smart-admin-web-typescript/src/directives/privilege.ts
@@ -9,11 +9,9 @@
  */
 
 import { useUserStore } from '/@/store/modules/system/user';
-import { DirectiveBinding } from 'vue';
-import lodash from 'lodash';
+import _ from 'lodash';
 
 export function privilegeDirective(el: { parentNode: { removeChild: (arg0: any) => void } }, binding: DirectiveBinding<any>) {
-  let userInfo = useUserStore().getUserInfo;
   // 超级管理员
   if (useUserStore().administratorFlag) {
     return true;
@@ -24,7 +22,7 @@ export function privilegeDirective(el: { parentNode: { removeChild: (arg0: any)
     return false;
   }
   // 如果有权限，删除节点
-  if (!lodash.some(userPointsList, ['webPerms', binding.value])) {
+  if (!_.some(userPointsList, ['webPerms', binding.value])) {
     el.parentNode.removeChild(el);
   }
   return true;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/i18n/index.ts b/smart-admin-web-typescript/src/i18n/index.ts
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/i18n/index.ts
rename to smart-admin-web-typescript/src/i18n/index.ts
index e0c5057..44c8b97 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/i18n/index.ts
+++ b/smart-admin-web-typescript/src/i18n/index.ts
@@ -35,7 +35,7 @@ const i18n = createI18n({
   globalInjection: true,
   legacy: false, //
   locale: getInitializedLanguage(), //默认初始化的语言
-  messages,
+  messages, //
 });
 
 export default i18n;
diff --git a/smart-admin-web-typescript/src/i18n/lang/en-US/index.ts b/smart-admin-web-typescript/src/i18n/lang/en-US/index.ts
new file mode 100644
index 0000000..e5301df
--- /dev/null
+++ b/smart-admin-web-typescript/src/i18n/lang/en-US/index.ts
@@ -0,0 +1,31 @@
+/*
+ * 英文国际化
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-09-06 20:00:57
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+import antd from 'ant-design-vue/es/locale/en_US';
+import dayjs from 'dayjs/locale/eu';
+
+export default {
+  antdLocale: antd,
+  dayjsLocale: dayjs,
+  'setting.title': 'Setting',
+  'setting.color': 'Theme Color',
+  'setting.menu.layout': 'Menu Layout',
+  'setting.menu.width': 'Menu Width',
+  'setting.menu.theme': 'Menu Theme',
+  'setting.page.width': 'Page Width',
+  'setting.border.radius': 'Border Radius',
+  'setting.compact': 'Page Compact',
+  'setting.bread': 'Show Bread',
+  'setting.pagetag': 'Show PageTag',
+  'setting.pagetag.style': 'PageTag Style',
+  'setting.footer': 'Show Footer',
+  'setting.helpdoc': 'Show Helpdoc',
+  'setting.helpdoc.expand': 'Helpdoc Expand',
+  'setting.watermark': 'Show Watermark',
+};
diff --git a/smart-admin-web-typescript/src/i18n/lang/zh-CN/index.ts b/smart-admin-web-typescript/src/i18n/lang/zh-CN/index.ts
new file mode 100644
index 0000000..8561276
--- /dev/null
+++ b/smart-admin-web-typescript/src/i18n/lang/zh-CN/index.ts
@@ -0,0 +1,31 @@
+/*
+ * 中文国际化
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-09-06 20:01:06
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+import antd from 'ant-design-vue/es/locale/zh_CN';
+import dayjs from 'dayjs/locale/zh-cn';
+
+export default {
+  antdLocale: antd,
+  dayjsLocale: dayjs,
+  'setting.title': '网站设置',
+  'setting.color': '主题颜色',
+  'setting.menu.layout': '菜单布局',
+  'setting.menu.width': '菜单宽度',
+  'setting.menu.theme': '菜单主题',
+  'setting.compact': '页面紧凑',
+  'setting.border.radius': '页面圆角',
+  'setting.page.width': '页面宽度',
+  'setting.bread': '面包屑',
+  'setting.pagetag': '标签页',
+  'setting.pagetag.style': '标签页样式',
+  'setting.footer': '页脚',
+  'setting.helpdoc': '帮助文档',
+  'setting.helpdoc.expand': '帮助文档展开',
+  'setting.watermark': '水印',
+};
diff --git a/smart-admin-web-typescript/src/layout/components/change-password/regular-change-password-modal.vue b/smart-admin-web-typescript/src/layout/components/change-password/regular-change-password-modal.vue
new file mode 100644
index 0000000..305f590
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/components/change-password/regular-change-password-modal.vue
@@ -0,0 +1,47 @@
+<!--
+  *  定期强制修改密码
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2024-08-06 20:40:16
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <a-modal :open="visible" width="620px" :footer="null" :bodyStyle="{ height: '420px' }" title="" :closable="false" :maskClosable="true">
+    <a-alert style="width: 550px" message="根据《网络安全法》和《数据安全法》要求，需要定期修改密码保障数据安全！" type="warning" show-icon />
+    <Password @on-success="refresh" />
+  </a-modal>
+</template>
+<script setup lang="ts">
+  import { computed } from 'vue';
+  import Password from '/@/views/system/account/components/password/index.vue';
+  import { useUserStore } from '/@/store/modules/system/user.js';
+  import { loginApi } from '/@/api/system/login-api.js';
+  import { smartSentry } from '/@/lib/smart-sentry.js';
+  import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
+
+  /**
+   * 修改密码弹窗
+   */
+  const visible = computed(() => {
+    return useUserStore().$state.needUpdatePwdFlag;
+  });
+
+  /**
+   * 刷新
+   */
+  async function refresh() {
+    try {
+      SmartLoading.show();
+      //获取登录用户信息
+      const res = await loginApi.getLoginInfo();
+      //更新用户信息到pinia
+      useUserStore().setUserLoginInfo(res.data);
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue b/smart-admin-web-typescript/src/layout/components/header-user-space/header-avatar.vue
similarity index 73%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue
rename to smart-admin-web-typescript/src/layout/components/header-user-space/header-avatar.vue
index ddb602b..4233672 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-avatar.vue
+++ b/smart-admin-web-typescript/src/layout/components/header-user-space/header-avatar.vue
@@ -9,19 +9,20 @@
 -->
 
 <template>
-  <a-dropdown class="header-trigger">
+  <a-dropdown class="header-trigger" :get-popup-container="getPopupContainer">
     <div class="wrapper">
-      <a-avatar style="margin: 0 5px" :size="24" id="smartAdminAvatar">
+      <img class="avatar-image" :src="avatar" v-if="avatar" />
+      <a-avatar v-else style="margin: 0 5px" :size="20" id="smartAdminAvatar">
         {{ avatarName }}
       </a-avatar>
       <span class="name">{{ actualName }}</span>
     </div>
     <template #overlay>
       <a-menu :class="['avatar-menu']">
-        <a-menu-item @click="onRefresh">
-          <span>刷新权限</span>
+        <a-menu-item @click="toAccount()">
+          <span>个人中心</span>
         </a-menu-item>
-        <a-menu-item @click="showUpdatePwdModal">
+        <a-menu-item @click="toAccount(ACCOUNT_MENU.PASSWORD.menuId)">
           <span>修改密码</span>
         </a-menu-item>
         <a-menu-item @click="onLogout">
@@ -34,34 +35,39 @@
 </template>
 <script setup lang="ts">
   import { computed, ref, onMounted } from 'vue';
-  import { loginApi } from '/@/api/system/login/login-api';
+  import { loginApi } from '/@/api/system/login-api';
   import { useUserStore } from '/@/store/modules/system/user';
-  import { clearAllCoolies } from '/@/utils/cookie-util';
-  import { localClear } from '/@/utils/local-util';
   import { smartSentry } from '/@/lib/smart-sentry';
   import HeaderResetPassword from './header-reset-password-modal/index.vue';
+  import { useRouter } from 'vue-router';
+  import { ACCOUNT_MENU } from '/@/views/system/account/account-menu.js';
 
   // 头像背景颜色
   const AVATAR_BACKGROUND_COLOR_ARRAY = ['#87d068', '#00B853', '#f56a00', '#1890ff'];
 
   //监听退出登录方法
   async function onLogout() {
-    localClear();
-    clearAllCoolies();
-    useUserStore().logout();
     try {
       await loginApi.logout();
     } catch (e) {
       smartSentry.captureError(e);
     } finally {
+      useUserStore().logout();
       location.reload();
     }
   }
 
-  // 刷新用户信息（包含用户基础信息、权限信息等等）
-  async function onRefresh() {
-    await loginApi.refresh();
-    location.reload();
+  // ------------------------ 个人中心 ------------------------
+  const router = useRouter();
+  function toAccount(menuId) {
+    router.push({
+      path: '/account',
+      query: { menuId },
+    });
+  }
+
+  function getPopupContainer() {
+    return document.body;
   }
 
   // ------------------------ 修改密码 ------------------------
@@ -74,7 +80,9 @@
   // ------------------------ 以下是 头像和姓名 相关 ------------------------
 
   const avatarName = ref('');
+  const avatar = computed(() => useUserStore().avatar);
   const actualName = computed(() => useUserStore().actualName);
+
   // 更新头像信息
   function updateAvatar() {
     if (useUserStore().actualName) {
@@ -109,7 +117,15 @@
     cursor: pointer;
     display: flex;
     align-items: center;
+
+    .avatar-image {
+      width: 20px;
+      height: 20px;
+      object-fit: cover;
+      border-radius: 50%;
+    }
   }
+
   .header-trigger {
     height: @header-user-height;
     line-height: @header-user-height;
diff --git a/smart-admin-web-typescript/src/layout/components/header-user-space/header-message-detail-modal.vue b/smart-admin-web-typescript/src/layout/components/header-user-space/header-message-detail-modal.vue
new file mode 100644
index 0000000..9172150
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/components/header-user-space/header-message-detail-modal.vue
@@ -0,0 +1,47 @@
+<template>
+  <a-modal v-model:open="showFlag" :cancelText="null" :width="800" title="消息内容" :closable="false" :maskClosable="false" :destroyOnClose="true" @ok="showFlag = false">
+    <a-descriptions bordered :column="2" size="small">
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="1" label="类型"
+        >{{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', messageDetail.messageType) }}
+      </a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '120px' }" :span="1" label="发送时间">{{ messageDetail.createTime }}</a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="2" label="标题">{{ messageDetail.title }}</a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="2" label="内容">
+        <pre>{{ messageDetail.content }}</pre>
+      </a-descriptions-item>
+    </a-descriptions>
+    <template #footer>
+      <a-button  type="primary"  @click="showFlag = false">关闭</a-button>
+    </template>
+  </a-modal>
+</template>
+<script setup lang="ts">
+  import { reactive, ref } from 'vue';
+  import { messageApi } from '/@/api/support/message-api.js';
+
+  const emit = defineEmits(['refresh']);
+
+  const messageDetail = reactive({
+    messageType: '',
+    title: '',
+    content: '',
+    createTime: '',
+  });
+
+  const showFlag = ref(false);
+
+  function show(data) {
+    Object.assign(messageDetail, data);
+    showFlag.value = true;
+    read(data);
+  }
+
+  async function read(message) {
+    if (!message.readFlag) {
+      await messageApi.updateReadFlag(message.messageId);
+      emit('refresh');
+    }
+  }
+
+  defineExpose({ show });
+</script>
diff --git a/smart-admin-web-typescript/src/layout/components/header-user-space/header-message.vue b/smart-admin-web-typescript/src/layout/components/header-user-space/header-message.vue
new file mode 100644
index 0000000..3bfe9a0
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/components/header-user-space/header-message.vue
@@ -0,0 +1,262 @@
+<!--
+  * 消息通知
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:17:18
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+
+<template>
+  <div>
+    <a-popover v-model:open="show" trigger="click" placement="bottomLeft" :getPopupContainer="getPopupContainer">
+      <a-button type="text" @click="showMessage" style="padding: 4px 5px">
+        <a-badge :count="unreadMessageCount + toBeDoneCount">
+          <div style="width: 26px; height: 26px">
+            <BellOutlined :style="{ fontSize: '16px' }" />
+          </div>
+        </a-badge>
+      </a-button>
+
+      <template #content>
+        <a-spin :spinning="loading">
+          <a-tabs class="dropdown-tabs" centered :tabBarStyle="{ textAlign: 'center' }" style="width: 300px; z-index: 1030">
+            <a-tab-pane key="message">
+              <template #tab>
+                未读消息
+                <a-badge :count="unreadMessageCount" :show-zero="false" :offset="[-5, -15]" />
+              </template>
+              <a-list class="tab-pane" size="small">
+                <a-list-item v-for="item in messageList" :key="item.messageId">
+                  <a-list-item-meta>
+                    <template #title>
+                      <div class="title">
+                        <a-badge status="error" />
+                        <a @click="showMessageDetail(item)">{{ item.title }}</a>
+                      </div>
+                    </template>
+                    <template #description>
+                      <span> {{ timeago(item.createTime) }}</span>
+                    </template>
+                  </a-list-item-meta>
+                </a-list-item>
+                <a-list-item v-if="unreadMessageCount > 3">
+                  <a-button type="link" @click="gotoMessage" style="margin: 0 auto"> 查看更多</a-button>
+                </a-list-item>
+              </a-list>
+            </a-tab-pane>
+            <a-tab-pane key="to_be_done">
+              <template #tab>
+                待办工作
+                <a-badge :count="toBeDoneCount" :show-zero="false" :offset="[-5, -15]" />
+              </template>
+              <a-list class="tab-pane" size="small" :locale="{ emptyText: '暂无待办' }">
+                <a-list-item v-for="(item, index) in toBeDoneList" :key="index">
+                  <a-list-item-meta>
+                    <template #title>
+                      <a-badge status="error" />
+                      <a-tag v-if="item.starFlag" color="red">重要</a-tag>
+                      <span>{{ item.title }}</span>
+                    </template>
+                  </a-list-item-meta>
+                </a-list-item>
+              </a-list>
+            </a-tab-pane>
+          </a-tabs>
+        </a-spin>
+      </template>
+    </a-popover>
+    <MessageDetailModal ref="messageDetailModalRef" @refresh="queryMessage" />
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { computed, ref } from 'vue';
+  import { BellOutlined } from '@ant-design/icons-vue';
+  import { useUserStore } from '/@/store/modules/system/user.js';
+  import { smartSentry } from '/@/lib/smart-sentry.js';
+  import { messageApi } from '/@/api/support/message-api.js';
+  import dayjs from 'dayjs';
+  import { theme } from 'ant-design-vue';
+  import { useRouter } from 'vue-router';
+  import MessageDetailModal from './header-message-detail-modal.vue';
+  import localKey from '/@/constants/local-storage-key-const';
+  import { localRead } from '/@/utils/local-util';
+
+  const { useToken } = theme;
+  const { token } = useToken();
+
+  function getPopupContainer() {
+    return document.body;
+  }
+
+  const loading = ref(false);
+  const show = ref(false);
+
+  // 点击按钮打开消息气泡卡片的同时刷新消息
+  function showMessage() {
+    show.value = true;
+    queryMessage();
+    loadToBeDoneList();
+  }
+
+  function closeMessage() {
+    show.value = false;
+  }
+
+  // ------------------------- 查询消息  -------------------------
+
+  // 未读消息
+  const unreadMessageCount = computed(() => {
+    return useUserStore().unreadMessageCount;
+  });
+
+  // 消息列表
+  const messageList = ref([]);
+
+  // 查询我的未读消息
+  async function queryMessage() {
+    try {
+      loading.value = true;
+      let responseModel = await messageApi.queryMessage({
+        pageNum: 1,
+        pageSize: 3,
+        readFlag: false,
+      });
+      messageList.value = responseModel.data.list;
+      // 若中途有新消息了 打开列表也能及时更新未读数量
+      useUserStore().queryUnreadMessageCount();
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      loading.value = false;
+    }
+  }
+
+  const messageDetailModalRef = ref();
+
+  function showMessageDetail(data) {
+    messageDetailModalRef.value.show(data);
+    closeMessage();
+  }
+
+  const router = useRouter();
+
+  function gotoMessage() {
+    show.value = false;
+    router.push({ path: '/account', query: { menuId: 'message' } });
+  }
+
+  // ------------------------- 待办工作  -------------------------
+
+  // 待办工作数
+  const toBeDoneCount = computed(() => {
+    return useUserStore().toBeDoneCount;
+  });
+
+  // 待办工作列表
+  const toBeDoneList = ref([]);
+
+  const loadToBeDoneList = async () => {
+    try {
+      loading.value = true;
+      let localToBeDoneList = localRead(localKey.TO_BE_DONE);
+      if (localToBeDoneList) {
+        toBeDoneList.value = JSON.parse(localToBeDoneList).filter((e) => !e.doneFlag);
+      }
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      loading.value = false;
+    }
+  };
+
+  // ------------------------- 时间计算  -------------------------
+  function timeago(dateStr) {
+    let dateTimeStamp = dayjs(dateStr).toDate().getTime();
+    let result = '';
+    let minute = 1000 * 60; //把分，时，天，周，半个月，一个月用毫秒表示
+    let hour = minute * 60;
+    let day = hour * 24;
+    let week = day * 7;
+    let month = day * 30;
+    let now = new Date().getTime(); //获取当前时间毫秒
+    let diffValue = now - dateTimeStamp; //时间差
+
+    if (diffValue < 0) {
+      return '刚刚';
+    }
+    let minC = diffValue / minute; //计算时间差的分，时，天，周，月
+    let hourC = diffValue / hour;
+    let dayC = diffValue / day;
+    let weekC = diffValue / week;
+    let monthC = diffValue / month;
+    if (monthC >= 1 && monthC <= 3) {
+      result = ' ' + parseInt(monthC) + '月前';
+    } else if (weekC >= 1 && weekC <= 3) {
+      result = ' ' + parseInt(weekC) + '周前';
+    } else if (dayC >= 1 && dayC <= 6) {
+      result = ' ' + parseInt(dayC) + '天前';
+    } else if (hourC >= 1 && hourC <= 23) {
+      result = ' ' + parseInt(hourC) + '小时前';
+    } else if (minC >= 1 && minC <= 59) {
+      result = ' ' + parseInt(minC) + '分钟前';
+    } else if (diffValue >= 0 && diffValue <= minute) {
+      result = '刚刚';
+    } else {
+      let datetime = new Date();
+      datetime.setTime(dateTimeStamp);
+      let year = datetime.getFullYear();
+      let month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1;
+      let date = datetime.getDate() < 10 ? '0' + datetime.getDate() : datetime.getDate();
+      result = year + '-' + month + '-' + date;
+    }
+    return result;
+  }
+</script>
+
+<style lang="less" scoped>
+  @smart-page-tag-operate-width: 40px;
+  @color-primary: v-bind('token.colorPrimary');
+
+  .message-icon-div {
+    cursor: pointer;
+    height: 32px;
+    width: 42px;
+    padding-left: 10px;
+  }
+
+  .message-icon-div:hover {
+    background: @hover-bg-color !important;
+  }
+
+  .header-notice {
+    display: inline-block;
+    transition: all 0.3s;
+
+    span {
+      vertical-align: initial;
+    }
+
+    .notice-badge {
+      color: inherit;
+    }
+  }
+
+  .title {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    cursor: pointer;
+  }
+
+  .dropdown-tabs {
+    background-color: @base-bg-color;
+    border-radius: 4px;
+  }
+
+  .tab-pane {
+    height: auto;
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-reset-password-modal/index.vue b/smart-admin-web-typescript/src/layout/components/header-user-space/header-reset-password-modal/index.vue
similarity index 77%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-reset-password-modal/index.vue
rename to smart-admin-web-typescript/src/layout/components/header-user-space/header-reset-password-modal/index.vue
index 64a8144..e8bb22c 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-reset-password-modal/index.vue
+++ b/smart-admin-web-typescript/src/layout/components/header-user-space/header-reset-password-modal/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 修改密码
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:02:01 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:02:01
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-modal :open="visible" title="修改密码" ok-text="确认" cancel-text="取消" @ok="updatePwd" @cancel="cancelModal">
@@ -25,19 +25,19 @@
 <script setup lang="ts">
   import { ref, reactive } from 'vue';
   import { message } from 'ant-design-vue';
-  import { employeeApi } from '/@/api/system/employee/employee-api';
+  import { employeeApi } from '/@/api/system/employee-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { smartSentry } from '/@/lib/smart-sentry';
 
   const visible = ref(false);
   const formRef = ref();
-  const tips = '字母（不限大小写）+数字组合，6-15位'; //校验规则
-  const reg = /(^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,15}$)/; //校验正则
+  const tips = '密码必须为长度8-20位且包含大小写字母、数字、特殊符号三种及以上组合'; //校验规则
+  const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,20}$/;
 
   const rules = {
     oldPassword: [{ required: true, message: '请输入原密码' }],
-    newPassword: [{ type: 'string',  pattern: reg, message: '密码格式错误' }],
-    confirmPwd: [{ type: 'string',  pattern: reg, message: '请输入确认密码' }],
+    newPassword: [{ type: 'string', pattern: reg, message: '密码格式错误' }],
+    confirmPwd: [{ type: 'string', pattern: reg, message: '请输入确认密码' }],
   };
 
   const formDefault = {
@@ -75,6 +75,9 @@
 
   function showModal() {
     visible.value = true;
+    form.oldPassword = '';
+    form.newPassword = '';
+    form.confirmPwd = '';
   }
 
   function cancelModal() {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue b/smart-admin-web-typescript/src/layout/components/header-user-space/header-setting.vue
similarity index 53%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
rename to smart-admin-web-typescript/src/layout/components/header-user-space/header-setting.vue
index aebbd63..116808d 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-setting.vue
+++ b/smart-admin-web-typescript/src/layout/components/header-user-space/header-setting.vue
@@ -1,11 +1,11 @@
 <!--
   * 设置模块
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:18:20 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:18:20
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 
 <template>
@@ -16,36 +16,93 @@
           <a-select-option v-for="item in i18nList" :key="item.value" :value="item.value">{{ item.text }}</a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item label="菜单布局">
+      <a-form-item :label="$t('setting.color')">
+        <div class="color-container">
+          <template v-for="(item, index) in themeColors" :key="index">
+            <div v-if="index === formState.colorIndex" class="color">
+              <CheckSquareFilled :style="{ color: item.primaryColor, fontSize: '22px' }" />
+            </div>
+            <div v-else @click="changeColor(index)" class="color">
+              <svg
+                class="icon"
+                viewBox="0 0 1024 1024"
+                version="1.1"
+                :fill="item.primaryColor"
+                xmlns="http://www.w3.org/2000/svg"
+                width="26"
+                height="26"
+              >
+                <path
+                  d="M128 160.01219c0-17.67619 14.336-32.01219 32.01219-32.01219h704c17.65181 0 31.98781 14.336 31.98781 32.01219v704c0 17.65181-14.336 31.98781-32.01219 31.98781H160.036571a31.98781 31.98781 0 0 1-32.01219-32.01219V160.036571z"
+                />
+              </svg>
+            </div>
+          </template>
+        </div>
+      </a-form-item>
+      <a-form-item :label="$t('setting.border.radius')">
+        <a-slider v-model:value="formState.borderRadius" :min="0" :max="6" @change="changeBorderRadius" />
+      </a-form-item>
+      <a-form-item :label="$t('setting.menu.width')" v-if="formState.layout === LAYOUT_ENUM.SIDE.value">
+        <a-input-number @change="changeSideMenuWidth" v-model:value="formState.sideMenuWidth" :min="1" />
+        像素（px）
+      </a-form-item>
+      <a-form-item :label="$t('setting.page.width')" v-if="formState.layout === LAYOUT_ENUM.TOP.value">
+        <a-input @change="changePageWidth" v-model:value="formState.pageWidth" />
+        像素（px）或者 百分比
+      </a-form-item>
+      <a-form-item :label="$t('setting.compact')">
+        <a-radio-group v-model:value="formState.compactFlag" button-style="solid" @change="changeCompactFlag">
+          <a-radio-button :value="false">默认</a-radio-button>
+          <a-radio-button :value="true">紧凑</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item :label="$t('setting.menu.layout')">
         <a-radio-group @change="changeLayout" button-style="solid" v-model:value="formState.layout">
           <a-radio-button v-for="item in $smartEnumPlugin.getValueDescList('LAYOUT_ENUM')" :key="item.value" :value="item.value">
             {{ item.desc }}
           </a-radio-button>
         </a-radio-group>
       </a-form-item>
-      <a-form-item label="菜单宽度" v-if="formState.layout === LAYOUT_ENUM.SIDE.value">
-        <a-input-number @change="changeSideMenuWidth" v-model:value="formState.sideMenuWidth" :min="1" />
-        像素（px）
-      </a-form-item>
-      <a-form-item label="菜单主题">
+      <a-form-item :label="$t('setting.menu.theme')">
         <a-radio-group v-model:value="formState.sideMenuTheme" button-style="solid" @change="changeMenuTheme">
           <a-radio-button value="dark">Dark</a-radio-button>
           <a-radio-button value="light">Light</a-radio-button>
         </a-radio-group>
       </a-form-item>
-      <a-form-item label="面包屑">
-        <a-switch @change="changeBreadCrumbFlag" v-model:checked="formState.breadCrumbFlag" checked-children="显示" un-checked-children="隐藏" />
+      <a-form-item :label="$t('setting.pagetag.style')">
+        <a-radio-group v-model:value="formState.pageTagStyle" button-style="solid" @change="changePageTagStyle">
+          <a-radio-button value="default">默认</a-radio-button>
+          <a-radio-button value="antd">Ant Design</a-radio-button>
+        </a-radio-group>
       </a-form-item>
-      <a-form-item label="标签页">
+      <a-form-item :label="$t('setting.pagetag')">
         <a-switch @change="changePageTagFlag" v-model:checked="formState.pageTagFlag" checked-children="显示" un-checked-children="隐藏" />
       </a-form-item>
-      <a-form-item label="页脚">
+      <a-form-item :label="$t('setting.bread')">
+        <a-switch @change="changeBreadCrumbFlag" v-model:checked="formState.breadCrumbFlag" checked-children="显示" un-checked-children="隐藏" />
+      </a-form-item>
+      <a-form-item :label="$t('setting.footer')">
         <a-switch @change="changeFooterFlag" v-model:checked="formState.footerFlag" checked-children="显示" un-checked-children="隐藏" />
       </a-form-item>
-      <a-form-item label="帮助文档">
+      <a-form-item :label="$t('setting.watermark')">
+        <a-switch @change="changeWatermarkFlag" v-model:checked="formState.watermarkFlag" checked-children="显示" un-checked-children="隐藏" />
+      </a-form-item>
+      <a-form-item :label="$t('setting.helpdoc')">
         <a-switch @change="changeHelpDocFlag" v-model:checked="formState.helpDocFlag" checked-children="显示" un-checked-children="隐藏" />
       </a-form-item>
+      <a-form-item :label="$t('setting.helpdoc.expand')" v-if="formState.helpDocFlag">
+        <a-switch
+          @change="changeHelpDocExpandFlag"
+          v-model:checked="formState.helpDocExpandFlag"
+          checked-children="默认展开"
+          un-checked-children="默认不展开"
+        />
+      </a-form-item>
+      <br />
+      <br />
     </a-form>
+
     <div class="footer">
       <a-button style="margin-right: 8px" type="primary" @click="copy">复制配置信息</a-button>
       <a-button type="block" danger @click="reset">恢复默认配置 </a-button>
@@ -62,6 +119,7 @@
   import { useAppConfigStore } from '/@/store/modules/system/app-config';
   import { Modal } from 'ant-design-vue';
   import { appDefaultConfig } from '/@/config/app-config';
+  import { themeColors } from '/@/theme/color.js';
 
   // ----------------- modal 显示与隐藏 -----------------
 
@@ -96,7 +154,7 @@
 
     Modal.success({
       title: '复制成功',
-      content: h('div', {}, [h('p', '可以直接修改 /src/config/app-config.js 文件保存此配置')]),
+      content: h('div', {}, [h('p', '可以直接修改 /@/config/app-config.js 文件保存此配置')]),
     });
   }
 
@@ -121,18 +179,32 @@
     language: appConfigStore.language,
     // 布局: side 或者 side-expand
     layout: appConfigStore.layout,
+    // 页面宽度
+    pageWidth: appConfigStore.pageWidth,
+    // 颜色
+    colorIndex: appConfigStore.colorIndex,
     // 侧边菜单宽度
     sideMenuWidth: appConfigStore.sideMenuWidth,
     // 菜单主题
     sideMenuTheme: appConfigStore.sideMenuTheme,
+    // 页面紧凑
+    compactFlag: appConfigStore.compactFlag,
+    // 页面圆角
+    borderRadius: appConfigStore.borderRadius,
     // 标签页
     pageTagFlag: appConfigStore.pageTagFlag,
+    // 标签页 样式
+    pageTagStyle: appConfigStore.pageTagStyle,
     // 面包屑
     breadCrumbFlag: appConfigStore.breadCrumbFlag,
     // 页脚
     footerFlag: appConfigStore.footerFlag,
     // 帮助文档
     helpDocFlag: appConfigStore.helpDocFlag,
+    // 帮助文档 默认展开
+    helpDocExpandFlag: appConfigStore.helpDocExpandFlag,
+    // 水印
+    watermarkFlag: appConfigStore.watermarkFlag,
   };
 
   let formState = reactive({ ...formValue });
@@ -151,17 +223,42 @@
     });
   }
 
+  function changeColor(index) {
+    formState.colorIndex = index;
+    appConfigStore.$patch({
+      colorIndex: index,
+    });
+  }
+
   function changeSideMenuWidth(value) {
     appConfigStore.$patch({
       sideMenuWidth: value,
     });
   }
+
+  function changePageWidth(e) {
+    appConfigStore.$patch({
+      pageWidth: e.target.value,
+    });
+  }
+
   function changeMenuTheme(e) {
     appConfigStore.$patch({
       sideMenuTheme: e.target.value,
     });
   }
 
+  function changeCompactFlag(e) {
+    appConfigStore.$patch({
+      compactFlag: e.target.value,
+    });
+  }
+  function changeBorderRadius(e) {
+    appConfigStore.$patch({
+      borderRadius: e,
+    });
+  }
+
   function changeBreadCrumbFlag(e) {
     appConfigStore.$patch({
       breadCrumbFlag: e,
@@ -174,6 +271,12 @@
     });
   }
 
+  function changePageTagStyle(e) {
+    appConfigStore.$patch({
+      pageTagStyle: e.target.value,
+    });
+  }
+
   function changeFooterFlag(e) {
     appConfigStore.$patch({
       footerFlag: e,
@@ -185,6 +288,18 @@
       helpDocFlag: e,
     });
   }
+
+  function changeHelpDocExpandFlag(e) {
+    appConfigStore.$patch({
+      helpDocExpandFlag: e,
+    });
+  }
+
+  function changeWatermarkFlag(e) {
+    appConfigStore.$patch({
+      watermarkFlag: e,
+    });
+  }
 </script>
 <style lang="less" scoped>
   .footer {
@@ -198,4 +313,19 @@
     text-align: left;
     z-index: 1;
   }
+
+  .color-container {
+    display: flex;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+  }
+
+  .color {
+    margin-left: 8px;
+    height: 26px;
+    width: 26px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/index.vue b/smart-admin-web-typescript/src/layout/components/header-user-space/index.vue
similarity index 68%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/index.vue
rename to smart-admin-web-typescript/src/layout/components/header-user-space/index.vue
index 5e411bb..0aad41a 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/index.vue
+++ b/smart-admin-web-typescript/src/layout/components/header-user-space/index.vue
@@ -1,22 +1,15 @@
 <!--
   * 头部一整行
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:18:20 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:18:20
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-space :size="10">
     <div class="setting">
-      <a-input-search
-        @click="search"
-        style="margin-right: 30px; width: 250px"
-        placeholder="1024创新实验室、小镇程序员"
-        enter-button="搜索"
-        size="small"
-      />
       <!---消息通知--->
       <HeaderMessage ref="headerMessage" />
       <!---国际化--->
@@ -34,9 +27,9 @@
       <HeaderAvatar />
     </div>
     <!---帮助文档--->
-    <div class="user-space-item" @click="showHelpDoc">
-      <question-circle-two-tone style="font-size: 18px; margin-right: 5px; margin-top: 5px" />
+    <div class="user-space-item" @click="showHelpDoc" v-if="showHelpDocFlag">
       <span>帮助文档</span>
+      <DoubleLeftOutlined v-if="!helpDocExpandFlag" />
     </div>
 
     <HeaderSetting ref="headerSetting" />
@@ -48,7 +41,8 @@
   import HeaderSetting from './header-setting.vue';
   import HeaderMessage from './header-message.vue';
   import { useAppConfigStore } from '/@/store/modules/system/app-config';
-  import { ref } from 'vue';
+  import { computed, ref } from 'vue';
+  import { theme } from 'ant-design-vue';
 
   // 设置
   const headerSetting = ref();
@@ -56,21 +50,21 @@
     headerSetting.value.show();
   }
 
-  //消息通知
-  const headerMessage = ref();
-  function showMessage() {
-    headerMessage.value.showMessage();
-  }
-
   //帮助文档
   function showHelpDoc() {
     useAppConfigStore().showHelpDoc();
   }
 
-  //搜索
-  function search(){
-    window.open("https://1024lab.net");
-  }
+  const showHelpDocFlag = computed(() => {
+    return useAppConfigStore().helpDocFlag;
+  });
+
+  const helpDocExpandFlag = computed(() => {
+    return useAppConfigStore().helpDocExpandFlag;
+  });
+
+  const { useToken } = theme;
+  const { token } = useToken();
 </script>
 
 <style lang="less" scoped>
@@ -91,8 +85,8 @@
   }
 
   .user-space-item:hover {
-    color: @primary-color;
-    background: @hover-bg-color;
+    color: v-bind('token.colorPrimary');
+    background-color: @hover-bg-color !important;
   }
 
   .setting {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/menu-location-breadcrumb/index.vue b/smart-admin-web-typescript/src/layout/components/menu-location-breadcrumb/index.vue
similarity index 88%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/menu-location-breadcrumb/index.vue
rename to smart-admin-web-typescript/src/layout/components/menu-location-breadcrumb/index.vue
index 490cdbe..62a93cc 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/menu-location-breadcrumb/index.vue
+++ b/smart-admin-web-typescript/src/layout/components/menu-location-breadcrumb/index.vue
@@ -8,7 +8,7 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-breadcrumb separator=">" style="display: inline" v-if="breadCrumbFlag">
+  <a-breadcrumb separator=">" v-if="breadCrumbFlag" class="breadcrumb">
     <a-breadcrumb-item v-for="(item, index) in parentMenuList" :key="index">{{ item.title }}</a-breadcrumb-item>
     <a-breadcrumb-item>{{ currentRoute.meta.title }}</a-breadcrumb-item>
   </a-breadcrumb>
@@ -33,3 +33,8 @@
     return menuParentIdListMap.get(currentName) || [];
   });
 </script>
+<style scoped lang="less">
+.breadcrumb{
+  line-height: @page-tag-height;
+}
+</style>
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/page-tag/components/antd-tab.vue b/smart-admin-web-typescript/src/layout/components/page-tag/components/antd-tab.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/page-tag/components/antd-tab.vue
rename to smart-admin-web-typescript/src/layout/components/page-tag/components/antd-tab.vue
index d9ea9e5..2bc30e7 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/page-tag/components/antd-tab.vue
+++ b/smart-admin-web-typescript/src/layout/components/page-tag/components/antd-tab.vue
@@ -48,7 +48,7 @@
   </a-row>
 </template>
 
-<script setup>
+<script setup lang="ts">
   import { AppstoreOutlined, CloseOutlined } from '@ant-design/icons-vue';
   import { computed, ref, watch } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
@@ -105,7 +105,7 @@
     if (item && !closeAll) {
       let goName = HOME_PAGE_NAME;
       let goQuery = undefined;
-      if (item.fromMenuName && tagNav.value.some((e) => e.menuName === item.fromMenuName)) {
+      if (item.fromMenuName && item.fromMenuName !== item.menuName && tagNav.value.some((e) => e.menuName === item.fromMenuName)) {
         goName = item.fromMenuName;
         goQuery = item.fromMenuQuery;
       } else {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/page-tag/components/default-tab.vue b/smart-admin-web-typescript/src/layout/components/page-tag/components/default-tab.vue
similarity index 95%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/page-tag/components/default-tab.vue
rename to smart-admin-web-typescript/src/layout/components/page-tag/components/default-tab.vue
index 77e0d33..a3486c4 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/page-tag/components/default-tab.vue
+++ b/smart-admin-web-typescript/src/layout/components/page-tag/components/default-tab.vue
@@ -18,6 +18,7 @@
               <span>
                 {{ item.menuTitle }}
                 <close-outlined @click.stop="closeTag(item, false)" v-if="item.menuName !== HOME_PAGE_NAME" class="smart-page-tag-close" />
+                <home-outlined style="font-size: 12px" v-if="item.menuName === HOME_PAGE_NAME" class="smart-page-tag-close" />
               </span>
             </template>
           </a-tab-pane>
@@ -48,7 +49,7 @@
   </a-row>
 </template>
 
-<script setup>
+<script setup lang="ts">
   import { AppstoreOutlined, CloseOutlined } from '@ant-design/icons-vue';
   import { computed, ref, watch } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
@@ -105,7 +106,7 @@
     if (item && !closeAll) {
       let goName = HOME_PAGE_NAME;
       let goQuery = undefined;
-      if (item.fromMenuName && tagNav.value.some((e) => e.menuName === item.fromMenuName)) {
+      if (item.fromMenuName && item.fromMenuName !== item.menuName && tagNav.value.some((e) => e.menuName === item.fromMenuName)) {
         goName = item.fromMenuName;
         goQuery = item.fromMenuQuery;
       } else {
diff --git a/smart-admin-web-typescript/src/layout/components/page-tag/index.vue b/smart-admin-web-typescript/src/layout/components/page-tag/index.vue
new file mode 100644
index 0000000..40a28d3
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/components/page-tag/index.vue
@@ -0,0 +1,25 @@
+<!--
+  * 标签页 入口，支持三种模式：默认、a-tabs, chrome-tabs
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2024-06-12 20:55:04
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <div id="smartAdminPageTag">
+    <DefaultTab v-if="pageTagStyle === PAGE_TAG_ENUM.DEFAULT.value" />
+    <AntdTab v-if="pageTagStyle === PAGE_TAG_ENUM.ANTD.value" />
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { computed } from 'vue';
+  import { useAppConfigStore } from '/@/store/modules/system/app-config';
+  import DefaultTab from './components/default-tab.vue';
+  import AntdTab from './components/antd-tab.vue';
+  import { PAGE_TAG_ENUM } from '/@/constants/layout-const.js';
+
+  const pageTagStyle = computed(() => useAppConfigStore().$state.pageTagStyle);
+</script>
diff --git a/smart-admin-web-typescript/src/layout/components/side-expand-menu/index.vue b/smart-admin-web-typescript/src/layout/components/side-expand-menu/index.vue
new file mode 100644
index 0000000..dfc98d6
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/components/side-expand-menu/index.vue
@@ -0,0 +1,75 @@
+<!--
+  * 展开菜单
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-09-06 20:29:12 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <div class="menu-container">
+    <!-- 第一列：一级导航 -->
+    <TopMenu ref="topMenuRef" class="top-menu" />
+    <!-- 第二列：二级导航 -->
+    <RecursionMenu ref="recursionMenuRef" class="recursion-menu" />
+  </div>
+</template>
+<script setup lang="ts">
+  import { onMounted, ref, watch } from 'vue';
+  import { useRoute } from 'vue-router';
+  import RecursionMenu from './recursion-menu.vue';
+  import TopMenu from './top-menu.vue';
+  import { useUserStore } from '/@/store/modules/system/user';
+
+  const props = defineProps({
+    placeholder: {
+      type: String,
+      default: '请选择',
+    },
+  });
+
+  // 选中的顶级菜单
+  const topMenuRef = ref();
+  // 二级菜单引用
+  const recursionMenuRef = ref();
+
+  let currentRoute = useRoute();
+
+  // 根据路由更新菜单展开和选中状态
+  function updateSelectKeyAndOpenKey() {
+    // 第一步，根据路由 更新选中 顶级菜单
+    let parentList = useUserStore().menuParentIdListMap.get(currentRoute.name) || [];
+    if (parentList.length === 0) {
+      topMenuRef.value.updateSelectKey(currentRoute.name);
+      return;
+    }
+    topMenuRef.value.updateSelectKey(parentList[0].name);
+
+    //第二步，根据路由 更新 二级菜单的selectKey和openKey
+    recursionMenuRef.value.updateSelectKeyAndOpenKey(parentList, currentRoute.name);
+  }
+
+  onMounted(updateSelectKeyAndOpenKey);
+
+  //监听路由的变化，进行更新菜单展开项目
+  watch(currentRoute, () => {
+    updateSelectKeyAndOpenKey();
+  });
+</script>
+<style scoped lang="less">
+  .menu-container {
+    display: flex;
+    height: 100%;
+
+    .top-menu {
+      width: 114px;
+      flex-shrink: 0;
+    }
+
+    .recursion-menu {
+      min-width: 126px;
+      flex: 1;
+    }
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue b/smart-admin-web-typescript/src/layout/components/side-expand-menu/recursion-menu.vue
similarity index 60%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue
rename to smart-admin-web-typescript/src/layout/components/side-expand-menu/recursion-menu.vue
index 2eb6cb8..396abbb 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/recursion-menu.vue
+++ b/smart-admin-web-typescript/src/layout/components/side-expand-menu/recursion-menu.vue
@@ -8,14 +8,14 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <div class="resursion-container">
+  <div class="recursion-container" v-show="topMenu.children && topMenu.children.length > 0">
     <!-- 顶部顶级菜单名称 -->
     <div class="top-menu">
-      <span class="ant-menu">{{ props.selectedMenu?.menuName }}</span>
+      <span class="ant-menu">{{ topMenu.menuName }}</span>
     </div>
     <!-- 次级菜单展示 -->
     <a-menu :selectedKeys="selectedKeys" :openKeys="openKeys" mode="inline">
-      <template v-for="item in props.selectedMenu?.children" :key="item.menuId">
+      <template v-for="item in topMenu.children" :key="item.menuId">
         <template v-if="item.visibleFlag">
           <template v-if="$lodash.isEmpty(item.children)">
             <a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)">
@@ -34,59 +34,60 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { computed } from 'vue';
-  import { useRoute } from 'vue-router';
-  import { router } from '/@/router';
-  import SubMenu from './sub-menu.vue';
+  import { ref } from 'vue';
   import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
-  import { useUserStore } from '/@/store/modules/system/user';
+  import SubMenu from './sub-menu.vue';
+  import { router } from '/@/router';
   import _ from 'lodash';
+  import menuEmitter from './side-expand-menu-mitt';
+  import { useUserStore } from '/@/store/modules/system/user';
 
-  let props = defineProps({
-    selectedMenu: Object,
-  });
+  // 选中的顶级菜单
+  let topMenu = ref({});
+  menuEmitter.on('selectTopMenu', onSelectTopMenu);
 
-  defineEmits('update:value');
+  // 监听选中顶级菜单事件
+  function onSelectTopMenu(selectedTopMenu) {
+    topMenu.value = selectedTopMenu;
+    if (selectedTopMenu.children && selectedTopMenu.children.length > 0) {
+      openKeys.value = _.map(selectedTopMenu.children, 'menuId').map((e) => e.toString());
+    } else {
+      openKeys.value = [];
+    }
+    selectedKeys.value = [];
+  }
 
   //展开的菜单
-  let currentRoute = useRoute();
-  const selectedKeys = computed(() => {
-    return [currentRoute.name];
-  });
+  const selectedKeys = ref([]);
+  const openKeys = ref([]);
 
-  const parentMenuList = computed(() => {
-    let currentName = currentRoute.name;
-    if (!currentName || typeof currentName !== 'string') {
-      return [];
+  function updateSelectKeyAndOpenKey(parentList, currentSelectKey) {
+    if (!parentList) {
+      return;
     }
-    let menuParentIdListMap = useUserStore().getMenuParentIdListMap;
-    return menuParentIdListMap?.get(currentName) || [];
-  });
+    //获取需要展开的menu key集合
+    openKeys.value = _.map(parentList, 'name');
+    selectedKeys.value = [currentSelectKey];
+  }
 
-  const openKeys = computed(() => {
-    // // 仅展开当前页面
-    // return parentMenuList.value.map((e) => e.name);
-    // 展开所有
-    let children = props.selectedMenu?.children;
-    if (!children || _.isEmpty(children)) {
-      return [];
-    }
-    return children.map((e) => e.menuId.toString());
-  });
   // 页面跳转
   function turnToPage(route) {
+    useUserStore().deleteKeepAliveIncludes(route.menuId.toString());
     router.push({ name: route.menuId.toString() });
   }
 
   function goHome() {
     router.push({ name: HOME_PAGE_NAME });
   }
+
+  defineExpose({ updateSelectKeyAndOpenKey });
 </script>
 <style scoped lang="less">
-  .resursion-container {
+  .recursion-container {
     height: 100%;
     background: #ffffff;
   }
+
   .top-menu {
     overflow: hidden;
     display: flex;
diff --git a/smart-admin-web-typescript/src/layout/components/side-expand-menu/side-expand-menu-mitt.ts b/smart-admin-web-typescript/src/layout/components/side-expand-menu/side-expand-menu-mitt.ts
new file mode 100644
index 0000000..22e6a40
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/components/side-expand-menu/side-expand-menu-mitt.ts
@@ -0,0 +1,11 @@
+/*
+ * 展开菜单 event bus
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-07-12 23:32:48
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+import mitt from 'mitt';
+export default mitt();
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue b/smart-admin-web-typescript/src/layout/components/side-expand-menu/sub-menu.vue
similarity index 80%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue
rename to smart-admin-web-typescript/src/layout/components/side-expand-menu/sub-menu.vue
index 08e042d..3034e76 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/sub-menu.vue
+++ b/smart-admin-web-typescript/src/layout/components/side-expand-menu/sub-menu.vue
@@ -8,12 +8,12 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-sub-menu :key="props.menuInfo?.menuId.toString()">
+  <a-sub-menu :key="props.menuInfo.menuId.toString()">
     <template #icon>
-      <component :is="$antIcons[props.menuInfo?.icon]" />
+      <component :is="$antIcons[props.menuInfo.icon]" />
     </template>
-    <template #title>{{ props.menuInfo?.menuName }}</template>
-    <template v-for="item in props.menuInfo?.children" :key="item.menuId">
+    <template #title>{{ props.menuInfo.menuName }}</template>
+    <template v-for="item in props.menuInfo.children" :key="item.menuId">
       <template v-if="item.visibleFlag">
         <template v-if="!item.children">
           <a-menu-item :key="item.menuId.toString()" @click="turnToPage(item)">
@@ -32,7 +32,7 @@
 </template>
 <script setup lang="ts">
   let props = defineProps({
-    menuInfo: Array,
+    menuInfo: Object,
   });
   const emits = defineEmits(['turnToPage']);
   const turnToPage = (route) => {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue b/smart-admin-web-typescript/src/layout/components/side-expand-menu/top-menu.vue
similarity index 53%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue
rename to smart-admin-web-typescript/src/layout/components/side-expand-menu/top-menu.vue
index 46d9207..cf82fa9 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/top-menu.vue
+++ b/smart-admin-web-typescript/src/layout/components/side-expand-menu/top-menu.vue
@@ -12,17 +12,17 @@
     <!-- 顶部logo区域 -->
     <div class="logo" @click="onGoHome">
       <img class="logo-img" :src="logoImg" />
-      <div class="title">SmartAdmin 3.X</div>
+      <div class="title smart-logo">{{ websiteName }}</div>
     </div>
     <!-- 一级菜单展示 -->
     <a-menu :selectedKeys="selectedKeys" mode="inline" :theme="theme">
-      <template v-for="item in props.menuTree" :key="item.menuId">
+      <template v-for="item in menuTree" :key="item.menuId">
         <template v-if="item.visibleFlag">
           <a-menu-item :key="item.menuId.toString()" @click="onSelectMenu(item)">
             <template #icon>
               <component :is="$antIcons[item.icon]" />
             </template>
-            {{ item.menuName }}
+            {{ menuNameAdapter(item.menuName) }}
           </a-menu-item>
         </template>
       </template>
@@ -31,70 +31,52 @@
 </template>
 <script setup lang="ts">
   import _ from 'lodash';
-  import { computed, ref, watch } from 'vue';
-  import { useRoute } from 'vue-router';
-  import logoImg from '/@/assets/images/logo/smart-admin-logo.png';
+  import { computed, ref } from 'vue';
   import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
   import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
   import { router } from '/@/router';
   import { useAppConfigStore } from '/@/store/modules/system/app-config';
   import { useUserStore } from '/@/store/modules/system/user';
+  import logoImg from '/@/assets/images/logo/smart-admin-logo.png';
+  import menuEmitter from './side-expand-menu-mitt';
 
+  const websiteName = computed(() => useAppConfigStore().websiteName);
   const theme = computed(() => useAppConfigStore().$state.sideMenuTheme);
+  const menuTree = computed(() => useUserStore().getMenuTree || []);
 
-  const props = defineProps({
-    menuTree: Array,
-  });
-  const selectedMenu = ref();
-  let currentRoute = useRoute();
+  // 展开菜单的顶级目录名字适配，只展示两个字为好
+  function menuNameAdapter(name) {
+    return name.substr(0, 2);
+  }
 
-  const parentMenuList = computed(() => {
-    let currentName = currentRoute.name;
-    if (!currentName || typeof currentName !== 'string') {
-      return [];
-    }
-    let menuParentIdListMap = useUserStore().getMenuParentIdListMap;
-    return menuParentIdListMap.get(currentName) || [];
-  });
+  // 选中的顶级菜单
+  const selectedKeys = ref([]);
 
-  const selectedKeys = computed(() => {
-    if (selectedMenu.value) {
-      return [selectedMenu.value.menuId.toString()];
-    }
-    return parentMenuList.value.map((e) => e.name);
-  });
-
-  //监听路由的变化，进行更新菜单展开项目
-  watch(
-    currentRoute,
-    () => {
-      selectedMenu.value = undefined;
-      let menuList = props.menuTree.map((e) => e.menuId.toString());
-      let parentIdList = _.intersection(menuList, selectedKeys.value);
-      if (parentIdList.length > 0) {
-        let parentId = parentIdList[0];
-        let parentItem = props.menuTree.find((e) => e.menuId == Number(parentId));
-        selectedMenu.value = parentItem;
-      }
-    },
-    {
-      immediate: true,
-    }
-  );
   // 选中菜单，页面跳转
-  function onSelectMenu(route) {
-    selectedMenu.value = route;
-    if (route.menuType == MENU_TYPE_ENUM.MENU.value && (_.isEmpty(route.children) || route.children.every((e) => !e.visibleFlag))) {
-      router.push({ name: route.menuId.toString() });
+  function onSelectMenu(menuItem) {
+    selectedKeys.value = [menuItem.menuId.toString()];
+    if (menuItem.menuType === MENU_TYPE_ENUM.MENU.value && (_.isEmpty(menuItem.children) || menuItem.children.every((e) => !e.visibleFlag))) {
+      useUserStore().deleteKeepAliveIncludes(menuItem.menuId.toString());
+      router.push({ name: menuItem.menuId.toString() });
+    }
+    menuEmitter.emit('selectTopMenu', menuItem);
+  }
+
+  // 更新选中的菜单
+  function updateSelectKey(key) {
+    selectedKeys.value = [key];
+    let selectMenu = _.find(menuTree.value, { menuId: Number(key) });
+    if (selectMenu) {
+      menuEmitter.emit('selectTopMenu', selectMenu);
     }
   }
+
   //点击logo回到首页
   function onGoHome() {
     router.push({ name: HOME_PAGE_NAME });
   }
-  defineExpose({
-    selectedMenu,
-  });
+
+  defineExpose({ updateSelectKey });
 </script>
 <style scoped lang="less">
   .top-menu-container {
@@ -105,20 +87,23 @@
     line-height: @header-user-height;
     padding: 0px 15px 0px 15px;
     width: 100%;
-    z-index: 9999;
+    z-index: 100;
     display: flex;
     justify-content: space-between;
+    align-items: center;
     cursor: pointer;
 
     .logo-img {
-      width: 40px;
-      height: 40px;
+      width: 30px;
+      height: 30px;
     }
 
     .title {
       font-size: 16px;
       font-weight: 600;
       overflow: hidden;
+      word-wrap: break-word;
+      white-space: nowrap;
       color: v-bind('theme === "light" ? "#001529": "#ffffff"');
     }
   }
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-help-doc/components/contact-modal.vue b/smart-admin-web-typescript/src/layout/components/side-help-doc/components/contact-modal.vue
similarity index 88%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-help-doc/components/contact-modal.vue
rename to smart-admin-web-typescript/src/layout/components/side-help-doc/components/contact-modal.vue
index b4202bf..f5b5ef7 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-help-doc/components/contact-modal.vue
+++ b/smart-admin-web-typescript/src/layout/components/side-help-doc/components/contact-modal.vue
@@ -9,7 +9,7 @@
 -->
 <template>
   <a-modal :open="visible" width="600px" title="联系客服人员" :closable="false" :maskClosable="true">
-    <a-row><div style="margin-left: 180px">客服(卓大)电话：18637925892 ;</div> </a-row>
+    <a-row><div style="margin-left: 180px;font-weight:bolder">客服(卓大)电话：18637925892 ;</div> </a-row>
     <br />
     <div class="app-qr-box">
       <div class="app-qr">
@@ -19,8 +19,8 @@
       </div>
       <div class="app-qr">
         <img :src="xiaozhen" />
-        <span class="qr-desc strong"> 关注：小镇程序员 </span>
-        <span class="qr-desc"> 程序员的工作生活 </span>
+        <span class="qr-desc strong"> 六边形工程师 </span>
+        <span class="qr-desc"> 赚钱、代码、生活 </span>
       </div>
       <div class="app-qr">
         <img :src="lab1024" />
@@ -37,7 +37,7 @@
   import { ref, reactive, nextTick, computed } from 'vue';
   import zhuoda from '/@/assets/images/1024lab/zhuoda-wechat.jpg';
   import lab1024 from '/@/assets/images/1024lab/1024lab-gzh.jpg';
-  import xiaozhen from '/@/assets/images/1024lab/xiaozhen-gzh.jpg';
+  import xiaozhen from '/@/assets/images/1024lab/gzh.jpg';
 
   defineExpose({
     show,
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-help-doc/components/feedback-modal.vue b/smart-admin-web-typescript/src/layout/components/side-help-doc/components/feedback-modal.vue
similarity index 89%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-help-doc/components/feedback-modal.vue
rename to smart-admin-web-typescript/src/layout/components/side-help-doc/components/feedback-modal.vue
index 3837f86..c7b9da0 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-help-doc/components/feedback-modal.vue
+++ b/smart-admin-web-typescript/src/layout/components/side-help-doc/components/feedback-modal.vue
@@ -1,11 +1,11 @@
 <!--
-  *  意见反馈提交弹窗 
+  *  意见反馈提交弹窗
   *
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:40:16 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:40:16
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-modal :open="visible" title="意见反馈" :closable="false" :maskClosable="true" >
@@ -34,7 +34,7 @@
 <script setup lang="ts">
 import { reactive, ref } from 'vue';
 import { SmartLoading } from '/@/components/framework/smart-loading';
-import { feedbackApi } from '/@/api/support/feedback/feedback-api';
+import { feedbackApi } from '/@/api/support/feedback-api';
 import { message } from 'ant-design-vue';
 import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
 import Upload from '/@/components/support/file-upload/index.vue';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-help-doc/index.vue b/smart-admin-web-typescript/src/layout/components/side-help-doc/index.vue
similarity index 76%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-help-doc/index.vue
rename to smart-admin-web-typescript/src/layout/components/side-help-doc/index.vue
index 7bcd677..a421f55 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-help-doc/index.vue
+++ b/smart-admin-web-typescript/src/layout/components/side-help-doc/index.vue
@@ -1,11 +1,11 @@
 <!--
-  *  帮助文档 
+  *  帮助文档
   *
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:40:16 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:40:16
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <div class="help-doc-wrapper">
@@ -42,7 +42,7 @@
     <!-----文档列表---->
     <div class="help-doc-list">
       <div class="help-doc-item-all">
-        <router-link tag="a" target="_blank" :to="{ path: '/help-doc/detail' }">查看全部文档 >></router-link>
+        <router-link tag="a" target="_blank" :to="{ path: '/help-doc/detail' }">系统帮助文档 >></router-link>
       </div>
       <div class="help-doc-item" v-for="item in helpDocList" :key="item.helpDocId">
         <router-link tag="a" target="_blank" :to="{ path: '/help-doc/detail', query: { helpDocId: item.helpDocId } }">{{ item.title }}</router-link>
@@ -59,12 +59,13 @@
   import { onMounted, ref, watch, reactive } from 'vue';
   import { useRoute } from 'vue-router';
   import _ from 'lodash';
-  import { helpDocApi } from '/@/api/support/help-doc/help-doc-api';
+  import { helpDocApi } from '/@/api/support/help-doc-api';
   import ContactModal from './components/contact-modal.vue';
   import FeedbackModal from './components/feedback-modal.vue';
   import { useAppConfigStore } from '/@/store/modules/system/app-config';
-  import { feedbackApi } from '/@/api/support/feedback/feedback-api';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { feedbackApi } from '/@/api/support/feedback-api';
+  import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   function hideHelpDoc() {
     useAppConfigStore().hideHelpDoc();
@@ -76,34 +77,34 @@ import { smartSentry } from '/@/lib/smart-sentry';
   // ------------------ 意见反馈 --------------------------
   let feedbackMessageList = ref([]);
   onMounted(() => {
-    // 默认先查询一次
+    // 首先查询多一些意见反馈
     queryFeedbackList();
-    scroll();
+    // 更换显示
+    scheduleShowFeedback();
   });
 
-  let scrollInterval = null;
-  let swiper = 1;
+  let scheduleShowInterval = null;
+  let scheduleShowIndex = 0;
 
-  function scroll() {
-    if (scrollInterval != null) {
+  function scheduleShowFeedback() {
+    if (scheduleShowInterval != null) {
       return;
     }
 
-    scrollInterval = setInterval(() => {
-      if (currentPage >= pages) {
-        currentPage = 1;
-      }
-      if (pages == 0 || feedbackList.length == 0) {
+    scheduleShowInterval = setInterval(() => {
+      if (feedbackList.length === 0) {
         return;
       }
-      let initValue = (currentPage - 1) * 2;
-      feedbackMessageList.value[0] = feedbackList[initValue];
-      if (feedbackList[initValue + 1]) {
-        feedbackMessageList.value[1] = feedbackList[initValue + 1];
+
+      // 显示两条意见反馈
+      for (let i = 0; i < 2; i++) {
+        if (scheduleShowIndex >= feedbackList.length) {
+          scheduleShowIndex = 0;
+        }
+        feedbackMessageList.value[i] = feedbackList[scheduleShowIndex];
+        scheduleShowIndex++;
       }
-      swiper = currentPage - 1;
-      currentPage++;
-    }, 2000);
+    }, 3000);
   }
 
   // 总页数
@@ -120,7 +121,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
       };
       let result = await feedbackApi.queryFeedback(param);
       feedbackList = result.data.list;
-      pages = Math.ceil(result.data.total / 2);
+      pages = Math.ceil(feedbackList.length / 2);
     } catch (e) {
       smartSentry.captureError(e);
     }
@@ -142,11 +143,15 @@ import { smartSentry } from '/@/lib/smart-sentry';
       //SmartAdmin中 router的name 就是 后端存储menu的id
       let menuId = -1;
       try {
-        menuId = _.toNumber(currentRoute.name);
+        if (currentRoute.name === HOME_PAGE_NAME) {
+          menuId = 0;
+        } else {
+          menuId = _.toNumber(currentRoute.name);
+        }
       } catch (e) {
         smartSentry.captureError(e);
       }
-      if (menuId > 0) {
+      if (menuId > -1) {
         queryHelpDocList(menuId);
       }
     },
@@ -158,7 +163,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
 
 <style scoped lang="less">
   .help-doc-wrapper {
-    border-left:1px solid #ededed;
+    border-left: 1px solid #ededed;
     height: 100vh;
     padding: 0 10px;
 
@@ -182,6 +187,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
       justify-content: space-between;
       .help-doc-contact-left {
         width: 30px;
+        margin-top: 10px;
       }
       .help-doc-contact-right {
         margin-top: 10px;
@@ -189,19 +195,20 @@ import { smartSentry } from '/@/lib/smart-sentry';
         .help-doc-contac-time {
           color: #888;
           font-size: 12px;
+          margin-top: 10px;
         }
       }
     }
 
     .feedback {
       .feedback-message-list {
-        margin: 6px 0px;
-        height: 40px;
+        margin: 12px 0px;
+        height: 70px;
         position: relative;
         overflow: hidden;
         .feedback-message {
-          margin: 2px 2px;
-          color: #888;
+          margin: 10px 2px;
+          color: #a9a9a9;
           font-size: 12px;
         }
       }
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-menu/index.vue b/smart-admin-web-typescript/src/layout/components/side-menu/index.vue
similarity index 64%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-menu/index.vue
rename to smart-admin-web-typescript/src/layout/components/side-menu/index.vue
index b1abbe1..5f6c58d 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-menu/index.vue
+++ b/smart-admin-web-typescript/src/layout/components/side-menu/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 传统菜单
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:29:12 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:29:12
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <!--左侧菜单分为两部分：1、顶部logo区域，包含 logo和名称;2、下方菜单区域-->
@@ -13,19 +13,21 @@
   <!-- 1、顶部logo区域 -->
   <div class="logo" @click="onGoHome" :style="sideMenuWidth" v-if="!collapsed">
     <img class="logo-img" :src="logoImg" />
-    <div class="title title-light" v-if="sideMenuTheme === 'light'">{{websiteName}}</div>
-    <div class="title title-dark" v-if="sideMenuTheme === 'dark'">{{websiteName}}</div>
+    <div class="title smart-logo title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
+    <div class="title smart-logo title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
   </div>
   <div class="min-logo" @click="onGoHome" v-if="collapsed">
     <img class="logo-img" :src="logoImg" />
   </div>
 
   <!-- 2、下方菜单区域： 这里使用一个递归菜单解决 -->
-  <RecursionMenu :collapsed="collapsed" ref="menu" />
+  <div class="menu">
+    <RecursionMenu :collapsed="collapsed" ref="menuRef" />
+  </div>
 </template>
 
 <script setup lang="ts">
-  import { computed, ref, watch } from 'vue';
+  import { computed, nextTick, ref, watch } from 'vue';
   import { useRouter } from 'vue-router';
   import RecursionMenu from './recursion-menu.vue';
   import logoImg from '/@/assets/images/logo/smart-admin-logo.png';
@@ -44,14 +46,14 @@
     },
   });
 
-  const menu = ref();
+  const menuRef = ref();
 
   watch(
     () => props.collapsed,
     (newValue, oldValue) => {
       // 如果是展开菜单的话，重新获取更新菜单的展开项: openkeys和selectKeys
       if (!newValue) {
-        menu.value.updateOpenKeysAndSelectKeys();
+        nextTick(() => menuRef.value.updateOpenKeysAndSelectKeys());
       }
     }
   );
@@ -60,6 +62,13 @@
   function onGoHome() {
     router.push({ name: HOME_PAGE_NAME });
   }
+
+  const color = computed(() => {
+    let isLight = useAppConfigStore().$state.sideMenuTheme === 'light';
+    return {
+      background: isLight ? '#FFFFFF' : '#001529',
+    };
+  });
 </script>
 
 <style lang="less" scoped>
@@ -75,44 +84,50 @@
       height: @header-user-height;
       line-height: @header-user-height;
       padding: 0px 15px 0px 15px;
-      width: 100%;
-      z-index: 9999;
+      background-color: v-bind('color.background');
+      position: fixed;
+      width: 80px;
+      z-index: 21;
       display: flex;
       justify-content: center;
+      align-items: center;
       .logo-img {
-        width: 32px;
-        height: 32px;
+        width: 30px;
+        height: 30px;
       }
     }
 
     .logo {
       height: @header-user-height;
       line-height: @header-user-height;
+      background-color: v-bind('color.background');
       padding: 0px 15px 0px 15px;
-      z-index: 9999;
+      position: fixed;
+      z-index: 21;
       display: flex;
       cursor: pointer;
-      justify-content:space-around;
+      justify-content: center;
+      align-items: center;
 
       .logo-img {
-        width: 40px;
-        height: 40px;
+        width: 30px;
+        height: 30px;
       }
 
       .title {
         font-size: 16px;
         font-weight: 600;
-        margin-left:8px;
+        margin-left: 8px;
       }
       .title-light {
-        color:#001529;
+        color: #001529;
       }
       .title-dark {
-        color:#ffffff;
+        color: #ffffff;
       }
     }
   }
   .menu {
-    padding: 16px 0;
+    margin-top: @header-user-height;
   }
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-menu/recursion-menu.vue b/smart-admin-web-typescript/src/layout/components/side-menu/recursion-menu.vue
similarity index 84%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-menu/recursion-menu.vue
rename to smart-admin-web-typescript/src/layout/components/side-menu/recursion-menu.vue
index edba552..a922e2a 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-menu/recursion-menu.vue
+++ b/smart-admin-web-typescript/src/layout/components/side-menu/recursion-menu.vue
@@ -14,7 +14,7 @@
     class="smart-menu"
     mode="inline"
     :theme="theme"
-    :inlineCollapsed="inlineCollapsed"
+    :inlineCollapsed="collapsed"
   >
     <template v-for="item in menuTree" :key="item.menuId">
       <template v-if="item.visibleFlag && !item.disabledFlag">
@@ -45,7 +45,7 @@
   const theme = computed(() => useAppConfigStore().$state.sideMenuTheme);
 
   const props = defineProps({
-    inlineCollapsed: {
+    collapsed: {
       type: Boolean,
       default: false,
     },
@@ -59,8 +59,9 @@
   const openKeys = ref([]);
 
   // 页面跳转
-  function turnToPage(route) {
-    router.push({ name: route.menuId.toString() });
+  function turnToPage(menu) {
+    useUserStore().deleteKeepAliveIncludes(menu.menuId.toString());
+    router.push({ path: menu.path });
   }
 
   /**
@@ -77,9 +78,13 @@
     //获取需要展开的menu key集合
     let menuParentIdListMap = useUserStore().getMenuParentIdListMap;
     let parentList = menuParentIdListMap.get(currentRoute.name) || [];
-    let needOpenKeys = _.map(parentList, 'name').map(Number);
-    // 使用lodash的union函数，进行 去重合并两个数组
-    openKeys.value = _.union(openKeys.value, needOpenKeys);
+
+    // 如果是折叠菜单的话，则不需要设置openkey
+    if(!props.collapsed){
+      // 使用lodash的union函数，进行 去重合并两个数组
+      let needOpenKeys = _.map(parentList, 'name').map(Number);
+      openKeys.value = _.union(openKeys.value, needOpenKeys);
+    }
   }
 
   watch(
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-menu/sub-menu.vue b/smart-admin-web-typescript/src/layout/components/side-menu/sub-menu.vue
similarity index 95%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-menu/sub-menu.vue
rename to smart-admin-web-typescript/src/layout/components/side-menu/sub-menu.vue
index 97654b7..9385497 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-menu/sub-menu.vue
+++ b/smart-admin-web-typescript/src/layout/components/side-menu/sub-menu.vue
@@ -39,7 +39,7 @@
   });
 
   const emits = defineEmits(['turnToPage']);
-  const turnToPage = (route) => {
-    emits('turnToPage', route);
+  const turnToPage = (menu) => {
+    emits('turnToPage', menu);
   };
 </script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/smart-footer/index.vue b/smart-admin-web-typescript/src/layout/components/smart-footer/index.vue
similarity index 77%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/components/smart-footer/index.vue
rename to smart-admin-web-typescript/src/layout/components/smart-footer/index.vue
index 3bcbb7d..42650dd 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/smart-footer/index.vue
+++ b/smart-admin-web-typescript/src/layout/components/smart-footer/index.vue
@@ -8,10 +8,8 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
-  <div class="version" >
-    <a target="_blank" href="https://www.1024lab.net">
-      SmartAdmin V3.x @copyright 【1024创新实验室】 Since 2012-{{ currentYear }}
-    </a>
+  <div class="version">
+    <a target="_blank" class="smart-copyright" href="https://www.1024lab.net"> ©2012-{{ currentYear }} SmartAdmin | 1024创新实验室 </a>
   </div>
 </template>
 <script setup lang="ts">
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-keep-alive.ts b/smart-admin-web-typescript/src/layout/components/smart-keep-alive.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/smart-keep-alive.ts
rename to smart-admin-web-typescript/src/layout/components/smart-keep-alive.ts
diff --git a/smart-admin-web-typescript/src/layout/components/top-menu/index.vue b/smart-admin-web-typescript/src/layout/components/top-menu/index.vue
new file mode 100644
index 0000000..5c83ba0
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/components/top-menu/index.vue
@@ -0,0 +1,173 @@
+<!--
+  * 顶部菜单
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:29:12
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <!--总共3部分：1、logo区域，包含 logo和名称; 2、菜单区域  ;3、用户操作区域-->
+  <div class="header-main">
+    <!-- 1、logo区域 -->
+    <div class="logo" @click="onGoHome">
+      <img class="logo-img" :src="logoImg" />
+      <div class="title smart-logo title-light" v-if="sideMenuTheme === 'light'">{{ websiteName }}</div>
+      <div class="title smart-logo title-dark" v-if="sideMenuTheme === 'dark'">{{ websiteName }}</div>
+    </div>
+    <!-- 2、菜单区域 -->
+    <RecursionMenu ref="menuRef" />
+
+    <!-- 3、用户操作区域 -->
+    <div class="user-space">
+      <div class="setting">
+        <!---消息通知--->
+        <HeaderMessage ref="headerMessage" />
+        <!---设置--->
+        <a-button type="text" @click="showSetting" class="operate-icon">
+          <template #icon><setting-outlined /></template>
+        </a-button>
+      </div>
+      <!---头像信息--->
+      <div class="user-space-item">
+        <HeaderAvatar />
+      </div>
+      <HeaderSetting ref="headerSetting" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { computed, ref, watch } from 'vue';
+  import { useRouter } from 'vue-router';
+  import RecursionMenu from './recursion-menu.vue';
+  import logoImg from '/@/assets/images/logo/smart-admin-logo.png';
+  import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
+  import { useAppConfigStore } from '/@/store/modules/system/app-config';
+  import HeaderAvatar from '../header-user-space/header-avatar.vue';
+  import HeaderSetting from '../header-user-space/header-setting.vue';
+  import HeaderMessage from '../header-user-space/header-message.vue';
+
+  // 设置
+  const headerSetting = ref();
+  function showSetting() {
+    headerSetting.value.show();
+  }
+
+  //消息通知
+  const headerMessage = ref();
+  function showMessage() {
+    headerMessage.value.showMessage();
+  }
+
+  const websiteName = computed(() => useAppConfigStore().websiteName);
+  const sideMenuTheme = computed(() => useAppConfigStore().sideMenuTheme);
+
+  const props = defineProps({
+    collapsed: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  });
+
+  const menuRef = ref();
+
+  watch(
+    () => props.collapsed,
+    (newValue, oldValue) => {
+      // 如果是展开菜单的话，重新获取更新菜单的展开项: openkeys和selectKeys
+      if (!newValue) {
+        menuRef.value.updateSelectKeys();
+      }
+    }
+  );
+
+  const color = computed(() => {
+    let isLight = useAppConfigStore().$state.sideMenuTheme === 'light';
+    return {
+      color: isLight ? '#001529' : '#FFFFFF',
+      background: isLight ? '#FFFFFF' : '#001529',
+    };
+  });
+
+  const router = useRouter();
+  function onGoHome() {
+    router.push({ name: HOME_PAGE_NAME });
+  }
+</script>
+
+<style lang="less" scoped>
+  .header-main {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    width: 100%;
+    padding-left: 16px;
+    height: 48px;
+    z-index: 21;
+    border-bottom: 1px solid rgb(238, 238, 238);
+
+    .logo {
+      min-width: 192px;
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
+
+      .logo-img {
+        display: inline-block;
+        height: 30px;
+        vertical-align: middle;
+      }
+      .title {
+        font-size: 16px;
+        font-weight: 600;
+        margin-left: 8px;
+      }
+      .title-light {
+        color: #001529;
+      }
+      .title-dark {
+        color: #ffffff;
+      }
+    }
+
+    .user-space {
+      min-width: 208px;
+      margin-left: auto;
+      padding-right: 10px;
+      color: v-bind('color.color');
+      display: flex;
+      flex-direction: row;
+      vertical-align: middle;
+      align-items: center;
+      justify-content: flex-end;
+
+      .setting {
+        height: @header-user-height;
+        line-height: @header-user-height;
+        vertical-align: middle;
+        display: flex;
+        align-items: center;
+
+        :deep(.ant-badge) {
+          color: v-bind('color.color');
+        }
+      }
+      .operate-icon {
+        margin-left: 20px;
+        color: v-bind('color.color');
+      }
+
+      .user-space-item {
+        margin-left: 10px;
+      }
+    }
+  }
+
+  :deep(.ant-menu-horizontal) {
+    border-bottom: 0;
+  }
+</style>
diff --git a/smart-admin-web-typescript/src/layout/components/top-menu/recursion-menu.vue b/smart-admin-web-typescript/src/layout/components/top-menu/recursion-menu.vue
new file mode 100644
index 0000000..9c3f824
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/components/top-menu/recursion-menu.vue
@@ -0,0 +1,88 @@
+<!--
+  * 顶部菜单-递归菜单
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-09-06 20:29:12 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <a-menu
+    v-model:openKeys="openKeys"
+    v-model:selectedKeys="selectedKeys"
+    class="smart-menu"
+    mode="horizontal"
+    :theme="theme"
+  >
+    <template v-for="item in menuTree" :key="item.menuId">
+      <template v-if="item.visibleFlag && !item.disabledFlag">
+        <template v-if="$lodash.isEmpty(item.children)">
+          <a-menu-item :key="item.menuId" @click="turnToPage(item)">
+            <template #icon>
+              <component :is="$antIcons[item.icon]" />
+            </template>
+            {{ item.menuName }}
+          </a-menu-item>
+        </template>
+        <template v-else>
+          <SubMenu :menu-info="item" :key="item.menuId" @turnToPage="turnToPage" />
+        </template>
+      </template>
+    </template>
+  </a-menu>
+</template>
+<script setup lang="ts">
+  import _ from 'lodash';
+  import { computed, ref, watch } from 'vue';
+  import { useRoute } from 'vue-router';
+  import SubMenu from './sub-menu.vue';
+  import { router } from '/@/router/index';
+  import { useAppConfigStore } from '/@/store/modules/system/app-config';
+  import { useUserStore } from '/@/store/modules/system/user';
+
+  const theme = computed(() => useAppConfigStore().$state.sideMenuTheme);
+
+  const menuTree = computed(() => useUserStore().getMenuTree || []);
+
+  //展开的菜单
+  let currentRoute = useRoute();
+  const selectedKeys = ref([]);
+  const openKeys = ref([]);
+
+  // 页面跳转
+  function turnToPage(menu) {
+    useUserStore().deleteKeepAliveIncludes(menu.menuId.toString());
+    router.push({ path: menu.path });
+  }
+
+  /**
+   * SmartAdmin中 router的name 就是 后端存储menu的id
+   * 所以此处可以直接监听路由，根据路由更新菜单的选中和展开
+   */
+  function updateSelectKeys() {
+    // 更新选中
+    selectedKeys.value = [_.toNumber(currentRoute.name)];
+  }
+
+  watch(
+    currentRoute,
+    () => {
+      updateSelectKeys();
+    },
+    {
+      immediate: true,
+    }
+  );
+
+  defineExpose({
+    updateSelectKeys,
+  });
+</script>
+
+<style lang="less" scoped>
+  .smart-menu {
+    position: relative;
+  }
+
+</style>
diff --git a/smart-admin-web-typescript/src/layout/components/top-menu/sub-menu.vue b/smart-admin-web-typescript/src/layout/components/top-menu/sub-menu.vue
new file mode 100644
index 0000000..f98b6e6
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/components/top-menu/sub-menu.vue
@@ -0,0 +1,45 @@
+<!--
+  * 顶部菜单-递归菜单
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-09-06 20:29:12 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <a-sub-menu :key="menuInfo.menuId">
+    <template #icon>
+      <component :is="$antIcons[menuInfo.icon]" />
+    </template>
+    <template #title>{{ menuInfo.menuName }}</template>
+    <template v-for="item in menuInfo.children" :key="item.menuId">
+      <template v-if="item.visibleFlag && !item.disabledFlag">
+        <template v-if="!item.children">
+          <a-menu-item :key="item.menuId" @click="turnToPage(item)">
+            <template #icon>
+              <component :is="$antIcons[item.icon]" />
+            </template>
+            {{ item.menuName }}
+          </a-menu-item>
+        </template>
+        <template v-else>
+          <SubMenu :menu-info="item" :key="item.menuId" @turnToPage="turnToPage" />
+        </template>
+      </template>
+    </template>
+  </a-sub-menu>
+</template>
+<script setup lang="ts">
+  const props = defineProps({
+    menuInfo: {
+      type: Object,
+      default: () => ({}),
+    },
+  });
+
+  const emits = defineEmits(['turnToPage']);
+  const turnToPage = (menu) => {
+    emits('turnToPage', menu);
+  };
+</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-help-doc-layout.vue b/smart-admin-web-typescript/src/layout/help-doc-layout.vue
similarity index 92%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/smart-help-doc-layout.vue
rename to smart-admin-web-typescript/src/layout/help-doc-layout.vue
index 15410a5..f418451 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-help-doc-layout.vue
+++ b/smart-admin-web-typescript/src/layout/help-doc-layout.vue
@@ -18,9 +18,9 @@
     <!-- 顶部头部信息 -->
     <a-layout-header class="layout-header">
       <a-row class="layout-header-title">
-          <img class="logo-img" :src="logoImg" />
-          <div class="title">{{ websiteName }}</div>
-          <div class="title">帮助文档</div>
+        <img class="logo-img" :src="logoImg" />
+        <div class="title">{{ websiteName }}</div>
+        <div class="title">帮助文档</div>
         <a-col class="avatar">
           <HeaderAvatar />
         </a-col>
@@ -67,22 +67,22 @@
   import { smartSentry } from '../lib/smart-sentry';
   import { useAppConfigStore } from '../store/modules/system/app-config';
   import SmartFooter from './components/smart-footer/index.vue';
-  import { helpDocApi } from '/@/api/support/help-doc/help-doc-api';
-  import { helpDocCatalogApi } from '/@/api/support/help-doc/help-doc-catalog-api';
+  import { helpDocApi } from '/@/api/support/help-doc-api';
+  import { helpDocCatalogApi } from '/@/api/support/help-doc-catalog-api';
   import logoImg from '/@/assets/images/logo/smart-admin-logo-white.png';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
-  import watermark from '/@/lib/smart-wartermark';
+  import watermark from '../lib/smart-watermark';
   import { useUserStore } from '/@/store/modules/system/user';
   import HeaderAvatar from './components/header-user-space/header-avatar.vue';
 
   const websiteName = computed(() => useAppConfigStore().websiteName);
   const windowHeight = window.innerHeight;
   onMounted(() => {
-    watermark.set('smartAdminLayoutContent', useUserStore().actualName);
+    watermark.set(LAYOUT_ELEMENT_IDS.content, useUserStore().actualName);
   });
   const backTopTarget = () => {
-    return document.getElementById('smartAdminMain');
+    return document.getElementById(LAYOUT_ELEMENT_IDS.main);
   };
   const router = useRouter();
   const route = useRoute();
@@ -109,7 +109,7 @@
     expandedKeys.value = [TYPE_HELP_DOC_PREFIX + helpDocId];
     selectedKeys.value = [TYPE_HELP_DOC_PREFIX + helpDocId];
 
-    let helpDoc = helpDocList.filter((e) => e.helpDocId == helpDocId);
+    let helpDoc = helpDocList.filter((e) => e.helpDocId === helpDocId);
     let catalogId = null;
     if (helpDoc.length > 0) {
       catalogId = helpDoc[0].helpDocCatalogId;
@@ -121,7 +121,7 @@
 
     let parentId = catalogId;
     while (parentId !== 0) {
-      let catalog = catalogList.filter((e) => e.helpDocCatalogId == parentId);
+      let catalog = catalogList.filter((e) => e.helpDocCatalogId === parentId);
       if (catalog.length > 0) {
         parentId = catalog[0].parentId;
         expandedKeys.value.push(TYPE_CATALOG_PREFIX + catalog[0].helpDocCatalogId);
@@ -201,6 +201,7 @@
       if (e.key.indexOf(TYPE_HELP_DOC_PREFIX) > -1) {
         continue;
       }
+      e.isLeaf = false;
       e.children = buildHelpDocCatalogTree(data, e.helpDocCatalogId, helpDocMap);
     }
 
@@ -216,7 +217,7 @@
     height: auto;
   }
   :deep(.ant-tree-treenode) {
-    margin: 2px 0px;
+    margin: 2px 0;
   }
 
   .help-doc-layout {
@@ -226,7 +227,7 @@
   }
 
   .layout-header {
-    background: @primary-7;
+    background: @primary-color;
     padding: 0;
     z-index: 999;
     color: white;
@@ -300,3 +301,4 @@
     justify-content: center;
   }
 </style>
+../lib/smart-watermark
diff --git a/smart-admin-web-typescript/src/layout/index.vue b/smart-admin-web-typescript/src/layout/index.vue
new file mode 100644
index 0000000..a49fcf3
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/index.vue
@@ -0,0 +1,30 @@
+<!--
+  *  layout 多种模式
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:40:16
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <!--左侧菜单 模式-->
+  <SideLayout v-if="layout === LAYOUT_ENUM.SIDE.value" />
+  <!--左侧展开菜单 模式-->
+  <SideExpandLayout v-if="layout === LAYOUT_ENUM.SIDE_EXPAND.value" />
+  <!--顶部菜单 模式-->
+  <TopLayout v-if="layout === LAYOUT_ENUM.TOP.value" />
+  <!--定期修改密码-->
+  <RegularChangePasswordModal />
+</template>
+<script setup lang="ts">
+  import { computed } from 'vue';
+  import { LAYOUT_ENUM } from '/@/constants/layout-const';
+  import SideExpandLayout from './side-expand-layout.vue';
+  import SideLayout from './side-layout.vue';
+  import TopLayout from './top-layout.vue';
+  import { useAppConfigStore } from '/@/store/modules/system/app-config';
+  import RegularChangePasswordModal from './components/change-password/regular-change-password-modal.vue';
+
+  const layout = computed(() => useAppConfigStore().$state.layout);
+</script>
diff --git a/smart-admin-web-typescript/src/layout/layout-const.ts b/smart-admin-web-typescript/src/layout/layout-const.ts
new file mode 100644
index 0000000..98fc8b5
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/layout-const.ts
@@ -0,0 +1,9 @@
+/**
+ *  layout 相关元素 id
+ */
+export const LAYOUT_ELEMENT_IDS = {
+    menu: 'smartAdminMenu',
+    main: 'smartAdminMain',
+    header: 'smartAdminHeader',
+    content: 'smartAdminLayoutContent',
+}
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-side-expand-layout.vue b/smart-admin-web-typescript/src/layout/side-expand-layout.vue
similarity index 74%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/smart-side-expand-layout.vue
rename to smart-admin-web-typescript/src/layout/side-expand-layout.vue
index 0b6d38d..9785cd1 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-side-expand-layout.vue
+++ b/smart-admin-web-typescript/src/layout/side-expand-layout.vue
@@ -10,15 +10,15 @@
 <template>
   <a-layout class="admin-layout" style="min-height: 100%">
     <!-- 侧边菜单 side-menu -->
-    <a-layout-sider :theme="theme" class="side-menu" :collapsed="collapsed" :trigger="null">
+    <a-layout-sider :id="LAYOUT_ELEMENT_IDS.menu" :theme="theme" class="side-menu" :collapsed="collapsed" :trigger="null">
       <!-- 左侧菜单 -->
       <SideExpandMenu :collapsed="collapsed" />
     </a-layout-sider>
 
     <!--中间内容，一共三部分：1、顶部;2、中间内容区域;3、底部（一般是公司版权信息）;-->
-    <a-layout class="admin-layout-main" :style="`height: ${windowHeight}px`" id="smartAdminMain">
+    <a-layout class="admin-layout-main" :style="`height: ${windowHeight}px`" :id="LAYOUT_ELEMENT_IDS.main">
       <!-- 顶部头部信息 -->
-      <a-layout-header class="smart-layout-header">
+      <a-layout-header class="smart-layout-header" :id="LAYOUT_ELEMENT_IDS.header">
         <a-row justify="space-between" class="smart-layout-header-user">
           <a-col class="smart-layout-header-left">
             <span class="collapsed-button">
@@ -44,25 +44,25 @@
       </a-layout-header>
 
       <!--中间内容-->
-      <a-layout-content class="admin-layout-content" id="smartAdminLayoutContent">
+      <a-layout-content class="admin-layout-content" :id="LAYOUT_ELEMENT_IDS.content">
         <!--不keepAlive的iframe使用单个iframe组件-->
         <IframeIndex v-show="iframeNotKeepAlivePageFlag" :key="route.name" :name="route.name" :url="route.meta.frameUrl" />
         <!--keepAlive的iframe 每个页面一个iframe组件-->
         <IframeIndex
           v-for="item in keepAliveIframePages"
-          v-show="route.name == item.name"
+          v-show="route.name === item.name"
           :key="item.name"
           :name="item.name"
           :url="item.meta.frameUrl"
         />
         <!--非iframe使用router-view-->
-        <router-view v-show="!iframeNotKeepAlivePageFlag && keepAliveIframePages.every((e) => route.name != e.name)" v-slot="{ Component }">
-          <keep-alive :include="keepAliveIncludes">
-            <div :key="route.name" style="height:100%">
-              <component :is="Component" />
-            </div>
-          </keep-alive>
-        </router-view>
+        <div v-show="!iframeNotKeepAlivePageFlag && keepAliveIframePages.every((e) => route.name !== e.name)">
+          <router-view v-slot="{ Component }">
+            <keep-alive :include="keepAliveIncludes">
+              <component :is="Component" :key="route.name" />
+            </keep-alive>
+          </router-view>
+        </div>
       </a-layout-content>
       <!-- footer 版权公司信息 -->
       <a-layout-footer class="smart-layout-footer" v-show="footerFlag"> <SmartFooter /></a-layout-footer>
@@ -70,26 +70,35 @@
       <a-back-top :target="backTopTarget" :visibilityHeight="80" />
     </a-layout>
     <!-- 右侧帮助文档 help-doc -->
-    <a-layout-sider v-show="helpDocFlag" theme="light" :width="180" class="help-doc-sider" :trigger="null" style="min-height: 100%">
+    <a-layout-sider
+      v-if="helpDocFlag"
+      v-show="helpDocExpandFlag"
+      theme="light"
+      :width="180"
+      class="help-doc-sider"
+      :trigger="null"
+      style="min-height: 100%"
+    >
       <SideHelpDoc />
     </a-layout-sider>
   </a-layout>
 </template>
 <script setup lang="ts">
-  import { computed, onMounted, ref } from 'vue';
+  import { computed, onMounted, ref, watch } from 'vue';
   import HeaderUserSpace from './components/header-user-space/index.vue';
   import MenuLocationBreadcrumb from './components/menu-location-breadcrumb/index.vue';
   import PageTag from './components/page-tag/index.vue';
   import SideExpandMenu from './components/side-expand-menu/index.vue';
   import SmartFooter from './components/smart-footer/index.vue';
-  import { smartKeepAlive } from './smart-keep-alive';
+  import { smartKeepAlive } from './components/smart-keep-alive';
   import IframeIndex from '/@/components/framework/iframe/iframe-index.vue';
-  import watermark from '/@/lib/smart-wartermark';
+  import watermark from '../lib/smart-watermark';
   import { useAppConfigStore } from '/@/store/modules/system/app-config';
   import { useUserStore } from '/@/store/modules/system/user';
   import SideHelpDoc from './components/side-help-doc/index.vue';
   import { useRouter } from 'vue-router';
   import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
+  import { LAYOUT_ELEMENT_IDS } from '/@/layout/layout-const.js';
 
   const windowHeight = ref(window.innerHeight);
 
@@ -99,23 +108,53 @@
   const pageTagFlag = computed(() => useAppConfigStore().$state.pageTagFlag);
   // 是否显示帮助文档
   const helpDocFlag = computed(() => useAppConfigStore().$state.helpDocFlag);
+  // 是否默认展开帮助文档
+  const helpDocExpandFlag = computed(() => useAppConfigStore().$state.helpDocExpandFlag);
   // 是否显示页脚
   const footerFlag = computed(() => useAppConfigStore().$state.footerFlag);
+  // 是否显示水印
+  const watermarkFlag = computed(() => useAppConfigStore().$state.watermarkFlag);
+  // 多余高度
+  const dueHeight = computed(() => {
+    let due = 40;
+    if (useAppConfigStore().$state.pageTagFlag) {
+      due = due + 40;
+    }
+    if (useAppConfigStore().$state.footerFlag) {
+      due = due + 40;
+    }
+    return due;
+  });
   //是否隐藏菜单
   const collapsed = ref(false);
 
   //页面初始化的时候加载水印
   onMounted(() => {
-    watermark.set('smartAdminLayoutContent', useUserStore().actualName);
+    if (watermarkFlag.value) {
+      watermark.set(LAYOUT_ELEMENT_IDS.content, useUserStore().actualName);
+    } else {
+      watermark.clear();
+    }
   });
 
+  watch(
+    () => watermarkFlag.value,
+    (newValue) => {
+      if (newValue) {
+        watermark.set(LAYOUT_ELEMENT_IDS.content, useUserStore().actualName);
+      } else {
+        watermark.clear();
+      }
+    }
+  );
+
   window.addEventListener('resize', function () {
     windowHeight.value = window.innerHeight;
   });
 
   //回到顶部
   const backTopTarget = () => {
-    return document.getElementById('smartAdminMain');
+    return document.getElementById(LAYOUT_ELEMENT_IDS.main);
   };
   // ----------------------- keep-alive相关 -----------------------
   let { route, keepAliveIncludes, iframeNotKeepAlivePageFlag, keepAliveIframePages } = smartKeepAlive();
@@ -135,7 +174,7 @@
   .smart-layout-header {
     background: #fff;
     padding: 0;
-    z-index: 999;
+    z-index: 21;
   }
 
   .smart-layout-header-user {
@@ -220,17 +259,18 @@
     }
 
     .admin-layout-content {
+      background-color: inherit;
       min-height: auto;
       position: relative;
       padding: 10px 10px 0px 10px;
-      height: v-bind('pageTagFlag ? "calc(100% - 80px)": "calc(100% - 40px)"');
+      height: calc(100% - v-bind(dueHeight) px);
       overflow-x: hidden;
     }
   }
 
   .smart-layout-footer {
     position: relative;
-    padding: 10px 0px;
+    padding: 10px 0;
     display: flex;
     justify-content: center;
   }
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-side-layout.vue b/smart-admin-web-typescript/src/layout/side-layout.vue
similarity index 70%
rename from smart-admin-web/typescript-ant-design-vue3/src/layout/smart-side-layout.vue
rename to smart-admin-web-typescript/src/layout/side-layout.vue
index 0a9739c..005eb3b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-side-layout.vue
+++ b/smart-admin-web-typescript/src/layout/side-layout.vue
@@ -1,15 +1,15 @@
 <template>
   <a-layout class="admin-layout" style="min-height: 100%">
     <!-- 侧边菜单 side-menu -->
-    <a-layout-sider class="side-menu" :width="sideMenuWidth" :collapsed="collapsed" :theme="theme">
+    <a-layout-sider :id="LAYOUT_ELEMENT_IDS.menu" class="side-menu" :width="sideMenuWidth" :collapsed="collapsed" :theme="theme">
       <!-- 左侧菜单 -->
       <SideMenu :collapsed="collapsed" />
     </a-layout-sider>
 
     <!--中间内容，一共三部分：1、顶部;2、中间内容区域;3、底部（一般是公司版权信息）;-->
-    <a-layout id="smartAdminMain" :style="`height: ${windowHeight}px`" class="admin-layout-main">
+    <a-layout :id="LAYOUT_ELEMENT_IDS.main" :style="`height: ${windowHeight}px`" class="admin-layout-main">
       <!-- 顶部头部信息 -->
-      <a-layout-header class="layout-header">
+      <a-layout-header class="layout-header" :id="LAYOUT_ELEMENT_IDS.header">
         <a-row class="layout-header-user" justify="space-between">
           <a-col class="layout-header-left">
             <span class="collapsed-button">
@@ -35,25 +35,25 @@
       </a-layout-header>
 
       <!--中间内容-->
-      <a-layout-content id="smartAdminLayoutContent" class="admin-layout-content">
+      <a-layout-content :id="LAYOUT_ELEMENT_IDS.content" class="admin-layout-content">
         <!--不keepAlive的iframe使用单个iframe组件-->
         <IframeIndex v-if="iframeNotKeepAlivePageFlag" :key="route.name" :name="route.name" :url="route.meta.frameUrl" />
         <!--keepAlive的iframe 每个页面一个iframe组件-->
         <IframeIndex
           v-for="item in keepAliveIframePages"
-          v-show="route.name == item.name"
+          v-show="route.name === item.name"
           :key="item.name"
           :name="item.name"
           :url="item.meta.frameUrl"
         />
         <!--非iframe使用router-view-->
-        <router-view v-show="!iframeNotKeepAlivePageFlag && keepAliveIframePages.every((e) => route.name != e.name)" v-slot="{ Component }">
-          <keep-alive :include="keepAliveIncludes">
-            <div :key="route.name" style="height: 100%">
-              <component :is="Component" />
-            </div>
-          </keep-alive>
-        </router-view>
+        <div v-show="!iframeNotKeepAlivePageFlag && keepAliveIframePages.every((e) => route.name != e.name)">
+          <router-view v-slot="{ Component }">
+            <keep-alive :include="keepAliveIncludes">
+              <component :is="Component" :key="route.name" />
+            </keep-alive>
+          </router-view>
+        </div>
       </a-layout-content>
 
       <!-- footer 版权公司信息 -->
@@ -64,27 +64,36 @@
       <a-back-top :target="backTopTarget" :visibilityHeight="80" />
     </a-layout>
     <!-- 右侧帮助文档 help-doc -->
-    <a-layout-sider v-show="helpDocFlag" theme="light" :width="180" class="help-doc-sider" :trigger="null" style="min-height: 100%">
+    <a-layout-sider
+      v-if="helpDocFlag"
+      v-show="helpDocExpandFlag"
+      theme="light"
+      :width="180"
+      class="help-doc-sider"
+      :trigger="null"
+      style="min-height: 100%"
+    >
       <SideHelpDoc />
     </a-layout-sider>
   </a-layout>
 </template>
 
 <script setup lang="ts">
-  import { computed, onMounted, ref } from 'vue';
+  import { computed, onMounted, ref, watch } from 'vue';
   import { useAppConfigStore } from '../store/modules/system/app-config';
   import HeaderUserSpace from './components/header-user-space/index.vue';
   import MenuLocationBreadcrumb from './components/menu-location-breadcrumb/index.vue';
   import PageTag from './components/page-tag/index.vue';
   import SideMenu from './components/side-menu/index.vue';
   import SmartFooter from './components/smart-footer/index.vue';
-  import { smartKeepAlive } from './smart-keep-alive';
+  import { smartKeepAlive } from './components/smart-keep-alive';
   import IframeIndex from '/@/components/framework/iframe/iframe-index.vue';
-  import watermark from '/@/lib/smart-wartermark';
+  import watermark from '../lib/smart-watermark';
   import { useUserStore } from '/@/store/modules/system/user';
   import SideHelpDoc from './components/side-help-doc/index.vue';
   import { useRouter } from 'vue-router';
   import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
+  import { LAYOUT_ELEMENT_IDS } from '/@/layout/layout-const.js';
 
   const windowHeight = ref(window.innerHeight);
   //菜单宽度
@@ -95,19 +104,49 @@
   const pageTagFlag = computed(() => useAppConfigStore().$state.pageTagFlag);
   // 是否显示帮助文档
   const helpDocFlag = computed(() => useAppConfigStore().$state.helpDocFlag);
+  // 是否默认展开帮助文档
+  const helpDocExpandFlag = computed(() => useAppConfigStore().$state.helpDocExpandFlag);
   // 是否显示页脚
   const footerFlag = computed(() => useAppConfigStore().$state.footerFlag);
+  // 是否显示水印
+  const watermarkFlag = computed(() => useAppConfigStore().$state.watermarkFlag);
+  // 多余高度
+  const dueHeight = computed(() => {
+    let due = 40;
+    if (useAppConfigStore().$state.pageTagFlag) {
+      due = due + 40;
+    }
+    if (useAppConfigStore().$state.footerFlag) {
+      due = due + 40;
+    }
+    return due;
+  });
   //是否隐藏菜单
   const collapsed = ref(false);
 
   //页面初始化的时候加载水印
   onMounted(() => {
-    watermark.set('smartAdminLayoutContent', useUserStore().actualName);
+    if (watermarkFlag.value) {
+      watermark.set(LAYOUT_ELEMENT_IDS.content, useUserStore().actualName);
+    } else {
+      watermark.clear();
+    }
   });
 
+  watch(
+    () => watermarkFlag.value,
+    (newValue) => {
+      if (newValue) {
+        watermark.set(LAYOUT_ELEMENT_IDS.content, useUserStore().actualName);
+      } else {
+        watermark.clear();
+      }
+    }
+  );
+
   //回到顶部
   const backTopTarget = () => {
-    return document.getElementById('smartAdminMain');
+    return document.getElementById(LAYOUT_ELEMENT_IDS.main);
   };
 
   const router = useRouter();
@@ -127,6 +166,7 @@
   :deep(.ant-layout-header) {
     height: auto;
   }
+
   :deep(.layout-header) {
     height: auto;
   }
@@ -134,7 +174,7 @@
   .layout-header {
     background: #fff;
     padding: 0;
-    z-index: 999;
+    z-index: 21;
   }
 
   .layout-header-user {
@@ -145,7 +185,6 @@
   .layout-header-left {
     display: flex;
     height: @header-user-height;
-    align-items: center;
 
     .collapsed-button {
       margin-left: 10px;
@@ -183,7 +222,7 @@
     .side-menu {
       height: 100vh;
       overflow-x: hidden;
-
+      overflow-y: scroll;
       &.fixed-side {
         position: fixed;
         height: 100vh;
@@ -192,12 +231,25 @@
       }
     }
 
+    .side-menu::-webkit-scrollbar {
+      width: 4px;
+    }
+    .side-menu::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background: rgba(0, 0, 0, 0.2);
+    }
+    .side-menu::-webkit-scrollbar-track {
+      border-radius: 0;
+      background: rgba(0, 0, 0, 0.1);
+    }
+
     .help-doc-sider {
       flex: 0 !important;
       min-width: 100px;
       height: 100vh;
       max-width: 100px;
       width: auto !important;
+
       &.fixed-side {
         position: fixed;
         height: 100vh;
@@ -205,6 +257,7 @@
         top: 0;
       }
     }
+
     .virtual-side {
       transition: all 0.2s;
     }
@@ -224,11 +277,12 @@
     }
 
     .admin-layout-content {
+      background-color: inherit;
       min-height: auto;
       position: relative;
       overflow-x: hidden;
       padding: 10px 10px 0px 10px;
-      height: v-bind('pageTagFlag ? "calc(100% - 80px)": "calc(100% - 40px)"');
+      height: calc(100% - v-bind(dueHeight) px);
     }
   }
 
diff --git a/smart-admin-web-typescript/src/layout/top-layout.vue b/smart-admin-web-typescript/src/layout/top-layout.vue
new file mode 100644
index 0000000..8ff4bf4
--- /dev/null
+++ b/smart-admin-web-typescript/src/layout/top-layout.vue
@@ -0,0 +1,169 @@
+<template>
+  <a-layout class="admin-layout">
+    <!-- 顶部菜单  -->
+    <a-layout-header class="top-menu" :theme="theme" :id="LAYOUT_ELEMENT_IDS.menu">
+      <TopMenu />
+    </a-layout-header>
+
+    <!--中间内容-->
+    <a-layout-content :id="LAYOUT_ELEMENT_IDS.content" class="admin-layout-content">
+      <!---标签页-->
+      <div class="page-tag-div" v-show="pageTagFlag" :id="LAYOUT_ELEMENT_IDS.header">
+        <PageTag />
+      </div>
+
+      <!--不keepAlive的iframe使用单个iframe组件-->
+      <IframeIndex v-if="iframeNotKeepAlivePageFlag" :key="route.name" :name="route.name" :url="route.meta.frameUrl" />
+
+      <!--keepAlive的iframe 每个页面一个iframe组件-->
+      <IframeIndex
+        v-for="item in keepAliveIframePages"
+        v-show="route.name === item.name"
+        :key="item.name"
+        :name="item.name"
+        :url="item.meta.frameUrl"
+      />
+
+      <!--非iframe使用router-view-->
+      <div v-show="!iframeNotKeepAlivePageFlag && keepAliveIframePages.every((e) => route.name !== e.name)">
+        <router-view v-slot="{ Component }">
+          <keep-alive :include="keepAliveIncludes">
+            <component :is="Component" :key="route.name" />
+          </keep-alive>
+        </router-view>
+      </div>
+    </a-layout-content>
+
+    <!-- footer 版权公司信息 -->
+    <a-layout-footer class="layout-footer" v-show="footerFlag">
+      <smart-footer />
+    </a-layout-footer>
+    <!--- 回到顶部 -->
+    <a-back-top :target="backTopTarget" :visibilityHeight="80" />
+  </a-layout>
+</template>
+
+<script setup lang="ts">
+  import { computed, onMounted, ref, watch } from 'vue';
+  import { useAppConfigStore } from '../store/modules/system/app-config';
+  import PageTag from './components/page-tag/index.vue';
+  import TopMenu from './components/top-menu/index.vue';
+  import SmartFooter from './components/smart-footer/index.vue';
+  import { smartKeepAlive } from './components/smart-keep-alive';
+  import IframeIndex from '/@/components/framework/iframe/iframe-index.vue';
+  import watermark from '../lib/smart-watermark';
+  import { useUserStore } from '/@/store/modules/system/user';
+  import { useRouter } from 'vue-router';
+  import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
+  import { LAYOUT_ELEMENT_IDS } from '/@/layout/layout-const.js';
+
+  const windowHeight = ref(window.innerHeight);
+  //主题颜色
+  const theme = computed(() => useAppConfigStore().$state.sideMenuTheme);
+  const color = computed(() => {
+    let isLight = useAppConfigStore().$state.sideMenuTheme === 'light';
+    return {
+      color: isLight ? '#001529' : '#FFFFFF',
+      background: isLight ? '#FFFFFF' : '#001529',
+    };
+  });
+
+  //是否显示标签页
+  const pageTagFlag = computed(() => useAppConfigStore().$state.pageTagFlag);
+  // 是否显示页脚
+  const footerFlag = computed(() => useAppConfigStore().$state.footerFlag);
+  // 是否显示水印
+  const watermarkFlag = computed(() => useAppConfigStore().$state.watermarkFlag);
+  // 页面宽度
+  const pageWidth = computed(() => useAppConfigStore().$state.pageWidth);
+  // 多余高度
+  const dueHeight = computed(() => {
+    let due = '45px';
+    if (useAppConfigStore().$state.pageTagFlag) {
+      due = '85px';
+    }
+    return due;
+  });
+
+  //页面初始化的时候加载水印
+  onMounted(() => {
+    if (watermarkFlag.value) {
+      watermark.set(LAYOUT_ELEMENT_IDS.content, useUserStore().actualName);
+    } else {
+      watermark.clear();
+    }
+  });
+
+  watch(
+    () => watermarkFlag.value,
+    (newValue) => {
+      if (newValue) {
+        watermark.set(LAYOUT_ELEMENT_IDS.content, useUserStore().actualName);
+      } else {
+        watermark.clear();
+      }
+    }
+  );
+
+  //回到顶部
+  const backTopTarget = () => {
+    return document.getElementById(LAYOUT_ELEMENT_IDS.main);
+  };
+
+  const router = useRouter();
+  function goHome() {
+    router.push({ name: HOME_PAGE_NAME });
+  }
+
+  window.addEventListener('resize', function () {
+    windowHeight.value = window.innerHeight;
+  });
+
+  // ----------------------- keep-alive相关 -----------------------
+  let { route, keepAliveIncludes, iframeNotKeepAlivePageFlag, keepAliveIframePages } = smartKeepAlive();
+</script>
+
+<style lang="less" scoped>
+  .admin-layout {
+    min-height: 100%;
+
+    .top-menu {
+      padding: 0px;
+      height: 48px;
+      line-height: 48px;
+      width: 100%;
+      z-index: 3;
+      right: 0;
+      position: fixed;
+      background-color: v-bind('color.background');
+    }
+
+    .admin-layout-content {
+      background-color: inherit;
+      min-height: auto;
+      position: relative;
+      overflow-x: hidden;
+      padding: 10px 0;
+      width: v-bind(pageWidth);
+      margin-top: v-bind(dueHeight);
+      margin-left: auto;
+      margin-right: auto;
+
+      .page-tag-div {
+        position: fixed;
+        top: 48px;
+        width: v-bind(pageWidth);
+        height: 40px;
+        line-height: 40px;
+        z-index: 3;
+      }
+    }
+  }
+
+  .layout-footer {
+    position: relative;
+    padding: 7px 0px;
+    display: flex;
+    justify-content: center;
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/lib/axios.ts b/smart-admin-web-typescript/src/lib/axios.ts
similarity index 73%
rename from smart-admin-web/typescript-ant-design-vue3/src/lib/axios.ts
rename to smart-admin-web-typescript/src/lib/axios.ts
index fd3f808..2ee2b2d 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/lib/axios.ts
+++ b/smart-admin-web-typescript/src/lib/axios.ts
@@ -7,19 +7,17 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-
-import axios, { AxiosRequestConfig } from 'axios';
-import { getTokenFromCookie } from '/@/utils/cookie-util';
 import { message, Modal } from 'ant-design-vue';
-import { clearAllCoolies } from '/@/utils/cookie-util';
-import { smartSentry } from '/@/lib/smart-sentry';
-import { localClear } from '/@/utils/local-util';
+import axios from 'axios';
+import { localRead } from '/@/utils/local-util';
+import { useUserStore } from '/@/store/modules/system/user';
 import { decryptData, encryptData } from './encrypt';
 import { DATA_TYPE_ENUM } from '../constants/common-const';
 import _ from 'lodash';
+import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
 
 // token的消息头
-const TOKEN_HEADER: string = 'x-access-token';
+const TOKEN_HEADER = 'x-access-token';
 
 // 创建axios对象
 const smartAxios = axios.create({
@@ -28,7 +26,7 @@ const smartAxios = axios.create({
 
 // 退出系统
 function logout() {
-  localClear();
+  useUserStore().logout();
   location.href = '/';
 }
 
@@ -37,7 +35,7 @@ function logout() {
 smartAxios.interceptors.request.use(
   (config) => {
     // 在发送请求之前消息头加入token token
-    const token = getTokenFromCookie();
+    const token = localRead(LocalStorageKeyConst.USER_TOKEN);
     if (token) {
       config.headers[TOKEN_HEADER] = token;
     } else {
@@ -61,12 +59,12 @@ smartAxios.interceptors.response.use(
     if (contentType.indexOf('application/json') === -1) {
       return Promise.resolve(response);
     }
-    
+
     // 如果是json数据
     if (response.data && response.data instanceof Blob) {
       return Promise.reject(response.data);
     }
-    
+
     // 如果是加密数据
     if (response.data.dataType === DATA_TYPE_ENUM.ENCRYPT.value) {
       response.data.encryptData = response.data.data;
@@ -75,22 +73,17 @@ smartAxios.interceptors.response.use(
         response.data.data = JSON.parse(decryptStr);
       }
     }
-    
-    // 对响应数据做点什么
+
     const res = response.data;
     if (res.code && res.code !== 1) {
       // `token` 过期或者账号已在别处登录
       if (res.code === 30007 || res.code === 30008) {
+        message.destroy();
         message.error('您没有登录，请重新登录');
-        clearAllCoolies();
-        localClear();
-        //跳转到登录页面，直接使用页面刷新的策略
-        setTimeout(() => {
-          location.href = '/';
-        }, 300);
+        setTimeout(logout, 300);
         return Promise.reject(response);
       }
-      
+
       // 等保安全的登录提醒
       if (res.code === 30010 || res.code === 30011) {
         Modal.error({
@@ -99,7 +92,7 @@ smartAxios.interceptors.response.use(
         });
         return Promise.reject(response);
       }
-      
+
       // 长时间未操作系统，需要重新登录
       if (res.code === 30012) {
         Modal.error({
@@ -111,7 +104,6 @@ smartAxios.interceptors.response.use(
         return Promise.reject(response);
       }
       message.destroy();
-      
       message.error(res.msg);
       return Promise.reject(response);
     } else {
@@ -120,13 +112,13 @@ smartAxios.interceptors.response.use(
   },
   (error) => {
     // 对响应错误做点什么
-    if (error.message.indexOf('timeout') != -1) {
+    if (error.message.indexOf('timeout') !== -1) {
       message.destroy();
       message.error('网络超时');
-    } else if (error.message == 'Network Error') {
+    } else if (error.message === 'Network Error') {
       message.destroy();
       message.error('网络连接错误');
-    }else if (error.message.indexOf('Request') != -1) {
+    } else if (error.message.indexOf('Request') !== -1) {
       message.destroy();
       message.error('网络发生错误');
     }
@@ -136,35 +128,38 @@ smartAxios.interceptors.response.use(
 
 // ================================= 对外提供请求方法：通用请求，get， post, 下载download等 =================================
 
+/**
+ * get请求
+ */
+export const getRequest = (url, params) => {
+  return request({ url, method: 'get', params });
+};
+
 /**
  * 通用请求封装
  * @param config
  */
-export const request = <T = any>(config: AxiosRequestConfig): Promise<T> => {
+export const request = (config) => {
   return smartAxios.request(config);
 };
 
 /**
  * post请求
  */
-export const postRequest = <T = any>(url: string, data: any): Promise<T> => {
-  return request({ data, url, method: 'post' });
+export const postRequest = (url, data) => {
+  return request({
+    data,
+    url,
+    method: 'post',
+  });
 };
 
-/**
- * get请求
- */
-export const getRequest = <T = any>(url: string, params?: any): Promise<T> => {
-  return request({ url, method: 'get', params });
-};
-
-
 // ================================= 加密 =================================
 
 /**
  * 加密请求参数的post请求
  */
-export const postEncryptRequest = <T = any>(url: string, data: any): Promise<T> => {
+export const postEncryptRequest = (url, data) => {
   return request({
     data: { encryptData: encryptData(data) },
     url,
@@ -174,7 +169,7 @@ export const postEncryptRequest = <T = any>(url: string, data: any): Promise<T>
 
 // ================================= 下载 =================================
 
-export const postDownload = function (url: string, data: any) {
+export const postDownload = function (url, data) {
   request({
     method: 'post',
     url,
@@ -192,7 +187,7 @@ export const postDownload = function (url: string, data: any) {
 /**
  * 文件下载
  */
-export const getDownload = function (url: string, params: any) {
+export const getDownload = function (url, params) {
   request({
     method: 'get',
     url,
@@ -207,12 +202,12 @@ export const getDownload = function (url: string, params: any) {
     });
 };
 
-function handleDownloadError(error: any) {
+function handleDownloadError(error) {
   if (error instanceof Blob) {
     const fileReader = new FileReader();
     fileReader.readAsText(error);
     fileReader.onload = () => {
-      const msg: any = fileReader.result;
+      const msg = fileReader.result;
       const jsonMsg = JSON.parse(msg);
       message.destroy();
       message.error(jsonMsg.msg);
@@ -223,60 +218,33 @@ function handleDownloadError(error: any) {
   }
 }
 
-function handleDownloadData(response: any) {
+function handleDownloadData(response) {
   if (!response) {
     return;
   }
-  
+
   // 获取返回类型
   let contentType = _.isUndefined(response.headers['content-type']) ? response.headers['Content-Type'] : response.headers['content-type'];
-  
+
   // 构建下载数据
   let url = window.URL.createObjectURL(new Blob([response.data], { type: contentType }));
   let link = document.createElement('a');
   link.style.display = 'none';
   link.href = url;
-  
+
   // 从消息头获取文件名
   let str = _.isUndefined(response.headers['content-disposition'])
     ? response.headers['Content-Disposition'].split(';')[1]
     : response.headers['content-disposition'].split(';')[1];
-  
+
   let filename = _.isUndefined(str.split('fileName=')[1]) ? str.split('filename=')[1] : str.split('fileName=')[1];
   link.setAttribute('download', decodeURIComponent(filename));
-  
+
   // 触发点击下载
   document.body.appendChild(link);
   link.click();
-  
+
   // 下载完释放
   document.body.removeChild(link); // 下载完成移除元素
   window.URL.revokeObjectURL(url); // 释放掉blob对象
 }
-
-/**
- * 下载
- */
-export const download = function (fileName: string, url: string, params?: any): void {
-  request({
-    method: 'get',
-    url: url,
-    params: params,
-    responseType: 'blob',
-  })
-    .then((data) => {
-      if (!data) {
-        return;
-      }
-      let url = window.URL.createObjectURL(new Blob([data]));
-      let link = document.createElement('a');
-      link.style.display = 'none';
-      link.href = url;
-      link.setAttribute('download', fileName);
-      document.body.appendChild(link);
-      link.click();
-    })
-    .catch((error) => {
-      smartSentry.captureError(error);
-    });
-};
diff --git a/smart-admin-web-typescript/src/lib/default-time-ranges.ts b/smart-admin-web-typescript/src/lib/default-time-ranges.ts
new file mode 100644
index 0000000..634da84
--- /dev/null
+++ b/smart-admin-web-typescript/src/lib/default-time-ranges.ts
@@ -0,0 +1,29 @@
+/*
+ * 时间选择框快捷选择
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-09-06 20:49:28
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+
+import dayjs from 'dayjs';
+import {ref} from 'vue';
+
+export const defaultTimeRanges = ref([{label: '今日', value: [dayjs(), dayjs()]}, {
+    label: '昨日',
+    value: [dayjs().subtract(1, 'days'), dayjs().subtract(1, 'days')]
+}, {label: '本月', value: [dayjs().startOf('month'), dayjs().endOf('month')]}, {
+    label: '上个月',
+    value: [dayjs().subtract(1, 'months').startOf('month'), dayjs().subtract(1, 'months').endOf('month')]
+}, {
+    label: '下个月',
+    value: [dayjs().subtract(-1, 'months').startOf('month'), dayjs().subtract(-1, 'months').endOf('month')]
+},
+
+    {label: '本年度', value: [dayjs().startOf('year'), dayjs().endOf('year')]}, {
+        label: '上年度',
+        value: [dayjs().subtract(1, 'years').startOf('year'), dayjs().subtract(1, 'years').endOf('year')]
+    }]);
+
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/lib/encrypt.ts b/smart-admin-web-typescript/src/lib/encrypt.ts
similarity index 51%
rename from smart-admin-web/typescript-ant-design-vue3/src/lib/encrypt.ts
rename to smart-admin-web-typescript/src/lib/encrypt.ts
index d61e542..3ba986b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/lib/encrypt.ts
+++ b/smart-admin-web-typescript/src/lib/encrypt.ts
@@ -1,18 +1,16 @@
-// @ts-ignore
 import CryptoJS from 'crypto-js';
-// @ts-ignore
 import CryptoSM from 'sm-crypto';
 
-function object2string(data: any) {
+function object2string(data) {
   if (typeof data === 'object') {
     return JSON.stringify(data);
   }
-  
+
   let str = JSON.stringify(data);
-  if (str.startsWith('\'') || str.startsWith('"')) {
+  if (str.startsWith("'") || str.startsWith('"')) {
     str = str.substring(1);
   }
-  if (str.endsWith('\'') || str.endsWith('"')) {
+  if (str.endsWith("'") || str.endsWith('"')) {
     str = str.substring(0, str.length - 1);
   }
   return str;
@@ -21,7 +19,7 @@ function object2string(data: any) {
 /**
  * 字符串转为数字
  */
-function stringToHex(str: string) {
+function stringToHex(str) {
   let hex = '';
   for(let i = 0; i < str.length; i++) {
     hex += str.charCodeAt(i).toString(16).padStart(2, '0');
@@ -29,56 +27,78 @@ function stringToHex(str: string) {
   return hex;
 }
 
-// -----------------------  AES 加密、解密 -----------------------
+
+/*
+ * -------------------- ※ AES 加密、解密 begin ※ --------------------
+ *
+ * 1、AES加密算法支持三种密钥长度：128位、192位和256位，这里选择128位
+ * 2、AES 要求秘钥为 128bit，转化字节为 16个字节；
+ * 3、js前端使用 UCS-2 或者 UTF-16 编码，字母、数字、特殊符号等 占用1个字节；
+ * 4、所以：秘钥Key 组成为：字母、数字、特殊符号 一共16个即可
+ *
+ * -------------------- ※ AES 加密、解密 end ※ --------------------
+ */
 const AES_KEY = '1024lab__1024lab';
 
-export const AES = {
-  encryptData: function (data: any) {
+const AES = {
+  encryptData: function (data) {
     // AES 加密 并转为 base64
     let utf8Data = CryptoJS.enc.Utf8.parse(object2string(data));
     const key = CryptoJS.enc.Utf8.parse(AES_KEY);
     const encrypted = CryptoJS.AES.encrypt(utf8Data, key, {
       mode: CryptoJS.mode.ECB,
-      padding: CryptoJS.pad.Pkcs7
+      padding: CryptoJS.pad.Pkcs7,
     });
-    
-    return encrypted.toString();
+    return CryptoJS.enc.Base64.stringify(encrypted.ciphertext);
   },
-  
-  decryptData: function (data: any) {
+
+  decryptData: function (data) {
     //  第一步：Base64 解码
     let words = CryptoJS.enc.Base64.parse(data);
-    
+
     // 第二步：AES 解密
     const key = CryptoJS.enc.Utf8.parse(AES_KEY);
-    return CryptoJS.AES.decrypt({ciphertext: words}, key, {
+    return CryptoJS.AES.decrypt({ ciphertext: words }, key, {
       mode: CryptoJS.mode.ECB,
-      padding: CryptoJS.pad.Pkcs7
+      padding: CryptoJS.pad.Pkcs7,
     }).toString(CryptoJS.enc.Utf8);
-  }
+  },
 };
 
-// -----------------------  国密SM4算法 加密、解密 -----------------------
+/*
+ * -------------------- ※ 国密SM4算法 加密、解密 begin ※ --------------------
+ *
+ * 1、国密SM4 要求秘钥为 128bit，转化字节为 16个字节；
+ * 2、js前端使用 UCS-2 或者 UTF-16 编码，字母、数字、特殊符号等 占用1个字节；
+ * 3、java中 每个 字母数字 也是占用1个字节；
+ * 4、所以：前端和后端的 秘钥Key 组成为：字母、数字、特殊符号 一共16个即可
+ *
+ * -------------------- ※ 国密SM4算法 加密、解密 end ※ --------------------
+ */
+
+// 秘钥Key 组成为：字母、数字、特殊符号 一共16个即可
 const SM4_KEY = '1024lab__1024lab';
 
 const SM4 = {
-  encryptData: function (data: any) {
+  encryptData: function (data) {
     // 第一步：SM4 加密
     let encryptData = CryptoSM.sm4.encrypt(object2string(data), stringToHex(SM4_KEY));
     // 第二步： Base64 编码
     return CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(encryptData));
   },
-  
-  decryptData: function (data: any) {
+
+  decryptData: function (data) {
     // 第一步：Base64 解码
     let words = CryptoJS.enc.Base64.parse(data);
     let decode64Str = CryptoJS.enc.Utf8.stringify(words);
-    
+
     // 第二步：SM4 解密
     return CryptoSM.sm4.decrypt(decode64Str, stringToHex(SM4_KEY));
-  }
+  },
 };
 
+
+
 // -----------------------  对外暴露： 加密、解密 -----------------------
 
 // 默认使用SM4算法
@@ -88,13 +108,13 @@ const EncryptObject = SM4;
 /**
  * 加密
  */
-export const encryptData = function (data: any) {
+export const encryptData = function (data) {
   return !data ? null : EncryptObject.encryptData(data);
 };
 
 /**
  * 解密
  */
-export const decryptData = function (data: any) {
+export const decryptData = function (data) {
   return !data ? null : EncryptObject.decryptData(data);
 };
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/lib/highlight-line-number.ts b/smart-admin-web-typescript/src/lib/highlight-line-number.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/lib/highlight-line-number.ts
rename to smart-admin-web-typescript/src/lib/highlight-line-number.ts
diff --git a/smart-admin-web-typescript/src/lib/smart-sentry.ts b/smart-admin-web-typescript/src/lib/smart-sentry.ts
new file mode 100644
index 0000000..4c6afc1
--- /dev/null
+++ b/smart-admin-web-typescript/src/lib/smart-sentry.ts
@@ -0,0 +1,22 @@
+/*
+ * 错误上报sentry
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-09-06 20:49:28
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+
+export const smartSentry = {
+    /**
+     * sentry 主动上报
+     */
+    captureError: (error) => {
+        if (error.config && error.data && error && error.headers && error.request && error.status) {
+            return;
+        }
+        // Sentry.captureException(error);
+        console.error(error);
+    },
+};
diff --git a/smart-admin-web-typescript/src/lib/smart-watermark.ts b/smart-admin-web-typescript/src/lib/smart-watermark.ts
new file mode 100644
index 0000000..6e9f681
--- /dev/null
+++ b/smart-admin-web-typescript/src/lib/smart-watermark.ts
@@ -0,0 +1,106 @@
+/*
+ * 水印
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-09-06 20:50:10
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+ */
+
+import dayjs from 'dayjs';
+
+/**
+ *  水印DOM id
+ */
+const WATER_MARK_DOM_ID = 'smart_admin_water_mark';
+let smartAdminWaterMarkIntervalId: NodeJS.Timer | null = null;
+
+/**
+ *
+ * 因为modal的z-index为1000，所以为了modal的黑色背景隐藏掉，z-index为 999
+ *
+ * @param id
+ * @param str
+ * @returns
+ */
+
+function setWatermark(id, str) {
+    //删掉之前的水印
+    if (document.getElementById(WATER_MARK_DOM_ID) !== null) {
+        document.getElementById(WATER_MARK_DOM_ID).remove();
+    }
+
+    str = str + ' ' + dayjs().format('YYYY-MM-DD HH:mm');
+
+    //创建一个画布
+    const can = document.createElement('canvas');
+    //设置画布的长宽
+    can.width = 400;
+    can.height = 200;
+
+    const cans = can.getContext('2d');
+    //旋转角度
+    cans.rotate((-15 * Math.PI) / 150);
+    cans.font = '16px Microsoft JhengHei';
+    //设置填充绘画的颜色、渐变或者模式
+    cans.fillStyle = 'rgba(190, 190, 190, 0.30)';
+    //设置文本内容的当前对齐方式
+    cans.textAlign = 'left';
+    //设置在绘制文本时使用的当前文本基线
+    cans.textBaseline = 'middle';
+    //在画布上绘制填色的文本（输出的文本，开始绘制文本的X坐标位置，开始绘制文本的Y坐标位置）
+    cans.fillText(str, can.width / 8, can.height / 2);
+    const div = document.createElement('div');
+    div.id = WATER_MARK_DOM_ID;
+    div.style.pointerEvents = 'none';
+    div.style.top = '0px';
+    div.style.left = '0px';
+    div.style.position = 'absolute';
+    div.style.zIndex = '99';
+    div.style.width = '100%';
+    div.style.height = '100%';
+    div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat';
+    document.getElementById(id).appendChild(div);
+}
+
+const watermark = {
+    show: function () {
+        document.getElementById(WATER_MARK_DOM_ID).style.display = 'block';
+    },
+    hide: function () {
+        document.getElementById(WATER_MARK_DOM_ID).style.display = 'hide';
+    },
+    // 该方法只允许调用一次
+    set: function (id, str) {
+        // 如果存在水印，则不允许再调用了
+        if (document.getElementById(WATER_MARK_DOM_ID) !== null) {
+            return;
+        }
+
+        setWatermark(id, str);
+
+        //每隔1分钟检查一次水印
+        smartAdminWaterMarkIntervalId = setInterval(() => {
+            setWatermark(id, str);
+        }, 60000);
+
+        window.onresize = () => {
+            setWatermark(id, str);
+        };
+    },
+    // 清空水印
+    clear: function () {
+        let watermarkDom = document.getElementById(WATER_MARK_DOM_ID);
+        if (watermarkDom) {
+            watermarkDom.remove();
+        }
+
+        window.removeEventListener('resize', setWatermark);
+        if (smartAdminWaterMarkIntervalId) {
+            clearInterval(smartAdminWaterMarkIntervalId);
+            smartAdminWaterMarkIntervalId = null;
+        }
+    },
+};
+export default watermark;
diff --git a/smart-admin-web-typescript/src/lib/table-auto-height.ts b/smart-admin-web-typescript/src/lib/table-auto-height.ts
new file mode 100644
index 0000000..3b2fd62
--- /dev/null
+++ b/smart-admin-web-typescript/src/lib/table-auto-height.ts
@@ -0,0 +1,30 @@
+/**
+ * 计算表格自适应高度
+ *
+ * @param {*} heightRef
+ * @param {*} removeRefArray
+ * @param {*} extraRemoveHeight
+ * @returns
+ */
+
+import { useAppConfigStore } from '../store/modules/system/app-config';
+
+export function calcTableHeight(heightRef, removeRefArray, extraRemoveHeight) {
+  let removeHeight = 0;
+  if (removeRefArray && removeRefArray.length > 0) {
+    for (const item of removeRefArray) {
+      removeHeight = removeHeight + item.value.$el.offsetHeight;
+    }
+  }
+
+  let due = 40;
+  if (useAppConfigStore().$state.pageTagFlag) {
+    due = due + 40;
+  }
+  if (useAppConfigStore().$state.footerFlag) {
+    due = due + 40;
+  }
+
+  removeHeight = removeHeight + extraRemoveHeight + due;
+  heightRef.value = document.querySelector('#smartAdminLayoutContent').offsetHeight - removeHeight;
+}
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/main.ts b/smart-admin-web-typescript/src/main.ts
similarity index 68%
rename from smart-admin-web/typescript-ant-design-vue3/src/main.ts
rename to smart-admin-web-typescript/src/main.ts
index 7a6504a..e9eeeb2 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/main.ts
+++ b/smart-admin-web-typescript/src/main.ts
@@ -7,39 +7,41 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import * as antIcons from '@ant-design/icons-vue';
-import Antd, { message } from 'ant-design-vue';
-import lodash from 'lodash';
+
 import { createApp } from 'vue';
+import Antd, { message } from 'ant-design-vue';
+import * as antIcons from '@ant-design/icons-vue';
+import lodash from 'lodash';
 import JsonViewer from 'vue3-json-viewer';
 import 'vue3-json-viewer/dist/index.css';
 import App from './App.vue';
 import { smartSentry } from '/@/lib/smart-sentry';
-import { loginApi } from '/@/api/system/login/login-api';
+import { loginApi } from '/@/api/system/login-api';
 import constantsInfo from '/@/constants/index';
 import { privilegeDirective } from '/@/directives/privilege';
 import i18n from '/@/i18n/index';
 import privilegePlugin from '/@/plugins/privilege-plugin';
 import smartEnumPlugin from '/@/plugins/smart-enums-plugin';
-import { buildRoutes, router } from '/@/router/index';
-import { store } from '/@/store/index';
+import { buildRoutes, router } from '/@/router';
+import { store } from '/@/store';
 import { useUserStore } from '/@/store/modules/system/user';
 import 'ant-design-vue/dist/reset.css';
 import 'vue3-tabs-chrome/dist/vue3-tabs-chrome.css';
 import '/@/theme/index.less';
-import { getTokenFromCookie } from '/@/utils/cookie-util';
-
+import { localRead } from '/@/utils/local-util.js';
+import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
 
 /*
- * -------------------- ※ 着重 解释说明下这里的初始化逻辑 begin ※ --------------------
+ * -------------------- ※ 着重 解释说明下main.js的初始化逻辑 begin ※ --------------------
  *
- * 1、很多框架都是 直接调用vue方法，创建vue实例，然后挂载路由router、状态管理store等等，但是关于router这块是有问题的；
- * 2、现在大部分路由都是从后台返回的，直接挂载，这个时候前端是没有从后端请求到所有路由的，所以只能写到路由拦截器里，这也很绕很不清晰；
- *    比如做法流程应该是：
+ * 1、在main.js里很多框架都是 直接调用初始化的vue方法，创建vue实例，然后挂载路由router、状态管理store等等，但是关于router这块是有问题的；
+ * 2、因为现在大部分路由都是从后端接口返回的，如若直接初始化挂载路由，这时前端还没有从后端请求路由的数据，所以只能写到路由拦截器里，这样很绕很不清晰；
+ *    正确的做法流程应该是：
  *      2.1）如果存在登录信息，则先ajax请求用户的所有路由，然后加载，再去创建vue实例和挂载路由
  *      2.2）如果不存在路由信息，则创建vue实例和挂载路由（此时的路由应该只有login页面，因为用户拥有哪些路由是登录之后才知道的）
+ * 3、以上，在main.js里两个方法，一个是 获取登录信息getLoginInfo，另一个初始化vue: initVue，在最下的if操作里
  *
- * -------------------- ※ 着重 解释说明下这里的初始化逻辑 end ※ --------------------
+ * -------------------- ※ 着重 解释说明下main.js的初始化逻辑 end ※ --------------------
  */
 
 /**
@@ -56,8 +58,9 @@ async function getLoginInfo() {
     //更新用户信息到pinia
     useUserStore().setUserLoginInfo(res.data);
   } catch (e) {
-    message.error(e);
+    message.error(e.data ? e.data.msg : e.message);
     smartSentry.captureError(e);
+    initVue();
   }
 }
 
@@ -82,7 +85,7 @@ function initVue() {
 }
 
 //不需要获取用户信息、用户菜单、用户菜单动态路由，直接初始化vue即可
-let token = getTokenFromCookie();
+let token = localRead(LocalStorageKeyConst.USER_TOKEN);
 if (!token) {
   initVue();
 } else {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/plugins/privilege-plugin.ts b/smart-admin-web-typescript/src/plugins/privilege-plugin.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/plugins/privilege-plugin.ts
rename to smart-admin-web-typescript/src/plugins/privilege-plugin.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/plugins/smart-enums-plugin.ts b/smart-admin-web-typescript/src/plugins/smart-enums-plugin.ts
similarity index 87%
rename from smart-admin-web/typescript-ant-design-vue3/src/plugins/smart-enums-plugin.ts
rename to smart-admin-web-typescript/src/plugins/smart-enums-plugin.ts
index f79d523..d1d50f4 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/plugins/smart-enums-plugin.ts
+++ b/smart-admin-web-typescript/src/plugins/smart-enums-plugin.ts
@@ -24,6 +24,7 @@ export default {
      */
     smartEnumPlugin.getDescByValue = function (constantName: string, value: any): string {
       if (!smartEnumWrapper || !Object.prototype.hasOwnProperty.call(smartEnumWrapper, constantName)) {
+        console.error('无法找到变量名称：' + constantName + '，请检查 /constants/index.js 文件中是否引入此变量！');
         return '';
       }
       // boolean类型需要做特殊处理
@@ -46,6 +47,7 @@ export default {
      */
     smartEnumPlugin.getValueDescList = function <T>(constantName: string): SmartEnumItem<T>[] {
       if (!Object.prototype.hasOwnProperty.call(smartEnumWrapper, constantName)) {
+        console.error('无法找到变量名称：' + constantName + '，请检查 /constants/index.js 文件中是否引入此变量！');
         return [];
       }
       const result: SmartEnumItem<T>[] = [];
@@ -63,6 +65,7 @@ export default {
      */
     smartEnumPlugin.getValueDesc = function (constantName: string): { [key: string]: string } {
       if (!Object.prototype.hasOwnProperty.call(smartEnumWrapper, constantName)) {
+        console.error('无法找到变量名称：' + constantName + '，请检查 /constants/index.js 文件中是否引入此变量！');
         return {};
       }
       let smartEnum = smartEnumWrapper[constantName];
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/router/index.ts b/smart-admin-web-typescript/src/router/index.ts
similarity index 53%
rename from smart-admin-web/typescript-ant-design-vue3/src/router/index.ts
rename to smart-admin-web-typescript/src/router/index.ts
index d6d7b1e..3f78636 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/router/index.ts
+++ b/smart-admin-web-typescript/src/router/index.ts
@@ -7,68 +7,83 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-
 import nProgress from 'nprogress';
 import 'nprogress/nprogress.css';
-import {nextTick} from 'vue';
-import {createRouter, createWebHashHistory, RouteRecordRaw} from 'vue-router';
-import {routerArray} from './routers';
-import {PAGE_PATH_404, PAGE_PATH_LOGIN} from '/@/constants/common-const';
-import {HOME_PAGE_NAME} from '/@/constants/system/home-const';
-import SmartLayout from '/@/layout/smart-layout.vue';
-import {useUserStore} from '/@/store/modules/system/user';
-import {clearAllCoolies, getTokenFromCookie} from '/@/utils/cookie-util';
-import {localClear} from '/@/utils/local-util';
+import { nextTick } from 'vue';
+import { createRouter, createWebHashHistory } from 'vue-router';
+import { routerArray } from './routers';
+import { PAGE_PATH_404, PAGE_PATH_LOGIN, HOME_PAGE_PATH } from '/@/constants/common-const';
+import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
+import SmartLayout from '../layout/index.vue';
+import { useUserStore } from '/@/store/modules/system/user';
+import { localClear, localRead } from '/@/utils/local-util';
+import _ from 'lodash';
+import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
 
 export const router = createRouter({
   history: createWebHashHistory(),
   routes: routerArray,
   strict: true,
-  scrollBehavior: () => ({left: 0, top: 0})
+  scrollBehavior: () => ({ left: 0, top: 0 }),
 });
 
 // ----------------------- 路由加载前 -----------------------
 router.beforeEach(async (to, from, next) => {
   // 进度条开启
   nProgress.start();
-  
+
   // 公共页面，任何时候都可以跳转
-  if (to.path === PAGE_PATH_404 || to.path === PAGE_PATH_LOGIN) {
+  if (to.path === PAGE_PATH_404) {
     next();
     return;
   }
-  
+
   // 验证登录
-  const token = getTokenFromCookie();
+  const token = localRead(LocalStorageKeyConst.USER_TOKEN);
   if (!token) {
-    clearAllCoolies();
-    localClear();
-    next({path: PAGE_PATH_LOGIN});
+    useUserStore().logout();
+    if (to.path === PAGE_PATH_LOGIN) {
+      next();
+    } else {
+      next({ path: PAGE_PATH_LOGIN });
+    }
     return;
   }
-  
+
+  // 登录页，则跳转到首页
+  if (to.path === PAGE_PATH_LOGIN) {
+    next({ path: HOME_PAGE_PATH });
+    return;
+  }
+
   // 首页（ 需要登录 ，但不需要验证权限）
-  if (to.path == HOME_PAGE_NAME) {
+  if (to.path === HOME_PAGE_NAME) {
     next();
     return;
   }
-  
-  // 是否刷新缓存
-  // 当前路由是否在tag中 存在tag中且没有传递keepAlive则刷新缓存
-  let findTag = (useUserStore().tagNav || []).find((e) => e.menuName == to.name);
-  let reloadKeepAlive = findTag && !to.params.keepAlive;
-  
-  // 设置tagNav
-  useUserStore().setTagNav(to, from);
-  // 设置keepAlive 或 删除KeepAlive
-  if (to.meta.keepAlive) {
-    if (reloadKeepAlive) {
-      useUserStore().deleteKeepAliveIncludes(to.name?.toString());
-    }
-    nextTick(() => {
-      useUserStore().pushKeepAliveIncludes(to.name?.toString());
+
+  // 下载路由对应的 页面组件，并修改组件的Name，如果修改过，则不需要修改
+  let toRouterInfo = routerMap.get(to.name);
+  if (toRouterInfo && _.isFunction(toRouterInfo.component) && toRouterInfo.meta.renameComponentFlag === false) {
+    // 因为组件component 为 lazy load是个方法，所以可以直接执行 component()方法
+    toRouterInfo.component().then((val) => {
+      // 修改组件的name
+      val.default.name = to.meta.componentName;
+      // 记录已经修改过 组件的name
+      toRouterInfo.meta.renameComponentFlag = true;
     });
   }
+
+  // 设置tagNav
+  useUserStore().setTagNav(to, from);
+
+  // 设置keepAlive
+  if (to.meta.keepAlive) {
+    nextTick(() => {
+      useUserStore().pushKeepAliveIncludes(to.meta.componentName);
+    });
+  }
+
   next();
 });
 
@@ -86,12 +101,11 @@ export function buildRoutes(menuRouterList) {
    * 1、构建整个路由信息
    * 2、添加到路由里
    */
-  const resList = [];
+  const routerList = [];
   // 获取所有vue组件引用地址 用于构建路由
   const modules = import.meta.glob('../views/**/**.vue');
   // 获取所有vue组件 用于注入name属性 name属性用于keep-alive
-  // const modulesEager = import.meta.globEager('../views/**/**.vue');
-  
+
   //1、构建整个路由信息
   for (const e of menuList) {
     if (!e.menuId) {
@@ -100,15 +114,18 @@ export function buildRoutes(menuRouterList) {
     if (!e.path) {
       continue;
     }
-    if (e.deletedFlag && e.deletedFlag === 1) {
+    if (e.deletedFlag && e.deletedFlag === true) {
       continue;
     }
-    let menuIdStr = e.menuId.toString();
     let route = {
       path: e.path.startsWith('/') ? e.path : `/${e.path}`,
-      // 使用menuId作为name唯一标识
-      name: menuIdStr,
+      // 使用【menuId】作为name唯一标识
+      name: e.menuId.toString(),
       meta: {
+        // 数据库菜单(页面)id
+        id: e.menuId.toString(),
+        // 组件名称
+        componentName: e.menuId.toString(),
         // 菜单展示
         title: e.menuName,
         // 菜单图标展示
@@ -120,38 +137,29 @@ export function buildRoutes(menuRouterList) {
         // 是否为外链
         frameFlag: e.frameFlag,
         // 外链地址
-        frameUrl: e.frameUrl
-      }
+        frameUrl: e.frameUrl,
+        // 是否 rename了组件的名字
+        renameComponentFlag: false,
+      },
     };
-    
+
     if (e.frameFlag) {
-      route.component = () => import('../components/framework/iframe/route-default-component.vue');
-      resList.push(route);
-      continue;
+      route.component = () => import('../components/framework/iframe/iframe-index.vue');
     } else {
       let componentPath = e.component && e.component.startsWith('/') ? e.component : '/' + e.component;
       let relativePath = `../views${componentPath}`;
-      // eslint-disable-next-line no-prototype-builtins
+      // // eslint-disable-next-line no-prototype-builtins
       route.component = modules[relativePath];
     }
-    // 注释无用逻辑
-    // if (modules.hasOwnProperty(relativePath)) {
-    //   route.component = modules[relativePath];
-    //   // 组件注入name
-    //   let eager = modulesEager[relativePath];
-    //   if (eager) {
-    //     eager.default.name = menuIdStr;
-    //   }
-    // }
-    resList.push(route);
+    routerList.push(route);
     routerMap.set(e.menuId.toString(), route);
   }
-  
+
   //2、添加到路由里
   router.addRoute({
     path: '/',
     meta: {},
     component: SmartLayout,
-    children: resList
+    children: routerList,
   });
 }
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/router/routers.ts b/smart-admin-web-typescript/src/router/routers.ts
similarity index 54%
rename from smart-admin-web/typescript-ant-design-vue3/src/router/routers.ts
rename to smart-admin-web-typescript/src/router/routers.ts
index f86c21f..638d4d8 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/router/routers.ts
+++ b/smart-admin-web-typescript/src/router/routers.ts
@@ -10,5 +10,13 @@
 import { homeRouters } from './system/home';
 import { loginRouters } from './system/login';
 import { helpDocRouters } from './support/help-doc';
+import NotFound from '/@/views/system/40X/404.vue';
+import NoPrivilege from '/@/views/system/40X/403.vue';
 
-export const routerArray = [...loginRouters, ...homeRouters, ...helpDocRouters];
+export const routerArray = [
+    ...loginRouters,
+     ...homeRouters, 
+    ...helpDocRouters, 
+    { path: '/:pathMatch(.*)*', name: '404', component: NotFound },
+    { path: '/403', name: '403', component: NoPrivilege }
+];
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/router/support/help-doc.ts b/smart-admin-web-typescript/src/router/support/help-doc.ts
similarity index 84%
rename from smart-admin-web/typescript-ant-design-vue3/src/router/support/help-doc.ts
rename to smart-admin-web-typescript/src/router/support/help-doc.ts
index 03d0487..16c869f 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/router/support/help-doc.ts
+++ b/smart-admin-web-typescript/src/router/support/help-doc.ts
@@ -7,13 +7,13 @@
  * @Email:     lab1024@163.com
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
-import SmartHelpDocLayout from '/@/layout/smart-help-doc-layout.vue';
+import HelpDocLayout from '/@/layout/help-doc-layout.vue';
 
 export const helpDocRouters = [
   {
     path: '/help-doc',
     name: 'HelpDoc',
-    component: SmartHelpDocLayout,
+    component: HelpDocLayout,
     meta: {
       title: '帮助文档',
       hideInMenu: true,
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/router/system/home.ts b/smart-admin-web-typescript/src/router/system/home.ts
similarity index 78%
rename from smart-admin-web/typescript-ant-design-vue3/src/router/system/home.ts
rename to smart-admin-web-typescript/src/router/system/home.ts
index de99dfb..793a216 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/router/system/home.ts
+++ b/smart-admin-web-typescript/src/router/system/home.ts
@@ -9,8 +9,7 @@
  */
 import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
 import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
-import SmartLayout from '/@/layout/smart-layout.vue';
-import { RouteRecordRaw } from 'vue-router';
+import SmartLayout from '/@/layout/index.vue';
 
 export const homeRouters:Array<RouteRecordRaw> = [
   {
@@ -35,6 +34,15 @@ export const homeRouters:Array<RouteRecordRaw> = [
         },
         component: () => import('/@/views/system/home/index.vue'),
       },
+      {
+        path: '/account',
+        name: 'Account',
+        component: () => import('/@/views/system/account/index.vue'),
+        meta: {
+          title: '个人中心',
+          hideInMenu: false,
+        },
+      },
     ],
   },
 ];
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/router/system/login.ts b/smart-admin-web-typescript/src/router/system/login.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/router/system/login.ts
rename to smart-admin-web-typescript/src/router/system/login.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/shims-vue.d.ts b/smart-admin-web-typescript/src/shims-vue.d.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/shims-vue.d.ts
rename to smart-admin-web-typescript/src/shims-vue.d.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/store/index.ts b/smart-admin-web-typescript/src/store/index.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/store/index.ts
rename to smart-admin-web-typescript/src/store/index.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/model/UserTagNav.ts b/smart-admin-web-typescript/src/store/modules/model/UserTagNav.ts
similarity index 89%
rename from smart-admin-web/typescript-ant-design-vue3/src/store/modules/model/UserTagNav.ts
rename to smart-admin-web-typescript/src/store/modules/model/UserTagNav.ts
index 4de9994..c4e976e 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/model/UserTagNav.ts
+++ b/smart-admin-web-typescript/src/store/modules/model/UserTagNav.ts
@@ -4,7 +4,7 @@
  * @LastEditTime: 2021-08-19 17:53:36
  * @LastEditors: zhuoda
  * @Description:
- * @FilePath: /smart-admin/src/store/modules/model/UserTagNav.ts
+ * @FilePath: /smart-admin/@/store/modules/model/UserTagNav.ts
  */
 
 import { LocationQueryRaw } from 'vue-router';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/app-config.ts b/smart-admin-web-typescript/src/store/modules/system/app-config.ts
similarity index 73%
rename from smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/app-config.ts
rename to smart-admin-web-typescript/src/store/modules/system/app-config.ts
index ec6d380..5b3eae8 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/app-config.ts
+++ b/smart-admin-web-typescript/src/store/modules/system/app-config.ts
@@ -14,7 +14,9 @@ import { smartSentry } from '/@/lib/smart-sentry';
 import { AppConfig } from '/@/types/config';
 import { localRead } from '/@/utils/local-util';
 
-let state: AppConfig = { ...appDefaultConfig };
+let state = {
+  ...appDefaultConfig
+};
 
 let appConfigStr = localRead(localStorageKeyConst.APP_CONFIG);
 let language = appDefaultConfig.language;
@@ -39,19 +41,26 @@ export const useAppConfigStore = defineStore({
   state: (): AppConfig => ({
     // 读取config下的默认配置
     ...state,
+    // 全屏
+    fullScreenFlag: false,
   }),
   actions: {
-    reset(): void {
-      let key: keyof AppConfig;
-      for (key in appDefaultConfig) {
-        this.$state[key] = appDefaultConfig[key];
+    reset() {
+      for (const k in appDefaultConfig) {
+        this[k] = appDefaultConfig[k];
       }
     },
-    showHelpDoc(): void {
-      this.helpDocFlag = true;
+    showHelpDoc() {
+      this.helpDocExpandFlag = true;
     },
-    hideHelpDoc(): void {
-      this.helpDocFlag = false;
+    hideHelpDoc() {
+      this.helpDocExpandFlag = false;
+    },
+    startFullScreen() {
+      this.fullScreenFlag = true;
+    },
+    exitFullScreen() {
+      this.fullScreenFlag = false;
     },
   },
 });
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/role.ts b/smart-admin-web-typescript/src/store/modules/system/role.ts
similarity index 91%
rename from smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/role.ts
rename to smart-admin-web-typescript/src/store/modules/system/role.ts
index 4b9c0e3..5902308 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/role.ts
+++ b/smart-admin-web-typescript/src/store/modules/system/role.ts
@@ -24,15 +24,15 @@ export const useRoleStore = defineStore({
     },
     // 选中
     addCheckedData(data) {
-      if (this.checkedData.some((e) => e == data)) {
+      if (this.checkedData.some((e) => e === data)) {
         return;
       }
       this.checkedData.push(data);
     },
     // 选中本级以及子级
     addCheckedDataAndChildren(data) {
-      let findIndex = this.checkedData.findIndex((val) => val == data.menuId);
-      if (data.menuId && findIndex == -1) {
+      let findIndex = this.checkedData.findIndex((val) => val === data.menuId);
+      if (data.menuId && findIndex === -1) {
         this.addCheckedData(data.menuId);
       }
       if (data.children) {
@@ -47,8 +47,8 @@ export const useRoleStore = defineStore({
     },
     // 取消选中本级以及子级
     deleteCheckedDataAndChildren(data) {
-      let findIndex = this.checkedData.findIndex((val) => val == data.menuId);
-      if (findIndex != -1) {
+      let findIndex = this.checkedData.findIndex((val) => val === data.menuId);
+      if (findIndex !== -1) {
         this.deleteCheckedData(findIndex);
       }
       if (data.children) {
@@ -82,8 +82,8 @@ export const useRoleStore = defineStore({
         return;
       }
       // 选中父级
-      let parentIndex = this.checkedData.findIndex((e) => parentModule?.menuId === e);
-      if (parentModule.menuId && parentIndex == -1) {
+      let parentIndex = this.checkedData.findIndex((e) => parentModule.menuId === e);
+      if (parentModule.menuId && parentIndex === -1) {
         this.addCheckedData(parentModule.menuId);
       }
       // 如果上级还有上级 则进行递归
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/spin.ts b/smart-admin-web-typescript/src/store/modules/system/spin.ts
similarity index 62%
rename from smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/spin.ts
rename to smart-admin-web-typescript/src/store/modules/system/spin.ts
index 68cd2d2..fd12a61 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/spin.ts
+++ b/smart-admin-web-typescript/src/store/modules/system/spin.ts
@@ -18,17 +18,13 @@ export const useSpinStore = defineStore({
   actions: {
     hide() {
       this.loading = false;
-      let spins = document.querySelector<HTMLElement>('.ant-spin-nested-loading');
-      if (spins) {
-        spins.style.zIndex = '999';
-      }
+      let spins = document.querySelector('.ant-spin-nested-loading');
+      spins.style.zIndex = 999;
     },
     show() {
       this.loading = true;
-      let spins = document.querySelector<HTMLElement>('.ant-spin-nested-loading');
-      if (spins) {
-        spins.style.zIndex = '1001';
-      }
+      let spins = document.querySelector('.ant-spin-nested-loading');
+      spins.style.zIndex = 1001;
     },
   },
 });
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/user.ts b/smart-admin-web-typescript/src/store/modules/system/user.ts
similarity index 82%
rename from smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/user.ts
rename to smart-admin-web-typescript/src/store/modules/system/user.ts
index c603839..3c5ed6c 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/store/modules/system/user.ts
+++ b/smart-admin-web-typescript/src/store/modules/system/user.ts
@@ -12,8 +12,10 @@ import { defineStore } from 'pinia';
 import localKey from '/@/constants/local-storage-key-const';
 import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
 import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
-import { getTokenFromCookie } from '/@/utils/cookie-util';
-import { localClear, localRead, localSave } from '/@/utils/local-util';
+import { messageApi } from '/@/api/support/message-api.js';
+import { smartSentry } from '/@/lib/smart-sentry.js';
+import { localRead, localSave, localRemove } from '/@/utils/local-util';
+
 
 export const useUserStore = defineStore({
   id: 'userStore',
@@ -21,6 +23,8 @@ export const useUserStore = defineStore({
     token: '',
     //员工id
     employeeId: '',
+    // 头像
+    avatar: '',
     //登录名
     loginName: '',
     //姓名
@@ -31,10 +35,14 @@ export const useUserStore = defineStore({
     departmentId: '',
     //部门名词
     departmentName: '',
+    //是否需要修改密码
+    needUpdatePwdFlag: false,
     //是否为超级管理员
     administratorFlag: true,
     //上次登录ip
     lastLoginIp: '',
+    //上次登录ip地区
+    lastLoginIpRegion: '',
     //上次登录 设备
     lastLoginUserAgent: '',
     //上次登录时间
@@ -50,16 +58,23 @@ export const useUserStore = defineStore({
     // 功能点集合
     pointsList: [],
     // 标签页
-    tagNav: [],
+    tagNav: null,
     // 缓存
     keepAliveIncludes: [],
+    // 未读消息数量
+    unreadMessageCount: 0,
+    // 待办工作数
+    toBeDoneCount: 0,
   }),
   getters: {
     getToken(state) {
       if (state.token) {
         return state.token;
       }
-      return getTokenFromCookie();
+      return localRead(localKey.USER_TOKEN);
+    },
+    getNeedUpdatePwdFlag(state){
+      return state.needUpdatePwdFlag;
     },
     //是否初始化了 路由
     getMenuRouterInitFlag(state) {
@@ -105,21 +120,45 @@ export const useUserStore = defineStore({
       this.token = '';
       this.menuList = [];
       this.tagNav = [];
-      this.userInfo = {};
-      localClear();
+      this.unreadMessageCount = 0;
+      localRemove(localKey.USER_TOKEN);
+      localRemove(localKey.USER_POINTS);
+      localRemove(localKey.USER_TAG_NAV);
+    },
+    // 查询未读消息数量
+    async queryUnreadMessageCount() {
+      try {
+        let result = await messageApi.queryUnreadCount();
+        this.unreadMessageCount = result.data;
+      } catch (e) {
+        smartSentry.captureError(e);
+      }
+    },
+    async queryToBeDoneList() {
+      try {
+        let localToBeDoneList = localRead(localKey.TO_BE_DONE);
+        if (localToBeDoneList) {
+          this.toBeDoneCount = JSON.parse(localToBeDoneList).filter((e) => !e.doneFlag).length;
+        }
+      } catch (err) {
+        smartSentry.captureError(err);
+      }
     },
     //设置登录信息
     setUserLoginInfo(data) {
       // 用户基本信息
       this.token = data.token;
       this.employeeId = data.employeeId;
+      this.avatar = data.avatar;
       this.loginName = data.loginName;
       this.actualName = data.actualName;
       this.phone = data.phone;
       this.departmentId = data.departmentId;
       this.departmentName = data.departmentName;
+      this.needUpdatePwdFlag = data.needUpdatePwdFlag;
       this.administratorFlag = data.administratorFlag;
       this.lastLoginIp = data.lastLoginIp;
+      this.lastLoginIpRegion = data.lastLoginIpRegion;
       this.lastLoginUserAgent = data.lastLoginUserAgent;
       this.lastLoginTime = data.lastLoginTime;
 
@@ -134,6 +173,11 @@ export const useUserStore = defineStore({
 
       //功能点
       this.pointsList = data.menuList.filter((menu) => menu.menuType === MENU_TYPE_ENUM.POINTS.value && menu.visibleFlag && !menu.disabledFlag);
+
+      // 获取用户未读消息
+      this.queryUnreadMessageCount();
+      // 获取待办工作数
+      this.queryToBeDoneList();
     },
     setToken(token) {
       this.token = token;
@@ -146,10 +190,10 @@ export const useUserStore = defineStore({
       }
       // name唯一标识
       let name = route.name;
-      if (!name || name == HOME_PAGE_NAME || name === '403' || name === '404') {
+      if (!name || name === HOME_PAGE_NAME || name === '403' || name === '404') {
         return;
       }
-      let findTag = (this.tagNav || []).find((e) => e.menuName == name);
+      let findTag = (this.tagNav || []).find((e) => e.menuName === name);
       if (findTag) {
         // @ts-ignore
         findTag.fromMenuName = from.name;
@@ -176,9 +220,9 @@ export const useUserStore = defineStore({
         this.tagNav = [];
         this.clearKeepAliveIncludes();
       } else {
-        let findIndex = (this.tagNav || []).findIndex((e) => e.menuName == menuName);
+        let findIndex = (this.tagNav || []).findIndex((e) => e.menuName === menuName);
         if (closeAll) {
-          if (findIndex == -1) {
+          if (findIndex === -1) {
             this.tagNav = [];
             this.clearKeepAliveIncludes();
           } else {
@@ -200,12 +244,12 @@ export const useUserStore = defineStore({
         router.push({ path });
       } else {
         // 寻找tagNav
-        let index = this.getTagNav.findIndex((e) => e.menuName == route.name);
-        if (index == -1) {
+        let index = this.getTagNav.findIndex((e) => e.menuName === route.name);
+        if (index === -1) {
           router.push({ name: HOME_PAGE_NAME });
         } else {
           let tagNav = this.getTagNav[index];
-          if (tagNav.fromMenuName && this.getTagNav.some((e) => e.menuName == tagNav.fromMenuName)) {
+          if (tagNav.fromMenuName && this.getTagNav.some((e) => e.menuName === tagNav.fromMenuName)) {
             router.push({ name: tagNav.fromMenuName, query: tagNav.fromMenuQuery });
           } else {
             // 查询左侧tag
@@ -243,7 +287,7 @@ export const useUserStore = defineStore({
     },
     // 清空缓存
     clearKeepAliveIncludes(val) {
-      if (!val || !this.keepAliveIncludes?.includes(val)) {
+      if (!val || !this.keepAliveIncludes.includes(val)) {
         this.keepAliveIncludes = [];
         return;
       }
@@ -264,7 +308,7 @@ function buildMenuParentIdListMap(menuTree) {
 function recursiveBuildMenuParentIdListMap(menuList, parentMenuList, menuParentIdListMap) {
   for (const e of menuList) {
     // 顶级parentMenuList清空
-    if (e.parentId == 0) {
+    if (e.parentId === 0) {
       parentMenuList = [];
     }
     let menuIdStr = e.menuId.toString();
diff --git a/smart-admin-web-typescript/src/theme/color.ts b/smart-admin-web-typescript/src/theme/color.ts
new file mode 100644
index 0000000..72609ad
--- /dev/null
+++ b/smart-admin-web-typescript/src/theme/color.ts
@@ -0,0 +1,63 @@
+export const themeColors = [
+  // 蓝色
+  {
+    primaryColor: '#1677ff',
+    activeColor: '#0958d9',
+    hoverColor: '#4096ff',
+  },
+  // 蓝色2
+  {
+    primaryColor: '#2F54EB',
+    activeColor: '#1d39c4',
+    hoverColor: '#597ef7',
+  },
+  // 绿色
+  {
+    primaryColor: '#00b96b',
+    activeColor: '#00945b',
+    hoverColor: '#20c77c',
+  },
+
+  // 红色
+  {
+    primaryColor: '#F5222D',
+    activeColor: '#cf1322',
+    hoverColor: '#ff4d4f',
+  },
+  // 青色
+  {
+    primaryColor: '#13c2c2',
+    activeColor: '#08979c',
+    hoverColor: '#36cfc9',
+  },
+  // 粉色
+  {
+    primaryColor: '#EB2F96',
+    activeColor: '#c41d7f',
+    hoverColor: '#f759ab',
+  },
+  // 紫色
+  {
+    primaryColor: '#722ED1',
+    activeColor: '#531dab',
+    hoverColor: '#9254de',
+  },
+  // 极光绿
+  {
+    primaryColor: '#52c41a',
+    activeColor: '#389e0d',
+    hoverColor: '#73d13d',
+  },
+  // 深绿
+  {
+    primaryColor: '#009688',
+    activeColor: '#007069',
+    hoverColor: '#1aa391',
+  },
+  // 橙色
+  {
+    primaryColor: '#fa541c',
+    activeColor: '#d4380d',
+    hoverColor: '#ff7a45',
+  },
+];
diff --git a/smart-admin-web-typescript/src/theme/custom-variables.ts b/smart-admin-web-typescript/src/theme/custom-variables.ts
new file mode 100644
index 0000000..31ec1ce
--- /dev/null
+++ b/smart-admin-web-typescript/src/theme/custom-variables.ts
@@ -0,0 +1,19 @@
+import { theme } from 'ant-design-vue/lib';
+import convertLegacyToken from 'ant-design-vue/lib/theme/convertLegacyToken';
+
+const { defaultAlgorithm, defaultSeed } = theme;
+
+const mapToken = defaultAlgorithm(defaultSeed);
+const token = convertLegacyToken.default(mapToken);
+
+export default {
+  '@primary-color': token['primary-color'], // 全局主色
+  '@base-bg-color': '#fff',
+  '@hover-bg-color': 'rgba(0, 0, 0, 0.025)',
+  '@hover-bg-color-night': 'rgba(255, 255, 255, 0.025)',
+  '@header-light-bg-hover-color': '#f6f6f6',
+  '@header-height': '80px',
+  '@header-user-height': '40px',
+  '@page-tag-height': '40px',
+  '@theme-list': ['light', 'dark', 'night'],
+};
diff --git a/smart-admin-web-typescript/src/theme/index.less b/smart-admin-web-typescript/src/theme/index.less
new file mode 100644
index 0000000..ae50862
--- /dev/null
+++ b/smart-admin-web-typescript/src/theme/index.less
@@ -0,0 +1,112 @@
+/* 
+ * 默认样式的修改
+ * 
+ * @Author:    1024创新实验室-主任：卓大 
+ * @Date:      2022-09-12 14:41:59 
+ * @Wechat:    zhuda1024 
+ * @Email:     lab1024@163.com 
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+ */
+
+@import 'ant-design-vue/dist/reset.css';
+@import './smart-admin.less';
+
+/**********************************  基础样式 **********************************/
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+  outline: none !important;
+}
+
+html,
+body {
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  height: 100%;
+  -webkit-font-smoothing: antialiased;
+  -webkit-tap-highlight-color: transparent;
+  background-color: #f8f8f8;
+  font-size: 14px;
+  position: relative;
+}
+
+#app {
+  width: 100%;
+  height: 100%;
+}
+
+/**********************************  ant design spin **********************************/
+.ant-spin-blur{
+  opacity: 0.2;
+}
+
+/**********************************  ant design table **********************************/
+.ant-table-tbody :deep(.smart-table-striped) {
+  background-color: #fafafa;
+}
+
+/**********************************  ant design form **********************************/
+.ant-form-inline .ant-form-item-with-help {
+  margin-bottom: 0px !important;
+}
+
+/**********************************  ant design spin **********************************/
+.ant-spin-nested-loading {
+  width: 100%;
+  height: 100%;
+}
+
+.ant-spin-container {
+  width: 100%;
+  height: 100%;
+}
+
+/**********************************  富文本HTML样式 **********************************/
+.html-content {
+  /* table 样式 */
+  table {
+    border-top: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+  }
+  table td,
+  table th {
+    border-bottom: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+    padding: 3px 5px;
+  }
+  table th {
+    border-bottom: 2px solid #ccc;
+    text-align: center;
+  }
+
+  /* blockquote 样式 */
+  blockquote {
+    display: block;
+    border-left: 8px solid #d0e5f2;
+    padding: 5px 10px;
+    margin: 10px 0;
+    line-height: 1.4;
+    font-size: 100%;
+    background-color: #f1f1f1;
+  }
+
+  /* code 样式 */
+  code {
+    display: inline-block;
+    background-color: #f1f1f1;
+    border-radius: 3px;
+    padding: 3px 5px;
+    margin: 0 3px;
+  }
+  pre code {
+    display: block;
+  }
+
+  /* ul ol 样式 */
+  ul,
+  ol {
+    margin: 10px 0 10px 20px;
+  }
+}
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/theme/smart-admin.less b/smart-admin-web-typescript/src/theme/smart-admin.less
similarity index 76%
rename from smart-admin-web/typescript-ant-design-vue3/src/theme/smart-admin.less
rename to smart-admin-web-typescript/src/theme/smart-admin.less
index e36d98f..d2bd8ba 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/theme/smart-admin.less
+++ b/smart-admin-web-typescript/src/theme/smart-admin.less
@@ -1,28 +1,13 @@
-/* 
+/*
  * SmartAdmin 独有的样式
- * 
- * @Author:    1024创新实验室-主任：卓大 
- * @Date:      2022-09-12 14:43:01 
- * @Wechat:    zhuda1024 
- * @Email:     lab1024@163.com 
- * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+ *
+ * @Author:    1024创新实验室-主任：卓大
+ * @Date:      2022-09-12 14:43:01
+ * @Wechat:    zhuda1024
+ * @Email:     lab1024@163.com
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
 
-/**********************************  滚动条 **********************************/
-::-webkit-scrollbar {
-  width: 2px;
-  background-color: #f5f5f5;
-}
-::-webkit-scrollbar-thumb {
-  background-color: #cdcdcd;
-}
-
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgb(0 0 0 / 30%);
-  background-color: #f5f5f5;
-  border-radius: 1px;
-}
-
 /**********************************  宽度 **********************************/
 .smart-width-100 {
   width: 100%;
@@ -45,6 +30,22 @@
   margin-left: 20px;
 }
 
+/**********************************  右间距 **********************************/
+.smart-margin-right5 {
+  margin-right: 5px;
+}
+
+.smart-margin-right10 {
+  margin-right: 10px;
+}
+
+.smart-margin-right15 {
+  margin-right: 15px;
+}
+
+.smart-margin-right20 {
+  margin-right: 20px;
+}
 
 /******************************** 上间距 ********************************/
 .smart-margin-top5 {
@@ -72,7 +73,8 @@
 
 .smart-table-operate {
   .ant-btn {
-    padding: 0px 3px !important;
+    padding: 0 3px !important;
+    height: auto;
   }
 }
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/types/config.d.ts b/smart-admin-web-typescript/src/types/config.d.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/types/config.d.ts
rename to smart-admin-web-typescript/src/types/config.d.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/types/env.d.ts b/smart-admin-web-typescript/src/types/env.d.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/types/env.d.ts
rename to smart-admin-web-typescript/src/types/env.d.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/types/json-viewer.d.ts b/smart-admin-web-typescript/src/types/json-viewer.d.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/types/json-viewer.d.ts
rename to smart-admin-web-typescript/src/types/json-viewer.d.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/types/smart-enum.d.ts b/smart-admin-web-typescript/src/types/smart-enum.d.ts
similarity index 92%
rename from smart-admin-web/typescript-ant-design-vue3/src/types/smart-enum.d.ts
rename to smart-admin-web-typescript/src/types/smart-enum.d.ts
index 963b68c..3d9a66f 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/types/smart-enum.d.ts
+++ b/smart-admin-web-typescript/src/types/smart-enum.d.ts
@@ -4,7 +4,7 @@
  * @LastEditTime: 2021-08-26
  * @LastEditors: zhuoda
  * @Description:
- * @FilePath: /smart-admin/src/types/base.d.ts
+ * @FilePath: /smart-admin/@/types/base.d.ts
  */
 export interface SmartEnumWrapper<T> {
   [key: string]: SmartEnum<T>;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/types/user.d.ts b/smart-admin-web-typescript/src/types/user.d.ts
similarity index 95%
rename from smart-admin-web/typescript-ant-design-vue3/src/types/user.d.ts
rename to smart-admin-web-typescript/src/types/user.d.ts
index 4629f9a..f9ee7f1 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/types/user.d.ts
+++ b/smart-admin-web-typescript/src/types/user.d.ts
@@ -4,7 +4,7 @@
  * @LastEditTime: 2022-05-16 20:59:27
  * @LastEditors: LiHaiFan
  * @Description:
- * @FilePath: /typescript-ant-design-vue/src/types/user.d.ts
+ * @FilePath: /typescript-ant-design-vue/@/types/user.d.ts
  */
 import { MenuVo } from '/@/api/system/menu/model/menu-vo';
 import { MenuTreeVo } from '@/api/system/login/login-model.ts';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/utils/local-util.ts b/smart-admin-web-typescript/src/utils/local-util.ts
similarity index 66%
rename from smart-admin-web/typescript-ant-design-vue3/src/utils/local-util.ts
rename to smart-admin-web-typescript/src/utils/local-util.ts
index 53da930..80e8903 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/utils/local-util.ts
+++ b/smart-admin-web-typescript/src/utils/local-util.ts
@@ -8,14 +8,18 @@
  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
 
-export const localSave = (key: string, value: string) => {
+export const localSave = (key, value) => {
   localStorage.setItem(key, value);
 };
 
-export const localRead = (key: string): string | null => {
+export const localRead = (key) => {
   return localStorage.getItem(key) || '';
 };
 
-export const localClear = (): void => {
+export const localClear = () => {
   localStorage.clear();
 };
+
+export const localRemove = (key) => {
+  localStorage.removeItem(key);
+};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/utils/str-util.ts b/smart-admin-web-typescript/src/utils/str-util.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/utils/str-util.ts
rename to smart-admin-web-typescript/src/utils/str-util.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/components/category-form-modal.vue b/smart-admin-web-typescript/src/views/business/erp/catalog/components/category-form-modal.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/components/category-form-modal.vue
rename to smart-admin-web-typescript/src/views/business/erp/catalog/components/category-form-modal.vue
index a780bb6..5cfe152 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/components/category-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/business/erp/catalog/components/category-form-modal.vue
@@ -25,7 +25,7 @@
   import { smartSentry } from '/@/lib/smart-sentry';
 
   // emit
-  const emit = defineEmits('reloadList');
+  const emit = defineEmits(['reloadList']);
 
   //  组件
   const formRef = ref();
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/components/category-tree-table.vue b/smart-admin-web-typescript/src/views/business/erp/catalog/components/category-tree-table.vue
similarity index 85%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/components/category-tree-table.vue
rename to smart-admin-web-typescript/src/views/business/erp/catalog/components/category-tree-table.vue
index 5ed4506..167bd81 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/components/category-tree-table.vue
+++ b/smart-admin-web-typescript/src/views/business/erp/catalog/components/category-tree-table.vue
@@ -11,7 +11,7 @@
   <a-card size="small" :bordered="false" :hoverable="true">
     <a-row class="smart-table-btn-block">
       <div class="smart-table-operate-block">
-        <a-button @click="addCategory()" type="primary" size="small" v-privilege="`${privilegePrefix}Category:add`">
+        <a-button @click="addCategory()" type="primary" v-privilege="`${privilegePrefix}category:add`">
           <template #icon>
             <PlusOutlined />
           </template>
@@ -35,9 +35,11 @@
       <template #bodyCell="{ record, column }">
         <template v-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="addCategory(record.categoryId)" type="link" v-privilege="`${privilegePrefix}Category:addChild`">增加子分类</a-button>
-            <a-button @click="addCategory(undefined, record)" type="link" v-privilege="`${privilegePrefix}Category:edit`">编辑</a-button>
-            <a-button @click="confirmDeleteCategory(record.categoryId)" danger type="link" v-privilege="`${privilegePrefix}Category:delete`">删除</a-button>
+            <a-button @click="addCategory(record.categoryId)" type="link" v-privilege="`${privilegePrefix}category:addChild`">增加子分类</a-button>
+            <a-button @click="addCategory(undefined, record)" type="link" v-privilege="`${privilegePrefix}category:update`">编辑</a-button>
+            <a-button @click="confirmDeleteCategory(record.categoryId)" danger type="link" v-privilege="`${privilegePrefix}category:delete`"
+              >删除</a-button
+            >
           </div>
         </template>
       </template>
@@ -46,8 +48,8 @@
   </a-card>
 </template>
 <script setup lang="ts">
-  import { reactive, ref, onMounted, computed } from 'vue';
-  import { Modal, message } from 'ant-design-vue';
+  import { computed, onMounted, reactive, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import CategoryFormModal from './category-form-modal.vue';
   import { categoryApi } from '/@/api/business/category/category-api';
@@ -65,7 +67,7 @@
     },
   ];
   const columName = computed(() => {
-    let find = columnNameList.find((e) => e.categoryType == props.categoryType);
+    let find = columnNameList.find((e) => e.categoryType === props.categoryType);
     return find ? find.columnName : '';
   });
 
@@ -74,8 +76,8 @@
     categoryType: Number,
     privilegePrefix: {
       type: String,
-      default: 'goods'
-    }
+      default: '',
+    },
   });
 
   // ------------------------------ 查询 ------------------------------
@@ -100,8 +102,7 @@
         categoryType: props.categoryType,
       };
       let responseModel = await categoryApi.queryCategoryTree(queryForm);
-      const list = responseModel.data;
-      tableData.value = list;
+      tableData.value = responseModel.data;
     } catch (e) {
       smartSentry.captureError(e);
     } finally {
@@ -152,7 +153,7 @@
     try {
       SmartLoading.show();
       await categoryApi.deleteCategoryById(categoryId);
-      message.success('撤销成功');
+      message.success('删除成功');
       queryList();
     } catch (e) {
       smartSentry.captureError(e);
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/custom-catalog.vue b/smart-admin-web-typescript/src/views/business/erp/catalog/custom-catalog.vue
similarity index 93%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/custom-catalog.vue
rename to smart-admin-web-typescript/src/views/business/erp/catalog/custom-catalog.vue
index 2450920..50a3670 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/custom-catalog.vue
+++ b/smart-admin-web-typescript/src/views/business/erp/catalog/custom-catalog.vue
@@ -9,7 +9,7 @@
 -->
 <template>
   <div>
-    <CategoryTreeTable :category-type="CATEGORY_TYPE_ENUM.DEMO.value" :privilegePrefix="'custom'"/>
+    <CategoryTreeTable :category-type="CATEGORY_TYPE_ENUM.DEMO.value" :privilegePrefix="'custom:'"/>
   </div>
 </template>
 <script setup lang="ts">
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/goods-catalog.vue b/smart-admin-web-typescript/src/views/business/erp/catalog/goods-catalog.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/catalog/goods-catalog.vue
rename to smart-admin-web-typescript/src/views/business/erp/catalog/goods-catalog.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/goods/components/goods-form-modal.vue b/smart-admin-web-typescript/src/views/business/erp/goods/components/goods-form-modal.vue
similarity index 94%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/goods/components/goods-form-modal.vue
rename to smart-admin-web-typescript/src/views/business/erp/goods/components/goods-form-modal.vue
index 536e71d..577be0d 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/goods/components/goods-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/business/erp/goods/components/goods-form-modal.vue
@@ -20,7 +20,7 @@
         <SmartEnumSelect enum-name="GOODS_STATUS_ENUM" v-model:value="form.goodsStatus" />
       </a-form-item>
       <a-form-item label="产地" name="place">
-        <DictSelect key-code="GODOS_PLACE" v-model:value="form.place" />
+        <DictSelect width="100%" key-code="GODOS_PLACE" v-model:value="form.place" mode="tags" />
       </a-form-item>
       <a-form-item label="上架状态" name="shelvesFlag">
         <a-radio-group v-model:value="form.shelvesFlag">
@@ -67,7 +67,7 @@
   import DictSelect from '/@/components/support/dict-select/index.vue';
 
   // emit
-  const emit = defineEmits('reloadList');
+  const emit = defineEmits(['reloadList']);
 
   // 组件ref
   const formRef = ref();
@@ -80,7 +80,7 @@
     //商品状态
     goodsStatus: GOODS_STATUS_ENUM.APPOINTMENT.value,
     //产地
-    place: undefined,
+    place: [],
     //商品价格
     price: undefined,
     //上架状态
@@ -106,7 +106,9 @@
     if (rowData && !_.isEmpty(rowData)) {
       Object.assign(form, rowData);
     }
-    console.log(form);
+    if (form.place && form.place.length > 0) {
+      form.place = form.place.map((e) => e.valueCode);
+    }
     visible.value = true;
     nextTick(() => {
       formRef.value.clearValidate();
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/goods/goods-list.vue b/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
similarity index 66%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/goods/goods-list.vue
rename to smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
index ac30801..65f2198 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/erp/goods/goods-list.vue
+++ b/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
@@ -33,7 +33,7 @@
       </a-form-item>
 
       <a-form-item label="快速筛选" class="smart-query-form-item">
-        <a-radio-group v-model:value="queryForm.shelvesFlag" @change="queryData">
+        <a-radio-group v-model:value="queryForm.shelvesFlag" @change="onSearch">
           <a-radio-button :value="undefined">全部</a-radio-button>
           <a-radio-button :value="true">上架</a-radio-button>
           <a-radio-button :value="false">下架</a-radio-button>
@@ -41,18 +41,20 @@
       </a-form-item>
 
       <a-form-item class="smart-query-form-item">
-        <a-button type="primary" @click="queryData" v-privilege="'goods:query'">
-          <template #icon>
-            <ReloadOutlined />
-          </template>
-          查询
-        </a-button>
-        <a-button @click="resetQuery" class="smart-margin-left10" v-privilege="'goods:query'">
-          <template #icon>
-            <SearchOutlined />
-          </template>
-          重置
-        </a-button>
+        <a-button-group>
+          <a-button type="primary" @click="onSearch" v-privilege="'goods:query'">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery" v-privilege="'goods:query'">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
       </a-form-item>
     </a-row>
   </a-form>
@@ -62,26 +64,39 @@
     <!---------- 表格操作行 begin ----------->
     <a-row class="smart-table-btn-block">
       <div class="smart-table-operate-block">
-        <a-button @click="addGoods" type="primary" size="small" v-privilege="'goods:add'">
+        <a-button @click="addGoods" type="primary" v-privilege="'goods:add'">
           <template #icon>
             <PlusOutlined />
           </template>
           新建
         </a-button>
 
-        <a-button @click="confirmBatchDelete" type="danger" size="small" :disabled="selectedRowKeyList.length == 0" v-privilege="'goods:batchDelete'">
+        <a-button @click="confirmBatchDelete" danger :disabled="selectedRowKeyList.length === 0" v-privilege="'goods:batchDelete'">
           <template #icon>
             <DeleteOutlined />
           </template>
           批量删除
         </a-button>
+
+        <a-button @click="showImportModal" type="primary" v-privilege="'goods:importGoods'">
+          <template #icon>
+            <ImportOutlined />
+          </template>
+          导入
+        </a-button>
+
+        <a-button @click="onExportGoods" type="primary" v-privilege="'goods:exportGoods'">
+          <template #icon>
+            <ExportOutlined />
+          </template>
+          导出
+        </a-button>
       </div>
       <div class="smart-table-setting-block">
         <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.ERP.GOODS" :refresh="queryData" />
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
-
     <a-table
       size="small"
       :dataSource="tableData"
@@ -89,11 +104,13 @@
       rowKey="goodsId"
       bordered
       :pagination="false"
+      :showSorterTooltip="false"
       :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+      @change="onChange"
     >
       <template #bodyCell="{ text, record, column }">
         <template v-if="column.dataIndex === 'place'">
-          <span>{{ text && text.length > 0 ? text[0].valueName : '' }}</span>
+          <span>{{ text && text.length > 0 ? text.map((e) => e.valueName).join(',') : '' }}</span>
         </template>
         <template v-if="column.dataIndex === 'goodsStatus'">
           <span>{{ $smartEnumPlugin.getDescByValue('GOODS_STATUS_ENUM', text) }}</span>
@@ -127,6 +144,34 @@
     </div>
 
     <GoodsFormModal ref="formModal" @reloadList="queryData" />
+
+    <a-modal v-model:open="importModalShowFlag" title="导入" @onCancel="hideImportModal" @ok="hideImportModal">
+      <div style="text-align: center; width: 400px; margin: 0 auto">
+        <a-button @click="downloadExcel"> <download-outlined />第一步：下载模板</a-button>
+        <br />
+        <br />
+        <a-upload
+          v-model:fileList="fileList"
+          name="file"
+          :multiple="false"
+          action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+          accept=".xls,.xlsx"
+          :before-upload="beforeUpload"
+          @remove="handleRemove"
+        >
+          <a-button>
+            <upload-outlined />
+            第二步：选择文件
+          </a-button>
+        </a-upload>
+
+        <br />
+        <a-button @click="onImportGoods">
+          <ImportOutlined />
+          第三步：开始导入
+        </a-button>
+      </div>
+    </a-modal>
   </a-card>
 </template>
 <script setup lang="ts">
@@ -144,6 +189,9 @@
   import { GOODS_STATUS_ENUM } from '/@/constants/business/erp/goods-const';
   import DictSelect from '/@/components/support/dict-select/index.vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
+  import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const.js';
+  import FileUpload from '/@/components/support/file-upload/index.vue';
+  import _ from 'lodash';
 
   // ---------------------------- 表格列 ----------------------------
 
@@ -159,6 +207,7 @@
     {
       title: '商品状态',
       dataIndex: 'goodsStatus',
+      sorter: true
     },
     {
       title: '产地',
@@ -167,10 +216,12 @@
     {
       title: '商品价格',
       dataIndex: 'price',
+      sorter: true
     },
     {
       title: '上架状态',
       dataIndex: 'shelvesFlag',
+      sorter: true
     },
     {
       title: '备注',
@@ -200,9 +251,10 @@
     goodsType: undefined,
     pageNum: 1,
     pageSize: 10,
+    sortItemList: []
   };
   // 查询表单form
-  const queryForm = reactive({ ...queryFormState });
+  const queryForm = reactive(_.cloneDeep(queryFormState));
   // 表格加载loading
   const tableLoading = ref(false);
   // 表格数据
@@ -213,11 +265,17 @@
   // 重置查询条件
   function resetQuery() {
     let pageSize = queryForm.pageSize;
-    Object.assign(queryForm, queryFormState);
+    Object.assign(queryForm, _.cloneDeep(queryFormState));
     queryForm.pageSize = pageSize;
     queryData();
   }
 
+  // 搜索
+  function onSearch() {
+    queryForm.pageNum = 1;
+    queryData();
+  }
+
   // 查询数据
   async function queryData() {
     tableLoading.value = true;
@@ -306,4 +364,83 @@
       SmartLoading.hide();
     }
   }
+
+  // ------------------------------- 导出和导入 ---------------------------------
+  // 导入弹窗
+  const importModalShowFlag = ref(false);
+
+  const fileList = ref([]);
+  // 显示导入
+  function showImportModal() {
+    fileList.value = [];
+    importModalShowFlag.value = true;
+  }
+
+  // 关闭 导入
+  function hideImportModal() {
+    importModalShowFlag.value = false;
+  }
+
+  function handleChange() {}
+
+  function handleDrop() {}
+
+  function handleRemove(file) {
+    const index = fileList.value.indexOf(file);
+    const newFileList = fileList.value.slice();
+    newFileList.splice(index, 1);
+    fileList.value = newFileList;
+  }
+  function beforeUpload(file) {
+    fileList.value = [...(fileList.value || []), file];
+    return false;
+  }
+
+  function downloadExcel() {
+    window.open('https://smartadmin.vip/cdn/%E5%95%86%E5%93%81%E6%A8%A1%E6%9D%BF.xls');
+  }
+
+  async function onImportGoods() {
+    const formData = new FormData();
+    fileList.value.forEach((file) => {
+      formData.append('file', file.originFileObj);
+    });
+
+    SmartLoading.show();
+    try {
+      let res = await goodsApi.importGoods(formData);
+      message.success(res.msg);
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+
+  async function onExportGoods() {
+    await goodsApi.exportGoods();
+  }
+
+  function onChange(pagination, filters, sorter, { action }){
+    if (action === 'sort') {
+      const { order, field } = sorter;
+      let column = camelToUnderscore(field);
+      let findIndex = queryForm.sortItemList.findIndex(e => e.column === column);
+      if (findIndex !== -1) {
+        queryForm.sortItemList.splice(findIndex, 1);
+      }
+      if (order) {
+        let isAsc = order !== 'ascend';
+        queryForm.sortItemList.push({
+          column,
+          isAsc
+        });
+      }
+      queryData();
+    }
+  }
+
+  function camelToUnderscore(str) {
+    return str.replace(/([A-Z])/g, "_$1").toLowerCase();
+  }
 </script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-list.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
similarity index 91%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
rename to smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
index 4752571..2c8fddc 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
@@ -1,11 +1,11 @@
 <!--
   * 企业 银行列表
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
+  *
+  * @Author:    1024创新实验室-主任：卓大
   * @Date:      2022-08-15 20:15:49
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-form class="smart-query-form">
@@ -21,18 +21,20 @@
       </a-form-item>
 
       <a-form-item class="smart-query-form-item smart-margin-left10">
-        <a-button type="primary" @click="ajaxQuery">
-          <template #icon>
-            <SearchOutlined />
-          </template>
-          查询
-        </a-button>
-        <a-button @click="resetQuery">
-          <template #icon>
-            <ReloadOutlined />
-          </template>
-          重置
-        </a-button>
+        <a-button-group>
+          <a-button type="primary" @click="onSearch">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
 
         <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20">
           <template #icon>
@@ -180,6 +182,11 @@
     ajaxQuery();
   }
 
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
   async function ajaxQuery() {
     try {
       tableLoading.value = true;
diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
new file mode 100644
index 0000000..fee387a
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
@@ -0,0 +1,131 @@
+<!--
+  * 企业 银行 表单
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-08-15 20:15:49
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <a-modal :open="visible" :title="form.bankId ? '编辑' : '添加'" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 18 }">
+      <a-form-item label="开户银行" name="bankName">
+        <a-input v-model:value="form.bankName" placeholder="请输入开户银行" />
+      </a-form-item>
+      <a-form-item label="账户名称" name="accountName">
+        <a-input v-model:value="form.accountName" placeholder="请输入账户名称" />
+      </a-form-item>
+      <a-form-item label="账号" name="accountNumber">
+        <a-input v-model:value="form.accountNumber" placeholder="请输入账号" />
+      </a-form-item>
+      <a-form-item label="是否对公" name="businessFlag">
+        <a-switch v-model:checked="businessFlagChecked" @change="businessFlagCheckedChange" />
+      </a-form-item>
+      <a-form-item label="启用状态" name="disabledFlag">
+        <a-switch v-model:checked="enabledChecked" @change="enabledCheckedChange" />
+      </a-form-item>
+      <a-form-item label="备注" name="remark">
+        <a-textarea v-model:value="form.remark" :rows="2" />
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script setup lang="ts">
+  import { ref, reactive } from 'vue';
+  import { message } from 'ant-design-vue';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import { bankApi } from '/@/api/business/oa/bank-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
+
+  const props = defineProps({
+    enterpriseId: {
+      type: Number,
+      default: null,
+    },
+  });
+  // emit
+  const emit = defineEmits(['reloadList']);
+
+  // ---------------------- 显示、隐藏 ----------------------
+  // 是否展示
+  const visible = ref(false);
+  function showModal(rowData) {
+    Object.assign(form, formDefault);
+    if (rowData) {
+      Object.assign(form, rowData);
+      businessFlagChecked.value = rowData.businessFlag;
+      enabledChecked.value = !rowData.disabledFlag;
+    }
+    form.enterpriseId = props.enterpriseId;
+    visible.value = true;
+  }
+
+  function onClose() {
+    Object.assign(form, formDefault);
+    formRef.value.resetFields();
+    visible.value = false;
+  }
+
+  // ---------------------- 表单 ----------------------
+
+  //  组件
+  const formRef = ref();
+
+  const formDefault = {
+    bankId: undefined,
+    enterpriseId: undefined,
+    bankName: '',
+    accountName: '',
+    accountNumber: '',
+    businessFlag: false,
+    disabledFlag: false,
+    remark: '',
+  };
+  let form = reactive({ ...formDefault });
+  const rules = {
+    bankName: [{ required: true, message: '请输入开户银行' }],
+    accountName: [{ required: true, message: '请输入账户名称' }],
+    accountNumber: [{ required: true, message: '请输入账号' }],
+  };
+
+  const businessFlagChecked = ref(false);
+  const enabledChecked = ref(true);
+
+  function businessFlagCheckedChange(checked) {
+    form.businessFlag = checked;
+  }
+  function enabledCheckedChange(checked) {
+    form.disabledFlag = !checked;
+  }
+
+  function onSubmit() {
+    formRef.value
+      .validate()
+      .then(async () => {
+        SmartLoading.show();
+        try {
+          if (form.bankId) {
+            await bankApi.update(form);
+          } else {
+            await bankApi.create(form);
+          }
+          message.success(`${form.bankId ? '修改' : '添加'}成功`);
+          emit('reloadList');
+          onClose();
+        } catch (error) {
+          smartSentry.captureError(error);
+        } finally {
+          SmartLoading.hide();
+        }
+      })
+      .catch((error) => {
+        console.log('error', error);
+        message.error('参数验证错误，请仔细填写表单数据!');
+      });
+  }
+
+  defineExpose({
+    showModal,
+  });
+</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-employee-list.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
similarity index 92%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
rename to smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
index 6ea7448..8465923 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
@@ -12,14 +12,14 @@
     <div class="header">
       <div>
         关键字：
-        <a-input style="width: 250px" v-model:value="queryForm.keywords" placeholder="姓名/手机号/登录账号" />
-        <a-button class="button-style" type="primary" @click="queryEmployee">搜索</a-button>
+        <a-input style="width: 250px" v-model:value="queryForm.keyword" placeholder="姓名/手机号/登录账号" />
+        <a-button class="button-style" type="primary" @click="onSearch">搜索</a-button>
         <a-button class="button-style" type="default" @click="resetQueryEmployee">重置</a-button>
       </div>
 
       <div>
-        <a-button class="button-style" type="primary" @click="addEmployee" v-privilege="'enterprise:addEmployee'"> 添加员工 </a-button>
-        <a-button class="button-style" type="primary" danger @click="batchDelete" v-privilege="'enterprise:deleteEmployee'"> 批量移除 </a-button>
+        <a-button class="button-style" type="primary" @click="addEmployee" v-privilege="'oa:enterprise:addEmployee'"> 添加员工 </a-button>
+        <a-button class="button-style" type="primary" danger @click="batchDelete" v-privilege="'oa:enterprise:deleteEmployee'"> 批量移除 </a-button>
       </div>
     </div>
     <a-table
@@ -40,7 +40,7 @@
           <span>{{ $smartEnumPlugin.getDescByValue('GENDER_ENUM', text) }}</span>
         </template>
         <template v-if="column.dataIndex === 'operate'">
-          <a @click="deleteEmployee(record.employeeId)" v-privilege="'enterprise:deleteEmployee'">移除</a>
+          <a @click="deleteEmployee(record.employeeId)" v-privilege="'oa:enterprise:deleteEmployee'">移除</a>
         </template>
       </template>
     </a-table>
@@ -68,7 +68,7 @@
   import { message, Modal } from 'ant-design-vue';
   import _ from 'lodash';
   import { computed, reactive, ref, watch } from 'vue';
-  import { enterpriseApi } from '/src/api/business/oa/enterprise-api';
+  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS, showTableTotal } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
@@ -122,7 +122,7 @@
     pageNum: 1,
     pageSize: PAGE_SIZE,
     enterpriseId: undefined,
-    keywords: undefined,
+    keyword: undefined,
   };
   // 查询表单
   const queryForm = reactive({ ...defaultQueryForm });
@@ -131,7 +131,12 @@
   const tableLoading = ref(false);
 
   function resetQueryEmployee() {
-    queryForm.keywords = '';
+    queryForm.keyword = '';
+    queryEmployee();
+  }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
     queryEmployee();
   }
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
similarity index 91%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
rename to smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
index 3646840..f9fb314 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
@@ -1,11 +1,11 @@
 <!--
   * 企业 发票信息
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
+  *
+  * @Author:    1024创新实验室-主任：卓大
   * @Date:      2022-08-15 20:15:49
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-form class="smart-query-form">
@@ -21,18 +21,20 @@
       </a-form-item>
 
       <a-form-item class="smart-query-form-item smart-margin-left10">
-        <a-button type="primary" @click="ajaxQuery">
-          <template #icon>
-            <SearchOutlined />
-          </template>
-          查询
-        </a-button>
-        <a-button @click="resetQuery">
-          <template #icon>
-            <ReloadOutlined />
-          </template>
-          重置
-        </a-button>
+        <a-button-group>
+          <a-button type="primary" @click="onSearch">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
 
         <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20">
           <template #icon>
@@ -183,6 +185,11 @@
     ajaxQuery();
   }
 
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
   async function ajaxQuery() {
     try {
       tableLoading.value = true;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
rename to smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
index d3db056..3dd2757 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
@@ -36,7 +36,7 @@
   import { message } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { invoiceApi } from '/@/api/business/oa/invoice-api';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   const props = defineProps({
     enterpriseId: {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
rename to smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
index de6c9ea..3a31a40 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
@@ -61,7 +61,7 @@
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
   import { nextTick, reactive, ref } from 'vue';
-  import { enterpriseApi } from '/src/api/business/oa/enterprise-api';
+  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
   import AreaCascader from '/@/components/framework/area-cascader/index.vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import Upload from '/@/components/support/file-upload/index.vue';
@@ -72,7 +72,7 @@
   defineExpose({
     showModal,
   });
-  const emit = defineEmits('refresh');
+  const emit = defineEmits(['refresh']);
 
   // --------------------- modal 显示与隐藏 ---------------------
   // 是否展示
@@ -134,7 +134,7 @@
     unifiedSocialCreditCode: undefined,
     businessLicense: undefined,
     contact: undefined,
-    enterpriseLogo:undefined,
+    enterpriseLogo: undefined,
     contactPhone: undefined,
     email: undefined,
     province: undefined,
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/enterprise-detail.vue
similarity index 76%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue
rename to smart-admin-web-typescript/src/views/business/oa/enterprise/enterprise-detail.vue
index 5f9ec5e..7b3911d 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-detail.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/enterprise-detail.vue
@@ -1,11 +1,11 @@
 <!--
   * 公司 详情
-  *
-  * @Author:    1024创新实验室-主任：卓大
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
   * @Date:      2022-08-15 20:15:49
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
   <div class="detail-header">
@@ -24,7 +24,7 @@
           <a-descriptions-item label="创建时间">{{ detail.createTime }}</a-descriptions-item>
           <a-descriptions-item label="创建人">{{ detail.createUserName }}</a-descriptions-item>
           <a-descriptions-item label="营业执照">
-            <FilePreview :default-file-list="detail.businessLicense" />
+            <FilePreview :file-list="detail.businessLicense" />
           </a-descriptions-item>
         </a-descriptions>
       </div>
@@ -50,19 +50,19 @@
 </template>
 
 <script setup lang="ts">
-import _ from 'lodash';
-import { computed, onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import BankList from './components/enterprise-bank-list.vue';
-import EmployeeList from './components/enterprise-employee-list.vue';
-import InvoiceList from './components/enterprise-invoice-list.vue';
-import EnterpriseOperate from './components/enterprise-operate-modal.vue';
-import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import DataTracer from '/@/components/support/data-tracer/index.vue';
-import FilePreview from '/@/components/support/file-preview/index.vue';
-import { DATA_TRACER_TYPE_ENUM } from '/@/constants/support/data-tracer-const';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import _ from 'lodash';
+  import { computed, onMounted, ref } from 'vue';
+  import { useRoute } from 'vue-router';
+  import BankList from './components/enterprise-bank-list.vue';
+  import EmployeeList from './components/enterprise-employee-list.vue';
+  import InvoiceList from './components/enterprise-invoice-list.vue';
+  import EnterpriseOperate from './components/enterprise-operate-modal.vue';
+  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import DataTracer from '/@/components/support/data-tracer/index.vue';
+  import FilePreview from '/@/components/support/file-preview/index.vue';
+  import { DATA_TRACER_TYPE_ENUM } from '/@/constants/support/data-tracer-const';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   const route = useRoute();
   let enterpriseId = ref();
@@ -75,7 +75,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
 
   //编辑
   const operateRef = ref();
-  function showUpdate(){
+  function showUpdate() {
     operateRef.value.showModal(enterpriseId.value);
   }
 
diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/enterprise-list.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/enterprise-list.vue
new file mode 100644
index 0000000..b315e62
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/enterprise-list.vue
@@ -0,0 +1,283 @@
+<!--
+  * 公司列表
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-15 20:15:49
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <a-form class="smart-query-form" v-privilege="'oa:enterprise:query'">
+    <a-row class="smart-query-form-row">
+      <a-form-item label="关键字" class="smart-query-form-item">
+        <a-input style="width: 300px" v-model:value="queryForm.keywords" placeholder="企业名称/联系人/联系电话" />
+      </a-form-item>
+
+      <a-form-item label="创建时间" class="smart-query-form-item">
+        <a-space direction="vertical" :size="12">
+          <a-range-picker v-model:value="searchDate" :presets="defaultTimeRanges" @change="dateChange" />
+        </a-space>
+      </a-form-item>
+
+      <a-form-item class="smart-query-form-item smart-margin-left10">
+        <a-button-group>
+          <a-button type="primary" @click="onSearch">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
+      </a-form-item>
+    </a-row>
+  </a-form>
+
+  <a-card size="small" :bordered="false" :hoverable="true">
+    <a-row class="smart-table-btn-block">
+      <div class="smart-table-operate-block">
+        <a-button @click="add()" v-privilege="'oa:enterprise:add'" type="primary">
+          <template #icon>
+            <PlusOutlined />
+          </template>
+          新建企业
+        </a-button>
+        <a-button @click="exportExcel()" v-privilege="'oa:enterprise:exportExcel'" type="primary">
+          <template #icon>
+            <FileExcelOutlined />
+          </template>
+          导出数据（带水印）
+        </a-button>
+      </div>
+      <div class="smart-table-setting-block">
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.OA.ENTERPRISE" :refresh="ajaxQuery" />
+      </div>
+    </a-row>
+
+    <a-table
+      :scroll="{ x: 1300 }"
+      size="small"
+      :dataSource="tableData"
+      :columns="columns"
+      rowKey="enterpriseId"
+      :pagination="false"
+      :loading="tableLoading"
+      bordered
+    >
+      <template #bodyCell="{ column, record, text }">
+        <template v-if="column.dataIndex === 'disabledFlag'">
+          {{ text ? '禁用' : '启用' }}
+        </template>
+        <template v-if="column.dataIndex === 'enterpriseName'">
+          <a @click="detail(record.enterpriseId)">{{ record.enterpriseName }}</a>
+        </template>
+        <template v-if="column.dataIndex === 'type'">
+          <span>{{ $smartEnumPlugin.getDescByValue('ENTERPRISE_TYPE_ENUM', text) }}</span>
+        </template>
+        <template v-if="column.dataIndex === 'action'">
+          <div class="smart-table-operate">
+            <a-button @click="update(record.enterpriseId)" size="small" v-privilege="'oa:enterprise:update'" type="link">编辑</a-button>
+            <a-button @click="confirmDelete(record.enterpriseId)" size="small" danger v-privilege="'oa:enterprise:delete'" type="link">删除</a-button>
+          </div>
+        </template>
+      </template>
+    </a-table>
+
+    <div class="smart-query-table-page">
+      <a-pagination
+        showSizeChanger
+        showQuickJumper
+        show-less-items
+        :pageSizeOptions="PAGE_SIZE_OPTIONS"
+        :defaultPageSize="queryForm.pageSize"
+        v-model:current="queryForm.pageNum"
+        v-model:pageSize="queryForm.pageSize"
+        :total="total"
+        @change="ajaxQuery"
+        @showSizeChange="ajaxQuery"
+        :show-total="(total) => `共${total}条`"
+      />
+    </div>
+    <EnterpriseOperate ref="operateRef" @refresh="ajaxQuery" />
+  </a-card>
+</template>
+<script setup lang="ts">
+  import { reactive, ref, onMounted } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
+  import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import { useRouter } from 'vue-router';
+  import EnterpriseOperate from './components/enterprise-operate-modal.vue';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import { defaultTimeRanges } from '/@/lib/default-time-ranges';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
+
+  // --------------------------- 企业表格 列 ---------------------------
+
+  const columns = ref([
+    {
+      title: '企业名称',
+      dataIndex: 'enterpriseName',
+      minWidth: 180,
+      ellipsis: true,
+    },
+    {
+      title: '统一社会信用代码',
+      dataIndex: 'unifiedSocialCreditCode',
+      minWidth: 170,
+      ellipsis: true,
+    },
+    {
+      title: '企业类型',
+      dataIndex: 'type',
+      width: 100,
+    },
+    {
+      title: '联系人',
+      width: 100,
+      dataIndex: 'contact',
+      ellipsis: true,
+    },
+    {
+      title: '联系人电话',
+      width: 120,
+      dataIndex: 'contactPhone',
+      ellipsis: true,
+    },
+    {
+      title: '邮箱',
+      minWidth: 100,
+      dataIndex: 'email',
+      ellipsis: true,
+    },
+    {
+      title: '状态',
+      width: 50,
+      dataIndex: 'disabledFlag',
+    },
+    {
+      title: '创建人',
+      width: 60,
+      dataIndex: 'createUserName',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      width: 150,
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      // fixed: 'right',
+      width: 100,
+    },
+  ]);
+
+  // --------------------------- 查询 ---------------------------
+
+  const queryFormState = {
+    keywords: '',
+    endTime: null,
+    startTime: null,
+    pageNum: 1,
+    pageSize: PAGE_SIZE,
+    searchCount: true,
+  };
+  const queryForm = reactive({ ...queryFormState });
+  const tableLoading = ref(false);
+  const tableData = ref([]);
+  const total = ref(0);
+
+  // 日期选择
+  let searchDate = ref();
+
+  function dateChange(dates, dateStrings) {
+    queryForm.startTime = dateStrings[0];
+    queryForm.endTime = dateStrings[1];
+  }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
+  function resetQuery() {
+    searchDate.value = [];
+    Object.assign(queryForm, queryFormState);
+    ajaxQuery();
+  }
+
+  async function ajaxQuery() {
+    try {
+      tableLoading.value = true;
+      let responseModel = await enterpriseApi.pageQuery(queryForm);
+      const list = responseModel.data.list;
+      total.value = responseModel.data.total;
+      tableData.value = list;
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      tableLoading.value = false;
+    }
+  }
+
+  // --------------------------- 导出 ---------------------------
+  async function exportExcel() {
+    await enterpriseApi.exportExcel(queryForm);
+  }
+
+  // --------------------------- 删除 ---------------------------
+
+  function confirmDelete(enterpriseId) {
+    Modal.confirm({
+      title: '确定要删除吗？',
+      content: '删除后，该信息将不可恢复',
+      okText: '删除',
+      okType: 'danger',
+      onOk() {
+        del(enterpriseId);
+      },
+      cancelText: '取消',
+      onCancel() {},
+    });
+  }
+
+  async function del(enterpriseId) {
+    try {
+      SmartLoading.show();
+      await enterpriseApi.delete(enterpriseId);
+      message.success('删除成功');
+      ajaxQuery();
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+
+  // --------------------------- 增加、修改、详情 ---------------------------
+
+  let router = useRouter();
+  const operateRef = ref();
+  function add() {
+    operateRef.value.showModal();
+  }
+
+  function update(enterpriseId) {
+    operateRef.value.showModal(enterpriseId);
+  }
+
+  function detail(enterpriseId) {
+    router.push({ path: '/oa/enterprise/enterprise-detail', query: { enterpriseId: enterpriseId } });
+  }
+
+  onMounted(ajaxQuery);
+</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-drawer.vue b/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-drawer.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-drawer.vue
rename to smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-drawer.vue
index 7e6d0c5..0486294 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-drawer.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-drawer.vue
@@ -103,7 +103,7 @@
 <script setup lang="ts">
   import { reactive, ref, onMounted, watch, computed, nextTick } from 'vue';
   import { message, Modal } from 'ant-design-vue';
-  import lodash from 'lodash';
+  import _ from 'lodash';
   import dayjs, { Dayjs } from 'dayjs';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
@@ -178,7 +178,7 @@
       SmartLoading.show();
       const result = await noticeApi.getUpdateNoticeInfo(noticeId);
       const attachment = result.data.attachment;
-      if (!lodash.isEmpty(attachment)) {
+      if (!_.isEmpty(attachment)) {
         defaultFileList.value = attachment;
       } else {
         defaultFileList.value = [];
@@ -287,7 +287,7 @@
   const defaultFileList = ref([]);
   function changeAttachment(fileList) {
     defaultFileList.value = fileList;
-    formData.attachment = lodash.isEmpty(fileList) ? [] : fileList;
+    formData.attachment = _.isEmpty(fileList) ? [] : fileList;
   }
 
   // ----------------------- 以下是暴露的方法内容 ------------------------
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-modal.vue b/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-visible-modal.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-modal.vue
rename to smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-visible-modal.vue
diff --git a/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue b/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue
new file mode 100644
index 0000000..89d634a
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue
@@ -0,0 +1,204 @@
+<!--
+  * 通知  可见范围 选择部门
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-08-21 19:52:43 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <div class="wrapper">
+    <div class="sider-fl">
+      <a-tree :tree-data="treeData" :fieldNames="{ title: 'name', key: 'departmentId' }" :selectable="false" v-model:expandedKeys="expandedKeys">
+        <template #switcherIcon="{ switcherCls }">
+          <caret-down-outlined :class="switcherCls" />
+        </template>
+        <template #title="{ name, departmentId }">
+          <div class="list-item" :class="{ active: checkExists(departmentId) }">
+            <div class="list-item-title">{{ name }}</div>
+            <check-circle-filled class="check-icon-style" @click="onSelectAdd(name, departmentId)" />
+          </div>
+        </template>
+      </a-tree>
+    </div>
+    <div class="sider-fr">
+      <div class="selected-list">
+        <div class="list-item" v-for="(item, index) in selectedList" :key="item.dataId">
+          <div class="list-item-title">{{ item.dataName }}</div>
+          <close-circle-two-tone @click="onRemove(index)" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { reactive, ref, onMounted, watch, computed, nextTick } from 'vue';
+  import _ from 'lodash';
+  import { NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM } from '/@/constants/business/oa/notice-const';
+  import { departmentApi } from '/@/api/system/department-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
+
+  const props = defineProps({
+    // 已选择的部门数据列表
+    departmentList: {
+      type: Array,
+      default: () => [],
+    },
+  });
+
+  const emits = defineEmits(['onChange']);
+
+  const treeData = ref([]);
+  async function queryDepartmentTree() {
+    try {
+      const result = await departmentApi.queryDepartmentTree();
+      if (!_.isEmpty(result.data)) {
+        treeData.value = result.data;
+        setExpanded();
+      }
+    } catch (err) {
+      smartSentry.captureError(err);
+    }
+  }
+
+  // 设置默认展开的节点
+  const expandedKeys = ref([]);
+  function setExpanded() {
+    expandedKeys.value = [treeData.value[0].departmentId];
+  }
+
+  // 选择的部门列表数据
+  const selectedList = ref([]);
+
+  // 选择的部门列表Ids
+  const selectedIds = computed(() => {
+    return selectedList.value.map((item) => item.dataId);
+  });
+
+  watch(
+    () => props.departmentList,
+    (newVal) => {
+      selectedList.value = newVal;
+    },
+    { immediate: true }
+  );
+
+  // 检查是否已选
+  function checkExists(dataId) {
+    return selectedIds.value.includes(dataId);
+  }
+
+  // 点击左边添加
+  function onSelectAdd(name, departmentId) {
+    if (checkExists(departmentId)) {
+      return;
+    }
+    selectedList.value.push({
+      dataName: name,
+      dataId: departmentId,
+      dataType: NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.DEPARTMENT.value,
+    });
+    onChangeEmit();
+  }
+
+  // 点击右边移除
+  function onRemove(index) {
+    selectedList.value.splice(index, 1);
+    onChangeEmit();
+  }
+
+  function onChangeEmit() {
+    emits('onChange', { selectedList: selectedList.value, selectedIds: selectedIds.value });
+  }
+
+  onMounted(() => {
+    queryDepartmentTree();
+  });
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-tree-list-holder-inner) {
+    display: block !important;
+    .ant-tree-treenode {
+      align-items: center;
+      padding-bottom: 0;
+      &:hover {
+        background-color: #f9f9f9;
+      }
+      .ant-tree-switcher {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .ant-tree-switcher-icon {
+          font-size: 12px;
+        }
+      }
+      .ant-tree-node-content-wrapper {
+        display: block;
+        flex: 1;
+        &:hover {
+          cursor: auto;
+        }
+        .ant-tree-title {
+          display: block;
+        }
+      }
+    }
+  }
+
+  .wrapper {
+    display: flex;
+    .sider-fl,
+    .sider-fr {
+      flex: 1;
+      height: 500px;
+      border: 1px solid #d9d9d9;
+      overflow: hidden;
+      overflow-y: auto;
+      &::-webkit-scrollbar {
+        width: 6px;
+      }
+      &::-webkit-scrollbar-track-piece {
+        background-color: #ededed;
+      }
+      &::-webkit-scrollbar-thumb {
+        height: 50px;
+        background-color: #a1a1a1;
+        border-radius: 4px;
+      }
+    }
+    .sider-fr {
+      margin-left: 15px;
+      .list-item {
+        padding-left: 14px;
+      }
+    }
+  }
+  .list-item {
+    display: flex;
+    align-items: center;
+    padding: 0 14px 0 0;
+    height: 32px;
+    &:hover {
+      background-color: #f9f9f9;
+    }
+    &.active {
+      .check-icon-style {
+        cursor: auto;
+        color: @primary-color;
+      }
+    }
+    .list-item-title {
+      flex: 1;
+      margin-right: 10px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .check-icon-style {
+      color: #d9d9d9;
+    }
+  }
+</style>
diff --git a/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue b/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue
new file mode 100644
index 0000000..295526c
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue
@@ -0,0 +1,252 @@
+<!--
+  * 通知  可见范围 选择员工
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-08-21 19:52:43 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <div class="wrapper">
+    <div class="sider-left">
+      <a-tree :tree-data="treeData" :fieldNames="{ title: 'name' }" :selectable="false" v-model:expandedKeys="expandedKeys">
+        <template #switcherIcon="{ switcherCls }">
+          <caret-down-outlined :class="switcherCls" />
+        </template>
+        <template #title="{ name, id, dataType }">
+          <div class="list-item" :class="{ active: checkExists(id) }">
+            <div class="list-item-title">
+              <user-outlined v-if="dataType === NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value" />
+              {{ name }}
+            </div>
+            <check-circle-filled
+              v-if="dataType === NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value"
+              class="check-icon-style"
+              @click="onSelectAdd(name, id, dataType)"
+            />
+          </div>
+        </template>
+      </a-tree>
+    </div>
+    <div class="sider-right">
+      <div class="selected-list">
+        <div class="list-item" v-for="(item, index) in selectedList" :key="item.id">
+          <div class="list-item-title">{{ item.dataName }}</div>
+          <close-circle-two-tone @click="onRemove(index)" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { computed, nextTick, onMounted, ref, watch } from 'vue';
+  import _ from 'lodash';
+  import { NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM } from '/@/constants/business/oa/notice-const';
+  import { departmentApi } from '/@/api/system/department-api';
+  import { employeeApi } from '/@/api/system/employee-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
+
+  const props = defineProps({
+    // 已选择的员工数据列表
+    employeeList: {
+      type: Array,
+      default: () => [],
+    },
+  });
+
+  const emits = defineEmits(['onChange']);
+
+  const treeData = ref([]);
+
+  // 查询部门树形
+  async function queryDepartmentTree() {
+    try {
+      const departmentResult = await departmentApi.queryDepartmentTree();
+      const employeeResult = await employeeApi.queryAll();
+      const departmentTree = departmentResult.data;
+      buildDepartmentEmployeeTree(departmentTree, employeeResult.data);
+
+      if (!_.isEmpty(departmentTree)) {
+        treeData.value = departmentTree;
+        console.log(treeData.value);
+        nextTick(() => {
+          setExpanded();
+        });
+      }
+    } catch (err) {
+      smartSentry.captureError(err);
+    }
+  }
+
+  // 递归构建部门员工树
+  function buildDepartmentEmployeeTree(departmentTree, employeeList) {
+    for (const department of departmentTree) {
+      if (department.dataType && department.dataType === NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value) {
+        continue;
+      }
+
+      department.id = department.departmentId;
+      department.key = 'department_' + department.departmentId;
+      department.dataType = NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.DEPARTMENT.value;
+      let employeeChildren = employeeList
+        .filter((e) => e.departmentId === department.departmentId)
+        .map((e) =>
+          Object.assign(
+            {},
+            {
+              id: e.employeeId,
+              key: 'employee_' + e.employeeId,
+              name: e.actualName,
+              dataType: NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value,
+            }
+          )
+        );
+      if (!department.children) {
+        department.children = [];
+      }
+      department.children.push(...employeeChildren);
+      buildDepartmentEmployeeTree(department.children, employeeList);
+    }
+  }
+
+  // 设置默认展开的节点
+  const expandedKeys = ref([]);
+  function setExpanded() {
+    expandedKeys.value = [treeData.value[0].key];
+  }
+
+  // 选择的员工列表数据
+  const selectedList = ref([]);
+
+  // 选择的员工列表Ids
+  const selectedIds = computed(() => {
+    return selectedList.value.map((item) => item.dataId);
+  });
+
+  watch(
+    () => props.employeeList,
+    (newVal) => {
+      selectedList.value = newVal;
+    },
+    { immediate: true }
+  );
+
+  // 检查是否已选
+  function checkExists(id) {
+    return selectedIds.value.includes(id);
+  }
+
+  // 点击左边添加
+  function onSelectAdd(name, id, dataType) {
+    if (checkExists(id)) {
+      return;
+    }
+    selectedList.value.push({
+      dataName: name,
+      dataId: id,
+      dataType: NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value,
+    });
+    onChangeEmit();
+  }
+
+  // 点击右边移除
+  function onRemove(index) {
+    selectedList.value.splice(index, 1);
+    onChangeEmit();
+  }
+
+  function onChangeEmit() {
+    emits('onChange', { selectedList: selectedList.value, selectedIds: selectedIds.value });
+  }
+
+  onMounted(() => {
+    queryDepartmentTree();
+  });
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-tree-list-holder-inner) {
+    display: block !important;
+    .ant-tree-treenode {
+      align-items: center;
+      padding-bottom: 0;
+      &:hover {
+        background-color: #f9f9f9;
+      }
+      .ant-tree-switcher {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .ant-tree-switcher-icon {
+          font-size: 12px;
+        }
+      }
+      .ant-tree-node-content-wrapper {
+        display: block;
+        flex: 1;
+        &:hover {
+          cursor: auto;
+        }
+        .ant-tree-title {
+          display: block;
+        }
+      }
+    }
+  }
+
+  .wrapper {
+    display: flex;
+    .sider-left,
+    .sider-right {
+      flex: 1;
+      height: 500px;
+      border: 1px solid #d9d9d9;
+      overflow: hidden;
+      overflow-y: auto;
+      &::-webkit-scrollbar {
+        width: 6px;
+      }
+      &::-webkit-scrollbar-track-piece {
+        background-color: #ededed;
+      }
+      &::-webkit-scrollbar-thumb {
+        height: 50px;
+        background-color: #a1a1a1;
+        border-radius: 4px;
+      }
+    }
+    .sider-right {
+      margin-left: 15px;
+      .list-item {
+        padding-left: 14px;
+      }
+    }
+  }
+  .list-item {
+    display: flex;
+    align-items: center;
+    padding: 0 14px 0 0;
+    height: 32px;
+    &:hover {
+      background-color: #f9f9f9;
+    }
+    &.active {
+      .check-icon-style {
+        cursor: auto;
+        color: @primary-color;
+      }
+    }
+    .list-item-title {
+      flex: 1;
+      margin-right: 10px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .check-icon-style {
+      color: #d9d9d9;
+    }
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-view-record-list.vue b/smart-admin-web-typescript/src/views/business/oa/notice/components/notice-view-record-list.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-view-record-list.vue
rename to smart-admin-web-typescript/src/views/business/oa/notice/components/notice-view-record-list.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue b/smart-admin-web-typescript/src/views/business/oa/notice/notice-detail.vue
similarity index 57%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue
rename to smart-admin-web-typescript/src/views/business/oa/notice/notice-detail.vue
index cac8e04..188c866 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-detail.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/notice-detail.vue
@@ -9,7 +9,7 @@
 -->
 <template>
   <a-card style="margin-bottom: 15px" size="small">
-    <a-descriptions :title="noticeDetail.title" :columns="4" size="small">
+    <a-descriptions :title="noticeDetail.title" :column="4" size="small">
       <template #extra>
         <a-button v-if="!noticeDetail.publishFlag" type="primary" size="small" @click="onEdit">编辑</a-button>
       </template>
@@ -23,12 +23,12 @@
       <a-descriptions-item label="发布时间">{{ noticeDetail.publishTime }}</a-descriptions-item>
       <a-descriptions-item label="定时发布">{{ noticeDetail.publishFlag ? '已发布' : '待发布' }}</a-descriptions-item>
       <a-descriptions-item label="删除状态">{{ noticeDetail.deletedFlag ? '已删除' : '未删除' }}</a-descriptions-item>
-      <a-descriptions-item v-if="!$lodash.isEmpty(noticeDetail.attachmentFile)" label="附件">
+      <a-descriptions-item v-if="!$lodash.isEmpty(noticeDetail.attachment)" label="附件">
         <div class="file-list">
-          <a class="file-item" v-for="item in noticeDetail.attachmentFile" :key="item.fileId" @click="onPrevFile(item)">{{ item.fileName }}</a>
+          <a class="file-item" v-for="item in noticeDetail.attachment" :key="item.fileId" @click="onPrevFile(item)">{{ item.fileName }}</a>
         </div>
       </a-descriptions-item>
-      <a-descriptions-item label="可见范围" :span="2">
+      <a-descriptions-item label="可见范围">
         <template v-if="noticeDetail.allVisibleFlag">全部可见</template>
         <div class="visible-list">
           <div class="visible-item" v-for="item in noticeDetail.visibleRangeList" :key="item.dataId">
@@ -59,86 +59,86 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import NoticeFormDrawer from './components/notice-form-drawer.vue';
-import NoticeViewRecordList from './components/notice-view-record-list.vue';
-import { noticeApi } from '/@/api/business/oa/notice-api';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { onMounted, ref } from 'vue';
+  import { useRoute } from 'vue-router';
+  import NoticeFormDrawer from './components/notice-form-drawer.vue';
+  import NoticeViewRecordList from './components/notice-view-record-list.vue';
+  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
-const route = useRoute();
+  const route = useRoute();
 
-const props = defineProps({
-  newsType: {
-    type: Number,
-  },
-});
+  const props = defineProps({
+    newsType: {
+      type: Number,
+    },
+  });
 
-const activeKey = ref(1);
+  const activeKey = ref(1);
 
-const noticeDetail = ref({});
-const noticeViewRecordList = ref();
+  const noticeDetail = ref({});
+  const noticeViewRecordList = ref();
 
-onMounted(() => {
-  if (route.query.noticeId) {
-    queryNoticeDetail();
-    noticeViewRecordList.value.onSearch();
+  onMounted(() => {
+    if (route.query.noticeId) {
+      queryNoticeDetail();
+      noticeViewRecordList.value.onSearch();
+    }
+  });
+
+  // 查询详情
+  async function queryNoticeDetail() {
+    try {
+      SmartLoading.show();
+      const result = await noticeApi.getUpdateNoticeInfo(route.query.noticeId);
+      noticeDetail.value = result.data;
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      SmartLoading.hide();
+    }
   }
-});
 
-// 查询详情
-async function queryNoticeDetail() {
-  try {
-    SmartLoading.show();
-    const result = await noticeApi.getUpdateNoticeInfo(route.query.noticeId);
-    noticeDetail.value = result.data;
-  } catch (err) {
-    smartSentry.captureError(err);
-  } finally {
-    SmartLoading.hide();
+  // 点击编辑
+  const noticeFormDrawerRef = ref();
+  function onEdit() {
+    noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
   }
-}
 
-// 点击编辑
-const noticeFormDrawerRef = ref();
-function onEdit() {
-  noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
-}
-
-// 预览附件
-const filePreviewRef = ref();
-function onPrevFile(fileItem) {
-  filePreviewRef.value.showPreview(fileItem);
-}
+  // 预览附件
+  const filePreviewRef = ref();
+  function onPrevFile(fileItem) {
+    filePreviewRef.value.showPreview(fileItem);
+  }
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-descriptions-item-content) {
-  flex: 1;
-  overflow: hidden;
-}
-.file-list {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  .file-item {
-    display: block;
-    margin-right: 10px;
+  :deep(.ant-descriptions-item-content) {
+    flex: 1;
+    overflow: hidden;
   }
-}
-.visible-list {
-  display: flex;
-  flex-wrap: wrap;
-  .visible-item {
-    margin-right: 10px;
-    color: #666;
+  .file-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    .file-item {
+      display: block;
+      margin-right: 10px;
+    }
   }
-}
-.content-html {
-  img {
-    max-width: 100%;
+  .visible-list {
+    display: flex;
+    flex-wrap: wrap;
+    .visible-item {
+      margin-right: 10px;
+      color: #666;
+    }
+  }
+  .content-html {
+    img {
+      max-width: 100%;
+    }
   }
-}
 </style>
diff --git a/smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-detail.vue b/smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-detail.vue
new file mode 100644
index 0000000..166ac05
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-detail.vue
@@ -0,0 +1,145 @@
+<!--
+  * 通知  详情 （员工）
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-08-21 19:52:43 
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+-->
+<template>
+  <a-card size="small">
+    <div>
+      <div class="content-header">
+        <!--startprint-->
+        <div class="content-header-title">
+          {{ noticeDetail.title }}
+        </div>
+        <div class="content-header-info">
+          <span v-show="noticeDetail.author">作者：{{ noticeDetail.author }}</span>
+          <span v-show="noticeDetail.source">来源：{{ noticeDetail.source }}</span>
+          <span>发布时间：{{ noticeDetail.publishTime }}</span>
+          <span>阅读量：{{ noticeDetail.pageViewCount }}</span>
+          <span @click="print">【打印本页】</span>
+        </div>
+      </div>
+      <div class="content-html" v-html="noticeDetail.contentHtml"></div>
+      <!--endprint-->
+    </div>
+    <a-divider />
+    <div>
+      附件：
+      <file-preview v-if="!$lodash.isEmpty(noticeDetail.attachment)" :fileList="noticeDetail.attachment" />
+      <span v-else>无</span>
+    </div>
+  </a-card>
+
+  <a-card title="记录" size="small" class="smart-margin-top10">
+    <NoticeViewRecordList ref="noticeViewRecordList" :noticeId="route.query.noticeId" />
+  </a-card>
+</template>
+
+<script setup lang="ts">
+  import { onMounted, ref } from 'vue';
+  import { useRoute } from 'vue-router';
+  import NoticeViewRecordList from './components/notice-view-record-list.vue';
+  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import FilePreview from '/@/components/support/file-preview/index.vue';
+  import { smartSentry } from '/@/lib/smart-sentry';
+
+  const route = useRoute();
+
+  const noticeDetail = ref({});
+
+  onMounted(() => {
+    if (route.query.noticeId) {
+      queryNoticeDetail();
+    }
+  });
+
+  const noticeViewRecordList = ref();
+
+  // 查询详情
+  async function queryNoticeDetail() {
+    try {
+      SmartLoading.show();
+      const result = await noticeApi.view(route.query.noticeId);
+      noticeDetail.value = result.data;
+
+      noticeViewRecordList.value.onSearch();
+    } catch (err) {
+      smartSentry.captureError(err);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+
+  // 点击编辑
+  const noticeFormDrawerRef = ref();
+  function onEdit() {
+    noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
+  }
+
+  // 打印
+  function print() {
+    let bdhtml = window.document.body.innerHTML;
+    let sprnstr = '<!--startprint-->'; //必须在页面添加<!--startprint-->和<!--endprint-->而且需要打印的内容必须在它们之间
+    let eprnstr = '<!--endprint-->';
+    let prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
+    prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
+    let newWin = window.open(''); //新打开一个空窗口
+    newWin.document.body.innerHTML = prnhtml;
+    newWin.document.close(); //在IE浏览器中使用必须添加这一句
+    newWin.focus(); //在IE浏览器中使用必须添加这一句
+    newWin.print(); //打印
+    newWin.close(); //关闭窗口
+  }
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-descriptions-item-content) {
+    flex: 1;
+    overflow: hidden;
+  }
+  .file-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    .file-item {
+      display: block;
+      margin-right: 10px;
+    }
+  }
+  .visible-list {
+    display: flex;
+    flex-wrap: wrap;
+    .visible-item {
+      margin-right: 10px;
+      color: #666;
+    }
+  }
+  .content-header {
+    .content-header-title {
+      margin: 10px 0px;
+      font-size: 18px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .content-header-info {
+      margin: 10px 0px;
+      font-size: 14px;
+      color: #888;
+      text-align: center;
+      span {
+        margin: 0 10px;
+        cursor: pointer;
+      }
+    }
+  }
+  .content-html {
+    img {
+      max-width: 100%;
+    }
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-employee-list.vue b/smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-list.vue
similarity index 79%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-employee-list.vue
rename to smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-list.vue
index 13f5f51..28baa0f 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-employee-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-list.vue
@@ -1,25 +1,17 @@
 <!--
   * 通知  详情 （员工列表）
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-21 19:52:43 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-21 19:52:43
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-form class="smart-query-form">
     <a-row class="smart-query-form-row">
-      <a-form-item label="分类" class="smart-query-form-item">
-        <a-select v-model:value="queryForm.noticeTypeId" style="width: 100px" :showSearch="true" :allowClear="true">
-          <a-select-option v-for="item in noticeTypeList" :key="item.noticeTypeId" :value="item.noticeTypeId">
-            {{ item.noticeTypeName }}
-          </a-select-option>
-        </a-select>
-      </a-form-item>
-
       <a-form-item label="关键字" class="smart-query-form-item">
-        <a-input style="width: 300px" v-model:value="queryForm.keywords" placeholder="标题、作者、来源、文号" />
+        <a-input style="width: 200px" v-model:value="queryForm.keywords" placeholder="标题、作者、来源、文号" />
       </a-form-item>
 
       <a-form-item label="发布时间" class="smart-query-form-item">
@@ -43,6 +35,7 @@
         </a-button-group>
       </a-form-item>
     </a-row>
+    <a-row class="smart-query-form-row"> </a-row>
   </a-form>
 
   <a-card size="small" :bordered="false">
@@ -51,20 +44,11 @@
       <a-tab-pane :key="1" tab="未读" />
     </a-tabs>
 
-    <a-table
-      rowKey="noticeId"
-      :columns="tableColumns"
-      :dataSource="tableData"
-      :scroll="{ x: 1500 }"
-      :pagination="false"
-      :loading="tableLoading"
-      bordered
-      size="small"
-    >
+    <a-table rowKey="noticeId" :columns="tableColumns" :dataSource="tableData" :pagination="false" :loading="tableLoading" bordered size="small">
       <template #bodyCell="{ column, record, text }">
         <template v-if="column.dataIndex === 'title'">
           <span v-show="record.viewFlag">
-            <a @click="toDetail(record.noticeId)" style="color: #666">【{{ record.noticeTypeName }}】{{ text }}（已读）</a>
+            <a @click="toDetail(record.noticeId)" style="color: #8c8c8c">【{{ record.noticeTypeName }}】{{ text }}（已读）</a>
           </span>
           <span v-show="!record.viewFlag">
             <a @click="toDetail(record.noticeId)"
@@ -96,50 +80,39 @@
 </template>
 
 <script setup lang="ts">
-  import { reactive, ref, onMounted } from 'vue';
-  import { message, Modal } from 'ant-design-vue';
+  import { onMounted, reactive, ref } from 'vue';
   import { useRouter } from 'vue-router';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
-  import SmartBooleanSelect from '/@/components/framework/boolean-select/index.vue';
   import { noticeApi } from '/@/api/business/oa/notice-api';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   const tableColumns = reactive([
     {
       title: `标题`,
       dataIndex: 'title',
-      width: 300,
       ellipsis: true,
     },
-
     {
-      title: `文号`,
-      dataIndex: 'documentNumber',
-      width: 100,
-      ellipsis: true,
-    },
-
-    {
-      title: `作者`,
-      dataIndex: 'author',
-      width: 40,
-      ellipsis: true,
+      title: '访问量',
+      dataIndex: 'pageViewCount',
+      width: 90,
     },
     {
       title: `来源`,
       dataIndex: 'source',
-      width: 90,
+      width: 150,
+      ellipsis: true,
+    },
+    {
+      title: `作者`,
+      dataIndex: 'author',
+      width: 80,
       ellipsis: true,
     },
     {
       title: '发布时间',
       dataIndex: 'publishTime',
-      width: 140,
-    },
-    {
-      title: '用户/页面浏览量',
-      dataIndex: 'pageViewCount',
-      width: 90,
+      width: 150,
     },
   ]);
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue b/smart-admin-web-typescript/src/views/business/oa/notice/notice-list.vue
similarity index 91%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue
rename to smart-admin-web-typescript/src/views/business/oa/notice/notice-list.vue
index c3f5dc7..88b865e 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/notice-list.vue
@@ -1,15 +1,15 @@
 <!--
   * 通知  管理列表
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-21 19:52:43 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-21 19:52:43
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 
 <template>
-  <a-form class="smart-query-form" v-privilege="'notice:query'">
+  <a-form class="smart-query-form" v-privilege="'oa:notice:query'">
     <a-row class="smart-query-form-row">
       <a-form-item label="分类" class="smart-query-form-item">
         <a-select v-model:value="queryForm.noticeTypeId" style="width: 100px" :showSearch="true" :allowClear="true" placeholder="分类">
@@ -36,11 +36,11 @@
       </a-form-item>
 
       <a-form-item label="发布时间" class="smart-query-form-item">
-        <a-range-picker v-model:value="publishDate" @change="publishDateChange" style="width: 220px" />
+        <a-range-picker v-model:value="publishDate" :presets="defaultTimeRanges" @change="publishDateChange" style="width: 220px" />
       </a-form-item>
 
       <a-form-item label="创建时间" class="smart-query-form-item">
-        <a-range-picker v-model:value="createDate" @change="createDateChange" style="width: 220px" />
+        <a-range-picker v-model:value="createDate" :presets="defaultTimeRanges" @change="createDateChange" style="width: 220px" />
       </a-form-item>
 
       <a-form-item class="smart-query-form-item smart-margin-left10">
@@ -65,7 +65,7 @@
   <a-card size="small" :bordered="false">
     <a-row class="smart-table-btn-block">
       <div class="smart-table-operate-block">
-        <a-button type="primary" size="small" @click="addOrUpdate()" v-privilege="'notice:add'">
+        <a-button type="primary" @click="addOrUpdate()" v-privilege="'oa:notice:add'">
           <template #icon>
             <PlusOutlined />
           </template>
@@ -73,8 +73,8 @@
         </a-button>
       </div>
       <div class="smart-table-setting-block">
-            <TableOperator v-model="tableColumns" :tableId="TABLE_ID_CONST.BUSINESS.OA.NOTICE" :refresh="queryNoticeList" />
-        </div>
+        <TableOperator v-model="tableColumns" :tableId="TABLE_ID_CONST.BUSINESS.OA.NOTICE" :refresh="queryNoticeList" />
+      </div>
     </a-row>
 
     <a-table
@@ -101,8 +101,8 @@
         </template>
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button type="link" @click="addOrUpdate(record.noticeId)" v-privilege="'notice:edit'">编辑</a-button>
-            <a-button type="link" @click="onDelete(record.noticeId)" v-privilege="'notice:delete'" danger>删除</a-button>
+            <a-button type="link" @click="addOrUpdate(record.noticeId)" v-privilege="'oa:notice:update'">编辑</a-button>
+            <a-button type="link" @click="onDelete(record.noticeId)" v-privilege="'oa:notice:delete'" danger>删除</a-button>
           </div>
         </template>
       </template>
@@ -136,10 +136,10 @@
   import SmartBooleanSelect from '/@/components/framework/boolean-select/index.vue';
   import { noticeApi } from '/@/api/business/oa/notice-api';
   import NoticeFormDrawer from './components/notice-form-drawer.vue';
+  import { defaultTimeRanges } from '/@/lib/default-time-ranges';
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
   import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
-  
 
   const queryFormState = {
     noticeTypeId: undefined, //分类
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/api-encrypt/api-encrypt-index.vue b/smart-admin-web-typescript/src/views/support/api-encrypt/api-encrypt-index.vue
similarity index 93%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/api-encrypt/api-encrypt-index.vue
rename to smart-admin-web-typescript/src/views/support/api-encrypt/api-encrypt-index.vue
index 01a84fa..50aca9f 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/api-encrypt/api-encrypt-index.vue
+++ b/smart-admin-web-typescript/src/views/support/api-encrypt/api-encrypt-index.vue
@@ -6,8 +6,6 @@
   * @Copyright  1024创新实验室
 -->
 <template>
-  <vue3-tabs-chrome :tabs="tagNav" v-model="selectedKey" />
-
   <a-alert closable>
     <template v-slot:message>
       <h4>接口加解密：</h4>
@@ -26,7 +24,7 @@
   </a-alert>
   <br />
   <a-alert
-    message="当前加密算法为：SM2，若想改为 AES，前端请修改 'lib/encrypt.js'文件中的EncryptObject，后端请修改 ApiEncryptService 的实现类"
+    message="当前加密算法为：SM4，若想改为 AES，前端请修改 'lib/encrypt.js'文件中的EncryptObject，后端请修改 ApiEncryptService 的实现类"
     type="error"
   />
   <br />
@@ -140,30 +138,10 @@
   </a-card>
   <!---------- 返回结果解密 end ----------->
 </template>
-<script setup>
+<script setup lang="ts">
   import { reactive, ref } from 'vue';
-  import { encryptApi } from '/@/api/support/api-encrypt/api-encrypt-api';
+  import { encryptApi } from '/@/api/support/api-encrypt-api';
   import { encryptData } from '/@/lib/encrypt';
-  import Vue3TabsChrome from 'vue3-tabs-chrome';
-
-  const tagNav = reactive([
-    {
-      label: 'google',
-      key: 'google',
-      // favico: require('./assets/google.jpg'),
-    },
-    {
-      label: 'facebook',
-      key: 'facebook',
-      // favico: require('./assets/fb.jpg'),
-    },
-    {
-      label: 'New Tab',
-      key: 'costom key',
-    },
-  ]);
-
-  const selectedKey = ref('google');
 
   // ---------------------------- 第一种：请求参数加密 ----------------------------
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/cache/cache-list.vue b/smart-admin-web-typescript/src/views/support/cache/cache-list.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/cache/cache-list.vue
rename to smart-admin-web-typescript/src/views/support/cache/cache-list.vue
index 8a79f0c..7df5c35 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/cache/cache-list.vue
+++ b/smart-admin-web-typescript/src/views/support/cache/cache-list.vue
@@ -40,7 +40,7 @@ Caffeine ：
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
   import { onMounted, reactive, ref, h } from 'vue';
-  import { cacheApi } from '/@/api/support/cache/cache-api';
+  import { cacheApi } from '/@/api/support/cache-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { Modal } from 'ant-design-vue';
   import _ from 'lodash';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/change-log/change-log-form.vue b/smart-admin-web-typescript/src/views/support/change-log/change-log-form.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/change-log/change-log-form.vue
rename to smart-admin-web-typescript/src/views/support/change-log/change-log-form.vue
index bcef0cb..7de1281 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/change-log/change-log-form.vue
+++ b/smart-admin-web-typescript/src/views/support/change-log/change-log-form.vue
@@ -50,7 +50,7 @@
   import _ from 'lodash';
   import { message } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { changeLogApi } from '/@/api/support/change-log/change-log-api';
+  import { changeLogApi } from '/@/api/support/change-log-api';
   import { smartSentry } from '/@/lib/smart-sentry';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/change-log/change-log-list.vue b/smart-admin-web-typescript/src/views/support/change-log/change-log-list.vue
similarity index 89%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/change-log/change-log-list.vue
rename to smart-admin-web-typescript/src/views/support/change-log/change-log-list.vue
index 469d017..a06a7a5 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/change-log/change-log-list.vue
+++ b/smart-admin-web-typescript/src/views/support/change-log/change-log-list.vue
@@ -7,7 +7,7 @@
 -->
 <template>
   <!---------- 查询表单form begin ----------->
-  <a-form class="smart-query-form" v-privilege="'changeLog:query'">
+  <a-form class="smart-query-form" v-privilege="'support:changeLog:query'">
     <a-row class="smart-query-form-row">
       <a-form-item label="更新类型" class="smart-query-form-item">
         <SmartEnumSelect width="200px" v-model:value="queryForm.type" enumName="CHANGE_LOG_TYPE_ENUM" placeholder="更新类型" />
@@ -22,18 +22,20 @@
         <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="queryForm.createTime" style="width: 150px" />
       </a-form-item>
       <a-form-item class="smart-query-form-item">
-        <a-button type="primary" @click="queryData">
-          <template #icon>
-            <ReloadOutlined />
-          </template>
-          查询
-        </a-button>
-        <a-button @click="resetQuery" class="smart-margin-left10">
-          <template #icon>
-            <SearchOutlined />
-          </template>
-          重置
-        </a-button>
+        <a-button-group>
+          <a-button type="primary" @click="onSearch">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery" class="smart-margin-left10">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
       </a-form-item>
     </a-row>
   </a-form>
@@ -43,13 +45,13 @@
     <!---------- 表格操作行 begin ----------->
     <a-row class="smart-table-btn-block">
       <div class="smart-table-operate-block">
-        <a-button @click="showForm" type="primary" v-privilege="'changeLog:add'">
+        <a-button @click="showForm" type="primary" v-privilege="'support:changeLog:add'">
           <template #icon>
             <PlusOutlined />
           </template>
           新建
         </a-button>
-        <a-button @click="confirmBatchDelete" type="danger" :disabled="selectedRowKeyList.length == 0" v-privilege="'changeLog:batchDelete'">
+        <a-button @click="confirmBatchDelete" danger :disabled="selectedRowKeyList.length === 0" v-privilege="'support:changeLog:batchDelete'">
           <template #icon>
             <DeleteOutlined />
           </template>
@@ -74,7 +76,7 @@
     >
       <template #bodyCell="{ text, record, column }">
         <template v-if="column.dataIndex === 'version'">
-          <a-button @click="showModal(record)" type="link">{{text}}</a-button>
+          <a-button @click="showModal(record)" type="link">{{ text }}</a-button>
         </template>
         <template v-if="column.dataIndex === 'type'">
           <a-tag color="success">
@@ -86,8 +88,8 @@
         </template>
         <template v-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="showForm(record)" type="link" v-privilege="'changeLog:update'">编辑</a-button>
-            <a-button @click="onDelete(record)" danger type="link" v-privilege="'changeLog:delete'">删除</a-button>
+            <a-button @click="showForm(record)" type="link" v-privilege="'support:changeLog:update'">编辑</a-button>
+            <a-button @click="onDelete(record)" danger type="link" v-privilege="'support:changeLog:delete'">删除</a-button>
           </div>
         </template>
       </template>
@@ -119,7 +121,7 @@
   import { reactive, ref, onMounted } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { changeLogApi } from '/@/api/support/change-log/change-log-api';
+  import { changeLogApi } from '/@/api/support/change-log-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
@@ -209,6 +211,12 @@
     queryData();
   }
 
+  // 搜索
+  function onSearch() {
+    queryForm.pageNum = 1;
+    queryData();
+  }
+
   // 查询数据
   async function queryData() {
     tableLoading.value = true;
@@ -264,9 +272,6 @@
   async function requestDelete(data) {
     SmartLoading.show();
     try {
-      let deleteForm = {
-        goodsIdList: selectedRowKeyList.value,
-      };
       await changeLogApi.delete(data.changeLogId);
       message.success('删除成功');
       queryData();
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue b/smart-admin-web-typescript/src/views/support/change-log/change-log-modal.vue
similarity index 86%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue
rename to smart-admin-web-typescript/src/views/support/change-log/change-log-modal.vue
index 8e2d4b3..eb2b5a0 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/change-log/change-log-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/change-log/change-log-modal.vue
@@ -6,11 +6,12 @@
   * @Copyright  1024创新实验室
 -->
 <template>
-  <a-modal title="更新日志" width="700px" :open="visibleFlag" @close="onClose" >
-
+  <a-modal title="更新日志" width="700px" :open="visibleFlag" @cancel="onClose">
     <div>
       <pre>{{ content }}</pre>
-      <div v-if="link">链接：<a :href="link" target="_blank">{{ link }}</a></div>
+      <div v-if="link">
+        链接：<a :href="link" target="_blank">{{ link }}</a>
+      </div>
     </div>
 
     <template #footer>
@@ -18,7 +19,6 @@
         <a-button type="primary" @click="onClose">关闭</a-button>
       </a-space>
     </template>
-
   </a-modal>
 </template>
 <script setup lang="ts">
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/code-generator-list.vue b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
similarity index 86%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/code-generator-list.vue
rename to smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
index 66fe0de..498b1a7 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/code-generator-list.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
@@ -1,11 +1,11 @@
 <!--
   * 代码生成 列表
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-06-08 21:50:41 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-06-08 21:50:41
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <div>
@@ -16,18 +16,20 @@
         </a-form-item>
 
         <a-form-item class="smart-query-form-item smart-margin-left10">
-          <a-button type="primary" @click="ajaxQuery">
-            <template #icon>
-              <ReloadOutlined />
-            </template>
-            查询
-          </a-button>
-          <a-button @click="resetQuery">
-            <template #icon>
-              <SearchOutlined />
-            </template>
-            重置
-          </a-button>
+          <a-button-group>
+            <a-button type="primary" @click="onSearch">
+              <template #icon>
+                <ReloadOutlined />
+              </template>
+              查询
+            </a-button>
+            <a-button @click="resetQuery">
+              <template #icon>
+                <SearchOutlined />
+              </template>
+              重置
+            </a-button>
+          </a-button-group>
         </a-form-item>
       </a-row>
     </a-form>
@@ -69,13 +71,13 @@
       </div>
     </a-card>
 
-    <CodeGeneratorTableConfigForm ref="codeGeneratorTableConfigFormRef" />
+    <CodeGeneratorTableConfigForm ref="codeGeneratorTableConfigFormRef" @reloadList="ajaxQuery" />
     <CodeGeneratorPreviewModal ref="codeGeneratorPreviewModalRef" />
   </div>
 </template>
 <script setup lang="ts">
-  import { onMounted, reactive, ref, nextTick } from 'vue';
-  import { codeGeneratorApi } from '/@/api/support/code-generator/code-generator-api';
+  import { onMounted, reactive, ref } from 'vue';
+  import { codeGeneratorApi } from '/@/api/support/code-generator-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
   import CodeGeneratorTableConfigForm from './components/form/code-generator-table-config-form.vue';
@@ -140,6 +142,12 @@
     Object.assign(queryForm, queryFormState);
     ajaxQuery();
   }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
   async function ajaxQuery() {
     try {
       tableLoading.value = true;
@@ -169,7 +177,7 @@
   }
 
   // ------------------------- 下载 ------------------------------
-  
+
   function download(rowData) {
     codeGeneratorApi.downloadCode(rowData.tableName);
   }
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/code-generator-util.ts b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-util.ts
similarity index 95%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/code-generator-util.ts
rename to smart-admin-web-typescript/src/views/support/code-generator/code-generator-util.ts
index 9c58b7c..5c2942b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/code-generator-util.ts
+++ b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-util.ts
@@ -2,6 +2,7 @@ import { convertUpperCamel } from '/@/utils/str-util';
 
 // -------------------------------- java 类型 --------------------------------
 export const JavaTypeMap = new Map();
+JavaTypeMap.set('bit', 'Boolean');
 JavaTypeMap.set('int', 'Integer');
 JavaTypeMap.set('tinyint', 'Integer');
 JavaTypeMap.set('smallint', 'Integer');
@@ -37,6 +38,7 @@ export function getJavaType(dataType) {
 
 // -------------------------------- js 类型 --------------------------------
 export const JsTypeMap = new Map();
+JsTypeMap.set('bit', 'Boolean');
 JsTypeMap.set('int', 'Number');
 JsTypeMap.set('tinyint', 'Number');
 JsTypeMap.set('smallint', 'Number');
@@ -56,11 +58,10 @@ JsTypeMap.set('date', 'Date');
 JsTypeMap.set('datetime', 'Date');
 
 export const JsTypeList = [
+  'Boolean', //
   'Number', //
   'String', //
   'Date', //
-  'Boolean', //
-  'String', //
 ];
 
 export function getJsType(dataType) {
@@ -70,8 +71,9 @@ export function getJsType(dataType) {
 // -------------------------------- 前端组件 --------------------------------
 
 export const FrontComponentMap = new Map();
+FrontComponentMap.set('bit', 'BooleanSelect');
 FrontComponentMap.set('int', 'InputNumber');
-FrontComponentMap.set('tinyint', 'BooleanSelect');
+FrontComponentMap.set('tinyint', 'InputNumber');
 FrontComponentMap.set('smallint', 'InputNumber');
 FrontComponentMap.set('integer', 'InputNumber');
 FrontComponentMap.set('year', 'Date');
@@ -84,7 +86,7 @@ FrontComponentMap.set('varchar', 'Input');
 FrontComponentMap.set('tinytext', 'Input');
 FrontComponentMap.set('text', 'Textarea');
 FrontComponentMap.set('longtext', 'Textarea');
-FrontComponentMap.set('blob', 'Upload');
+FrontComponentMap.set('blob', 'FileUpload');
 FrontComponentMap.set('date', 'Date');
 FrontComponentMap.set('datetime', 'DateTime');
 
@@ -114,7 +116,6 @@ export const TS_FILE_LIST = [
   'ts/const.js', //
 ];
 
-
 // -------------------------------- 后端文件 --------------------------------
 
 export const JAVA_DOMAIN_FILE_LIST = [
@@ -132,6 +133,7 @@ export const JAVA_FILE_LIST = [
   'Dao.java', //
   'Mapper.xml', //
   ...JAVA_DOMAIN_FILE_LIST,
+  'Menu.sql', //
 ];
 
 // -------------------------------- 枚举enum --------------------------------
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue
similarity index 89%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue
rename to smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue
index 6135cc6..6f73b0e 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-basic.vue
@@ -8,11 +8,22 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-row type="flex">
+  <a-alert
+    :closable="true"
+    message="默认数据库表名前缀为：t_， 如果想修改默认前缀，请修改前端 code-generator-table-config-form-basic.vue 文件的 tablePrefix 变量"
+    type="success"
+    show-icon
+  >
+    <template #icon><smile-outlined /></template>
+  </a-alert>
+  <a-row type="flex" class="smart-margin-top10">
     <a-col flex="350px">
       <a-form ref="formRef" :model="formData" :rules="formRules" :label-col="{ span: 5 }" :wrapper-col="{ span: 16 }">
         <a-form-item label="表"> {{ tableInfo.tableName }} </a-form-item>
         <a-form-item label="表备注"> {{ tableInfo.tableComment }} </a-form-item>
+        <a-form-item label="表前缀" name="tablePrefix">
+          <a-input v-model:value="tablePrefix" @change="onChangeTablePrefix" placeholder="请输入 表前缀 " />
+        </a-form-item>
         <a-form-item label="单词命名" name="moduleName">
           <a-input v-model:value="formData.moduleName" placeholder="请输入 单词命名 " />
         </a-form-item>
@@ -127,7 +138,7 @@
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
   import dayjs from 'dayjs';
-  import lodash from 'lodash';
+  import _ from 'lodash';
   import { computed, inject, reactive, ref } from 'vue';
   import { convertLowerHyphen, convertUpperCamel } from '/@/utils/str-util';
 
@@ -150,6 +161,7 @@
     copyright: undefined, //版权
   };
 
+  const tablePrefix = ref('t_');
   const formData = reactive({ ...defaultFormData });
 
   const formRules = {
@@ -169,8 +181,8 @@
 
     //命名
     let removePrefixTableName = tableInfo.tableName;
-    if (lodash.startsWith(tableInfo.tableName, 't_')) {
-      removePrefixTableName = lodash.trim(removePrefixTableName, '_t');
+    if (_.startsWith(tableInfo.tableName, tablePrefix.value)) {
+      removePrefixTableName = _.trim(removePrefixTableName, tablePrefix.value);
     }
     formData.moduleName = basic && basic.moduleName ? basic.moduleName : removePrefixTableName;
     formData.moduleName = convertUpperCamel(formData.moduleName);
@@ -190,6 +202,14 @@
     formData.copyright = basic && basic.copyright ? basic.copyright : null;
   }
 
+  function onChangeTablePrefix(e) {
+    let removePrefixTableName = tableInfo.tableName;
+    if (_.startsWith(tableInfo.tableName, tablePrefix.value)) {
+      removePrefixTableName = _.trim(removePrefixTableName, tablePrefix.value);
+    }
+    formData.moduleName = convertUpperCamel(removePrefixTableName);
+  }
+
   // 获取表单数据
   const timeFormat = 'YYYY-MM-DD HH:mm:ss';
   function getBasicForm() {
@@ -208,7 +228,7 @@
           resolve(true);
         })
         .catch((error) => {
-          message.error('基础命名表单 参数验证错误!');
+          message.error(' 请检查【1.基础命名】表单，有参数验证错误');
           reject(error);
         });
     });
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
similarity index 89%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
rename to smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
index 3d0661e..73bf75b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
@@ -35,7 +35,7 @@
 
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
-  import lodash from 'lodash';
+  import _ from 'lodash';
   import { inject, reactive, ref } from 'vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
   import { CODE_DELETE_ENUM } from '/@/constants/support/code-generator-const';
@@ -68,12 +68,13 @@
     if (deletedFlagColumn) {
       deleteFlagColumnName.value = deletedFlagColumn.columnName;
     }
+    console.log(deletedFlagColumn);
 
     //表单
-    let deleteInfo = config.delete;
+    let deleteInfo = config.deleteInfo;
 
-    formData.isSupportDelete = deleteInfo && deleteInfo.isSupportDelete ? deleteInfo.isSupportDelete : true;
-    formData.isPhysicallyDeleted = deleteInfo && deleteInfo.isPhysicallyDeleted ? deleteInfo.isPhysicallyDeleted : deletedFlagColumn ? false : true;
+    formData.isSupportDelete = deleteInfo ? deleteInfo.isSupportDelete : true;
+    formData.isPhysicallyDeleted = deleteInfo && deleteInfo.isPhysicallyDeleted ? deleteInfo.isPhysicallyDeleted : !deletedFlagColumn;
     formData.deleteEnum = deleteInfo && deleteInfo.deleteEnum ? deleteInfo.deleteEnum : CODE_DELETE_ENUM.SINGLE_AND_BATCH.value;
   }
 
@@ -83,7 +84,7 @@
       return null;
     }
 
-    let result = configFields.filter((e) => lodash.startsWith(e.columnName, 'deleted_flag' || lodash.startsWith(e.columnName, 'delete_flag')));
+    let result = configFields.filter((e) => _.startsWith(e.columnName, 'deleted_flag' || _.startsWith(e.columnName, 'delete_flag')));
     return result && result.length > 0 ? result[0] : null;
   }
 
@@ -101,7 +102,7 @@
           resolve(true);
         })
         .catch((error) => {
-          message.error('删除表单 参数验证错误!');
+          message.error(' 请检查【4.删除】表单，有参数验证错误');
           reject(error);
         });
     });
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
similarity index 85%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
rename to smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
index 0bf3fa0..439cdd5 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
@@ -8,6 +8,13 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
+  <a-alert :closable="true" message="请务必将每一个字段的 “ 字段名词 ” 填写完整！！！" type="success" show-icon>
+    <template #icon><smile-outlined /></template>
+  </a-alert>
+  <!-- 为了方便再配置时中途新增字典后 可以重新刷新字典下拉 (需要先随便选择一个字典后才能看到最新的字典) -->
+  <div style="float: right; padding: 10px 0px">
+    <a-button type="primary" @click="refreshDict">刷新字典</a-button>
+  </div>
   <a-table
     :scroll="{ x: 1300 }"
     size="small"
@@ -61,7 +68,7 @@
       </template>
 
       <template v-if="column.dataIndex === 'dict'">
-        <DictKeySelect v-model:value="record.dict" />
+        <DictKeySelect ref="dictRef" v-model:value="record.dict" />
       </template>
 
       <template v-if="column.dataIndex === 'enumName'">
@@ -76,7 +83,12 @@
   import { checkExistEnum, convertJavaEnumName, getJavaType, getJsType, JavaTypeList, JsTypeList } from '../../code-generator-util';
   import DictKeySelect from '/@/components/support/dict-key-select/index.vue';
   import { convertUpperCamel, convertLowerCamel } from '/@/utils/str-util';
-  import lodash from 'lodash';
+  import _ from 'lodash';
+
+  const dictRef = ref();
+  function refreshDict() {
+    dictRef.value.queryDict();
+  }
 
   //------------------------ 全局数据 ---------------------
   const tableInfo = inject('tableInfo');
@@ -151,8 +163,8 @@
 
     //命名
     let removePrefixTableName = tableInfo.tableName;
-    if (lodash.startsWith(tableInfo.tableName, 't_')) {
-      removePrefixTableName = lodash.trim(removePrefixTableName, '_t');
+    if (_.startsWith(tableInfo.tableName, 't_')) {
+      removePrefixTableName = _.trim(removePrefixTableName, '_t');
     }
     let moduleName = basic && basic.moduleName ? basic.moduleName : removePrefixTableName;
     moduleName = convertUpperCamel(moduleName);
@@ -164,9 +176,9 @@
         columnName: column.columnName,
         columnComment: column.columnComment,
         dataType: column.dataType,
-        nullableFlag: column.isNullable === 'NO' ? true : false,
-        primaryKeyFlag: column.columnKey === 'PRI' ? true : false,
-        autoIncreaseFlag: column.extra === 'auto_increment' ? true : false,
+        nullableFlag: column.isNullable === 'NO',
+        primaryKeyFlag: column.columnKey === 'PRI',
+        autoIncreaseFlag: column.extra === 'auto_increment',
         //表单
         fieldName: configField ? configField.fieldName : convertLowerCamel(column.columnName),
         label: configField ? configField.label : column.columnComment,
@@ -200,7 +212,7 @@
     return tableData.value.map((e) => {
       return {
         columnName: e.columnName,
-        columnComment:e.columnComment,
+        columnComment: e.columnComment,
         label: e.label,
         fieldName: e.fieldName,
         javaType: e.javaType,
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
similarity index 88%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
rename to smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
index adeb092..6db9c19 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
@@ -19,11 +19,16 @@
         </a-form-item>
         <a-form-item label="页面方式" name="pageType" v-if="formData.isSupportInsertAndUpdate">
           <a-radio-group v-model:value="formData.pageType" button-style="solid">
-            <a-radio-button :value="CODE_INSERT_AND_UPDATE_PAGE_ENUM.MODAL.value">{{CODE_INSERT_AND_UPDATE_PAGE_ENUM.MODAL.desc}}</a-radio-button>
-            <a-radio-button :value="CODE_INSERT_AND_UPDATE_PAGE_ENUM.DRAWER.value">{{CODE_INSERT_AND_UPDATE_PAGE_ENUM.DRAWER.desc}}</a-radio-button>
+            <a-radio-button :value="CODE_INSERT_AND_UPDATE_PAGE_ENUM.MODAL.value">{{ CODE_INSERT_AND_UPDATE_PAGE_ENUM.MODAL.desc }}</a-radio-button>
+            <a-radio-button :value="CODE_INSERT_AND_UPDATE_PAGE_ENUM.DRAWER.value">{{ CODE_INSERT_AND_UPDATE_PAGE_ENUM.DRAWER.desc }}</a-radio-button>
           </a-radio-group>
         </a-form-item>
-        <a-form-item label="页面宽度" v-show="formData.pageType !== CODE_INSERT_AND_UPDATE_PAGE_ENUM.PAGE.value" name="width" v-if="formData.isSupportInsertAndUpdate">
+        <a-form-item
+          label="页面宽度"
+          v-show="formData.pageType !== CODE_INSERT_AND_UPDATE_PAGE_ENUM.PAGE.value"
+          name="width"
+          v-if="formData.isSupportInsertAndUpdate"
+        >
           <a-input v-model:value="formData.width" placeholder="Modal或者Drawer的width属性 " />
         </a-form-item>
         <a-form-item label="每行数量" name="countPerLine" v-if="formData.isSupportInsertAndUpdate">
@@ -52,7 +57,16 @@
     </a-col>
   </a-row>
 
-  <a-table size="small" bordered class="smart-margin-top10" :dataSource="tableData" :columns="columns" rowKey="columnName" :pagination="false" v-if="formData.isSupportInsertAndUpdate">
+  <a-table
+    size="small"
+    bordered
+    class="smart-margin-top10"
+    :dataSource="tableData"
+    :columns="columns"
+    rowKey="columnName"
+    :pagination="false"
+    v-if="formData.isSupportInsertAndUpdate"
+  >
     <template #bodyCell="{ text, record, index, column }">
       <template v-if="column.dataIndex === 'no'">
         {{ index + 1 }}
@@ -95,13 +109,11 @@
 </template>
 
 <script setup lang="ts">
-  import { inject, ref, reactive, computed } from 'vue';
+  import { computed, inject, reactive, ref } from 'vue';
   import { checkExistEnum, getFrontComponent } from '../../code-generator-util';
-  import SmartEnumRadio from '/@/components/framework/smart-enum-radio/index.vue';
-  import { CODE_INSERT_AND_UPDATE_PAGE_ENUM } from '/@/constants/support/code-generator-const';
+  import { CODE_FRONT_COMPONENT_ENUM, CODE_INSERT_AND_UPDATE_PAGE_ENUM } from '/@/constants/support/code-generator-const';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
   import { message } from 'ant-design-vue';
-  import { CODE_FRONT_COMPONENT_ENUM } from '/@/constants/support/code-generator-const';
 
   //------------------------ 全局数据 ---------------------
   const tableInfo = inject('tableInfo');
@@ -203,9 +215,9 @@
         columnName: column.columnName,
         columnComment: column.columnComment,
         dataType: column.dataType,
-        nullableFlag: column.isNullable === 'NO' ? true : false,
-        primaryKeyFlag: column.columnKey === 'PRI' ? true : false,
-        autoIncreaseFlag: column.extra === 'auto_increment' ? true : false,
+        nullableFlag: column.isNullable === 'NO',
+        primaryKeyFlag: column.columnKey === 'PRI',
+        autoIncreaseFlag: column.extra === 'auto_increment',
       };
 
       //表单
@@ -265,7 +277,7 @@
           resolve(true);
         })
         .catch((error) => {
-          message.error('基础命名表单 参数验证错误!');
+          message.error(' 请检查【3.增加、修改】表单，有参数验证错误');
           reject(error);
         });
     });
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
similarity index 78%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
rename to smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
index 9bad9ee..b93f3f7 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
@@ -22,7 +22,7 @@
     rowKey="rowKey"
     :pagination="false"
   >
-    <template #bodyCell="{ text, record, index, column }">
+    <template #bodyCell="{ record, index, column }">
       <template v-if="column.dataIndex === 'drag'">
         <a-button type="text" class="handle" size="small" style="width: 100%; text-align: left">
           <template #icon> <drag-outlined /> </template>
@@ -30,15 +30,15 @@
       </template>
 
       <template v-if="column.dataIndex === 'label'">
-        <a-input v-model:value="record.label"  placeholder="关键字查询"/>
+        <a-input v-model:value="record.label" placeholder="关键字查询" />
       </template>
 
       <template v-if="column.dataIndex === 'fieldName'">
-        <a-input v-model:value="record.fieldName" placeholder="keywords"/>
+        <a-input v-model:value="record.fieldName" placeholder="keywords" />
       </template>
 
       <template v-if="column.dataIndex === 'width'">
-        <a-input v-model:value="record.width" placeholder="150px"/>
+        <a-input v-model:value="record.width" placeholder="150px" />
       </template>
 
       <template v-if="column.dataIndex === 'queryTypeEnum'">
@@ -75,11 +75,9 @@
 </template>
 
 <script setup lang="ts">
-  import lodash from 'lodash';
   import Sortable from 'sortablejs';
   import { inject, nextTick, ref } from 'vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
-  import { SmartLoading } from '/@/components/framework/smart-loading';
   import { CODE_QUERY_FIELD_QUERY_TYPE_ENUM } from '/@/constants/support/code-generator-const';
   import { convertLowerCamel } from '/@/utils/str-util';
 
@@ -94,15 +92,16 @@
       dataIndex: 'drag',
       width: 60,
     },
-    {
-      title: '列',
-      dataIndex: 'columnNameList',
-    },
     {
       title: '查询类型',
       dataIndex: 'queryTypeEnum',
       width: 130,
     },
+    {
+      title: '查询列',
+      dataIndex: 'columnNameList',
+    },
+
     {
       title: '条件名称',
       dataIndex: 'label',
@@ -128,14 +127,14 @@
   const tableData = ref([]);
 
   const tableColumns = ref([]);
-  
+
+  let rowKeyCounter = 1;
   //初始化设置数据
   function setData(tableColumnInfos, config) {
     rowKeyCounter = 1;
     let data = config && config.queryFields ? config.queryFields : [];
     for (let index = 0; index < data.length; index++) {
-
-      data[index].rowKey = 'rowKey' + (index + 1);
+      data[index].rowKey = 'rowKey' + rowKeyCounter;
       rowKeyCounter++;
     }
     tableData.value = data;
@@ -147,7 +146,6 @@
   }
 
   // -------------------  增加、删除 -------------------
-  let rowKeyCounter = 1;
   function addQuery() {
     tableData.value.push({
       rowKey: 'rowKey' + rowKeyCounter,
@@ -155,13 +153,19 @@
       fieldName: '',
       queryTypeEnum: '',
       columnNameList: null,
-      width: '',
+      width: '200px',
     });
     rowKeyCounter++;
   }
 
   function onDelete(index) {
-    lodash.pullAt(tableData.value, index);
+    // 以这种方式删除 列表才会重新渲染
+    const tempList = [...tableData.value];
+    tempList.splice(index, 1);
+    tableData.value = [];
+    nextTick(() => {
+      tableData.value = tempList;
+    });
   }
 
   //初始化拖拽
@@ -173,6 +177,10 @@
       ghostClass: 'smart-ghost-class', //设置拖拽停靠样式类名
       chosenClass: 'smart-ghost-class', //设置选中样式类名
       handle: '.handle',
+      onEnd: ({ oldIndex, newIndex }) => {
+        const oldRow = tableData.value.splice(oldIndex, 1)[0];
+        tableData.value.splice(newIndex, 0, oldRow);
+      },
     });
   }
 
@@ -193,12 +201,8 @@
     let column = getConfigField(tableColumns.value, columnName);
 
     //表单
-    if (!record.fieldName) {
-      record.fieldName = column && column.columnName ? convertLowerCamel(column.columnName) : '';
-    }
-    if (!record.label) {
-      record.label = column && column.columnComment ? convertLowerCamel(column.columnComment) : '';
-    }
+    record.fieldName = column && column.columnName ? convertLowerCamel(column.columnName) : '';
+    record.label = column && column.columnComment ? convertLowerCamel(column.columnComment) : '';
   }
 
   // 获取配置过的字段信息
@@ -215,36 +219,16 @@
 
   // 获取表单数据
   function getFieldsForm() {
-    let result = [];
-    let trList = document.querySelectorAll('#smartCodeQueryFieldsTable tbody .column-row');
-    if (trList && trList.length === 0) {
-      return result;
-    }
-
-    for (let tr of trList) {
-      let rowKey = tr.getAttribute('data-row-key');
-      if (!rowKey) {
-        continue;
-      }
-      if (rowKey && rowKey.indexOf('rowKey') === -1) {
-        continue;
-      }
-
-      let index = parseInt(rowKey.substring(6));
-      let tableItem = tableData.value[index - 1];
-      let obj = {
-        queryTypeEnum: tableItem.queryTypeEnum,
-        label: tableItem.label,
-        fieldName: tableItem.fieldName,
-        columnNameList: tableItem.columnNameList,
-        width: tableItem.width,
+    let result = tableData.value.map((item) => {
+      return {
+        label: item.label,
+        width: item.width,
+        fieldName: item.fieldName,
+        queryTypeEnum: item.queryTypeEnum,
+        // 字符串转为数组
+        columnNameList: item.columnNameList && typeof item.columnNameList === 'string' ? [item.columnNameList] : item.columnNameList,
       };
-      // 字符串转为数组
-      if (obj.columnNameList && typeof obj.columnNameList === 'string') {
-        obj.columnNameList = [obj.columnNameList];
-      }
-      result.push(obj);
-    }
+    });
     return result;
   }
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue
similarity index 87%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue
rename to smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue
index 4d7b574..911374b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-table-field.vue
@@ -8,8 +8,20 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-table size="small" bordered  :scroll="{ x: 1000 }" class="smart-margin-top10" :dataSource="tableData" :columns="columns" rowKey="columnName" :pagination="false">
-    <template #bodyCell="{ text, record, index, column }">
+  <a-alert :closable="true" message="请务必将每一个字段的 “ 字段名词 ” 填写完整！！！" type="success" show-icon>
+    <template #icon><smile-outlined /></template>
+  </a-alert>
+  <a-table
+    size="small"
+    bordered
+    :scroll="{ x: 1000 }"
+    class="smart-margin-top10"
+    :dataSource="tableData"
+    :columns="columns"
+    rowKey="columnName"
+    :pagination="false"
+  >
+    <template #bodyCell="{ record, index, column }">
       <template v-if="column.dataIndex === 'no'">
         {{ index + 1 }}
       </template>
@@ -39,7 +51,7 @@
 
 <script setup lang="ts">
   import { inject, ref } from 'vue';
-import { convertLowerCamel } from '/@/utils/str-util';
+  import { convertLowerCamel } from '/@/utils/str-util';
 
   //------------------------ 全局数据 ---------------------
   const tableInfo = inject('tableInfo');
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
similarity index 96%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
rename to smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
index 847010c..899de87 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
@@ -1,18 +1,18 @@
 <!--
   * 代码生成 配置信息
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-22 21:50:41 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-22 21:50:41
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-drawer
     title="代码配置"
     style=""
     :open="visibleFlag"
-    :width="1000"
+    :width="1200"
     :footerStyle="{ textAlign: 'right' }"
     @close="onClose"
     :maskClosable="false"
@@ -89,7 +89,7 @@
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { smartSentry } from '/@/lib/smart-sentry';
   import CodeGeneratorTableConfigFormBasic from './code-generator-table-config-form-basic.vue';
-  import { codeGeneratorApi } from '/@/api/support/code-generator/code-generator-api';
+  import { codeGeneratorApi } from '/@/api/support/code-generator-api';
   import CodeGeneratorTableConfigFormField from './code-generator-table-config-form-field.vue';
   import CodeGeneratorTableConfigFormInsertAndUpdate from './code-generator-table-config-form-insert-and-update.vue';
   import CodeGeneratorTableConfigFormDelete from './code-generator-table-config-form-delete.vue';
@@ -169,12 +169,13 @@
   // ------------------ 提交表单 ------------------
   const emits = defineEmits(['reloadList']);
   async function save() {
+    SmartLoading.show();
     try {
       let basicValidated = await basicRef.value.validateForm();
       let insertAndUpdateValidated = await insertAndUpdateRef.value.validateForm();
       let deleteValidated = await deleteRef.value.validateForm();
 
-      if (!basicValidated || !insertAndUpdateValidated || !deleteValidated ) {
+      if (!basicValidated || !insertAndUpdateValidated || !deleteValidated) {
         return;
       }
 
@@ -200,6 +201,8 @@
       onClose();
     } catch (e) {
       smartSentry.captureError(e);
+    } finally {
+      SmartLoading.hide();
     }
   }
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
similarity index 87%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
rename to smart-admin-web-typescript/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
index d93121c..2302ea0 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
@@ -1,11 +1,11 @@
 <!--
   * 代码生成 预览代码
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-22 21:50:41 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-22 21:50:41
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-drawer
@@ -37,9 +37,9 @@
 </template>
 
 <script setup lang="ts">
-  import { computed, nextTick, ref, watch } from 'vue';
-  import { codeGeneratorApi } from '/@/api/support/code-generator/code-generator-api';
-  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST,TS_FILE_LIST, JAVA_DOMAIN_FILE_LIST } from '../../code-generator-util';
+  import { computed, nextTick, ref } from 'vue';
+  import { codeGeneratorApi } from '/@/api/support/code-generator-api';
+  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST } from '../../code-generator-util';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { lineNumbersBlock } from '/@/lib/highlight-line-number';
   import hljs from 'highlight.js';
@@ -74,11 +74,11 @@
   // ------------------ 标签页 ------------------
   const languageType = ref(LANGUAGE_LIST[0]);
   const tabList = computed(() => {
-    if(languageType.value === LANGUAGE_LIST[0]){
+    if (languageType.value === LANGUAGE_LIST[0]) {
       return JS_FILE_LIST;
-    }else if(languageType.value === LANGUAGE_LIST[1]){
+    } else if (languageType.value === LANGUAGE_LIST[1]) {
       return TS_FILE_LIST;
-    }else{
+    } else {
       return JAVA_FILE_LIST;
     }
   });
@@ -86,21 +86,21 @@
   const fileKey = ref(tabList.value[0]);
 
   function getLanguage() {
-    if(languageType.value === LANGUAGE_LIST[0]){
+    if (languageType.value === LANGUAGE_LIST[0]) {
       return 'javascript';
-    }else if(languageType.value === LANGUAGE_LIST[1]){
+    } else if (languageType.value === LANGUAGE_LIST[1]) {
       return 'typescript';
-    }else{
+    } else {
       return 'java';
     }
   }
 
-  function onChangeLanguageType(e){
-    if(e.target.value === LANGUAGE_LIST[0]){
+  function onChangeLanguageType(e) {
+    if (e.target.value === LANGUAGE_LIST[0]) {
       fileKey.value = JS_FILE_LIST[0];
-    }else if(e.target.value === LANGUAGE_LIST[1]){
+    } else if (e.target.value === LANGUAGE_LIST[1]) {
       fileKey.value = TS_FILE_LIST[0];
-    }else{
+    } else {
       fileKey.value = JAVA_FILE_LIST[0];
     }
     onChangeTab(fileKey.value);
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/config/config-form-modal.vue b/smart-admin-web-typescript/src/views/support/config/config-form-modal.vue
similarity index 96%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/config/config-form-modal.vue
rename to smart-admin-web-typescript/src/views/support/config/config-form-modal.vue
index 35e26c8..1d3c507 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/config/config-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/config/config-form-modal.vue
@@ -28,12 +28,12 @@
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
   import { reactive, ref } from 'vue';
-  import { configApi } from '/@/api/support/config/config-api';
+  import { configApi } from '/@/api/support/config-api';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { SmartLoading } from '/@/components/framework/smart-loading';
 
   // emit
-  const emit = defineEmits('reloadList');
+  const emit = defineEmits(['reloadList']);
 
   //  组件
   const formRef = ref();
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/config/config-list.vue b/smart-admin-web-typescript/src/views/support/config/config-list.vue
similarity index 84%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/config/config-list.vue
rename to smart-admin-web-typescript/src/views/support/config/config-list.vue
index 12ca525..e9f44a2 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/config/config-list.vue
+++ b/smart-admin-web-typescript/src/views/support/config/config-list.vue
@@ -16,19 +16,20 @@
         </a-form-item>
 
         <a-form-item class="smart-query-form-item smart-margin-left10">
-          <a-button type="primary" @click="ajaxQuery" v-privilege="'support:config:query'">
-            <template #icon>
-              <ReloadOutlined />
-            </template>
-            查询
-          </a-button>
-          <a-button @click="resetQuery" v-privilege="'support:config:query'">
-            <template #icon>
-              <SearchOutlined />
-            </template>
-            重置
-          </a-button>
-
+          <a-button-group>
+            <a-button type="primary" @click="onSearch" v-privilege="'support:config:query'">
+              <template #icon>
+                <ReloadOutlined />
+              </template>
+              查询
+            </a-button>
+            <a-button @click="resetQuery" v-privilege="'support:config:query'">
+              <template #icon>
+                <SearchOutlined />
+              </template>
+              重置
+            </a-button>
+          </a-button-group>
           <a-button @click="toEditOrAdd()" v-privilege="'support:config:add'" type="primary" class="smart-margin-left20">
             <template #icon>
               <PlusOutlined />
@@ -40,8 +41,8 @@
     </a-form>
 
     <a-card size="small" :bordered="false" :hoverable="true">
-      <a-row justify="end" >
-          <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
+      <a-row justify="end">
+        <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
       </a-row>
 
       <a-table size="small" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
@@ -75,7 +76,7 @@
 </template>
 <script setup lang="ts">
   import { onMounted, reactive, ref } from 'vue';
-  import { configApi } from '/@/api/support/config/config-api';
+  import { configApi } from '/@/api/support/config-api';
   import ConfigFormModal from './config-form-modal.vue';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
@@ -145,6 +146,12 @@
     Object.assign(queryForm, queryFormState);
     ajaxQuery();
   }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
   async function ajaxQuery() {
     try {
       tableLoading.value = true;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/components/dict-key-operate-modal.vue b/smart-admin-web-typescript/src/views/support/dict/components/dict-key-operate-modal.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/components/dict-key-operate-modal.vue
rename to smart-admin-web-typescript/src/views/support/dict/components/dict-key-operate-modal.vue
index 35eb6d0..92ec73c 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/components/dict-key-operate-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/dict/components/dict-key-operate-modal.vue
@@ -27,7 +27,7 @@
   import { ref, reactive } from 'vue';
   import { message } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { dictApi } from '/@/api/support/dict/dict-api';
+  import { dictApi } from '/@/api/support/dict-api';
   import { smartSentry } from '/@/lib/smart-sentry';
 
   // emit
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/components/dict-value-modal.vue b/smart-admin-web-typescript/src/views/support/dict/components/dict-value-modal.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/components/dict-value-modal.vue
rename to smart-admin-web-typescript/src/views/support/dict/components/dict-value-modal.vue
index a8f16a6..d248512 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/components/dict-value-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/dict/components/dict-value-modal.vue
@@ -42,7 +42,7 @@
             新建
           </a-button>
 
-          <a-button @click="confirmBatchDelete" type="danger" size="small" :disabled="selectedRowKeyList.length == 0">
+          <a-button @click="confirmBatchDelete" type="text" danger size="small" :disabled="selectedRowKeyList.length == 0">
             <template #icon>
               <DeleteOutlined />
             </template>
@@ -91,7 +91,7 @@
   import { reactive, ref } from 'vue';
   import DictValueOperateModal from './dict-value-operate-modal.vue';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
-  import { dictApi } from '/@/api/support/dict/dict-api';
+  import { dictApi } from '/@/api/support/dict-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { Modal } from 'ant-design-vue';
   import { message } from 'ant-design-vue';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/components/dict-value-operate-modal.vue b/smart-admin-web-typescript/src/views/support/dict/components/dict-value-operate-modal.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/components/dict-value-operate-modal.vue
rename to smart-admin-web-typescript/src/views/support/dict/components/dict-value-operate-modal.vue
index 072816e..03d76e7 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/components/dict-value-operate-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/dict/components/dict-value-operate-modal.vue
@@ -29,7 +29,7 @@
   import { ref, reactive } from 'vue';
   import { message } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { dictApi } from '/@/api/support/dict/dict-api';
+  import { dictApi } from '/@/api/support/dict-api';
   import { smartSentry } from '/@/lib/smart-sentry';
 
   // emit
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/index.vue b/smart-admin-web-typescript/src/views/support/dict/index.vue
similarity index 91%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/index.vue
rename to smart-admin-web-typescript/src/views/support/dict/index.vue
index dcf1c2b..3aa7458 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/dict/index.vue
+++ b/smart-admin-web-typescript/src/views/support/dict/index.vue
@@ -15,18 +15,20 @@
       </a-form-item>
 
       <a-form-item class="smart-query-form-item smart-margin-left10">
-        <a-button type="primary" @click="ajaxQuery">
-          <template #icon>
-            <ReloadOutlined />
-          </template>
-          查询
-        </a-button>
-        <a-button @click="resetQuery">
-          <template #icon>
-            <SearchOutlined />
-          </template>
-          重置
-        </a-button>
+        <a-button-group>
+          <a-button type="primary" @click="onSearch">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
       </a-form-item>
     </a-row>
   </a-form>
@@ -40,14 +42,14 @@
           </template>
           新建
         </a-button>
-        
+
         <a-button @click="confirmBatchDelete" v-privilege="'support:dict:batchDelete'" type="text" danger :disabled="selectedRowKeyList.length === 0">
           <template #icon>
             <DeleteOutlined />
           </template>
           批量删除
         </a-button>
-        
+
         <a-button @click="cacheRefresh" v-privilege="'support:dict:refresh'" type="primary">
           <template #icon>
             <cloud-sync-outlined />
@@ -76,7 +78,7 @@
         </template>
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="addOrUpdateKey(record)" v-privilege="'support:dict:update'" type="link">编辑</a-button>
+            <a-button @click="addOrUpdateKey(record)" v-privilege="'support:dict:edit'" type="link">编辑</a-button>
           </div>
         </template>
       </template>
@@ -109,7 +111,7 @@
   import { reactive, ref, onMounted } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { dictApi } from '/@/api/support/dict/dict-api';
+  import { dictApi } from '/@/api/support/dict-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
@@ -169,6 +171,10 @@
     Object.assign(queryForm, queryFormState);
     ajaxQuery();
   }
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
   async function ajaxQuery() {
     try {
       tableLoading.value = true;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/feedback/feedback-list.vue b/smart-admin-web-typescript/src/views/support/feedback/feedback-list.vue
similarity index 96%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/feedback/feedback-list.vue
rename to smart-admin-web-typescript/src/views/support/feedback/feedback-list.vue
index 99fd786..a685ec3 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/feedback/feedback-list.vue
+++ b/smart-admin-web-typescript/src/views/support/feedback/feedback-list.vue
@@ -1,11 +1,11 @@
 <!--
   * 意见反馈
-  *
+  * 
   * @Author:    1024创新实验室：开云
   * @Date:      2022-07-21 21:55:12
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+  * @Wechat:    zhuda1024 
+  * @Email:     lab1024@163.com 
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
   <a-form class="smart-query-form">
@@ -40,7 +40,7 @@
       </a-form-item>
     </a-row>
   </a-form>
-  
+
   <a-card size="small">
     <a-table rowKey="feedbackId" :dataSource="tableData" :columns="tableColumns" :pagination="false" :loading="tableLoading" size="small" bordered>
       <template #bodyCell="{ text, column }">
@@ -52,7 +52,7 @@
         </template>
       </template>
     </a-table>
-    
+
     <div class="smart-query-table-page">
       <a-pagination
         showSizeChanger
@@ -75,7 +75,7 @@
   import { onMounted, reactive, ref } from 'vue';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { defaultTimeRanges } from '/@/lib/default-time-ranges';
-  import { feedbackApi } from '/@/api/support/feedback/feedback-api';
+  import { feedbackApi } from '/@/api/support/feedback-api';
   import FilePreview from '/@/components/support/file-preview/index.vue';
   import { smartSentry } from '/@/lib/smart-sentry';
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/file/file-list.vue b/smart-admin-web-typescript/src/views/support/file/file-list.vue
similarity index 51%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/file/file-list.vue
rename to smart-admin-web-typescript/src/views/support/file/file-list.vue
index 15c6cd7..eb748fc 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/file/file-list.vue
+++ b/smart-admin-web-typescript/src/views/support/file/file-list.vue
@@ -46,7 +46,7 @@
     </a-row>
   </a-form>
   <!---------- 查询表单form end ----------->
-  
+
   <a-card size="small" :bordered="false" :hoverable="true">
     <!---------- 表格操作行 begin ----------->
     <a-row class="smart-table-btn-block">
@@ -63,7 +63,7 @@
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
-    
+
     <!---------- 表格 begin ----------->
     <a-table
       size="small"
@@ -91,7 +91,7 @@
       </template>
     </a-table>
     <!---------- 表格 end ----------->
-    
+
     <div class="smart-query-table-page">
       <a-pagination
         showSizeChanger
@@ -107,9 +107,9 @@
         :show-total="(total) => `共${total}条`"
       />
     </div>
-    
+
     <FilePreviewModal ref="filePreviewModalRef" />
-    
+
     <a-modal v-model:open="uploadModalFlag" title="上传文件" @onCancel="hideUploadModal" @ok="hideUploadModal">
       <FileUpload
         list-type="text"
@@ -123,170 +123,170 @@
   </a-card>
 </template>
 <script setup lang="ts">
-import { onMounted, reactive, ref } from 'vue';
-import { fileApi } from '/@/api/support/file/file-api';
-import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
-import TableOperator from '/@/components/support/table-operator/index.vue';
-import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
-import { defaultTimeRanges } from '/@/lib/default-time-ranges';
-import { smartSentry } from '/@/lib/smart-sentry';
-import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
-import FileUpload from '/@/components/support/file-upload/index.vue';
-import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
-// ---------------------------- 表格列 ----------------------------
+  import { onMounted, reactive, ref } from 'vue';
+  import { fileApi } from '/@/api/support/file-api';
+  import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import { defaultTimeRanges } from '/@/lib/default-time-ranges';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
+  import FileUpload from '/@/components/support/file-upload/index.vue';
+  import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
+  // ---------------------------- 表格列 ----------------------------
 
-const columns = ref([
-  {
-    title: '主键ID',
-    dataIndex: 'fileId',
-    ellipsis: true,
-    width: 70,
-  },
-  {
-    title: '文件夹',
-    dataIndex: 'folderType',
-    ellipsis: true,
-    width: 100,
-  },
-  {
-    title: '文件名称',
-    dataIndex: 'fileName',
-    width: 200,
-  },
-  {
-    title: '文件大小',
-    dataIndex: 'fileSize',
-    ellipsis: true,
-    width: 100,
-  },
-  {
-    title: '文件类型',
-    dataIndex: 'fileType',
-    ellipsis: true,
-    width: 80,
-  },
-  {
-    title: '上传人',
-    dataIndex: 'creatorName',
-    ellipsis: true,
-    width: 100,
-  },
-  {
-    title: '人类型',
-    dataIndex: 'creatorUserType',
-    ellipsis: true,
-    width: 100,
-  },
-  {
-    title: '上传时间',
-    dataIndex: 'createTime',
-    ellipsis: true,
-    width: 150,
-  },
-  {
-    title: '操作',
-    dataIndex: 'action',
-    width: 120,
-    fixed: 'right',
-  },
-]);
+  const columns = ref([
+    {
+      title: '主键ID',
+      dataIndex: 'fileId',
+      ellipsis: true,
+      width: 70,
+    },
+    {
+      title: '文件夹',
+      dataIndex: 'folderType',
+      ellipsis: true,
+      width: 100,
+    },
+    {
+      title: '文件名称',
+      dataIndex: 'fileName',
+      width: 200,
+    },
+    {
+      title: '文件大小',
+      dataIndex: 'fileSize',
+      ellipsis: true,
+      width: 100,
+    },
+    {
+      title: '文件类型',
+      dataIndex: 'fileType',
+      ellipsis: true,
+      width: 80,
+    },
+    {
+      title: '上传人',
+      dataIndex: 'creatorName',
+      ellipsis: true,
+      width: 100,
+    },
+    {
+      title: '人类型',
+      dataIndex: 'creatorUserType',
+      ellipsis: true,
+      width: 100,
+    },
+    {
+      title: '上传时间',
+      dataIndex: 'createTime',
+      ellipsis: true,
+      width: 150,
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      width: 120,
+      fixed: 'right',
+    },
+  ]);
 
-// ---------------------------- 查询数据表单和方法 ----------------------------
+  // ---------------------------- 查询数据表单和方法 ----------------------------
 
-const queryFormState = {
-  folderType: undefined, //文件夹类型
-  fileName: undefined, //文件名词
-  fileKey: undefined, //文件Key
-  fileType: undefined, //文件类型
-  creatorName: undefined, //创建人
-  createTime: [], //创建时间
-  createTimeBegin: undefined, //创建时间 开始
-  createTimeEnd: undefined, //创建时间 结束
-  pageNum: 1,
-  pageSize: 10,
-};
-// 查询表单form
-const queryForm = reactive({ ...queryFormState });
-// 表格加载loading
-const tableLoading = ref(false);
-// 表格数据
-const tableData = ref([]);
-// 总数
-const total = ref(0);
+  const queryFormState = {
+    folderType: undefined, //文件夹类型
+    fileName: undefined, //文件名词
+    fileKey: undefined, //文件Key
+    fileType: undefined, //文件类型
+    creatorName: undefined, //创建人
+    createTime: [], //创建时间
+    createTimeBegin: undefined, //创建时间 开始
+    createTimeEnd: undefined, //创建时间 结束
+    pageNum: 1,
+    pageSize: 10,
+  };
+  // 查询表单form
+  const queryForm = reactive({ ...queryFormState });
+  // 表格加载loading
+  const tableLoading = ref(false);
+  // 表格数据
+  const tableData = ref([]);
+  // 总数
+  const total = ref(0);
 
-// 重置查询条件
-function resetQuery() {
-  let pageSize = queryForm.pageSize;
-  Object.assign(queryForm, queryFormState);
-  queryForm.pageSize = pageSize;
-  queryData();
-}
+  // 重置查询条件
+  function resetQuery() {
+    let pageSize = queryForm.pageSize;
+    Object.assign(queryForm, queryFormState);
+    queryForm.pageSize = pageSize;
+    queryData();
+  }
 
-// 查询数据
+  // 查询数据
 
-function onSearch() {
-  queryForm.pageNum = 1;
-  queryData();
-}
+  function onSearch() {
+    queryForm.pageNum = 1;
+    queryData();
+  }
 
-async function queryData() {
-  tableLoading.value = true;
-  try {
-    let queryResult = await fileApi.queryPage(queryForm);
-    for (const file of queryResult.data.list) {
-      file.fileSize = getFileSize(file.fileSize);
+  async function queryData() {
+    tableLoading.value = true;
+    try {
+      let queryResult = await fileApi.queryPage(queryForm);
+      for (const file of queryResult.data.list) {
+        file.fileSize = getFileSize(file.fileSize);
+      }
+      tableData.value = queryResult.data.list;
+      total.value = queryResult.data.total;
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      tableLoading.value = false;
     }
-    tableData.value = queryResult.data.list;
-    total.value = queryResult.data.total;
-  } catch (e) {
-    smartSentry.captureError(e);
-  } finally {
-    tableLoading.value = false;
   }
-}
 
-function onChangeCreateTime(dates, dateStrings) {
-  queryForm.createTimeBegin = dateStrings[0];
-  queryForm.createTimeEnd = dateStrings[1];
-}
-
-function getFileSize(size) {
-  //把字节转换成正常文件大小
-  if (!size) return '';
-  var num = 1024.0; //byte
-  if (size < num) return size + 'B';
-  if (size < Math.pow(num, 2)) return (size / num).toFixed(2) + 'KB'; //kb
-  if (size < Math.pow(num, 3)) return (size / Math.pow(num, 2)).toFixed(2) + 'MB'; //M
-  if (size < Math.pow(num, 4)) return (size / Math.pow(num, 3)).toFixed(2) + 'G'; //G
-  return (size / Math.pow(num, 4)).toFixed(2) + 'T'; //T
-}
-
-// 查看文件
-const filePreviewModalRef = ref();
-function view(file) {
-  filePreviewModalRef.value.showPreview(file);
-}
-
-// 下载文件
-async function download(file) {
-  try {
-    await fileApi.downLoadFile(file.fileName, file.fileKey);
-  } catch (e) {
-    smartSentry.captureError(e);
+  function onChangeCreateTime(dates, dateStrings) {
+    queryForm.createTimeBegin = dateStrings[0];
+    queryForm.createTimeEnd = dateStrings[1];
   }
-}
 
-onMounted(queryData);
+  function getFileSize(size) {
+    //把字节转换成正常文件大小
+    if (!size) return '';
+    var num = 1024.0; //byte
+    if (size < num) return size + 'B';
+    if (size < Math.pow(num, 2)) return (size / num).toFixed(2) + 'KB'; //kb
+    if (size < Math.pow(num, 3)) return (size / Math.pow(num, 2)).toFixed(2) + 'MB'; //M
+    if (size < Math.pow(num, 4)) return (size / Math.pow(num, 3)).toFixed(2) + 'G'; //G
+    return (size / Math.pow(num, 4)).toFixed(2) + 'T'; //T
+  }
 
-// ------------- 上传文件 --------------------
-const uploadModalFlag = ref(false);
+  // 查看文件
+  const filePreviewModalRef = ref();
+  function view(file) {
+    filePreviewModalRef.value.showPreview(file);
+  }
 
-function showUploadModal() {
-  uploadModalFlag.value = true;
-}
+  // 下载文件
+  async function download(file) {
+    try {
+      await fileApi.downLoadFile(file.fileKey);
+    } catch (e) {
+      smartSentry.captureError(e);
+    }
+  }
 
-function hideUploadModal() {
-  uploadModalFlag.value = false;
-  queryData();
-}
+  onMounted(queryData);
+
+  // ------------- 上传文件 --------------------
+  const uploadModalFlag = ref(false);
+
+  function showUploadModal() {
+    uploadModalFlag.value = true;
+  }
+
+  function hideUploadModal() {
+    uploadModalFlag.value = false;
+    queryData();
+  }
 </script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/heart-beat/heart-beat-list.vue b/smart-admin-web-typescript/src/views/support/heart-beat/heart-beat-list.vue
similarity index 68%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/heart-beat/heart-beat-list.vue
rename to smart-admin-web-typescript/src/views/support/heart-beat/heart-beat-list.vue
index 65090eb..d719e44 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/heart-beat/heart-beat-list.vue
+++ b/smart-admin-web-typescript/src/views/support/heart-beat/heart-beat-list.vue
@@ -1,11 +1,11 @@
 <!--
   * 心跳记录
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-06-02 20:23:08 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-06-02 20:23:08
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-card size="small" :bordered="false" :hoverable="true">
@@ -38,54 +38,56 @@
         </a-form-item>
 
         <a-form-item class="smart-query-form-item smart-margin-left10">
-          <a-button type="primary" @click="ajaxQuery">
-            <template #icon>
-              <ReloadOutlined />
-            </template>
-            查询
-          </a-button>
-          <a-button @click="resetQuery">
-            <template #icon>
-              <SearchOutlined />
-            </template>
-            重置
-          </a-button>
+          <a-button-group>
+            <a-button type="primary" @click="onSearch">
+              <template #icon>
+                <ReloadOutlined />
+              </template>
+              查询
+            </a-button>
+            <a-button @click="resetQuery">
+              <template #icon>
+                <SearchOutlined />
+              </template>
+              重置
+            </a-button>
+          </a-button-group>
         </a-form-item>
       </a-row>
     </a-form>
-      <a-row justify="end">
-        <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.HEART_BEAT" :refresh="ajaxQuery" />
-      </a-row>
-      <a-table
-        size="small"
-        bordered
-        :loading="tableLoading"
-        class="smart-margin-top10"
-        :dataSource="tableData"
-        :columns="columns"
-        rowKey="goodsId"
-        :pagination="false"
+    <a-row justify="end">
+      <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.HEART_BEAT" :refresh="ajaxQuery" />
+    </a-row>
+    <a-table
+      size="small"
+      bordered
+      :loading="tableLoading"
+      class="smart-margin-top10"
+      :dataSource="tableData"
+      :columns="columns"
+      rowKey="goodsId"
+      :pagination="false"
+    />
+    <div class="smart-query-table-page">
+      <a-pagination
+        showSizeChanger
+        showQuickJumper
+        show-less-items
+        :pageSizeOptions="PAGE_SIZE_OPTIONS"
+        :defaultPageSize="queryForm.pageSize"
+        v-model:current="queryForm.pageNum"
+        v-model:pageSize="queryForm.pageSize"
+        :total="total"
+        @change="ajaxQuery"
+        @showSizeChange="ajaxQuery"
+        :show-total="(total) => `共${total}条`"
       />
-      <div class="smart-query-table-page">
-        <a-pagination
-          showSizeChanger
-          showQuickJumper
-          show-less-items
-          :pageSizeOptions="PAGE_SIZE_OPTIONS"
-          :defaultPageSize="queryForm.pageSize"
-          v-model:current="queryForm.pageNum"
-          v-model:pageSize="queryForm.pageSize"
-          :total="total"
-          @change="ajaxQuery"
-          @showSizeChange="ajaxQuery"
-          :show-total="(total) => `共${total}条`"
-        />
-      </div>
+    </div>
   </a-card>
 </template>
 <script setup lang="ts">
   import { onMounted, reactive, ref } from 'vue';
-  import { heartBeatApi } from '/@/api/support/heart-beat/heart-beat-api';
+  import { heartBeatApi } from '/@/api/support/heart-beat-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { defaultTimeRanges } from '/@/lib/default-time-ranges';
   import { smartSentry } from '/@/lib/smart-sentry';
@@ -117,17 +119,17 @@
     {
       title: '进程号',
       dataIndex: 'processNo',
-      width:100
+      width: 100,
     },
     {
       title: '进程开启时间',
       dataIndex: 'processStartTime',
-      width:150
+      width: 150,
     },
     {
       title: '心跳当前时间',
       dataIndex: 'heartBeatTime',
-      width:150
+      width: 150,
     },
   ]);
 
@@ -148,6 +150,12 @@
     createDateRange.value = [];
     ajaxQuery();
   }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
   async function ajaxQuery() {
     try {
       tableLoading.value = true;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue
similarity index 94%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue
rename to smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue
index bd9d8f6..8d50e2a 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-catalog-form-modal.vue
@@ -10,7 +10,7 @@
 <template>
   <a-modal v-model:open="visible" :title="formState.helpDocCatalogId ? '编辑目录' : '添加目录'" @ok="handleOk" destroyOnClose>
     <a-form ref="formRef" :model="formState" :rules="rules" layout="vertical">
-      <a-form-item label="上级目录" name="parentId" v-if="formState.parentId != 0">
+      <a-form-item label="上级目录" name="parentId" v-if="formState.parentId !== 0">
         <HelpDocCatalogTreeSelect ref="helpDocCatalogTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false" width="100%" />
       </a-form-item>
       <a-form-item label="目录名称" name="name">
@@ -25,10 +25,10 @@
 <script setup lang="ts">
   import message from 'ant-design-vue/lib/message';
   import { reactive, ref } from 'vue';
-  import { helpDocCatalogApi } from '/@/api/support/help-doc/help-doc-catalog-api';
+  import { helpDocCatalogApi } from '/@/api/support/help-doc-catalog-api';
   import HelpDocCatalogTreeSelect from './help-doc-catalog-tree-select.vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   // ----------------------- 对外暴漏 ---------------------
 
@@ -116,7 +116,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
   async function updateHelpDocCatalog() {
     SmartLoading.show();
     try {
-      if (formState.parentId == formState.helpDocCatalogId) {
+      if (formState.parentId === formState.helpDocCatalogId) {
         message.warning('上级菜单不能为自己');
         return;
       }
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue
similarity index 96%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue
rename to smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue
index 5bfc582..35d1b4b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue
+++ b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-catalog-tree-select.vue
@@ -25,7 +25,7 @@
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
   import _ from 'lodash';
-  import { helpDocCatalogApi } from '/@/api/support/help-doc/help-doc-catalog-api';
+  import { helpDocCatalogApi } from '/@/api/support/help-doc-catalog-api';
 
   const props = defineProps({
     // 绑定值
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue
similarity index 93%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue
rename to smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue
index 11c2608..5e5362b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue
+++ b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-catalog-tree.vue
@@ -18,7 +18,7 @@
         <template v-if="showSortFlag"> （越小越靠前） </template>
         ：<a-switch v-model:checked="showSortFlag" />
       </span>
-      <a-button type="primary" @click="addTop" size="small" v-privilege="'helpDocCatalog:addCategory'">新建</a-button>
+      <a-button type="primary" @click="addTop" size="small" v-privilege="'support:helpDocCatalog:addCategory'">新建</a-button>
     </a-row>
     <a-tree
       v-if="!_.isEmpty(helpDocCatalogTreeData)"
@@ -40,13 +40,13 @@
         <a-popover placement="right" v-if="props.showMenu">
           <template #content>
             <div style="display: flex; flex-direction: column">
-              <a-button type="text" @click="addHelpDocCatalog(item.dataRef)" v-privilege="'helpDocCatalog:addCategory'">添加下级</a-button>
-              <a-button type="text" @click="updateHelpDocCatalog(item.dataRef)" v-privilege="'helpDocCatalog:edit'">修改</a-button>
+              <a-button type="text" @click="addHelpDocCatalog(item.dataRef)" v-privilege="'support:helpDocCatalog:addCategory'">添加下级</a-button>
+              <a-button type="text" @click="updateHelpDocCatalog(item.dataRef)" v-privilege="'support:helpDocCatalog:edit'">修改</a-button>
               <a-button
                 type="text"
-                v-if="item.helpDocCatalogId != topHelpDocCatalogId"
+                v-if="item.helpDocCatalogId !== topHelpDocCatalogId"
                 @click="deleteHelpDocCatalog(item.helpDocCatalogId)"
-                v-privilege="'helpDocCatalog:delete'"
+                v-privilege="'support:helpDocCatalog:delete'"
                 >删除</a-button
               >
             </div>
@@ -73,10 +73,10 @@
   import _ from 'lodash';
   import { createVNode, onMounted } from 'vue';
   import HelpDocCatalogFormModal from './help-doc-catalog-form-modal.vue';
-  import { helpDocCatalogApi } from '/@/api/support/help-doc/help-doc-catalog-api';
+  import { helpDocCatalogApi } from '/@/api/support/help-doc-catalog-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import helpDocCatalogEmitter from '../help-doc-mitt';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   const HELP_DOC_CATALOG_PARENT_ID = 0;
 
@@ -194,7 +194,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
       return;
     }
     let id = idList[0];
-    selectedHelpDocCatalogChildren.value = helpDocCatalogList.value.filter((e) => e.parentId == id);
+    selectedHelpDocCatalogChildren.value = helpDocCatalogList.value.filter((e) => e.parentId === id);
     let filterHelpDocCatalogList = [];
     recursionFilterHelpDocCatalog(filterHelpDocCatalogList, id, true);
     breadcrumb.value = filterHelpDocCatalogList.map((e) => e.name);
@@ -233,7 +233,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
   // 根据ID递归筛选目录
   function recursionFilterHelpDocCatalog(resList, id, unshift) {
     let info = idInfoMap.value.get(id);
-    if (!info || resList.some((e) => e.helpDocCatalogId == id)) {
+    if (!info || resList.some((e) => e.helpDocCatalogId === id)) {
       return;
     }
     if (unshift) {
@@ -241,7 +241,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
     } else {
       resList.push(info);
     }
-    if (info.parentId && info.parentId != 0) {
+    if (info.parentId && info.parentId !== 0) {
       recursionFilterHelpDocCatalog(resList, info.parentId, unshift);
     }
   }
@@ -289,8 +289,8 @@ import { smartSentry } from '/@/lib/smart-sentry';
           let selectedKey = null;
           if (!_.isEmpty(selectedKeys.value)) {
             selectedKey = selectedKeys.value[0];
-            if (selectedKey == id) {
-              let selectInfo = helpDocCatalogList.value.find((e) => e.helpDocCatalogId == id);
+            if (selectedKey === id) {
+              let selectInfo = helpDocCatalogList.value.find((e) => e.helpDocCatalogId === id);
               if (selectInfo && selectInfo.parentId) {
                 selectedKey = selectInfo.parentId;
               }
@@ -345,7 +345,6 @@ import { smartSentry } from '/@/lib/smart-sentry';
 
     .sort-span {
       margin-left: 5px;
-      color: @success-color;
     }
     .no-data {
       margin: 10px;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-form-drawer.vue b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-form-drawer.vue
similarity index 79%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-form-drawer.vue
rename to smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-form-drawer.vue
index c4c40b6..e4bec43 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-form-drawer.vue
+++ b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-form-drawer.vue
@@ -9,7 +9,7 @@
 -->
 <template>
   <a-drawer
-    :title="formData.helpDocId ? '编辑' : '新建'"
+    :title="formData.helpDocId ? '编辑系统手册' : '新建系统手册'"
     :open="visibleFlag"
     :width="1000"
     :footerStyle="{ textAlign: 'right' }"
@@ -29,7 +29,13 @@
       <a-form-item label="排序" name="sort">
         <a-input-number v-model:value="formData.sort" placeholder="值越小越靠前" />（值越小越靠前）
       </a-form-item>
-      <a-form-item label="关联菜单">
+      <a-form-item label="是否首页显示">
+        <a-radio-group v-model:value="relateHomeFlag" button-style="solid">
+          <a-radio-button :value="true">首页显示</a-radio-button>
+          <a-radio-button :value="false">首页不用显示</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="关联菜单" v-if="!relateHomeFlag">
         <MenuTreeSelect v-model:value="formData.relationIdList" ref="menuTreeSelect" />
       </a-form-item>
       <a-form-item label="公告内容" name="contentHtml">
@@ -58,18 +64,17 @@
 </template>
 
 <script setup lang="ts">
-  import { reactive, ref, nextTick } from 'vue';
-  import { message, Modal } from 'ant-design-vue';
-  import lodash from 'lodash';
+  import { nextTick, reactive, ref } from 'vue';
+  import { message } from 'ant-design-vue';
+  import _ from 'lodash';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';
-  import { helpDocApi } from '/@/api/support/help-doc/help-doc-api';
+  import { helpDocApi } from '/@/api/support/help-doc-api';
   import Wangeditor from '/@/components/framework/wangeditor/index.vue';
   import Upload from '/@/components/support/file-upload/index.vue';
   import HelpDocCatalogTreeSelect from './help-doc-catalog-tree-select.vue';
   import MenuTreeSelect from '/@/components/system/menu-tree-select/index.vue';
-  import _ from 'lodash';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   const emits = defineEmits(['reloadList']);
 
@@ -98,7 +103,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
 
   const formRef = ref();
   const contentRef = ref();
-  const noticeFormVisibleModal = ref();
+  const relateHomeFlag = ref(false);
 
   const defaultFormData = {
     helpDocId: undefined,
@@ -128,13 +133,18 @@ import { smartSentry } from '/@/lib/smart-sentry';
       SmartLoading.show();
       const result = await helpDocApi.getDetail(helpDocId);
       const attachment = result.data.attachment;
-      if (!lodash.isEmpty(attachment)) {
+      if (!_.isEmpty(attachment)) {
         defaultFileList.value = attachment;
       } else {
         defaultFileList.value = [];
       }
       Object.assign(formData, result.data);
       formData.relationIdList = result.data.relationList ? result.data.relationList.map((e) => e.relationId) : [];
+      if (formData.relationIdList.length === 1 && formData.relationIdList[0].relationId === 0) {
+        relateHomeFlag.value = true;
+      } else {
+        relateHomeFlag.value = false;
+      }
     } catch (err) {
       smartSentry.captureError(err);
     } finally {
@@ -148,7 +158,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
       formData.contentHtml = contentRef.value.getHtml();
       formData.contentText = contentRef.value.getText();
       await formRef.value.validateFields();
-      save();
+      await save();
     } catch (err) {
       message.error('参数验证错误，请仔细填写表单数据!');
     }
@@ -161,8 +171,18 @@ import { smartSentry } from '/@/lib/smart-sentry';
     try {
       SmartLoading.show();
       let param = _.cloneDeep(formData);
-      let relationList = menuTreeSelect.value.getMenuListByIdList(formData.relationIdList);
-      param.relationList = relationList.map((e) => Object.assign({}, { relationId: e.menuId, relationName: e.menuName }));
+      // 首页显示的话，为0
+      if (relateHomeFlag.value) {
+        param.relationList = [
+          {
+            relationName: '首页',
+            relationId: 0,
+          },
+        ];
+      } else {
+        let relationList = menuTreeSelect.value.getMenuListByIdList(formData.relationIdList);
+        param.relationList = relationList.map((e) => Object.assign({}, { relationId: e.menuId, relationName: e.menuName }));
+      }
 
       if (param.helpDocId) {
         await helpDocApi.update(param);
@@ -184,7 +204,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
   const defaultFileList = ref([]);
   function changeAttachment(fileList) {
     defaultFileList.value = fileList;
-    formData.attachment = lodash.isEmpty(fileList) ? [] : fileList;
+    formData.attachment = _.isEmpty(fileList) ? [] : fileList;
   }
 
   // ----------------------- 以下是暴露的方法内容 ------------------------
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-list.vue b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-list.vue
similarity index 92%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-list.vue
rename to smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-list.vue
index bddf23c..47cf4f9 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-list.vue
+++ b/smart-admin-web-typescript/src/views/support/help-doc/management/components/help-doc-list.vue
@@ -8,14 +8,14 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
-  <a-form class="smart-query-form" v-privilege="'helpDoc:query'">
+  <a-form class="smart-query-form" v-privilege="'support:helpDoc:query'">
     <a-row class="smart-query-form-row">
       <a-form-item label="关键字" class="smart-query-form-item">
         <a-input style="width: 300px" v-model:value="queryForm.keywords" placeholder="标题、作者" />
       </a-form-item>
 
       <a-form-item label="创建时间" class="smart-query-form-item">
-        <a-range-picker v-model:value="createDate" @change="createDateChange" style="width: 220px" />
+        <a-range-picker :presets="defaultTimeRanges" v-model:value="createDate" @change="createDateChange" style="width: 220px" />
       </a-form-item>
 
       <a-form-item class="smart-query-form-item smart-margin-left10">
@@ -40,7 +40,7 @@
   <a-card size="small" :bordered="false">
     <a-row class="smart-table-btn-block">
       <div class="smart-table-operate-block">
-        <a-button type="primary" size="small" @click="addOrUpdate()" v-privilege="'helpDoc:add'">
+        <a-button type="primary" @click="addOrUpdate()" v-privilege="'support:helpDoc:add'">
           <template #icon>
             <PlusOutlined />
           </template>
@@ -70,8 +70,8 @@
         </template>
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button type="link" @click="addOrUpdate(record.helpDocId)" v-privilege="'helpDoc:update'">编辑</a-button>
-            <a-button type="link" danger @click="onDelete(record.helpDocId)" v-privilege="'helpDoc:delete'">删除</a-button>
+            <a-button type="link" @click="addOrUpdate(record.helpDocId)" v-privilege="'support:helpDoc:update'">编辑</a-button>
+            <a-button type="link" danger @click="onDelete(record.helpDocId)" v-privilege="'support:helpDoc:delete'">删除</a-button>
           </div>
         </template>
       </template>
@@ -101,10 +101,11 @@
   import { message, Modal } from 'ant-design-vue';
   import { onMounted, reactive, ref, watch } from 'vue';
   import HelpDocFormDrawer from './help-doc-form-drawer.vue';
-  import { helpDocApi } from '/@/api/support/help-doc/help-doc-api';
+  import { helpDocApi } from '/@/api/support/help-doc-api';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { defaultTimeRanges } from '/@/lib/default-time-ranges';
   import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
 
   const props = defineProps({
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/help-doc-manage-list.vue b/smart-admin-web-typescript/src/views/support/help-doc/management/help-doc-manage-list.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/help-doc-manage-list.vue
rename to smart-admin-web-typescript/src/views/support/help-doc/management/help-doc-manage-list.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/help-doc-mitt.ts b/smart-admin-web-typescript/src/views/support/help-doc/management/help-doc-mitt.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/management/help-doc-mitt.ts
rename to smart-admin-web-typescript/src/views/support/help-doc/management/help-doc-mitt.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue b/smart-admin-web-typescript/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
rename to smart-admin-web-typescript/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
index da07d2a..52514de 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
+++ b/smart-admin-web-typescript/src/views/support/help-doc/user-view/components/help-doc-view-record-list.vue
@@ -57,7 +57,7 @@
 </template>
 <script setup lang="ts">
   import { reactive, ref } from 'vue';
-  import { helpDocApi } from '/@/api/support/help-doc/help-doc-api';
+  import { helpDocApi } from '/@/api/support/help-doc-api';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import uaparser from 'ua-parser-js';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/user-view/help-doc-user-view.vue b/smart-admin-web-typescript/src/views/support/help-doc/user-view/help-doc-user-view.vue
similarity index 61%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/user-view/help-doc-user-view.vue
rename to smart-admin-web-typescript/src/views/support/help-doc/user-view/help-doc-user-view.vue
index 665b004..588ec11 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/help-doc/user-view/help-doc-user-view.vue
+++ b/smart-admin-web-typescript/src/views/support/help-doc/user-view/help-doc-user-view.vue
@@ -42,7 +42,7 @@
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import HelpDocViewRecordList from './components/help-doc-view-record-list.vue';
-import { helpDocApi } from '/@/api/support/help-doc/help-doc-api';
+import { helpDocApi } from '/@/api/support/help-doc-api';
 import { SmartLoading } from '/@/components/framework/smart-loading';
 import FilePreview from '/@/components/support/file-preview/index.vue';
 import { smartSentry } from '/@/lib/smart-sentry';
@@ -138,13 +138,191 @@ function print() {
     }
   }
 }
-.content-html {
+/*样式深入*/
+:deep(.content-html) {
   margin-top: 30px;
   padding: 0 8px;
   line-height: 28px;
-    font-size: 14px;
+  font-size: 16px;
+  border: #1e1e1e;
+
   img {
     max-width: 100%;
   }
+
+  body {
+    margin: 0 auto;
+    color: #ccd1d8;
+    line-height: 1.5;
+    padding: 16px;
+    background-color: #333842;
+    font-size: 16px;
+  }
+
+  h1, h2, h3, h4, h5, h6 {
+    color: #0D366F;
+    font-weight: bold;
+    margin-top: 20px;
+    margin-bottom: 10px;
+    padding: 0;
+  }
+
+  p {
+    padding: 0;
+    margin-bottom: 16px;
+  }
+
+  h1 {
+    font-size: 26px;
+  }
+
+  h2 {
+    font-size: 24px;
+  }
+
+  h3 {
+    font-size: 22px;
+  }
+
+  h4 {
+    font-size: 20px;
+  }
+
+  h5 {
+    font-size: 19px;
+  }
+
+  h6 {
+    font-size: 18px;
+  }
+
+  a {
+    color: #61afef;
+    margin: 0;
+    padding: 0;
+    vertical-align: baseline;
+    text-decoration: none;
+    word-break: break-word;
+  }
+
+  a:hover {
+    text-decoration: underline;
+  }
+
+  a:visited {
+    color: #ba68c8;
+  }
+
+  ul, ol {
+    padding: 0;
+    padding-left: 24px;
+  }
+
+  li {
+    line-height: 24px;
+  }
+
+  li ul, li ol {
+    margin-left: 16px;
+  }
+
+  p, ul, ol {
+    font-size: 16px;
+    line-height: 24px;
+  }
+
+  mark {
+    color: #000000;
+    background-color: #c4c400;
+  }
+
+  pre {
+    display: block;
+    overflow-y: hidden;
+    overflow-x: auto;
+    -moz-tab-size: 4;
+    tab-size: 4;
+  }
+
+  code {
+    color: #98c379;
+    word-break: break-word;
+  }
+
+  pre code {
+    display: block;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+    color: #98c379;
+    background-color: #2d323b;
+    line-height: 1.5;
+    white-space: pre;
+    -moz-tab-size: 4;
+    tab-size: 4;
+  }
+
+  aside {
+    display: block;
+    float: right;
+    width: 390px;
+  }
+
+  blockquote {
+    color: #abb2bf;
+    border-left: .5em solid #abb2bf;
+    padding: 0 1em;
+    margin-left: 0;
+  }
+
+  blockquote p {
+    color: #abb2bf;
+  }
+
+  hr {
+    display: block;
+    text-align: left;
+    margin: 1em 0;
+    border: none;
+    height: 2px;
+    background-color: #4c5562;
+  }
+
+  table {
+    padding: 0;
+    margin: 1rem 0.5rem;
+    border-collapse: collapse;
+  }
+
+  table tr {
+    border-top: 1px solid #4c5562;
+    margin: 0;
+    padding: 0;
+  }
+
+  table tr:hover {
+    background-color: #DBE5F2;
+  }
+
+  table tr th {
+    font-weight: bold;
+    background-color: #90BFFF;
+    border: 1px solid #4c5562;
+    margin: 0;
+    padding: 6px 13px;
+  }
+
+  table tr td {
+    border: 1px solid #4c5562;
+    margin: 0;
+    padding: 6px 13px;
+  }
+
+  table tr th :first-child, table tr td :first-child {
+    margin-top: 0;
+  }
+
+  table tr th :last-child, table tr td :last-child {
+    margin-bottom: 0;
+  }
 }
 </style>
diff --git a/smart-admin-web-typescript/src/views/support/job/components/job-form-modal.vue b/smart-admin-web-typescript/src/views/support/job/components/job-form-modal.vue
new file mode 100644
index 0000000..0eb5ab1
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/support/job/components/job-form-modal.vue
@@ -0,0 +1,248 @@
+<!--
+  * JOB 表单
+  * @Author:    huke
+  * @Date:      2024/06/29
+-->
+<template>
+  <div>
+    <!-- 编辑 -->
+    <a-modal :open="updateModalShow" :width="650" title="编辑" ok-text="确认" cancel-text="取消" @cancel="closeUpdateModal" @ok="confirmUpdateJob">
+      <a-form ref="updateFormRef" :model="updateForm" :rules="updateRules" :label-col="{ span: 4 }">
+        <a-form-item label="任务名称" name="jobName">
+          <a-input placeholder="请输入任务名称" v-model:value="updateForm.jobName" :maxlength="100" :showCount="true" />
+        </a-form-item>
+        <a-form-item label="任务描述" name="remark">
+          <a-textarea
+            :auto-size="{ minRows: 2, maxRows: 4 }"
+            v-model:value="updateForm.remark"
+            placeholder="(可选)请输入任务备注描述"
+            :maxlength="250"
+            :showCount="true"
+          />
+        </a-form-item>
+        <a-form-item label="排序" name="sort">
+          <a-input-number
+            v-model:value="updateForm.sort"
+            :min="-99999999"
+            :max="99999999"
+            :precision="0"
+            style="width: 100%"
+            placeholder="值越小越靠前"
+          >
+          </a-input-number>
+        </a-form-item>
+        <a-form-item label="执行类" name="jobClass">
+          <a-textarea
+            :auto-size="{ minRows: 2, maxRows: 4 }"
+            v-model:value="updateForm.jobClass"
+            placeholder="示例：net.lab1024.sa.base.module.support.job.sample.SmartJobSample1"
+            :maxlength="200"
+            :showCount="true"
+          />
+        </a-form-item>
+        <a-form-item label="任务参数" name="param">
+          <a-textarea
+            :auto-size="{ minRows: 3, maxRows: 6 }"
+            v-model:value="updateForm.param"
+            placeholder="(可选)请输入任务执行参数"
+            :maxlength="1000"
+            :showCount="true"
+          />
+        </a-form-item>
+        <a-form-item label="触发类型" name="triggerType">
+          <a-radio-group v-model:value="updateForm.triggerType">
+            <a-radio-button :value="TRIGGER_TYPE_ENUM.CRON.value">CRON表达式</a-radio-button>
+            <a-radio-button :value="TRIGGER_TYPE_ENUM.FIXED_DELAY.value">固定间隔</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="触发时间" name="triggerTime">
+          <a-input
+            v-if="updateForm.triggerType === TRIGGER_TYPE_ENUM.CRON.value"
+            placeholder="示例：10 15 0/1 * * *"
+            v-model:value="updateForm.cron"
+            :maxlength="100"
+            :showCount="true"
+          />
+          <a-input-number
+            v-else-if="updateForm.triggerType === TRIGGER_TYPE_ENUM.FIXED_DELAY.value"
+            v-model:value="updateForm.fixedDelay"
+            :min="1"
+            :max="100000000"
+            :precision="0"
+            :defaultValue="100"
+          >
+            <template #addonBefore>每隔</template>
+            <template #addonAfter>秒</template>
+          </a-input-number>
+        </a-form-item>
+        <a-form-item label="是否开启" name="enabledFlag">
+          <a-switch v-model:checked="updateForm.enabledFlag" />
+        </a-form-item>
+      </a-form>
+    </a-modal>
+
+    <!-- 立即执行 -->
+    <a-modal
+      :open="executeModalShow"
+      :width="650"
+      title="执行任务"
+      ok-text="执行"
+      cancel-text="取消"
+      @cancel="closeExecuteModal"
+      @ok="confirmExecuteJob"
+    >
+      <br />
+      <a-alert type="info" show-icon style="margin-left: 25px">
+        <template #message> 点击【执行】后会按照【任务参数】，无论任务是否开启，都会立即执行。 </template>
+      </a-alert>
+      <br />
+      <a-form :label-col="{ span: 4 }">
+        <a-form-item label="任务名称" name="jobName">
+          <a-input v-model:value="executeForm.jobName" :disabled="true" />
+        </a-form-item>
+        <a-form-item label="任务类名" name="jobClass">
+          <a-textarea :auto-size="{ minRows: 2, maxRows: 4 }" v-model:value="executeForm.jobClass" :disabled="true" />
+        </a-form-item>
+        <a-form-item label="任务参数" name="param">
+          <a-textarea
+            :auto-size="{ minRows: 3, maxRows: 6 }"
+            v-model:value="executeForm.param"
+            placeholder="(可选)请输入任务执行参数"
+            :maxlength="1000"
+            :showCount="true"
+          />
+        </a-form-item>
+      </a-form>
+    </a-modal>
+  </div>
+</template>
+<script setup lang="ts">
+  import { message } from 'ant-design-vue';
+  import { reactive, ref } from 'vue';
+  import { jobApi } from '/@/api/support/job-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
+  import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
+
+  // emit
+  const emit = defineEmits(['reloadList']);
+
+  const updateModalShow = ref(false);
+  const updateFormRef = ref();
+
+  const updateFormDefault = {
+    jobId: null,
+    jobName: '',
+    jobClass: '',
+    triggerType: null,
+    triggerValue: null,
+    cron: '',
+    fixedDelay: null,
+    param: '',
+    enabledFlag: false,
+    remark: '',
+    sort: null,
+  };
+  let updateForm = reactive({ ...updateFormDefault });
+  const updateRules = {
+    jobName: [{ required: true, message: '请输入任务名称' }],
+    jobClass: [{ required: true, message: '请输入执行类' }],
+    triggerType: [{ required: true, message: '请选择触发类型' }],
+    sort: [{ required: true, message: '请输入排序' }],
+  };
+
+  // 打开编辑弹框
+  function openUpdateModal(record) {
+    Object.assign(updateForm, record);
+    if (TRIGGER_TYPE_ENUM.CRON.value === record.triggerType) {
+      updateForm.cron = record.triggerValue;
+    }
+    if (TRIGGER_TYPE_ENUM.FIXED_DELAY.value === record.triggerType) {
+      updateForm.fixedDelay = record.triggerValue;
+    }
+    updateModalShow.value = true;
+  }
+
+  // 关闭编辑弹框
+  function closeUpdateModal() {
+    Object.assign(updateForm, updateFormDefault);
+    updateModalShow.value = false;
+  }
+
+  // 确认更新
+  async function confirmUpdateJob() {
+    updateFormRef.value
+      .validate()
+      .then(async () => {
+        SmartLoading.show();
+        if (TRIGGER_TYPE_ENUM.CRON.value === updateForm.triggerType) {
+          updateForm.triggerValue = updateForm.cron;
+        }
+        if (TRIGGER_TYPE_ENUM.FIXED_DELAY.value === updateForm.triggerType) {
+          updateForm.triggerValue = updateForm.fixedDelay;
+        }
+        try {
+          await jobApi.updateJob(updateForm);
+          message.success('更新成功');
+          closeUpdateModal();
+          emit('reloadList');
+        } catch (error) {
+          smartSentry.captureError(error);
+        } finally {
+          SmartLoading.hide();
+        }
+      })
+      .catch((error) => {
+        console.log('error', error);
+        message.error('参数验证错误，请检查表单数据');
+      });
+  }
+
+  // ------------------------------------ 执行任务 -------------------------------------
+  const executeModalShow = ref(false);
+  const executeFormDefault = {
+    jobId: null,
+    jobName: '',
+    jobClass: '',
+    param: null,
+  };
+  let executeForm = reactive({ ...executeFormDefault });
+
+  // 打开执行弹框
+  function openExecuteModal(record) {
+    Object.assign(executeForm, record);
+    executeModalShow.value = true;
+  }
+
+  // 关闭执行弹框
+  function closeExecuteModal() {
+    Object.assign(executeForm, executeFormDefault);
+    executeModalShow.value = false;
+  }
+
+  // 确认执行
+  async function confirmExecuteJob() {
+    try {
+      let executeParam = {
+        jobId: executeForm.jobId,
+        param: executeForm.param,
+      };
+      await jobApi.executeJob(executeParam);
+      // loading 延迟后再提示刷新
+      SmartLoading.show();
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+      message.success('执行成功');
+      closeExecuteModal();
+      emit('reloadList');
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+
+  defineExpose({
+    openUpdateModal,
+    openExecuteModal,
+  });
+</script>
diff --git a/smart-admin-web-typescript/src/views/support/job/components/job-log-list-modal.vue b/smart-admin-web-typescript/src/views/support/job/components/job-log-list-modal.vue
new file mode 100644
index 0000000..f1fecc4
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/support/job/components/job-log-list-modal.vue
@@ -0,0 +1,200 @@
+<!--
+  * job log列表
+  * @Author:    huke
+  * @Date:      2024/06/25
+-->
+<template>
+  <a-drawer v-model:open="showFlag" :width="1000" :title="title" placement="right" :destroyOnClose="true">
+    <a-form class="smart-query-form">
+      <a-row class="smart-query-form-row">
+        <a-form-item label="关键字" class="smart-query-form-item">
+          <a-input style="width: 200px" v-model:value="queryForm.searchWord" placeholder="请输入关键字" :maxlength="30" />
+        </a-form-item>
+        <a-form-item label="执行结果" class="smart-query-form-item">
+          <a-select style="width: 100px" v-model:value="queryForm.successFlag" placeholder="请选择" allowClear>
+            <a-select-option :key="1"> 成功 </a-select-option>
+            <a-select-option :key="0"> 失败 </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item label="执行时间" class="smart-query-form-item">
+          <a-space direction="vertical" :size="12">
+            <a-range-picker v-model:value="searchDate" style="width: 220px" @change="dateChange" />
+          </a-space>
+        </a-form-item>
+
+        <a-form-item class="smart-query-form-item smart-margin-left10">
+          <a-button-group>
+            <a-button type="primary" @click="onSearch">
+              <template #icon>
+                <ReloadOutlined />
+              </template>
+              查询
+            </a-button>
+            <a-button @click="resetQuery">
+              <template #icon>
+                <SearchOutlined />
+              </template>
+              重置
+            </a-button>
+          </a-button-group>
+        </a-form-item>
+      </a-row>
+    </a-form>
+
+    <a-card size="small" :bordered="false" :hoverable="true">
+      <a-row justify="end">
+        <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.JOB_LOG" :refresh="queryLogList" />
+      </a-row>
+
+      <a-table size="small" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="jobLogId" :pagination="false">
+        <template #bodyCell="{ record, column }">
+          <template v-if="column.dataIndex === 'executeStartTime'">
+            <div><a-tag color="green">始</a-tag>{{ record.executeStartTime }}</div>
+            <div style="margin-top: 5px"><a-tag color="blue">终</a-tag>{{ record.executeEndTime }}</div>
+          </template>
+          <template v-if="column.dataIndex === 'executeTimeMillis'"> {{ record.executeTimeMillis }} ms </template>
+          <template v-if="column.dataIndex === 'successFlag'">
+            <div v-if="record.successFlag" style="color: #39c710"><CheckOutlined />成功</div>
+            <div v-else style="color: #f50"><WarningOutlined />失败</div>
+          </template>
+        </template>
+      </a-table>
+
+      <div class="smart-query-table-page">
+        <a-pagination
+          showSizeChanger
+          showQuickJumper
+          show-less-items
+          :pageSizeOptions="PAGE_SIZE_OPTIONS"
+          :defaultPageSize="queryForm.pageSize"
+          v-model:current="queryForm.pageNum"
+          v-model:pageSize="queryForm.pageSize"
+          :total="total"
+          @change="queryLogList"
+          @showSizeChange="queryLogList"
+          :show-total="(total) => `共${total}条`"
+        />
+      </div>
+    </a-card>
+  </a-drawer>
+</template>
+<script setup lang="ts">
+  import { reactive, ref } from 'vue';
+  import { jobApi } from '/@/api/support/job-api';
+  import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
+
+  const showFlag = ref(false);
+  const title = ref('');
+
+  function show(jobId, name) {
+    queryForm.jobId = jobId;
+    queryLogList();
+    showFlag.value = true;
+    title.value = name;
+  }
+
+  defineExpose({ show });
+
+  const columns = ref([
+    {
+      title: '执行人',
+      dataIndex: 'createName',
+      width: 100,
+      ellipsis: true,
+    },
+    {
+      title: '执行参数',
+      dataIndex: 'param',
+      width: 80,
+      ellipsis: true,
+    },
+    {
+      title: '执行时间',
+      dataIndex: 'executeStartTime',
+      width: 200,
+    },
+    {
+      title: '执行用时',
+      dataIndex: 'executeTimeMillis',
+      width: 100,
+      ellipsis: true,
+    },
+    {
+      title: '结果',
+      dataIndex: 'successFlag',
+      width: 80,
+    },
+    {
+      title: '执行结果',
+      dataIndex: 'executeResult',
+      ellipsis: true,
+      width: 100,
+    },
+    {
+      title: 'ip',
+      dataIndex: 'ip',
+      width: 110,
+    },
+    {
+      title: '进程id',
+      dataIndex: 'processId',
+      width: 60,
+    },
+    {
+      title: '程序目录',
+      dataIndex: 'programPath',
+      ellipsis: true,
+    },
+  ]);
+
+  // ---------------- 查询数据 -----------------------
+  const queryFormState = {
+    searchWord: '',
+    jobId: null,
+    successFlag: null,
+    endTime: null,
+    startTime: null,
+    pageNum: 1,
+    pageSize: 10,
+  };
+  const queryForm = reactive({ ...queryFormState });
+
+  const tableLoading = ref(false);
+  const tableData = ref([]);
+  const total = ref(0);
+
+  // 日期选择
+  let searchDate = ref();
+
+  function dateChange(dates, dateStrings) {
+    queryForm.startTime = dateStrings[0];
+    queryForm.endTime = dateStrings[1];
+  }
+
+  function resetQuery() {
+    Object.assign(queryForm, queryFormState);
+    queryLogList();
+  }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    queryLogList();
+  }
+
+  async function queryLogList() {
+    try {
+      tableLoading.value = true;
+      let responseModel = await jobApi.queryJobLog(queryForm);
+      const list = responseModel.data.list;
+      total.value = responseModel.data.total;
+      tableData.value = list;
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      tableLoading.value = false;
+    }
+  }
+</script>
diff --git a/smart-admin-web-typescript/src/views/support/job/job-list.vue b/smart-admin-web-typescript/src/views/support/job/job-list.vue
new file mode 100644
index 0000000..aeb7e9f
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/support/job/job-list.vue
@@ -0,0 +1,322 @@
+<!--
+  * JOB 列表
+  * @Author:    huke
+  * @Date:      2024/06/25
+-->
+<template>
+  <div>
+    <a-form class="smart-query-form">
+      <a-row class="smart-query-form-row">
+        <a-form-item label="关键字" class="smart-query-form-item">
+          <a-input style="width: 200px" v-model:value="queryForm.searchWord" placeholder="请输入关键字" :maxlength="30" />
+        </a-form-item>
+        <a-form-item label="触发类型" class="smart-query-form-item">
+          <a-select style="width: 155px" v-model:value="queryForm.triggerType" placeholder="请选择触发类型" allowClear>
+            <a-select-option v-for="item in $smartEnumPlugin.getValueDescList('TRIGGER_TYPE_ENUM')" :key="item.value" :value="item.value">
+              {{ item.desc }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item label="状态" class="smart-query-form-item">
+          <a-select style="width: 150px" v-model:value="queryForm.enabledFlag" placeholder="请选择状态" allowClear>
+            <a-select-option :key="1"> 开启 </a-select-option>
+            <a-select-option :key="0"> 停止 </a-select-option>
+          </a-select>
+        </a-form-item>
+
+        <a-form-item class="smart-query-form-item smart-margin-left10">
+          <a-button-group>
+            <a-button type="primary" @click="onSearch" v-privilege="'support:job:query'">
+              <template #icon>
+                <ReloadOutlined />
+              </template>
+              查询
+            </a-button>
+            <a-button @click="resetQuery" v-privilege="'support:job:query'">
+              <template #icon>
+                <SearchOutlined />
+              </template>
+              重置
+            </a-button>
+          </a-button-group>
+        </a-form-item>
+      </a-row>
+    </a-form>
+
+    <a-card size="small" :bordered="false" :hoverable="true">
+      <a-row justify="end">
+        <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.JOB" :refresh="queryJobList" />
+      </a-row>
+
+      <a-table
+        :scroll="{ x: 1800 }"
+        size="small"
+        :loading="tableLoading"
+        bordered
+        :dataSource="tableData"
+        :columns="columns"
+        rowKey="jobId"
+        :pagination="false"
+      >
+        <template #bodyCell="{ record, column }">
+          <template v-if="column.dataIndex === 'jobClass'">
+            <a-tooltip>
+              <template #title>{{ record.jobClass }}</template>
+              {{ handleJobClass(record.jobClass) }}
+            </a-tooltip>
+          </template>
+          <template v-if="column.dataIndex === 'triggerType'">
+            <a-tag v-if="record.triggerType === TRIGGER_TYPE_ENUM.CRON.value" color="success">{{ record.triggerTypeDesc }}</a-tag>
+            <a-tag v-else-if="record.triggerType === TRIGGER_TYPE_ENUM.FIXED_DELAY.value" color="processing">{{ record.triggerTypeDesc }}</a-tag>
+            <a-tag v-else color="pink">{{ record.triggerTypeDesc }}</a-tag>
+          </template>
+          <template v-if="column.dataIndex === 'lastJob'">
+            <div v-if="record.lastJobLog">
+              <a-tooltip>
+                <template #title>{{ handleExecuteResult(record.lastJobLog.executeResult) }}</template>
+                <CheckOutlined v-if="record.lastJobLog.successFlag" style="color: #39c710" />
+                <WarningOutlined v-else style="color: #f50" />
+                {{ record.lastJobLog.executeStartTime }}
+              </a-tooltip>
+            </div>
+          </template>
+          <template v-if="column.dataIndex === 'nextJob'">
+            <a-tooltip v-if="record.enabledFlag && record.nextJobExecuteTimeList">
+              <template #title>
+                <div>下次执行(预估时间)</div>
+                <div v-for="item in record.nextJobExecuteTimeList" :key="item">{{ item }}</div>
+              </template>
+              {{ record.nextJobExecuteTimeList[0] }}
+            </a-tooltip>
+          </template>
+          <template v-if="column.dataIndex === 'enabledFlag'">
+            <a-switch
+              v-model:checked="record.enabledFlag"
+              @change="(checked) => handleEnabledUpdate(checked, record)"
+              :loading="record.enabledLoading"
+            />
+          </template>
+          <template v-if="column.dataIndex === 'action'">
+            <div class="smart-table-operate">
+              <a-button v-privilege="'support:job:update'" @click="openUpdateModal(record)" type="link">编辑</a-button>
+              <a-button v-privilege="'support:job:execute'" type="link" @click="openExecuteModal(record)">执行</a-button>
+              <a-button v-privilege="'support:job:log:query'" @click="openJobLogModal(record.jobId, record.jobName)" type="link">记录</a-button>
+            </div>
+          </template>
+        </template>
+      </a-table>
+
+      <div class="smart-query-table-page">
+        <a-pagination
+          showSizeChanger
+          showQuickJumper
+          show-less-items
+          :pageSizeOptions="PAGE_SIZE_OPTIONS"
+          :defaultPageSize="queryForm.pageSize"
+          v-model:current="queryForm.pageNum"
+          v-model:pageSize="queryForm.pageSize"
+          :total="total"
+          @change="queryJobList"
+          @showSizeChange="queryJobList"
+          :show-total="(total) => `共${total}条`"
+        />
+      </div>
+    </a-card>
+
+    <!-- 表单操作 -->
+    <JobFormModal ref="jobFormModal" @reloadList="queryJobList" />
+
+    <!-- 记录 -->
+    <JobLogListModal ref="jobLogModal" />
+  </div>
+</template>
+<script setup lang="ts">
+  import { message } from 'ant-design-vue';
+  import { onMounted, reactive, ref } from 'vue';
+  import { jobApi } from '/@/api/support/job-api';
+  import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
+  import { useRouter } from 'vue-router';
+  import { TRIGGER_TYPE_ENUM } from '/@/constants/support/job-const.js';
+  import JobFormModal from './components/job-form-modal.vue';
+  import JobLogListModal from './components/job-log-list-modal.vue';
+
+  const columns = ref([
+    {
+      title: 'id',
+      width: 50,
+      dataIndex: 'jobId',
+    },
+    {
+      title: '任务名称',
+      dataIndex: 'jobName',
+      minWidth: 150,
+      ellipsis: true,
+    },
+    {
+      title: '执行类',
+      dataIndex: 'jobClass',
+      minWidth: 180,
+      ellipsis: true,
+    },
+    {
+      title: '触发类型',
+      dataIndex: 'triggerType',
+      width: 110,
+    },
+    {
+      title: '触发配置',
+      dataIndex: 'triggerValue',
+      width: 150,
+    },
+    {
+      title: '上次执行',
+      width: 180,
+      dataIndex: 'lastJob',
+    },
+    {
+      title: '下次执行',
+      width: 150,
+      dataIndex: 'nextJob',
+    },
+    {
+      title: '状态',
+      dataIndex: 'enabledFlag',
+      width: 80,
+    },
+    {
+      title: '执行参数',
+      dataIndex: 'param',
+      ellipsis: true,
+    },
+    {
+      title: '任务描述',
+      dataIndex: 'remark',
+      ellipsis: true,
+    },
+    {
+      title: '排序',
+      dataIndex: 'sort',
+      width: 65,
+    },
+    {
+      title: '更新人',
+      dataIndex: 'updateName',
+      width: 90,
+    },
+    {
+      title: '更新时间',
+      dataIndex: 'updateTime',
+      width: 150,
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      fixed: 'right',
+      width: 130,
+    },
+  ]);
+
+  // ---------------- 查询数据 -----------------------
+
+  const queryFormState = {
+    searchWord: '',
+    enabledFlag: null,
+    triggerType: null,
+    pageNum: 1,
+    pageSize: 10,
+  };
+  const queryForm = reactive({ ...queryFormState });
+
+  const tableLoading = ref(false);
+  const tableData = ref([]);
+  const total = ref(0);
+
+  function resetQuery() {
+    Object.assign(queryForm, queryFormState);
+    queryJobList();
+  }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    queryJobList();
+  }
+
+  // 处理执行类展示 默认返回类
+  function handleJobClass(jobClass) {
+    return jobClass.split('.').pop();
+  }
+
+  // 上次处理结果展示 最多展示300
+  function handleExecuteResult(result) {
+    let num = 400;
+    return result ? result.substring(0, num) + (result.length > num ? ' ...' : '') : '';
+  }
+
+  async function queryJobList() {
+    try {
+      tableLoading.value = true;
+      let responseModel = await jobApi.queryJob(queryForm);
+      const list = responseModel.data.list;
+      total.value = responseModel.data.total;
+      tableData.value = list;
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      tableLoading.value = false;
+    }
+  }
+
+  onMounted(queryJobList);
+
+  // 更新状态
+  async function handleEnabledUpdate(checked, record) {
+    record.enabledLoading = true;
+    try {
+      let updateForm = {
+        jobId: record.jobId,
+        enabledFlag: checked,
+      };
+      await jobApi.updateJobEnabled(updateForm);
+      // 重新查询任务详情
+      let jobInfo = await queryJobInfo(record.jobId);
+      Object.assign(record, jobInfo);
+      message.success('更新成功');
+    } catch (e) {
+      record.enabledFlag = !checked;
+      smartSentry.captureError(e);
+    } finally {
+      record.enabledLoading = false;
+    }
+  }
+
+  // 查询任务详情
+  async function queryJobInfo(jobId) {
+    try {
+      let res = await jobApi.queryJobInfo(jobId);
+      return res.data;
+    } catch (e) {
+      smartSentry.captureError(e);
+    }
+  }
+
+  // ------------------------------------ 执行记录 -------------------------------------
+  const jobLogModal = ref();
+  function openJobLogModal(jobId, name) {
+    jobLogModal.value.show(jobId, name);
+  }
+
+  // ------------------------------------ 表单操作 -------------------------------------
+  const jobFormModal = ref();
+
+  // 打开更新表单
+  function openUpdateModal(record) {
+    jobFormModal.value.openUpdateModal(record);
+  }
+  // 打开执行表单
+  function openExecuteModal(record) {
+    jobFormModal.value.openExecuteModal(record);
+  }
+</script>
diff --git a/smart-admin-web-typescript/src/views/support/level3protect/data-masking-list.vue b/smart-admin-web-typescript/src/views/support/level3protect/data-masking-list.vue
new file mode 100644
index 0000000..db4cede
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/support/level3protect/data-masking-list.vue
@@ -0,0 +1,137 @@
+<!--
+  * 数据脱敏
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2024-08-02 20:23:08
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <a-card size="small" :bordered="false" :hoverable="true">
+    <a-alert>
+      <template v-slot:message>
+        <h4>数据脱敏 Data Masking介绍：</h4>
+      </template>
+      <template v-slot:description>
+        <pre>
+简介：《信息安全技术 网络安全等级保护基本要求》明确规定，二级以上保护则需要对敏感数据进行脱敏处理。
+原理：数据脱敏是指对某些敏感信息通过脱敏规则进行数据的变形，实现敏感隐私数据的可靠保护。
+举例：在不违反系统规则条件下，身份证号、手机号、卡号、客户号等个人信息都需要进行数据脱敏。
+
+使用方式：
+1）脱敏注解 @DataMasking ，支持数据类型如：用户ID、手机号、密码、地址、银行卡、车牌号等；
+2）脱敏工具类： SmartDataMaskingUtil ；
+</pre
+        >
+      </template>
+    </a-alert>
+
+    <a-form class="smart-query-form">
+      <a-row class="smart-query-form-row">
+        <a-form-item class="smart-query-form-item smart-margin-left10">
+          <a-button-group>
+            <a-button type="primary" @click="onSearch">
+              <template #icon>
+                <ReloadOutlined />
+              </template>
+              查询
+            </a-button>
+          </a-button-group>
+        </a-form-item>
+      </a-row>
+    </a-form>
+
+    <a-table
+      size="small"
+      bordered
+      :scroll="{ x: 1100 }"
+      :loading="tableLoading"
+      class="smart-margin-top10"
+      :dataSource="tableData"
+      :columns="columns"
+      :pagination="false"
+    />
+  </a-card>
+</template>
+<script setup lang="ts">
+  import { onMounted, reactive, ref } from 'vue';
+  import { heartBeatApi } from '/@/api/support/heart-beat-api';
+  import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import { defaultTimeRanges } from '/@/lib/default-time-ranges';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
+  import { dataMaskingApi } from '/@/api/support/data-masking-api.js';
+
+  //------------------------ 表格渲染 ---------------------
+
+  const columns = ref([
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      width: 70,
+    },
+    {
+      title: '默认',
+      dataIndex: 'other',
+      width: 100,
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      width: 100,
+    },
+    {
+      title: '身份证',
+      dataIndex: 'idCard',
+      width: 150,
+    },
+    {
+      title: '密码',
+      dataIndex: 'password',
+      width: 100,
+    },
+    {
+      title: '邮箱',
+      dataIndex: 'email',
+      width: 120,
+    },
+    {
+      title: '车牌号',
+      dataIndex: 'carLicense',
+      width: 120,
+    },
+    {
+      title: '银行卡',
+      dataIndex: 'bankCard',
+      width: 170,
+    },
+    {
+      title: '地址',
+      dataIndex: 'address',
+      width: 210,
+    },
+  ]);
+
+  const tableLoading = ref(false);
+  const tableData = ref([]);
+
+  function onSearch() {
+    ajaxQuery();
+  }
+
+  async function ajaxQuery() {
+    try {
+      tableLoading.value = true;
+      let responseModel = await dataMaskingApi.query();
+      tableData.value = responseModel.data;
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      tableLoading.value = false;
+    }
+  }
+
+  onMounted(ajaxQuery);
+</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/level3protect/level3-protect-config-index.vue b/smart-admin-web-typescript/src/views/support/level3protect/level3-protect-config-index.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/level3protect/level3-protect-config-index.vue
rename to smart-admin-web-typescript/src/views/support/level3protect/level3-protect-config-index.vue
index e9f3caa..ce1499c 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/level3protect/level3-protect-config-index.vue
+++ b/smart-admin-web-typescript/src/views/support/level3protect/level3-protect-config-index.vue
@@ -115,11 +115,11 @@
   </a-card>
   <!---------- 请求参数加密 end ----------->
 </template>
-<script setup>
+<script setup lang="ts">
   import { onMounted, reactive, ref } from 'vue';
-  import { level3ProtectApi } from '/@/api/support/level3-protect/level3-protect-api.js';
-  import { SmartLoading } from '/@/components/framework/smart-loading/index.ts';
-  import { smartSentry } from '/@/lib/smart-sentry.ts';
+  import { level3ProtectApi } from '/@/api/support/level3-protect-api.js';
+  import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
+  import { smartSentry } from '/@/lib/smart-sentry.js';
   import { message, Modal } from 'ant-design-vue';
 
   // 三级等保的默认值
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/login-fail/login-fail-list.vue b/smart-admin-web-typescript/src/views/support/login-fail/login-fail-list.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/login-fail/login-fail-list.vue
rename to smart-admin-web-typescript/src/views/support/login-fail/login-fail-list.vue
index b07379e..79b8ec0 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/login-fail/login-fail-list.vue
+++ b/smart-admin-web-typescript/src/views/support/login-fail/login-fail-list.vue
@@ -108,11 +108,11 @@
     </div>
   </a-card>
 </template>
-<script setup>
+<script setup lang="ts">
   import { reactive, ref, onMounted } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { loginFailApi } from '/@/api/support/login-fail/login-fail-api';
+  import { loginFailApi } from '/@/api/support/login-fail-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/login-log/login-log-list.vue b/smart-admin-web-typescript/src/views/support/login-log/login-log-list.vue
similarity index 74%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/login-log/login-log-list.vue
rename to smart-admin-web-typescript/src/views/support/login-log/login-log-list.vue
index 6376775..d149889 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/login-log/login-log-list.vue
+++ b/smart-admin-web-typescript/src/views/support/login-log/login-log-list.vue
@@ -1,14 +1,14 @@
 <!--
   * 登录、登出 日志
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-06-02 20:23:08 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-06-02 20:23:08
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
-  <a-form class="smart-query-form" v-privilege="'loginLog:query'">
+  <a-form class="smart-query-form" v-privilege="'support:loginLog:query'" ref="queryFormRef">
     <a-row class="smart-query-form-row">
       <a-form-item label="用户名称" class="smart-query-form-item">
         <a-input style="width: 300px" v-model:value="queryForm.userName" placeholder="用户名称" />
@@ -23,27 +23,38 @@
       </a-form-item>
 
       <a-form-item class="smart-query-form-item smart-margin-left10">
-        <a-button type="primary" @click="ajaxQuery">
-          <template #icon>
-            <ReloadOutlined />
-          </template>
-          查询
-        </a-button>
-        <a-button @click="resetQuery">
-          <template #icon>
-            <SearchOutlined />
-          </template>
-          重置
-        </a-button>
+        <a-button-group>
+          <a-button type="primary" @click="onSearch">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
       </a-form-item>
     </a-row>
   </a-form>
 
   <a-card size="small" :bordered="false" :hoverable="true">
-    <a-row justify="end">
+    <a-row justify="end" ref="tableOperatorRef">
       <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.LOGIN_LOG" :refresh="ajaxQuery" />
     </a-row>
-    <a-table size="small" :dataSource="tableData" :columns="columns" bordered rowKey="loginLogId" :pagination="false" :loading="tableLoading">
+    <a-table
+      size="small"
+      :dataSource="tableData"
+      :columns="columns"
+      bordered
+      rowKey="loginLogId"
+      :pagination="false"
+      :loading="tableLoading"
+      :scroll="{ y: scrollY }"
+    >
       <template #bodyCell="{ text, record, column }">
         <template v-if="column.dataIndex === 'loginResult'">
           <template v-if="text === LOGIN_RESULT_ENUM.LOGIN_SUCCESS.value">
@@ -85,15 +96,16 @@
   </a-card>
 </template>
 <script setup lang="ts">
-  import { onMounted, reactive, ref } from 'vue';
+  import { onMounted, onUnmounted, reactive, ref } from 'vue';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { defaultTimeRanges } from '/@/lib/default-time-ranges';
   import uaparser from 'ua-parser-js';
   import { LOGIN_RESULT_ENUM } from '/@/constants/support/login-log-const';
-  import { loginLogApi } from '/@/api/support/login-log/login-log-api';
+  import { loginLogApi } from '/@/api/support/login-log-api';
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
   import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
+  import { calcTableHeight } from '/@/lib/table-auto-height';
 
   const columns = ref([
     {
@@ -117,6 +129,11 @@
       dataIndex: 'loginIp',
       ellipsis: true,
     },
+    {
+      title: 'IP地区',
+      dataIndex: 'loginIpRegion',
+      ellipsis: true,
+    },
     {
       title: '设备信息',
       dataIndex: 'userAgent',
@@ -165,6 +182,12 @@
     createDateRange.value = [];
     ajaxQuery();
   }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
   async function ajaxQuery() {
     try {
       tableLoading.value = true;
@@ -190,5 +213,23 @@
     }
   }
 
-  onMounted(ajaxQuery);
+  // ----------------- 表格自适应高度 --------------------
+  const scrollY = ref(100);
+  const tableOperatorRef = ref();
+  const queryFormRef = ref();
+
+  function autoCalcTableHeight() {
+    calcTableHeight(scrollY, [tableOperatorRef, queryFormRef], 10);
+  }
+
+  window.addEventListener('resize', autoCalcTableHeight);
+
+  onMounted(() => {
+    ajaxQuery();
+    autoCalcTableHeight();
+  });
+
+  onUnmounted(() => {
+    window.removeEventListener('resize', autoCalcTableHeight);
+  });
 </script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue b/smart-admin-web-typescript/src/views/support/operate-log/operate-log-detail-modal.vue
similarity index 79%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue
rename to smart-admin-web-typescript/src/views/support/operate-log/operate-log-detail-modal.vue
index 4f13769..40a8e6c 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-detail-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/operate-log/operate-log-detail-modal.vue
@@ -13,32 +13,37 @@
       <a-row class="smart-margin-top10">
         <a-col :span="16">
           <a-row class="detail-info">
-            <a-col :span="12"> 请求地址： {{ detail.url }}</a-col>
+            <a-col :span="12"> 请求url： {{ detail.url }}</a-col>
             <a-col :span="12"> 请求日期： {{ detail.createTime }}</a-col>
           </a-row>
           <a-row class="detail-info">
-            <a-col> 请求方法： {{ detail.method }}</a-col>
+            <a-col :span="12"> 请求IP： {{ detail.ip }}</a-col>
+            <a-col :span="12"> IP地区： {{ detail.ipRegion }}</a-col>
           </a-row>
           <a-row class="detail-info">
             <a-col :span="12"> 用户id：{{ detail.operateUserId }}</a-col>
             <a-col :span="12"> 用户名称： {{ detail.operateUserName }}</a-col>
-            <a-col :span="12"> 请求内容： {{ detail.module }} - {{ detail.content }}</a-col>
           </a-row>
         </a-col>
         <a-col :span="8">
           <p class="detail-right-title">请求状态</p>
-          <p :class="['detail-right', detail.successFlag ? 'success' : 'error']">
+          <a-typography-text class="detail-right" :type="detail.successFlag ? 'success' : 'danger'">
             {{ detail.successFlag ? '成功' : '失败' }}
-          </p>
+          </a-typography-text>
         </a-col>
       </a-row>
     </div>
+    <div class="info-box">
+      <h4>请求明细：</h4>
+      <a-col :span="24"> 方法： {{ detail.method }}</a-col>
+      <a-col :span="24"> 说明： {{ detail.module }} - {{ detail.content }}</a-col>
+    </div>
     <div class="info-box">
       <h4>请求参数：</h4>
       <JsonViewer :value="detail.param ? JSON.parse(detail.param) : ''" theme="jv-dark" copyable boxed sort />
     </div>
-    <div class="info-box">
-      <h4>请求参数：</h4>
+    <div class="info-box" v-if="detail.failReason">
+      <h4>请求失败原因：</h4>
       <div>
         {{ detail.failReason }}
       </div>
@@ -49,8 +54,8 @@
 <script setup lang="ts">
   import { reactive, ref } from 'vue';
   import { JsonViewer } from 'vue3-json-viewer';
-  import { operateLogApi } from '/@/api/support/operate-log/operate-log-api';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { operateLogApi } from '/@/api/support/operate-log-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
   import { SmartLoading } from '/@/components/framework/smart-loading';
 
   defineExpose({
@@ -127,13 +132,6 @@ import { smartSentry } from '/@/lib/smart-sentry';
     font-size: 20px;
     font-weight: bold;
     text-align: right;
-  }
-
-  .success {
-    color: @success-color;
-  }
-
-  .error {
-    color: @error-color;
+    float: right;
   }
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-list.vue b/smart-admin-web-typescript/src/views/support/operate-log/operate-log-list.vue
similarity index 79%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-list.vue
rename to smart-admin-web-typescript/src/views/support/operate-log/operate-log-list.vue
index b6774b8..a7b47eb 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/operate-log/operate-log-list.vue
+++ b/smart-admin-web-typescript/src/views/support/operate-log/operate-log-list.vue
@@ -1,17 +1,23 @@
 <!--
   * 操作记录 列表
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-06-02 20:23:08 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-06-02 20:23:08
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
-  <a-form class="smart-query-form" v-privilege="'operateLog:query'">
+  <a-form class="smart-query-form" v-privilege="'support:operateLog:query'">
     <a-row class="smart-query-form-row">
+      <a-form-item label="操作关键字" class="smart-query-form-item">
+        <a-input style="width: 150px" v-model:value="queryForm.keywords" placeholder="模块/操作内容" />
+      </a-form-item>
+      <a-form-item label="请求关键字" class="smart-query-form-item">
+        <a-input style="width: 220px" v-model:value="queryForm.requestKeywords" placeholder="请求地址/请求方法/请求参数" />
+      </a-form-item>
       <a-form-item label="用户名称" class="smart-query-form-item">
-        <a-input style="width: 300px" v-model:value="queryForm.userName" placeholder="用户名称" />
+        <a-input style="width: 100px" v-model:value="queryForm.userName" placeholder="用户名称" />
       </a-form-item>
 
       <a-form-item label="请求时间" class="smart-query-form-item">
@@ -19,7 +25,7 @@
       </a-form-item>
 
       <a-form-item label="快速筛选" class="smart-query-form-item">
-        <a-radio-group v-model:value="queryForm.successFlag" @change="ajaxQuery">
+        <a-radio-group v-model:value="queryForm.successFlag" @change="onSearch">
           <a-radio-button :value="undefined">全部</a-radio-button>
           <a-radio-button :value="true">成功</a-radio-button>
           <a-radio-button :value="false">失败</a-radio-button>
@@ -27,27 +33,29 @@
       </a-form-item>
 
       <a-form-item class="smart-query-form-item smart-margin-left10">
-        <a-button type="primary" @click="ajaxQuery">
-          <template #icon>
-            <ReloadOutlined />
-          </template>
-          查询
-        </a-button>
-        <a-button @click="resetQuery">
-          <template #icon>
-            <SearchOutlined />
-          </template>
-          重置
-        </a-button>
+        <a-button-group>
+          <a-button type="primary" @click="ajaxQuery">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
       </a-form-item>
     </a-row>
   </a-form>
 
-  <a-card size="small" :bordered="false" :hoverable="true" style="height:100%">
+  <a-card size="small" :bordered="false" :hoverable="true" style="height: 100%">
     <a-row justify="end">
       <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
     </a-row>
-    <a-table size="small" :loading="tableLoading" :dataSource="tableData" :columns="columns" bordered rowKey="operateLogId" :pagination="false" >
+    <a-table size="small" :loading="tableLoading" :dataSource="tableData" :columns="columns" bordered rowKey="operateLogId" :pagination="false">
       <template #bodyCell="{ text, record, column }">
         <template v-if="column.dataIndex === 'successFlag'">
           <a-tag :color="text ? 'success' : 'error'">{{ text ? '成功' : '失败' }}</a-tag>
@@ -63,7 +71,7 @@
 
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="showDetail(record.operateLogId)" type="link" v-privilege="'operateLog:detail'">详情</a-button>
+            <a-button @click="showDetail(record.operateLogId)" type="link" v-privilege="'support:operateLog:detail'">详情</a-button>
           </div>
         </template>
       </template>
@@ -91,7 +99,7 @@
 <script setup lang="ts">
   import { onMounted, reactive, ref } from 'vue';
   import OperateLogDetailModal from './operate-log-detail-modal.vue';
-  import { operateLogApi } from '/@/api/support/operate-log/operate-log-api';
+  import { operateLogApi } from '/@/api/support/operate-log-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { defaultTimeRanges } from '/@/lib/default-time-ranges';
   import uaparser from 'ua-parser-js';
@@ -131,6 +139,11 @@
       dataIndex: 'ip',
       ellipsis: true,
     },
+    {
+      title: 'IP地区',
+      dataIndex: 'ipRegion',
+      ellipsis: true,
+    },
     {
       title: '客户端',
       dataIndex: 'userAgent',
@@ -161,6 +174,8 @@
 
   const queryFormState = {
     userName: '',
+    requestKeywords: '',
+    keywords: '',
     successFlag: undefined,
     startDate: undefined,
     endDate: undefined,
@@ -185,6 +200,12 @@
     createDateRange.value = [];
     ajaxQuery();
   }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
   async function ajaxQuery() {
     try {
       tableLoading.value = true;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/reload/do-reload-form-modal.vue b/smart-admin-web-typescript/src/views/support/reload/do-reload-form-modal.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/reload/do-reload-form-modal.vue
rename to smart-admin-web-typescript/src/views/support/reload/do-reload-form-modal.vue
index ff7376d..a4cab05 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/reload/do-reload-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/reload/do-reload-form-modal.vue
@@ -25,7 +25,7 @@
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
   import { reactive, ref } from 'vue';
-  import { reloadApi } from '/@/api/support/reload/reload-api';
+  import { reloadApi } from '/@/api/support/reload-api';
 import { smartSentry } from '/@/lib/smart-sentry';
   import { SmartLoading } from '/@/components/framework/smart-loading';
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/reload/reload-list.vue b/smart-admin-web-typescript/src/views/support/reload/reload-list.vue
similarity index 92%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/reload/reload-list.vue
rename to smart-admin-web-typescript/src/views/support/reload/reload-list.vue
index 83e40d5..b4e71a2 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/reload/reload-list.vue
+++ b/smart-admin-web-typescript/src/views/support/reload/reload-list.vue
@@ -44,11 +44,11 @@
       rowKey="tag"
       :pagination="false"
     >
-      <template #bodyCell="{ text, record, index, column }">
+      <template #bodyCell="{ record, column }">
         <template v-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="doReload(record.tag)" v-privilege="'reload:execute'" type="link">执行</a-button>
-            <a-button @click="showResultList(record.tag)" v-privilege="'reload:result'" type="link">查看结果</a-button>
+            <a-button @click="doReload(record.tag)" v-privilege="'support:reload:execute'" type="link">执行</a-button>
+            <a-button @click="showResultList(record.tag)" v-privilege="'support:reload:result'" type="link">查看结果</a-button>
           </div>
         </template>
       </template>
@@ -59,10 +59,10 @@
   </a-card>
 </template>
 <script setup lang="ts">
-  import { onMounted, reactive, ref } from 'vue';
+  import { onMounted, ref } from 'vue';
   import DoReloadForm from './do-reload-form-modal.vue';
   import ReloadResultList from './reload-result-list.vue';
-  import { reloadApi } from '/@/api/support/reload/reload-api';
+  import { reloadApi } from '/@/api/support/reload-api';
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
   import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/reload/reload-result-list.vue b/smart-admin-web-typescript/src/views/support/reload/reload-result-list.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/reload/reload-result-list.vue
rename to smart-admin-web-typescript/src/views/support/reload/reload-result-list.vue
index b9a1713..84528cf 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/reload/reload-result-list.vue
+++ b/smart-admin-web-typescript/src/views/support/reload/reload-result-list.vue
@@ -31,7 +31,7 @@
 </template>
 <script setup lang="ts">
   import { reactive, ref } from 'vue';
-  import { reloadApi } from '/@/api/support/reload/reload-api';
+  import { reloadApi } from '/@/api/support/reload-api';
 import { smartSentry } from '/@/lib/smart-sentry';
   defineExpose({
     showModal,
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/serial-number/serial-number-generate-form-modal.vue b/smart-admin-web-typescript/src/views/support/serial-number/serial-number-generate-form-modal.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/serial-number/serial-number-generate-form-modal.vue
rename to smart-admin-web-typescript/src/views/support/serial-number/serial-number-generate-form-modal.vue
index b5bdb30..7b05e5f 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/serial-number/serial-number-generate-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/support/serial-number/serial-number-generate-form-modal.vue
@@ -34,7 +34,7 @@
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
   import { reactive, ref } from 'vue';
-  import { serialNumberApi } from '/@/api/support/serial-number/serial-number-api';
+  import { serialNumberApi } from '/@/api/support/serial-number-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import _ from 'lodash';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/serial-number/serial-number-list.vue b/smart-admin-web-typescript/src/views/support/serial-number/serial-number-list.vue
similarity index 80%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/serial-number/serial-number-list.vue
rename to smart-admin-web-typescript/src/views/support/serial-number/serial-number-list.vue
index e418180..c761967 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/serial-number/serial-number-list.vue
+++ b/smart-admin-web-typescript/src/views/support/serial-number/serial-number-list.vue
@@ -25,7 +25,12 @@
     </a-alert>
 
     <a-row justify="end">
-      <TableOperator class="smart-margin-bottom5 smart-margin-top5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.SERIAL_NUMBER" :refresh="ajaxQuery" />
+      <TableOperator
+        class="smart-margin-bottom5 smart-margin-top5"
+        v-model="columns"
+        :tableId="TABLE_ID_CONST.SUPPORT.SERIAL_NUMBER"
+        :refresh="ajaxQuery"
+      />
     </a-row>
 
     <a-table
@@ -41,8 +46,8 @@
       <template #bodyCell="{ record, column }">
         <template v-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="generate(record)" v-privilege="'support:serial:number:generate'" type="link">生成</a-button>
-            <a-button @click="showRecord(record.serialNumberId)" v-privilege="'support:serial:number:record'" type="link">查看记录</a-button>
+            <a-button @click="generate(record)" v-privilege="'support:serialNumber:generate'" type="link">生成</a-button>
+            <a-button @click="showRecord(record.serialNumberId)" v-privilege="'support:serialNumber:record'" type="link">查看记录</a-button>
           </div>
         </template>
       </template>
@@ -55,14 +60,13 @@
   <SerialNumberRecordList ref="recordList" />
 </template>
 <script setup lang="ts">
-  import { onMounted, reactive, ref } from 'vue';
-import SerialNumberGenerateFormModal from './serial-number-generate-form-modal.vue';
-import SerialNumberRecordList from './serial-number-record-list.vue';
-import { serialNumberApi } from '/@/api/support/serial-number/serial-number-api';
-import TableOperator from '/@/components/support/table-operator/index.vue';
-import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
-import { smartSentry } from '/@/lib/smart-sentry';
-
+  import { onMounted, ref } from 'vue';
+  import SerialNumberGenerateFormModal from './serial-number-generate-form-modal.vue';
+  import SerialNumberRecordList from './serial-number-record-list.vue';
+  import { serialNumberApi } from '/@/api/support/serial-number-api';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   //------------------------ 表格渲染 ---------------------
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/serial-number/serial-number-record-list.vue b/smart-admin-web-typescript/src/views/support/serial-number/serial-number-record-list.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/support/serial-number/serial-number-record-list.vue
rename to smart-admin-web-typescript/src/views/support/serial-number/serial-number-record-list.vue
index 19ddf0b..51388d8 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/serial-number/serial-number-record-list.vue
+++ b/smart-admin-web-typescript/src/views/support/serial-number/serial-number-record-list.vue
@@ -40,7 +40,7 @@
 </template>
 <script setup lang="ts">
   import { reactive, ref } from 'vue';
-  import { serialNumberApi } from '/@/api/support/serial-number/serial-number-api';
+  import { serialNumberApi } from '/@/api/support/serial-number-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
 import { smartSentry } from '/@/lib/smart-sentry';
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/40X/403.vue b/smart-admin-web-typescript/src/views/system/40X/403.vue
similarity index 81%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/40X/403.vue
rename to smart-admin-web-typescript/src/views/system/40X/403.vue
index 263090d..ce8a587 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/40X/403.vue
+++ b/smart-admin-web-typescript/src/views/system/40X/403.vue
@@ -8,7 +8,7 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-result status="404" title="对不起，您没有权限访问此内容">
+  <a-result status="403" title="对不起，您没有权限访问此内容">
     <template #extra>
       <a-button type="primary" @click="goHome">返回首页</a-button>
     </template>
@@ -18,7 +18,8 @@
   import { useRouter } from 'vue-router';
   import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
 
+  const router = useRouter();
   function goHome() {
-    useRouter().push({ name: HOME_PAGE_NAME });
+    router.push({ name: HOME_PAGE_NAME });
   }
 </script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/40X/404.vue b/smart-admin-web-typescript/src/views/system/40X/404.vue
similarity index 77%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/40X/404.vue
rename to smart-admin-web-typescript/src/views/system/40X/404.vue
index 5b44f37..8c9aff8 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/40X/404.vue
+++ b/smart-admin-web-typescript/src/views/system/40X/404.vue
@@ -1,5 +1,5 @@
 <!--
-  * 403 不存在 页面
+  * 404 不存在 页面
   * 
   * @Author:    1024创新实验室-主任：卓大 
   * @Date:      2022-08-08 20:46:18
@@ -8,7 +8,7 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-result status="403" title="对不起，您访问的内容不存在！">
+  <a-result status="404" title="对不起，您访问的内容不存在！">
     <template #extra>
       <a-button type="primary" @click="goHome">返回首页</a-button>
     </template>
@@ -18,7 +18,8 @@
   import { useRouter } from 'vue-router';
   import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
 
+  const router = useRouter();
   function goHome() {
-    useRouter().push({ name: HOME_PAGE_NAME });
+    router.push({ name: HOME_PAGE_NAME });
   }
 </script>
diff --git a/smart-admin-web-typescript/src/views/system/account/account-menu.ts b/smart-admin-web-typescript/src/views/system/account/account-menu.ts
new file mode 100644
index 0000000..39d31d4
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/account/account-menu.ts
@@ -0,0 +1,39 @@
+import { defineAsyncComponent, markRaw } from 'vue';
+
+/**
+ * 菜单展示
+ * defineAsyncComponent 异步组件
+ * markRaw  将一个Vue组件对象转换为响应式对象时，可能会导致不必要的性能开销。使用markRaw方法将组件对象标记为非响应式对象
+ */
+export const ACCOUNT_MENU = {
+  CENTER: {
+    menuId: 'center',
+    menuName: '个人中心',
+    components: markRaw(defineAsyncComponent(() => import('./components/center/index.vue'))),
+  },
+  PASSWORD: {
+    menuId: 'password',
+    menuName: '修改密码',
+    components: markRaw(defineAsyncComponent(() => import('./components/password/index.vue'))),
+  },
+  MESSAGE: {
+    menuId: 'message',
+    menuName: '我的消息',
+    components: markRaw(defineAsyncComponent(() => import('./components/message/index.vue'))),
+  },
+  NOTICE: {
+    menuId: 'notice',
+    menuName: '通知公告',
+    components: markRaw(defineAsyncComponent(() => import('./components/notice/index.vue'))),
+  },
+  LOGIN_LOG: {
+    menuId: 'login-log',
+    menuName: '登录日志',
+    components: markRaw(defineAsyncComponent(() => import('./components/login-log/index.vue'))),
+  },
+  OPERATE_LOG: {
+    menuId: 'operate-log',
+    menuName: '操作日志',
+    components: markRaw(defineAsyncComponent(() => import('./components/operate-log/index.vue'))),
+  },
+};
diff --git a/smart-admin-web-typescript/src/views/system/account/components/center/index.vue b/smart-admin-web-typescript/src/views/system/account/components/center/index.vue
new file mode 100644
index 0000000..cbe8494
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/account/components/center/index.vue
@@ -0,0 +1,280 @@
+<template>
+  <div class="center-container">
+    <!--  页面标题-->
+    <div class="header-title">个人中心</div>
+
+    <!--  内容区域-->
+    <div class="center-form-area">
+      <a-row>
+        <a-col flex="350px">
+          <a-form ref="formRef" :model="form" :rules="rules" layout="vertical">
+            <a-form-item label="登录账号" name="loginName">
+              <a-input class="form-item" v-model:value.trim="form.loginName" placeholder="请输入登录账号" disabled />
+            </a-form-item>
+            <a-form-item label="员工名称" name="actualName">
+              <a-input class="form-item" v-model:value.trim="form.actualName" placeholder="请输入员工名称" />
+            </a-form-item>
+            <a-form-item label="性别" name="gender">
+              <smart-enum-select class="form-item" v-model:value="form.gender" placeholder="请选择性别" enum-name="GENDER_ENUM" />
+            </a-form-item>
+            <a-form-item label="手机号码" name="phone">
+              <a-input class="form-item" v-model:value.trim="form.phone" placeholder="请输入手机号码" />
+            </a-form-item>
+            <a-form-item label="部门" name="departmentId">
+              <DepartmentTreeSelect class="form-item" ref="departmentTreeSelect" width="100%" :init="false" v-model:value="form.departmentId" />
+            </a-form-item>
+            <a-form-item label="备注" name="remark">
+              <a-textarea class="form-item" v-model:value="form.remark" placeholder="请输入备注" :rows="4" />
+            </a-form-item>
+          </a-form>
+          <a-button type="primary" @click="onSubmit">更新个人信息</a-button>
+        </a-col>
+        <a-col flex="auto">
+          <a-form style="padding-left: 80px" layout="vertical">
+            <a-form-item label="头像" name="avatar">
+              <br />
+              <a-upload
+                name="avatar"
+                list-type="picture-card"
+                class="avatar-uploader"
+                :show-upload-list="false"
+                :headers="{ 'x-access-token': useUserStore().getToken }"
+                :customRequest="customRequest"
+                :before-upload="beforeUpload"
+              >
+                <div v-if="avatarUrl" class="avatar-container">
+                  <img :src="avatarUrl" class="avatar-image" alt="avatar" />
+                  <div class="overlay">
+                    <span>更新头像</span>
+                  </div>
+                </div>
+                <div v-else>
+                  <loading-outlined v-if="updateAvatarLoading" />
+                  <plus-outlined v-else />
+                  <div class="ant-upload-text">上传头像</div>
+                </div>
+              </a-upload>
+            </a-form-item>
+          </a-form>
+        </a-col>
+      </a-row>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import { onMounted, reactive, ref } from 'vue';
+  import { regular } from '/@/constants/regular-const.js';
+  import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
+  import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
+  import { loginApi } from '/@/api/system/login-api.js';
+  import { useUserStore } from '/@/store/modules/system/user.js';
+  import { message } from 'ant-design-vue';
+  import { smartSentry } from '/@/lib/smart-sentry.js';
+  import { employeeApi } from '/@/api/system/employee-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
+  import { fileApi } from '/@/api/support/file-api.js';
+  import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const.js';
+
+  // 组件ref
+  const formRef = ref();
+
+  const formDefault = {
+    // 员工ID
+    employeeId: undefined,
+    // 头像
+    avatar: undefined,
+    // 登录账号
+    loginName: '',
+    // 员工名称
+    actualName: '',
+    // 性别
+    gender: undefined,
+    // 手机号码
+    phone: '',
+    // 部门id
+    departmentId: undefined,
+    // 是否启用
+    disabledFlag: undefined,
+    // 邮箱
+    email: undefined,
+    // 备注
+    remark: '',
+  };
+  let form = reactive({ ...formDefault });
+  const rules = {
+    actualName: [
+      { required: true, message: '姓名不能为空' },
+      { max: 30, message: '姓名不能大于30个字符', trigger: 'blur' },
+    ],
+    phone: [
+      { required: true, message: '手机号不能为空' },
+      { pattern: regular.phone, message: '请输入正确的手机号码', trigger: 'blur' },
+    ],
+    gender: [{ required: true, message: '性别不能为空' }],
+    departmentId: [{ required: true, message: '部门不能为空' }],
+  };
+  // 头像地址
+  let avatarUrl = ref();
+
+  // 查询登录信息
+  async function getLoginInfo() {
+    try {
+      //获取登录用户信息
+      const res = await loginApi.getLoginInfo();
+      let data = res.data;
+      //更新用户信息到pinia
+      useUserStore().setUserLoginInfo(data);
+      // 当前form展示
+      form.employeeId = data.employeeId;
+      form.loginName = data.loginName;
+      form.actualName = data.actualName;
+      form.email = data.email;
+      form.gender = data.gender;
+      form.phone = data.phone;
+      form.departmentId = data.departmentId;
+      form.disabledFlag = data.disabledFlag;
+      form.remark = data.remark;
+      // 头像展示
+      avatarUrl.value = data.avatar;
+    } catch (e) {
+      smartSentry.captureError(e);
+    }
+  }
+
+  // 头像上传
+  const accept = ref('.jpg,.jpeg,.png,.gif');
+  const maxSize = ref(10);
+  const folder = ref(FILE_FOLDER_TYPE_ENUM.COMMON.value);
+  let updateAvatarLoading = ref(false);
+  function beforeUpload(file, files) {
+    const suffixIndex = file.name.lastIndexOf('.');
+    const fileSuffix = file.name.substring(suffixIndex <= -1 ? 0 : suffixIndex);
+    if (accept.value.indexOf(fileSuffix) === -1) {
+      message.error(`只支持上传 ${accept.value.replaceAll(',', ' ')} 格式的文件`);
+      return false;
+    }
+
+    const isLimitSize = file.size / 1024 / 1024 < maxSize.value;
+    if (!isLimitSize) {
+      message.error(`单个文件大小必须小于 ${maxSize.value} Mb`);
+      return false;
+    }
+    return true;
+  }
+
+  async function customRequest(options) {
+    updateAvatarLoading.value = true;
+    try {
+      const formData = new FormData();
+      formData.append('file', options.file);
+      let res = await fileApi.uploadFile(formData, folder.value);
+      let file = res.data;
+      avatarUrl.value = file.fileUrl;
+      // 更新头像
+      let updateAvatarForm = { avatar: file.fileKey };
+      await employeeApi.updateAvatar(updateAvatarForm);
+      message.success('更新成功');
+      // 重新获取详情，刷新整体缓存
+      await getLoginInfo();
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      updateAvatarLoading.value = false;
+    }
+  }
+
+  // 更新员工信息
+  async function updateEmployee() {
+    SmartLoading.show();
+    try {
+      await employeeApi.updateByLogin(form);
+      message.success('更新成功');
+      // 重新获取详情，刷新整体缓存
+      await getLoginInfo();
+    } catch (error) {
+      smartSentry.captureError(error);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+
+  // 表单提交
+  function onSubmit() {
+    formRef.value
+      .validate()
+      .then(() => {
+        updateEmployee();
+      })
+      .catch((error) => {
+        console.log('error', error);
+        message.error('参数验证错误，请仔细填写表单数据!');
+      });
+  }
+
+  onMounted(() => {
+    getLoginInfo();
+  });
+</script>
+<style lang="less" scoped>
+  .center-container {
+    .header-title {
+      font-size: 20px;
+    }
+
+    .center-form-area {
+      margin-top: 20px;
+
+      .avatar-container {
+        position: relative;
+        border-radius: 50%;
+        overflow: hidden;
+        width: 100%;
+        height: 100%;
+
+        .avatar-image {
+          width: 100%;
+          height: 100%;
+          object-fit: cover;
+        }
+
+        .overlay {
+          position: absolute;
+          top: 0;
+          left: 0;
+          right: 0;
+          bottom: 0;
+          background-color: rgba(0, 0, 0, 0.5);
+          opacity: 0;
+          transition: opacity 0.3s ease;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          color: #ffffff;
+          font-size: 17px;
+        }
+
+        &:hover .overlay {
+          opacity: 1; /* 鼠标悬停时显示蒙版 */
+        }
+      }
+
+      .avatar-uploader {
+        :deep(.ant-upload) {
+          border-radius: 50%;
+          width: 150px;
+          height: 150px;
+        }
+      }
+
+      .ant-upload-select-picture-card i {
+        font-size: 32px;
+        color: #999;
+      }
+
+      .ant-upload-select-picture-card .ant-upload-text {
+        margin-top: 8px;
+        color: #666;
+      }
+    }
+  }
+</style>
diff --git a/smart-admin-web-typescript/src/views/system/account/components/login-log/index.vue b/smart-admin-web-typescript/src/views/system/account/components/login-log/index.vue
new file mode 100644
index 0000000..921b003
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/account/components/login-log/index.vue
@@ -0,0 +1,192 @@
+<!--
+  * 登录、登出 日志
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-06-02 20:23:08
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <a-form class="smart-query-form" ref="queryFormRef">
+    <a-row class="smart-query-form-row">
+      <a-form-item label="时间" class="smart-query-form-item">
+        <a-range-picker @change="changeCreateDate" v-model:value="createDateRange" :presets="defaultChooseTimeRange" style="width: 240px" />
+      </a-form-item>
+
+      <a-form-item class="smart-query-form-item smart-margin-left10">
+        <a-button-group>
+          <a-button type="primary" @click="onSearch">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
+      </a-form-item>
+    </a-row>
+  </a-form>
+
+  <a-table size="small" :dataSource="tableData" :columns="columns" bordered rowKey="loginLogId" :pagination="false" :loading="tableLoading">
+    <template #bodyCell="{ text, record, column }">
+      <template v-if="column.dataIndex === 'loginResult'">
+        <template v-if="text === LOGIN_RESULT_ENUM.LOGIN_SUCCESS.value">
+          <a-tag color="success">登录成功</a-tag>
+        </template>
+        <template v-if="text === LOGIN_RESULT_ENUM.LOGIN_FAIL.value">
+          <a-tag color="error">登录失败</a-tag>
+        </template>
+        <template v-if="text === LOGIN_RESULT_ENUM.LOGIN_OUT.value">
+          <a-tag color="processing">退出登录</a-tag>
+        </template>
+      </template>
+      <template v-if="column.dataIndex === 'userAgent'">
+        <div>{{ record.browser }} / {{ record.os }} / {{ record.device }}</div>
+      </template>
+    </template>
+  </a-table>
+
+  <div class="smart-query-table-page">
+    <a-pagination
+      showSizeChanger
+      showQuickJumper
+      show-less-items
+      :pageSizeOptions="PAGE_SIZE_OPTIONS"
+      :defaultPageSize="queryForm.pageSize"
+      v-model:current="queryForm.pageNum"
+      v-model:pageSize="queryForm.pageSize"
+      :total="total"
+      @change="ajaxQuery"
+      @showSizeChange="ajaxQuery"
+      :show-total="(total) => `共${total}条`"
+    />
+  </div>
+</template>
+<script setup lang="ts">
+  import { onMounted, onUnmounted, reactive, ref } from 'vue';
+  import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import { defaultTimeRanges } from '/@/lib/default-time-ranges';
+  import uaparser from 'ua-parser-js';
+  import { LOGIN_RESULT_ENUM } from '/@/constants/support/login-log-const';
+  import { loginLogApi } from '/@/api/support/login-log-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import { calcTableHeight } from '/@/lib/table-auto-height';
+
+  const columns = ref([
+    {
+      title: '时间',
+      dataIndex: 'createTime',
+      width: 150,
+    },
+    {
+      title: '登录方式',
+      dataIndex: 'remark',
+      ellipsis: true,
+      width: 90,
+    },
+    {
+      title: '登录设备',
+      dataIndex: 'userAgent',
+      ellipsis: true,
+    },
+    {
+      title: 'IP地区',
+      dataIndex: 'loginIpRegion',
+      ellipsis: true,
+    },
+    {
+      title: 'IP',
+      dataIndex: 'loginIp',
+      ellipsis: true,
+      width: 120,
+    },
+    {
+      title: '结果',
+      dataIndex: 'loginResult',
+      ellipsis: true,
+      width: 90,
+    },
+  ]);
+
+  const queryFormState = {
+    userName: '',
+    ip: '',
+    startDate: undefined,
+    endDate: undefined,
+    pageNum: 1,
+    pageSize: 10,
+  };
+  const queryForm = reactive({ ...queryFormState });
+  const createDateRange = ref([]);
+  const defaultChooseTimeRange = defaultTimeRanges;
+  // 时间变动
+  function changeCreateDate(dates, dateStrings) {
+    queryForm.startDate = dateStrings[0];
+    queryForm.endDate = dateStrings[1];
+  }
+
+  const tableLoading = ref(false);
+  const tableData = ref([]);
+  const total = ref(0);
+
+  function resetQuery() {
+    Object.assign(queryForm, queryFormState);
+    createDateRange.value = [];
+    ajaxQuery();
+  }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
+  async function ajaxQuery() {
+    try {
+      tableLoading.value = true;
+      let responseModel = await loginLogApi.queryListLogin(queryForm);
+
+      for (const e of responseModel.data.list) {
+        if (!e.userAgent) {
+          continue;
+        }
+        let ua = uaparser(e.userAgent);
+        e.browser = ua.browser.name;
+        e.os = ua.os.name;
+        e.device = ua.device.vendor ? ua.device.vendor + ua.device.model : '';
+      }
+
+      const list = responseModel.data.list;
+      total.value = responseModel.data.total;
+      tableData.value = list;
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      tableLoading.value = false;
+    }
+  }
+
+  // ----------------- 表格自适应高度 --------------------
+  const scrollY = ref(100);
+  const queryFormRef = ref();
+
+  function autoCalcTableHeight() {
+    calcTableHeight(scrollY, [queryFormRef], 10);
+  }
+
+  window.addEventListener('resize', autoCalcTableHeight);
+
+  onMounted(() => {
+    ajaxQuery();
+    autoCalcTableHeight();
+  });
+
+  onUnmounted(() => {
+    window.removeEventListener('resize', autoCalcTableHeight);
+  });
+</script>
diff --git a/smart-admin-web-typescript/src/views/system/account/components/message/components/message-detail.vue b/smart-admin-web-typescript/src/views/system/account/components/message/components/message-detail.vue
new file mode 100644
index 0000000..e254c98
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/account/components/message/components/message-detail.vue
@@ -0,0 +1,46 @@
+<template>
+  <a-drawer v-model:open="showFlag" :width="800" title="消息内容" placement="right" :destroyOnClose="true">
+    <a-descriptions bordered :column="2" size="small">
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="1" label="类型"
+        >{{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', messageDetail.messageType) }}
+      </a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '120px' }" :span="1" label="发送时间">{{ messageDetail.createTime }}</a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="2" label="标题">{{ messageDetail.title }}</a-descriptions-item>
+      <a-descriptions-item :labelStyle="{ width: '80px' }" :span="2" label="内容">
+        <pre>{{ messageDetail.content }}</pre>
+      </a-descriptions-item>
+    </a-descriptions>
+  </a-drawer>
+</template>
+<script setup lang="ts">
+  import { reactive, ref } from 'vue';
+  import { messageApi } from '/@/api/support/message-api.js';
+  import { useUserStore } from '/@/store/modules/system/user.js';
+
+  const emit = defineEmits(['refresh']);
+
+  const messageDetail = reactive({
+    messageType: '',
+    title: '',
+    content: '',
+    createTime: '',
+  });
+
+  const showFlag = ref(false);
+
+  function show(data) {
+    Object.assign(messageDetail, data);
+    showFlag.value = true;
+    read(data);
+  }
+
+  async function read(message) {
+    if (!message.readFlag) {
+      await messageApi.updateReadFlag(message.messageId);
+      await useUserStore().queryUnreadMessageCount();
+      emit('refresh');
+    }
+  }
+
+  defineExpose({ show });
+</script>
diff --git a/smart-admin-web-typescript/src/views/system/account/components/message/index.vue b/smart-admin-web-typescript/src/views/system/account/components/message/index.vue
new file mode 100644
index 0000000..c49e5d8
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/account/components/message/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <a-form class="smart-query-form">
+    <a-row class="smart-query-form-row">
+      <a-form-item label="关键字" class="smart-query-form-item">
+        <a-input style="width: 300px" v-model:value.trim="queryForm.searchWord" placeholder="标题/内容" />
+      </a-form-item>
+
+      <a-form-item label="类型" class="smart-query-form-item">
+        <smart-enum-select style="width: 150px" v-model:value="queryForm.messageType" placeholder="消息类型" enum-name="MESSAGE_TYPE_ENUM" />
+      </a-form-item>
+
+      <a-form-item label="消息时间" class="smart-query-form-item">
+        <a-space direction="vertical" :size="12">
+          <a-range-picker v-model:value="searchDate" @change="dateChange" style="width: 220px" />
+        </a-space>
+      </a-form-item>
+
+      <a-form-item label="已读" class="smart-query-form-item">
+        <a-radio-group v-model:value="queryForm.readFlag" @change="quickQuery">
+          <a-radio-button :value="null">全部</a-radio-button>
+          <a-radio-button :value="false">未读</a-radio-button>
+          <a-radio-button :value="true">已读</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+
+      <a-form-item class="smart-query-form-item smart-margin-left10">
+        <a-button-group>
+          <a-button type="primary" @click="quickQuery">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
+      </a-form-item>
+    </a-row>
+  </a-form>
+
+  <a-table size="small" :dataSource="tableData" :columns="columns" rowKey="messageId" :pagination="false" bordered>
+    <template #bodyCell="{ text, record, column }">
+      <template v-if="column.dataIndex === 'messageType'">
+        <span>{{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', text) }}</span>
+      </template>
+      <template v-if="column.dataIndex === 'readFlag'">
+        <span v-show="record.readFlag">已读</span>
+        <span v-show="!record.readFlag" style="color: red">未读</span>
+      </template>
+      <template v-if="column.dataIndex === 'title'">
+        <span v-show="record.readFlag">
+          <a @click="toDetail(record)" style="color: #8c8c8c"
+            >【{{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', record.messageType) }}】{{ text }}</a
+          >
+        </span>
+        <span v-show="!record.readFlag">
+          <a @click="toDetail(record)">【{{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', record.messageType) }}】{{ text }} </a>
+        </span>
+      </template>
+    </template>
+  </a-table>
+
+  <div class="smart-query-table-page">
+    <a-pagination
+      showSizeChanger
+      showQuickJumper
+      show-less-items
+      :pageSizeOptions="PAGE_SIZE_OPTIONS"
+      :defaultPageSize="queryForm.pageSize"
+      v-model:current="queryForm.pageNum"
+      v-model:pageSize="queryForm.pageSize"
+      :total="total"
+      @change="ajaxQuery"
+      @showSizeChange="ajaxQuery"
+      :show-total="(total) => `共${total}条`"
+    />
+  </div>
+
+  <MessageDetail ref="messageDetailRef" @refresh="ajaxQuery" />
+</template>
+<script setup lang="ts">
+  import { reactive, ref, onMounted } from 'vue';
+  import { messageApi } from '/@/api/support/message-api';
+  import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import SmartEnumSelect from '/@/components/framework/smart-enum-select//index.vue';
+  import { smartSentry } from '/@/lib/smart-sentry.js';
+  import MessageDetail from './components/message-detail.vue';
+
+  const columns = reactive([
+    {
+      title: '消息',
+      dataIndex: 'title',
+    },
+    {
+      title: '已读',
+      width: 80,
+      dataIndex: 'readFlag',
+    },
+    {
+      title: '时间',
+      dataIndex: 'createTime',
+      width: 180,
+    },
+  ]);
+
+  const queryFormState = {
+    searchWord: '',
+    messageType: null,
+    dataId: null,
+    readFlag: null,
+    endDate: null,
+    startDate: null,
+    pageNum: 1,
+    pageSize: PAGE_SIZE,
+    searchCount: true,
+    receiverType: null,
+    receiverId: null,
+  };
+  const queryForm = reactive({ ...queryFormState });
+  const tableLoading = ref(false);
+  const tableData = ref([]);
+  const total = ref(0);
+
+  // 日期选择
+  let searchDate = ref();
+
+  function dateChange(dates, dateStrings) {
+    queryForm.startDate = dateStrings[0];
+    queryForm.endDate = dateStrings[1];
+  }
+
+  function resetQuery() {
+    searchDate.value = [];
+    Object.assign(queryForm, queryFormState);
+    ajaxQuery();
+  }
+
+  function quickQuery() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
+  // 查询
+  async function ajaxQuery() {
+    try {
+      tableLoading.value = true;
+      let responseModel = await messageApi.queryMessage(queryForm);
+      const list = responseModel.data.list;
+      total.value = responseModel.data.total;
+      tableData.value = list;
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      tableLoading.value = false;
+    }
+  }
+
+  // -------------------- 详情 -----------------------------------
+
+  const messageDetailRef = ref();
+
+  function toDetail(message) {
+    messageDetailRef.value.show(message);
+  }
+
+  onMounted(ajaxQuery);
+</script>
diff --git a/smart-admin-web-typescript/src/views/system/account/components/notice/index.vue b/smart-admin-web-typescript/src/views/system/account/components/notice/index.vue
new file mode 100644
index 0000000..fc6e360
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/account/components/notice/index.vue
@@ -0,0 +1,6 @@
+<template>
+  <NoticeEmployeeList />
+</template>
+<script setup lang="ts">
+  import NoticeEmployeeList from '/@/views/business/oa/notice/notice-employee-list.vue';
+</script>
diff --git a/smart-admin-web-typescript/src/views/system/account/components/operate-log/index.vue b/smart-admin-web-typescript/src/views/system/account/components/operate-log/index.vue
new file mode 100644
index 0000000..321b9a6
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/account/components/operate-log/index.vue
@@ -0,0 +1,193 @@
+<!--
+  * 操作记录 列表
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-06-02 20:23:08
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <a-form class="smart-query-form">
+    <a-row class="smart-query-form-row">
+      <a-form-item label="请求时间" class="smart-query-form-item">
+        <a-range-picker @change="changeCreateDate" v-model:value="createDateRange" :presets="defaultChooseTimeRange" style="width: 240px" />
+      </a-form-item>
+
+      <a-form-item label="快速筛选" class="smart-query-form-item">
+        <a-radio-group v-model:value="queryForm.successFlag" @change="onSearch">
+          <a-radio-button :value="undefined">全部</a-radio-button>
+          <a-radio-button :value="true">成功</a-radio-button>
+          <a-radio-button :value="false">失败</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+
+      <a-form-item class="smart-query-form-item smart-margin-left10">
+        <a-button-group>
+          <a-button type="primary" @click="ajaxQuery">
+            <template #icon>
+              <ReloadOutlined />
+            </template>
+            查询
+          </a-button>
+          <a-button @click="resetQuery">
+            <template #icon>
+              <SearchOutlined />
+            </template>
+            重置
+          </a-button>
+        </a-button-group>
+      </a-form-item>
+    </a-row>
+  </a-form>
+
+  <a-table size="small" :loading="tableLoading" :dataSource="tableData" :columns="columns" bordered rowKey="operateLogId" :pagination="false">
+    <template #bodyCell="{ text, record, column }">
+      <template v-if="column.dataIndex === 'successFlag'">
+        <a-tag :color="text ? 'success' : 'error'">{{ text ? '成功' : '失败' }}</a-tag>
+      </template>
+      <template v-if="column.dataIndex === 'userAgent'">
+        <div>{{ record.browser }} / {{ record.os }} / {{ record.device }}</div>
+      </template>
+      <template v-if="column.dataIndex === 'action'">
+        <div class="smart-table-operate">
+          <a-button @click="showDetail(record.operateLogId)" type="link">详情</a-button>
+        </div>
+      </template>
+    </template>
+  </a-table>
+
+  <div class="smart-query-table-page">
+    <a-pagination
+      showSizeChanger
+      showQuickJumper
+      show-less-items
+      :pageSizeOptions="PAGE_SIZE_OPTIONS"
+      :defaultPageSize="queryForm.pageSize"
+      v-model:current="queryForm.pageNum"
+      v-model:pageSize="queryForm.pageSize"
+      :total="total"
+      @change="ajaxQuery"
+      @showSizeChange="ajaxQuery"
+      :show-total="(total) => `共${total}条`"
+    />
+  </div>
+
+  <OperateLogDetailModal ref="detailModal" />
+</template>
+<script setup lang="ts">
+  import { onMounted, reactive, ref } from 'vue';
+  import OperateLogDetailModal from '/@/views/support/operate-log/operate-log-detail-modal.vue';
+  import { operateLogApi } from '/@/api/support/operate-log-api';
+  import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
+  import { defaultTimeRanges } from '/@/lib/default-time-ranges';
+  import uaparser from 'ua-parser-js';
+  import { smartSentry } from '/@/lib/smart-sentry';
+
+  const columns = ref([
+    {
+      title: '操作模块',
+      dataIndex: 'module',
+      ellipsis: true,
+      width: 120,
+    },
+    {
+      title: '操作内容',
+      dataIndex: 'content',
+      ellipsis: true,
+    },
+    {
+      title: 'IP地区',
+      dataIndex: 'ipRegion',
+      ellipsis: true,
+      width: 120,
+    },
+    {
+      title: '客户端',
+      dataIndex: 'userAgent',
+      ellipsis: true,
+      width: 140,
+    },
+    {
+      title: '时间',
+      dataIndex: 'createTime',
+      width: 150,
+    },
+    {
+      title: '结果',
+      dataIndex: 'successFlag',
+      width: 60,
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      fixed: 'right',
+      width: 60,
+    },
+  ]);
+
+  const queryFormState = {
+    userName: '',
+    successFlag: undefined,
+    startDate: undefined,
+    endDate: undefined,
+    pageNum: 1,
+    pageSize: 10,
+  };
+  const queryForm = reactive({ ...queryFormState });
+  const createDateRange = ref([]);
+  const defaultChooseTimeRange = defaultTimeRanges;
+  // 时间变动
+  function changeCreateDate(dates, dateStrings) {
+    queryForm.startDate = dateStrings[0];
+    queryForm.endDate = dateStrings[1];
+  }
+
+  const tableLoading = ref(false);
+  const tableData = ref([]);
+  const total = ref(0);
+
+  function resetQuery() {
+    Object.assign(queryForm, queryFormState);
+    createDateRange.value = [];
+    ajaxQuery();
+  }
+
+  function onSearch() {
+    queryForm.pageNum = 1;
+    ajaxQuery();
+  }
+
+  async function ajaxQuery() {
+    try {
+      tableLoading.value = true;
+      let responseModel = await operateLogApi.queryListLogin(queryForm);
+
+      for (const e of responseModel.data.list) {
+        if (!e.userAgent) {
+          continue;
+        }
+        let ua = uaparser(e.userAgent);
+        e.browser = ua.browser.name;
+        e.os = ua.os.name;
+        e.device = ua.device.vendor ? ua.device.vendor + ua.device.model : '';
+      }
+
+      const list = responseModel.data.list;
+      total.value = responseModel.data.total;
+      tableData.value = list;
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      tableLoading.value = false;
+    }
+  }
+
+  onMounted(ajaxQuery);
+
+  // ---------------------- 详情 ----------------------
+  const detailModal = ref();
+  function showDetail(operateLogId) {
+    detailModal.value.show(operateLogId);
+  }
+</script>
diff --git a/smart-admin-web-typescript/src/views/system/account/components/password/index.vue b/smart-admin-web-typescript/src/views/system/account/components/password/index.vue
new file mode 100644
index 0000000..a783298
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/account/components/password/index.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="password-container">
+    <!--  内容区域-->
+    <div class="password-form-area">
+      <a-form ref="formRef" :model="form" :rules="rules" layout="vertical">
+        <a-form-item label="原密码" name="oldPassword">
+          <a-input-password class="form-item" v-model:value.trim="form.oldPassword" type="password" placeholder="请输入原密码" />
+        </a-form-item>
+        <a-form-item label="新密码" name="newPassword" :help="tips">
+          <a-input-password class="form-item" v-model:value.trim="form.newPassword" type="password" placeholder="请输入新密码" />
+        </a-form-item>
+        <a-form-item label="确认密码" name="confirmPwd" :help="tips">
+          <a-input-password class="form-item" v-model:value.trim="form.confirmPwd" type="password" placeholder="请输入确认密码" />
+        </a-form-item>
+      </a-form>
+      <a-button type="primary" style="margin: 20px 0 0 250px" @click="onSubmit">修改密码</a-button>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import { computed, onMounted, reactive, ref } from 'vue';
+  import { message } from 'ant-design-vue';
+  import { SmartLoading } from '/@/components/framework/smart-loading/index.js';
+  import { employeeApi } from '/@/api/system/employee-api.js';
+  import { smartSentry } from '/@/lib/smart-sentry.js';
+
+  const emits = defineEmits(['onSuccess']);
+
+  const formRef = ref();
+  const passwordComplexityEnabledTips = '密码长度8-20位，必须包含字母、数字、特殊符号（如：@#$%^&*()_+-=）等三种字符'; //校验规则
+  const passwordTips = '密码长度至少8位';
+  const tips = ref(passwordTips);
+  const reg =
+    /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]{8,20}$/;
+
+  // 获取系统的密码复杂度
+  const passwordComplexityEnabledFlag = ref(false);
+
+  async function getPasswordComplexityEnabled() {
+    try {
+      SmartLoading.show();
+      let res = await employeeApi.getPasswordComplexityEnabled();
+      passwordComplexityEnabledFlag.value = res.data;
+      tips.value = passwordComplexityEnabledFlag.value ? passwordComplexityEnabledTips : passwordTips;
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+  onMounted(getPasswordComplexityEnabled);
+
+  const passwordComplexityEnabledRules = {
+    oldPassword: [{ required: true, message: '请输入原密码' }],
+    newPassword: [{ required: true, type: 'string', pattern: reg, message: '密码格式错误' }],
+    confirmPwd: [{ required: true, type: 'string', pattern: reg, message: '请输入确认密码' }],
+  };
+  const commonRules = {
+    oldPassword: [{ required: true, message: '请输入原密码' }],
+    newPassword: [
+      { required: true, message: '密码格式错误' },
+      { min: 8, message: '密码长度至少8位' },
+    ],
+    confirmPwd: [
+      { required: true, message: '密码格式错误' },
+      { min: 8, message: '密码长度至少8位' },
+    ],
+  };
+
+  const rules = computed(() => {
+    return passwordComplexityEnabledFlag.value ? passwordComplexityEnabledRules : commonRules;
+  });
+
+  const formDefault = {
+    oldPassword: '',
+    newPassword: '',
+  };
+  let form = reactive({
+    ...formDefault,
+  });
+
+  async function onSubmit() {
+    formRef.value
+      .validate()
+      .then(async () => {
+        if (form.newPassword !== form.confirmPwd) {
+          message.error('新密码与确认密码不一致');
+          return;
+        }
+        SmartLoading.show();
+        try {
+          await employeeApi.updateEmployeePassword(form);
+          message.success('修改成功');
+
+          form.oldPassword = '';
+          form.newPassword = '';
+          form.confirmPwd = '';
+
+          emits('onSuccess');
+        } catch (error) {
+          smartSentry.captureError(error);
+        } finally {
+          SmartLoading.hide();
+        }
+      })
+      .catch((error) => {
+        console.log('error', error);
+        message.error('参数验证错误，请仔细填写表单数据!');
+      });
+  }
+</script>
+<style lang="less" scoped>
+  .password-container {
+    .header-title {
+      font-size: 20px;
+    }
+
+    .password-form-area {
+      margin-top: 30px;
+
+      .form-item {
+        width: 550px !important;
+      }
+    }
+  }
+</style>
diff --git a/smart-admin-web-typescript/src/views/system/account/index.vue b/smart-admin-web-typescript/src/views/system/account/index.vue
new file mode 100644
index 0000000..e272cbe
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/account/index.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="account-container">
+    <!--菜单列-->
+    <div class="account-menu-list">
+      <a-menu v-model:selectedKeys="selectedKeys" mode="inline" @click="selectMenu($event.key)">
+        <a-menu-item v-for="item in menuList" :key="item.menuId">
+          <span v-if="item.menuId === 'message'">
+            {{ item.menuName }}
+            <a-badge :count="unreadMessageCount" style="margin-left: 10px" />
+          </span>
+          <span v-if="item.menuId !== 'message'">{{ item.menuName }} </span>
+        </a-menu-item>
+      </a-menu>
+    </div>
+    <!--内容区域-->
+    <div class="account-content">
+      <component :is="selectedMenu.components" />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import { computed, onMounted, ref, watch } from 'vue';
+  import _ from 'lodash';
+  import { ACCOUNT_MENU } from '/@/views/system/account/account-menu.js';
+  import { useRoute } from 'vue-router';
+  import { useUserStore } from '/@/store/modules/system/user.js';
+
+  // 菜单展示
+  let menuList = computed(() => {
+    return _.values(ACCOUNT_MENU);
+  });
+  // 选中的菜单
+  let selectedMenu = ref({ menuId: 0 });
+  let selectedKeys = computed(() => {
+    return _.isEmpty(selectedMenu.value) ? [] : [selectedMenu.value.menuId];
+  });
+
+  function selectMenu(menuId) {
+    selectedMenu.value = menuList.value.find((e) => e.menuId === menuId);
+  }
+
+  // ------------------------- 未读消息数量  -------------------------
+  const unreadMessageCount = computed(() => {
+    return useUserStore().unreadMessageCount;
+  });
+
+  // ------------------------- 绑定路由参数  -------------------------
+  const route = useRoute();
+  onMounted(() => {
+    if (_.isEmpty(menuList.value)) {
+      return;
+    }
+    let menuId;
+    if (route.query.menuId) {
+      menuId = route.query.menuId;
+    } else {
+      let firstMenu = menuList.value[0];
+      menuId = firstMenu.menuId;
+    }
+    selectMenu(menuId);
+  });
+
+  watch(
+    () => route.query,
+    (newQuery, oldQuery) => {
+      let menuId;
+      if (route.query.menuId) {
+        menuId = route.query.menuId;
+      } else {
+        let firstMenu = menuList.value[0];
+        menuId = firstMenu.menuId;
+      }
+      selectMenu(menuId);
+    }
+  );
+</script>
+<style lang="less" scoped>
+  .account-container {
+    display: flex;
+    height: 100%;
+    background-color: white;
+    padding: 20px 0;
+
+    .account-menu-list {
+      width: 180px;
+      height: calc(100% - 100);
+      border-right: solid 1px #efefef;
+    }
+
+    .account-content {
+      flex: 1;
+      margin-left: 10px;
+      background: #ffffff;
+      padding: 20px;
+      border-radius: 8px;
+    }
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/department/components/department-form-modal.vue b/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/department/components/department-form-modal.vue
rename to smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue
index e4333f4..f11bee4 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/department/components/department-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue
@@ -28,7 +28,7 @@
 <script setup lang="ts">
   import message from 'ant-design-vue/lib/message';
   import { reactive, ref } from 'vue';
-  import { departmentApi } from '/@/api/system/department/department-api';
+  import { departmentApi } from '/@/api/system/department-api';
   import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
   import EmployeeSelect from '/@/components/system/employee-select/index.vue';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/department/department-list.vue b/smart-admin-web-typescript/src/views/system/department/department-list.vue
similarity index 97%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/department/department-list.vue
rename to smart-admin-web-typescript/src/views/system/department/department-list.vue
index 4115f5f..820f0cc 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/department/department-list.vue
+++ b/smart-admin-web-typescript/src/views/system/department/department-list.vue
@@ -64,15 +64,15 @@
   </a-card>
 </template>
 
-<script setup>
+<script setup lang="ts">
   import { onMounted, reactive, ref, watch, createVNode } from 'vue';
-  import { departmentApi } from '/src/api/system/department-api';
+  import { departmentApi } from '/@/api/system/department-api';
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import _ from 'lodash';
-  import { SmartLoading } from '/src/components/framework/smart-loading';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
   import DepartmentFormModal from './components/department-form-modal.vue';
-  import { smartSentry } from '/src/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   const DEPARTMENT_PARENT_ID = 0;
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/department-children/index.vue b/smart-admin-web-typescript/src/views/system/employee/components/department-children/index.vue
similarity index 89%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/department-children/index.vue
rename to smart-admin-web-typescript/src/views/system/employee/components/department-children/index.vue
index 5418063..7e49306 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/department-children/index.vue
+++ b/smart-admin-web-typescript/src/views/system/employee/components/department-children/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 当前所选部门的子部门 人员管理右上半部分
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
+  *
+  * @Author:    1024创新实验室-主任：卓大
   * @Date:      2022-08-08 20:46:18
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
 -->
 <template>
   <a-card class="child-dept-container">
@@ -27,7 +27,7 @@
     </a-list>
   </a-card>
 </template>
-<script setup>
+<script setup lang="ts">
   import emitter from '../../department-mitt';
 
   const props = defineProps({
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/department-tree/index.vue b/smart-admin-web-typescript/src/views/system/employee/components/department-tree/index.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/department-tree/index.vue
rename to smart-admin-web-typescript/src/views/system/employee/components/department-tree/index.vue
index 1ddb993..b4acfd6 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/department-tree/index.vue
+++ b/smart-admin-web-typescript/src/views/system/employee/components/department-tree/index.vue
@@ -21,7 +21,6 @@
       :fieldNames="{ title: 'name', key: 'departmentId', value: 'departmentId' }"
       style="width: 100%; overflow-x: auto"
       :style="[!height ? '' : { height: `${height}px`, overflowY: 'auto' }]"
-      :showLine="!props.checkable"
       :checkable="props.checkable"
       :checkStrictly="props.checkStrictly"
       :selectable="!props.checkable"
@@ -35,10 +34,10 @@
     <div class="no-data" v-else>暂无结果</div>
   </a-card>
 </template>
-<script setup>
+<script setup lang="ts">
   import { onMounted, onUnmounted, ref, watch } from 'vue';
   import _ from 'lodash';
-  import { departmentApi } from '/@/api/system/department/department-api';
+  import { departmentApi } from '/@/api/system/department-api';
   import departmentEmitter from '../../department-mitt';
   import { smartSentry } from '/@/lib/smart-sentry';
 
@@ -185,7 +184,7 @@
     let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
     let filterDepartmentList = [];
     // 循环筛选出的部门 构建部门树
-      filterDepartment.forEach((e) => {
+    filterDepartment.forEach((e) => {
       recursionFilterDepartment(filterDepartmentList, e.departmentId, false);
     });
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-department-form-modal/index.vue b/smart-admin-web-typescript/src/views/system/employee/components/employee-department-form-modal/index.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-department-form-modal/index.vue
rename to smart-admin-web-typescript/src/views/system/employee/components/employee-department-form-modal/index.vue
index 3a3f1a0..fb2ab76 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-department-form-modal/index.vue
+++ b/smart-admin-web-typescript/src/views/system/employee/components/employee-department-form-modal/index.vue
@@ -21,7 +21,7 @@
   import _ from 'lodash';
   import { ref } from 'vue';
   import DepartmentTree from '../department-tree/index.vue';
-  import { employeeApi } from '/@/api/system/employee/employee-api';
+  import { employeeApi } from '/@/api/system/employee-api';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { SmartLoading } from '/@/components/framework/smart-loading';
 
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-form-modal/index.vue b/smart-admin-web-typescript/src/views/system/employee/components/employee-form-modal/index.vue
similarity index 91%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-form-modal/index.vue
rename to smart-admin-web-typescript/src/views/system/employee/components/employee-form-modal/index.vue
index 1aaf927..7b27b9d 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-form-modal/index.vue
+++ b/smart-admin-web-typescript/src/views/system/employee/components/employee-form-modal/index.vue
@@ -61,19 +61,19 @@
     </div>
   </a-drawer>
 </template>
-<script setup>
+<script setup lang="ts">
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
   import { nextTick, reactive, ref } from 'vue';
-  import { employeeApi } from '/src/api/system/employee-api';
-  import { roleApi } from '/src/api/system/role-api';
-  import DepartmentTreeSelect from '/src/components/system/department-tree-select/index.vue';
-  import SmartEnumSelect from '/src/components/framework/smart-enum-select/index.vue';
-  import PositionSelect from '/src/components/system/position-select/index.vue';
-  import { GENDER_ENUM } from '/src/constants/common-const';
-  import { regular } from '/src/constants/regular-const';
-  import { SmartLoading } from '/src/components/framework/smart-loading';
-  import { smartSentry } from '/src/lib/smart-sentry';
+  import { employeeApi } from '/@/api/system/employee-api';
+  import { roleApi } from '/@/api/system/role-api';
+  import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
+  import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
+  import PositionSelect from '/@/components/system/position-select/index.vue';
+  import { GENDER_ENUM } from '/@/constants/common-const';
+  import { regular } from '/@/constants/regular-const';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import { smartSentry } from '/@/lib/smart-sentry';
   // ----------------------- 以下是字段定义 emits props ---------------------
   const departmentTreeSelect = ref();
   // emit
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-list/index.vue b/smart-admin-web-typescript/src/views/system/employee/components/employee-list/index.vue
similarity index 100%
rename from smart-admin-web/javascript-ant-design-vue3/src/views/system/employee/components/employee-list/index.vue
rename to smart-admin-web-typescript/src/views/system/employee/components/employee-list/index.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-password-dialog/index.vue b/smart-admin-web-typescript/src/views/system/employee/components/employee-password-dialog/index.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-password-dialog/index.vue
rename to smart-admin-web-typescript/src/views/system/employee/components/employee-password-dialog/index.vue
index 4067af2..ece545e 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/components/employee-password-dialog/index.vue
+++ b/smart-admin-web-typescript/src/views/system/employee/components/employee-password-dialog/index.vue
@@ -27,7 +27,7 @@
     </template>
   </a-modal>
 </template>
-<script setup>
+<script setup lang="ts">
   import { message } from 'ant-design-vue';
   import Clipboard from 'clipboard';
   import { ref } from 'vue';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/department-mitt.ts b/smart-admin-web-typescript/src/views/system/employee/department-mitt.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/department-mitt.ts
rename to smart-admin-web-typescript/src/views/system/employee/department-mitt.ts
diff --git a/smart-admin-web-typescript/src/views/system/employee/index.vue b/smart-admin-web-typescript/src/views/system/employee/index.vue
new file mode 100644
index 0000000..8fab2bb
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/employee/index.vue
@@ -0,0 +1,70 @@
+<!--
+  * 组织架构
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-08-08 20:46:18
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <div class="height100">
+    <a-row :gutter="16" class="height100">
+      <a-col :span="6">
+        <DepartmentTree ref="departmentTree" />
+      </a-col>
+
+      <a-col :span="18" class="height100">
+        <div class="employee-box height100">
+          <EmployeeList style="flex-grow: 2.5" class="employee" :departmentId="selectedDepartmentId" />
+        </div>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+<script setup lang="ts">
+  import _ from 'lodash';
+  import { computed, ref } from 'vue';
+  import DepartmentTree from './components/department-tree/index.vue';
+  import EmployeeList from './components/employee-list/index.vue';
+
+  const departmentTree = ref();
+
+  // 部门 面包屑
+  const breadcrumb = computed(() => {
+    if (departmentTree.value) {
+      return departmentTree.value.breadcrumb;
+    }
+    return [];
+  });
+
+  // 当前选中部门的孩子
+  const selectedDepartmentChildren = computed(() => {
+    if (departmentTree.value) {
+      return departmentTree.value.selectedDepartmentChildren;
+    }
+    return [];
+  });
+
+  // 当前选中的部门id
+  const selectedDepartmentId = computed(() => {
+    if (departmentTree.value) {
+      let selectedKeys = departmentTree.value.selectedKeys;
+      return _.isEmpty(selectedKeys) ? null : selectedKeys[0];
+    }
+    return null;
+  });
+</script>
+<style scoped lang="less">
+  .height100 {
+    height: 100%;
+  }
+  .employee-box {
+    display: flex;
+    flex-direction: column;
+
+    .employee {
+      flex-grow: 2;
+    }
+  }
+</style>
diff --git a/smart-admin-web-typescript/src/views/system/home/ad-modal.vue b/smart-admin-web-typescript/src/views/system/home/ad-modal.vue
new file mode 100644
index 0000000..db353c9
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/home/ad-modal.vue
@@ -0,0 +1,92 @@
+<!--
+  *  客服人员弹窗
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-06 20:40:16
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+-->
+<template>
+  <a-modal :open="visible" width="600px" :bodyStyle="{height:'480px'}"   title="" :closable="false" :maskClosable="true">
+    <a-row><div style="font-weight:bolder;margin: 0 auto;font-size: 16px">助力卓大抖音1000个粉丝，开播写代码🎉🎉</div> </a-row>
+    <a-row><div style="font-weight:bolder;margin: 20px auto;font-size: 15px">和1024创新实验室一起，热爱代码，热爱生活，永远年轻，永远前行🎉🎉</div> </a-row>
+    <br />
+    <div class="app-qr-box">
+      <div class="app-qr">
+        <a-image
+            :width="300"
+            style="border-radius: 15px;"
+            src="https://img.smartadmin.1024lab.net/wechat/douyin.png"
+        />
+
+        <span class="qr-desc strong"> 打开【抖音APP】-点击【左上角侧边栏】-【点击扫一扫】-【进行关注】</span>
+      </div>
+    </div>
+    <template #footer>
+      <a-button type="primary" @click="hide">知道了</a-button>
+    </template>
+  </a-modal>
+</template>
+<script setup lang="ts">
+import {ref} from 'vue';
+
+defineExpose({
+    show,
+  });
+
+  const visible = ref(true);
+  function show() {
+    visible.value = true;
+  }
+  function hide() {
+    visible.value = false;
+  }
+</script>
+<style lang="less" scoped>
+  .app-qr-box {
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    .app-qr {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      > img {
+        width: 100%;
+        height: 100%;
+      }
+      .strong {
+        font-weight: 600;
+      }
+      .qr-desc {
+        display: flex;
+        margin-top: 20px;
+        align-items: center;
+        font-size: 13px;
+        color: red;
+        text-align: center;
+        overflow-x: hidden;
+        > img {
+          width: 15px;
+          height: 18px;
+          margin-right: 9px;
+        }
+      }
+    }
+  }
+
+  .ant-carousel :deep(.slick-slide) {
+    text-align: center;
+    height: 120px;
+    line-height: 120px;
+    width: 120px;
+    background: #364d79;
+    overflow: hidden;
+  }
+
+  .ant-carousel :deep(.slick-slide h3) {
+    color: #fff;
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/changelog-card.vue b/smart-admin-web-typescript/src/views/system/home/components/changelog-card.vue
similarity index 86%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/changelog-card.vue
rename to smart-admin-web-typescript/src/views/system/home/components/changelog-card.vue
index aca03df..60c7600 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/changelog-card.vue
+++ b/smart-admin-web-typescript/src/views/system/home/components/changelog-card.vue
@@ -9,7 +9,7 @@
   *
 -->
 <template>
-  <default-home-card extra="更多" icon="FireTwoTone" title="更新日志" @extraClick="onMore">
+  <default-home-card extra="更多" icon="FlagOutlined" title="更新日志" @extraClick="onMore">
     <a-empty v-if="$lodash.isEmpty(data)" />
     <ul v-else>
       <template v-for="(item, index) in data" :key="index">
@@ -30,7 +30,7 @@
   import { onMounted, ref } from 'vue';
   import { useRouter } from 'vue-router';
   import { smartSentry } from '/@/lib/smart-sentry';
-  import { changeLogApi } from '/@/api/support/change-log/change-log-api';
+  import { changeLogApi } from '/@/api/support/change-log-api';
   import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
   import ChangeLogForm from '/@/views/support/change-log/change-log-modal.vue';
 
@@ -88,20 +88,7 @@
 
     .time {
       flex-shrink: 0;
-      color: @text-color-secondary;
       min-width: 75px;
     }
   }
-
-  ul li :hover {
-    color: @primary-color;
-  }
-
-  .un-read a {
-    color: @text-color;
-  }
-
-  .read a {
-    color: @text-color-secondary;
-  }
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/default-home-card.vue b/smart-admin-web-typescript/src/views/system/home/components/default-home-card.vue
similarity index 52%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/default-home-card.vue
rename to smart-admin-web-typescript/src/views/system/home/components/default-home-card.vue
index ada5868..a8680c2 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/default-home-card.vue
+++ b/smart-admin-web-typescript/src/views/system/home/components/default-home-card.vue
@@ -13,9 +13,9 @@
     <a-card size="small">
       <template #title>
         <div class="title">
-          <component :is="$antIcons[props.icon]" v-if="props.icon" :style="{ fontSize: '18px' }" />
+          <component :is="$antIcons[props.icon]" v-if="props.icon" :style="{ fontSize: '18px', color: token.colorPrimary }" />
           <slot name="title"></slot>
-          <span v-if="!$slots.title" class="smart-margin-left10">{{ props.title }}</span>
+          <span v-if="!$slots.title" class="smart-margin-left10">{{ props.title }} </span>
         </div>
       </template>
       <template v-if="props.extra" #extra>
@@ -27,34 +27,42 @@
   </div>
 </template>
 <script setup lang="ts">
-let props = defineProps({
-  icon: String,
-  title: String,
-  extra: String,
-});
-let emits = defineEmits(['extraClick']);
+  import { theme } from 'ant-design-vue';
+  import { computed } from 'vue';
 
-function extraClick() {
-  emits('extraClick');
-}
+  let props = defineProps({
+    icon: String,
+    title: String,
+    extra: String,
+  });
+  let emits = defineEmits(['extraClick']);
+
+  function extraClick() {
+    emits('extraClick');
+  }
+
+  const { useToken } = theme;
+  const { token } = useToken();
+  const color = computed(() => {
+    return token.colorPrimary;
+  });
 </script>
 <style lang="less" scoped>
-.card-container {
-  background-color: #fff;
-  height: 100%;
+  .card-container {
+    height: 100%;
 
-  .title {
-    display: flex;
-    align-items: center;
-    &::before {
-      content: '';
-      position: absolute;
-      top: 3px;
-      left: 0;
-      width: 3px;
-      height: 30px;
-      background-color: @primary-color;
+    .title {
+      display: flex;
+      align-items: center;
+      &::before {
+        content: '';
+        position: absolute;
+        top: 3px;
+        left: 0;
+        width: 3px;
+        height: 30px;
+        background-color: v-bind('token.colorPrimary');
+      }
     }
   }
-}
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/category.vue b/smart-admin-web-typescript/src/views/system/home/components/echarts/category.vue
similarity index 95%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/category.vue
rename to smart-admin-web-typescript/src/views/system/home/components/echarts/category.vue
index 52a6df0..89fa52f 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/category.vue
+++ b/smart-admin-web-typescript/src/views/system/home/components/echarts/category.vue
@@ -1,5 +1,5 @@
 <template>
-  <default-home-card icon="ProfileTwoTone" title="【1024创新实验室】人员饭量">
+  <default-home-card icon="Profile" title="销量统计">
     <div class="echarts-box">
       <div class="category-main" id="category-main"></div>
     </div>
diff --git a/smart-admin-web-typescript/src/views/system/home/components/echarts/gauge.vue b/smart-admin-web-typescript/src/views/system/home/components/echarts/gauge.vue
new file mode 100644
index 0000000..d473247
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/home/components/echarts/gauge.vue
@@ -0,0 +1,118 @@
+<!--
+ * @Author: zhuoda
+ * @Date: 2021-08-24 16:35:45
+ * @LastEditTime: 2022-06-11
+ * @LastEditors: zhuoda
+ * @Description:
+ * @FilePath: /smart-admin/@/views/system/home/components/gauge.vue
+-->
+<template>
+  <default-home-card icon="Rocket" title="业绩完成度">
+    <div class="echarts-box">
+      <div id="gauge-main" class="gauge-main"></div>
+    </div>
+  </default-home-card>
+</template>
+<script setup lang="ts">
+  import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
+  import * as echarts from 'echarts';
+  import { onMounted, watch } from 'vue';
+  import { reactive } from 'vue';
+
+  const props = defineProps({
+    percent: {
+      type: Number,
+      default: 0,
+    },
+  });
+
+  let option = reactive({});
+  watch(
+    () => props.percent,
+    () => {
+      init();
+    }
+  );
+  onMounted(() => {
+    init();
+  });
+
+  function init() {
+    option = {
+      series: [
+        {
+          type: 'gauge',
+          startAngle: 90,
+          endAngle: -270,
+          pointer: {
+            show: false,
+          },
+          progress: {
+            show: true,
+            overlap: false,
+            roundCap: true,
+            clip: false,
+            itemStyle: {
+              borderWidth: 1,
+              borderColor: '#464646',
+            },
+          },
+          axisLine: {
+            lineStyle: {
+              width: 20,
+            },
+          },
+          splitLine: {
+            show: false,
+            distance: 0,
+            length: 10,
+          },
+          axisTick: {
+            show: false,
+          },
+          axisLabel: {
+            show: false,
+            distance: 50,
+          },
+          data: [
+            {
+              value: props.percent,
+              name: '完成度',
+              title: {
+                offsetCenter: ['0%', '-10%'],
+              },
+              detail: {
+                offsetCenter: ['0%', '20%'],
+              },
+            },
+          ],
+          title: {
+            fontSize: 18,
+          },
+          detail: {
+            fontSize: 16,
+            color: 'auto',
+            formatter: '{value}%',
+          },
+        },
+      ],
+    };
+    let chartDom = document.getElementById('gauge-main');
+    if (chartDom) {
+      let myChart = echarts.init(chartDom);
+      option && myChart.setOption(option);
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .echarts-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .gauge-main {
+      width: 260px;
+      height: 260px;
+      background: #fff;
+    }
+  }
+</style>
diff --git a/smart-admin-web-typescript/src/views/system/home/components/echarts/gradient.vue b/smart-admin-web-typescript/src/views/system/home/components/echarts/gradient.vue
new file mode 100644
index 0000000..dd072af
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/home/components/echarts/gradient.vue
@@ -0,0 +1,210 @@
+<template>
+  <default-home-card icon="BarChartOutlined" title="代码提交量">
+    <div class="echarts-box">
+      <div class="gradient-main" id="gradient-main"></div>
+    </div>
+  </default-home-card>
+</template>
+<script setup lang="ts">
+  import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
+  import * as echarts from 'echarts';
+  import { onMounted } from 'vue';
+
+  onMounted(() => {
+    init();
+  });
+
+  function init() {
+    let option = {
+      color: ['#80FFA5', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],
+      tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+          type: 'cross',
+          label: {
+            backgroundColor: '#6a7985',
+          },
+        },
+      },
+      legend: {
+        data: ['罗伊', '佩弦', '开云', '清野', '飞叶'],
+      },
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true,
+      },
+      xAxis: [
+        {
+          type: 'category',
+          boundaryGap: false,
+          data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+        },
+      ],
+      series: [
+        {
+          name: '罗伊',
+          type: 'line',
+          stack: 'Total',
+          smooth: true,
+          lineStyle: {
+            width: 0,
+          },
+          showSymbol: false,
+          areaStyle: {
+            opacity: 0.8,
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: 'rgb(128, 255, 165)',
+              },
+              {
+                offset: 1,
+                color: 'rgb(1, 191, 236)',
+              },
+            ]),
+          },
+          emphasis: {
+            focus: 'series',
+          },
+          data: [140, 232, 101, 264, 90, 340, 250],
+        },
+        {
+          name: '佩弦',
+          type: 'line',
+          stack: 'Total',
+          smooth: true,
+          lineStyle: {
+            width: 0,
+          },
+          showSymbol: false,
+          areaStyle: {
+            opacity: 0.8,
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: 'rgb(0, 221, 255)',
+              },
+              {
+                offset: 1,
+                color: 'rgb(77, 119, 255)',
+              },
+            ]),
+          },
+          emphasis: {
+            focus: 'series',
+          },
+          data: [120, 282, 111, 234, 220, 340, 310],
+        },
+        {
+          name: '开云',
+          type: 'line',
+          stack: 'Total',
+          smooth: true,
+          lineStyle: {
+            width: 0,
+          },
+          showSymbol: false,
+          areaStyle: {
+            opacity: 0.8,
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: 'rgb(55, 162, 255)',
+              },
+              {
+                offset: 1,
+                color: 'rgb(116, 21, 219)',
+              },
+            ]),
+          },
+          emphasis: {
+            focus: 'series',
+          },
+          data: [320, 132, 201, 334, 190, 130, 220],
+        },
+        {
+          name: '清野',
+          type: 'line',
+          stack: 'Total',
+          smooth: true,
+          lineStyle: {
+            width: 0,
+          },
+          showSymbol: false,
+          areaStyle: {
+            opacity: 0.8,
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: 'rgb(255, 0, 135)',
+              },
+              {
+                offset: 1,
+                color: 'rgb(135, 0, 157)',
+              },
+            ]),
+          },
+          emphasis: {
+            focus: 'series',
+          },
+          data: [220, 402, 231, 134, 190, 230, 120],
+        },
+        {
+          name: '飞叶',
+          type: 'line',
+          stack: 'Total',
+          smooth: true,
+          lineStyle: {
+            width: 0,
+          },
+          showSymbol: false,
+          label: {
+            show: true,
+            position: 'top',
+          },
+          areaStyle: {
+            opacity: 0.8,
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: 'rgb(255, 191, 0)',
+              },
+              {
+                offset: 1,
+                color: 'rgb(224, 62, 76)',
+              },
+            ]),
+          },
+          emphasis: {
+            focus: 'series',
+          },
+          data: [220, 302, 181, 234, 210, 290, 150],
+        },
+      ],
+    };
+    let chartDom = document.getElementById('gradient-main');
+    if (chartDom) {
+      let myChart = echarts.init(chartDom);
+      option && myChart.setOption(option);
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .echarts-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .gradient-main {
+      width: 1200px;
+      height: 300px;
+      background: #fff;
+    }
+  }
+</style>
diff --git a/smart-admin-web-typescript/src/views/system/home/components/echarts/pie.vue b/smart-admin-web-typescript/src/views/system/home/components/echarts/pie.vue
new file mode 100644
index 0000000..bc45326
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/home/components/echarts/pie.vue
@@ -0,0 +1,78 @@
+<template>
+  <default-home-card icon="PieChartOutlined" title="加班统计">
+    <div class="echarts-box">
+      <div class="pie-main" id="pie-main"></div>
+    </div>
+  </default-home-card>
+</template>
+<script setup lang="ts">
+  import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
+  import * as echarts from 'echarts';
+  import { onMounted } from 'vue';
+
+  onMounted(() => {
+    init();
+  });
+
+  function init() {
+    let option = {
+      tooltip: {
+        trigger: 'item',
+      },
+      legend: {
+        top: '5%',
+        left: 'center',
+      },
+      series: [
+        {
+          name: '加班次数',
+          type: 'pie',
+          radius: ['40%', '70%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderRadius: 10,
+            borderColor: '#fff',
+            borderWidth: 2,
+          },
+          label: {
+            show: false,
+            position: 'center',
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: '40',
+              fontWeight: 'bold',
+            },
+          },
+          labelLine: {
+            show: false,
+          },
+          data: [
+            { value: 10, name: '初晓' },
+            { value: 8, name: '善逸' },
+            { value: 3, name: '胡克' },
+            { value: 1, name: '罗伊' },
+          ],
+        },
+      ],
+    };
+    let chartDom = document.getElementById('pie-main');
+    if (chartDom) {
+      let myChart = echarts.init(chartDom);
+      option && myChart.setOption(option);
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .echarts-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .pie-main {
+      width: 260px;
+      height: 260px;
+      background: #fff;
+    }
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/official-account-card.vue b/smart-admin-web-typescript/src/views/system/home/components/official-account-card.vue
similarity index 75%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/official-account-card.vue
rename to smart-admin-web-typescript/src/views/system/home/components/official-account-card.vue
index e813938..253b2ac 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/official-account-card.vue
+++ b/smart-admin-web-typescript/src/views/system/home/components/official-account-card.vue
@@ -9,7 +9,7 @@
   *
 -->
 <template>
-  <default-home-card icon="SmileTwoTone" title="添加微信，关注【小镇程序员】、【1024创新实验室】">
+  <default-home-card icon="SmileOutlined" title="联系我们">
     <div class="app-qr-box">
       <div class="app-qr">
         <img :src="zhuoda" />
@@ -18,22 +18,16 @@
       </div>
       <div class="app-qr">
         <img :src="xiaozhen" />
-        <span class="qr-desc strong"> 小镇程序员 </span>
-        <span class="qr-desc"> 代码与生活，还有钱途 </span>
-      </div>
-      <div class="app-qr">
-        <img :src="lab1024" />
-        <span class="qr-desc strong"> 1024创新实验室 </span>
-        <span class="qr-desc"> 官方账号 </span>
+        <span class="qr-desc strong"> 六边形工程师 </span>
+        <span class="qr-desc"> 赚钱、代码、生活 </span>
       </div>
     </div>
   </default-home-card>
 </template>
 <script setup lang="ts">
   import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
-  import lab1024 from '/@/assets/images/1024lab/1024lab-gzh.jpg';
   import zhuoda from '/@/assets/images/1024lab/zhuoda-wechat.jpg';
-  import xiaozhen from '/@/assets/images/1024lab/xiaozhen-gzh.jpg';
+  import xiaozhen from '/@/assets/images/1024lab/gzh.jpg';
 </script>
 <style lang="less" scoped>
   .app-qr-box {
diff --git a/smart-admin-web-typescript/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue b/smart-admin-web-typescript/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue
new file mode 100644
index 0000000..8bb6d8a
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue
@@ -0,0 +1,80 @@
+<template>
+  <a-modal v-model:open="visible" title="新建快捷入口" @close="onClose">
+    <a-form ref="formRef" :model="form" :rules="rules">
+      <a-form-item label="图标" name="icon">
+        <IconSelect @updateIcon="selectIcon">
+          <template #iconSelect>
+            <a-input v-model:value="form.icon" placeholder="请输入菜单图标" style="width: 200px" />
+            <component :is="$antIcons[form.icon]" class="smart-margin-left15" style="font-size: 20px" />
+          </template>
+        </IconSelect>
+      </a-form-item>
+      <a-form-item label="标题" name="title">
+        <a-input v-model:value="form.title" placeholder="请输入标题" />
+      </a-form-item>
+      <a-form-item label="路径" name="path">
+        <a-input v-model:value="form.path" placeholder="请输入路径" />
+      </a-form-item>
+    </a-form>
+    <template #footer>
+      <a-button @click="onClose">取消</a-button>
+      <a-button type="primary" @click="onSubmit">提交</a-button>
+    </template>
+  </a-modal>
+</template>
+<script setup lang="ts">
+  import { reactive, ref } from 'vue';
+  import { message } from 'ant-design-vue';
+  import IconSelect from '/@/components/framework/icon-select/index.vue';
+  import _ from 'lodash';
+
+  defineExpose({
+    showModal,
+  });
+
+  const emit = defineEmits(['addQuickEntry']);
+
+  // 组件ref
+  const formRef = ref();
+
+  const formDefault = {
+    icon: undefined,
+    title: '',
+    path: '',
+  };
+  let form = reactive({ ...formDefault });
+  const rules = {
+    icon: [{ required: true, message: '请选择图标' }],
+    title: [{ required: true, message: '标题不能为空' }],
+    path: [{ required: true, message: '路径不能为空' }],
+  };
+
+  const visible = ref(false);
+
+  function showModal() {
+    visible.value = true;
+  }
+
+  function selectIcon(icon) {
+    form.icon = icon;
+  }
+
+  function onClose() {
+    Object.assign(form, formDefault);
+    visible.value = false;
+  }
+
+  function onSubmit() {
+    formRef.value
+      .validate()
+      .then(() => {
+        emit('addQuickEntry', _.cloneDeep(form));
+        onClose();
+      })
+      .catch((error) => {
+        console.log('error', error);
+        message.error('参数验证错误，请仔细填写表单数据!');
+      });
+  }
+</script>
+<style lang="less" scoped></style>
diff --git a/smart-admin-web-typescript/src/views/system/home/components/quick-entry/home-quick-entry.vue b/smart-admin-web-typescript/src/views/system/home/components/quick-entry/home-quick-entry.vue
new file mode 100644
index 0000000..70964a4
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/home/components/quick-entry/home-quick-entry.vue
@@ -0,0 +1,148 @@
+<template>
+  <default-home-card :extra="`${editFlag ? '完成' : '编辑'}`" icon="ThunderboltTwoTone" title="快捷入口" @extraClick="editFlag = !editFlag">
+    <div class="quick-entry-list">
+      <a-row>
+        <a-col v-for="(item, index) in quickEntry" :key="index" span="4">
+          <div class="quick-entry" @click="turnToPage(item.path)">
+            <div class="icon">
+              <component :is="$antIcons[item.icon]" :style="{ fontSize: '30px' }" />
+              <close-circle-outlined v-if="editFlag" class="delete-icon" @click="deleteQuickEntry(index)" />
+            </div>
+            <span class="entry-title">{{ item.title }}</span>
+          </div>
+        </a-col>
+        <a-col v-if="editFlag && quickEntry.length < maxCount" span="4">
+          <div class="add-quick-entry" @click="addHomeQuickEntry">
+            <div class="add-icon">
+              <plus-outlined :style="{ fontSize: '30px' }" />
+            </div>
+          </div>
+        </a-col>
+      </a-row>
+    </div>
+  </default-home-card>
+  <HomeQuickEntryModal ref="homeQuickEntryModal" @addQuickEntry="addQuickEntry" />
+</template>
+<script setup lang="ts">
+  import { onMounted, ref } from 'vue';
+  import { router } from '/@/router';
+  import HomeQuickEntryModal from './home-quick-entry-modal.vue';
+  import localKey from '/@/constants/local-storage-key-const';
+  import { localRead, localSave } from '/@/utils/local-util';
+  import _ from 'lodash';
+  import InitQuickEntryList from './init-quick-entry-list';
+  import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
+  import { theme } from 'ant-design-vue';
+
+  //---------------- 初始化展示 --------------------
+  onMounted(() => {
+    initQuickEntry();
+  });
+  let quickEntry = ref([]);
+
+  function initQuickEntry() {
+    let quickEntryJson = localRead(localKey.HOME_QUICK_ENTRY);
+    if (!quickEntryJson) {
+      quickEntry.value = _.cloneDeep(InitQuickEntryList);
+      return;
+    }
+    let quickEntryList = JSON.parse(quickEntryJson);
+    if (_.isEmpty(quickEntryList)) {
+      quickEntry.value = _.cloneDeep(InitQuickEntryList);
+      return;
+    }
+    quickEntry.value = quickEntryList;
+  }
+
+  // 页面跳转
+  function turnToPage(path) {
+    if (editFlag.value) {
+      return;
+    }
+    router.push({ path });
+  }
+
+  //----------------  编辑快捷入口 --------------------
+  let editFlag = ref(false);
+  let maxCount = ref(6);
+
+  // 快捷入口删除
+  function deleteQuickEntry(index) {
+    quickEntry.value.splice(index, 1);
+    localSave(localKey.HOME_QUICK_ENTRY, JSON.stringify(quickEntry.value));
+  }
+
+  // 添加快捷入口
+  let homeQuickEntryModal = ref();
+
+  function addHomeQuickEntry() {
+    homeQuickEntryModal.value.showModal();
+  }
+
+  function addQuickEntry(row) {
+    quickEntry.value.push(row);
+    localSave(localKey.HOME_QUICK_ENTRY, JSON.stringify(quickEntry.value));
+  }
+
+  const { useToken } = theme;
+  const { token } = useToken();
+</script>
+<style lang="less" scoped>
+  .quick-entry-list {
+    height: 100%;
+
+    .quick-entry {
+      padding: 10px 0;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+      border-radius: 4px;
+
+      .entry-title {
+        margin-top: 5px;
+      }
+
+      .icon {
+        position: relative;
+      }
+
+      &:hover {
+        background-color: #f0ffff;
+      }
+
+      .delete-icon {
+        position: absolute;
+        color: #f08080;
+        top: -5px;
+        right: -5px;
+      }
+    }
+
+    .add-quick-entry {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .add-icon {
+        width: 70px;
+        height: 70px;
+        background-color: #fafafa;
+        border: 1px dashed #d9d9d9;
+        border-radius: 2px;
+        cursor: pointer;
+        transition: border-color 0.3s;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #a9a9a9;
+
+        &:hover {
+          border-color: v-bind('token.colorPrimary');
+          color: v-bind('token.colorPrimary');
+        }
+      }
+    }
+  }
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/quick-entry/init-quick-entry-list.js b/smart-admin-web-typescript/src/views/system/home/components/quick-entry/init-quick-entry-list.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/quick-entry/init-quick-entry-list.js
rename to smart-admin-web-typescript/src/views/system/home/components/quick-entry/init-quick-entry-list.ts
diff --git a/smart-admin-web-typescript/src/views/system/home/components/to-be-done-card/home-to-be-done.vue b/smart-admin-web-typescript/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
new file mode 100644
index 0000000..512e55c
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/home/components/to-be-done-card/home-to-be-done.vue
@@ -0,0 +1,177 @@
+<!--
+  * 待办工作
+  * 
+  * @Author:    1024创新实验室-主任：卓大 
+  * @Date:      2022-09-12 22:34:00
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+-->
+<template>
+  <default-home-card extra="添加" icon="StarTwoTone" title="待办工作" @extraClick="showAddToBeDone">
+    <div style="height: 280px">
+      <div class="center column">
+        <a-space direction="vertical" style="width: 100%">
+          <a-empty v-if="$lodash.isEmpty(toBeDoneList)" description="暂无待办工作" />
+          <div v-for="(item, index) in toDoList" :key="index" :class="['to-do', { done: item.doneFlag }]">
+            <a-checkbox v-model:checked="item.doneFlag" @change="handleCheckbox">
+              <span class="task">{{ item.title }}</span>
+            </a-checkbox>
+            <div v-if="!item.doneFlag" class="star-icon" @click="itemStar(item)">
+              <StarFilled v-if="item.starFlag" style="color: #ff8c00" />
+              <StarOutlined v-else style="color: #c0c0c0" />
+            </div>
+            <close-circle-outlined class="delete-icon" @click="toDelete(item)" />
+          </div>
+          <div v-for="(item, index) in doneList" :key="index" :class="['to-do', { done: item.doneFlag }]">
+            <a-checkbox v-model:checked="item.doneFlag" @change="handleCheckbox">
+              <span class="task">{{ item.title }}</span>
+            </a-checkbox>
+            <div v-if="!item.doneFlag" class="star-icon" @click="itemStar(item)">
+              <StarFilled v-if="item.starFlag" style="color: #ff8c00" />
+              <StarOutlined v-else style="color: #c0c0c0" />
+            </div>
+            <close-circle-outlined class="delete-icon" @click="toDelete(item)" />
+          </div>
+        </a-space>
+      </div>
+    </div>
+  </default-home-card>
+  <ToBeDoneModal ref="toBeDoneModalRef" @addToBeDone="addToBeDone" />
+</template>
+<script setup lang="ts">
+  import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
+  import ToBeDoneModal from './to-be-done-modal.vue';
+  import localKey from '/@/constants/local-storage-key-const';
+  import { localRead, localSave } from '/@/utils/local-util';
+  import { useUserStore } from '/@/store/modules/system/user.js';
+  import { computed, ref, onMounted } from 'vue';
+  import { Modal } from 'ant-design-vue';
+
+  let toBeDoneList = ref([]);
+
+  onMounted(() => {
+    initTaskList();
+  });
+
+  function initTaskList() {
+    let localTaskList = localRead(localKey.TO_BE_DONE);
+    if (localTaskList) {
+      toBeDoneList.value = JSON.parse(localTaskList);
+    }
+  }
+
+  let toDoList = computed(() => {
+    return toBeDoneList.value.filter((e) => !e.doneFlag);
+  });
+
+  let doneList = computed(() => {
+    return toBeDoneList.value.filter((e) => e.doneFlag);
+  });
+
+  function handleCheckbox(e) {
+    localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+    useUserStore().toBeDoneCount = toDoList.value.length;
+  }
+
+  function itemStar(data) {
+    data.starFlag = !data.starFlag;
+    // 将取消 star 的删除掉
+    const index = toBeDoneList.value.findIndex((item) => item.title === data.title);
+    toBeDoneList.value.splice(index, 1);
+    if (data.starFlag) {
+      // 最新添加标记star的移动到第一位
+      toBeDoneList.value.unshift(data);
+    } else {
+      // 取消标记star的移动到最后一个标记 star 的后面添加
+      const lastStarIndex = toBeDoneList.value.findLastIndex((item) => item.starFlag);
+      toBeDoneList.value.splice(lastStarIndex + 1, 0, data);
+    }
+    localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+  }
+
+  //-------------------------任务新建-----------------------
+
+  let toBeDoneModalRef = ref();
+
+  function showAddToBeDone() {
+    toBeDoneModalRef.value.showModal();
+  }
+
+  // 添加待办工作
+  function addToBeDone(data) {
+    toBeDoneList.value.push(data);
+    localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+    useUserStore().toBeDoneCount = toDoList.value.length;
+  }
+
+  function toDelete(data) {
+    if (!data.doneFlag) {
+      Modal.confirm({
+        title: '提示',
+        content: '确定要删除吗?',
+        okText: '删除',
+        okType: 'danger',
+        onOk() {
+          deleteToBeDone(data);
+        },
+        cancelText: '取消',
+        onCancel() {},
+      });
+    } else {
+      deleteToBeDone(data);
+    }
+  }
+
+  // 删除待办工作
+  function deleteToBeDone(data) {
+    const index = toBeDoneList.value.findIndex((item) => item.title === data.title);
+    toBeDoneList.value.splice(index, 1);
+    localSave(localKey.TO_BE_DONE, JSON.stringify(toBeDoneList.value));
+    useUserStore().toBeDoneCount = toDoList.value.length;
+  }
+</script>
+<style lang="less" scoped>
+  .center {
+    display: flex;
+    justify-content: center;
+    height: 100%;
+    overflow-y: auto;
+
+    &.column {
+      flex-direction: column;
+      width: 100%;
+      padding: 0 10px;
+      justify-content: flex-start;
+    }
+  }
+
+  .to-do {
+    width: 100%;
+    border: 1px solid #d3d3d3;
+    border-radius: 4px;
+    padding: 4px;
+    display: flex;
+    align-items: center;
+    .star-icon {
+      margin-left: auto;
+      cursor: pointer;
+    }
+
+    &.done {
+      text-decoration: line-through;
+      color: #8c8c8c;
+
+      .task {
+        color: #8c8c8c;
+      }
+    }
+  }
+
+  .delete-icon {
+    color: #f08080;
+    padding-left: 10px;
+    top: -5px;
+    right: -5px;
+    float: right;
+  }
+</style>
diff --git a/smart-admin-web-typescript/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue b/smart-admin-web-typescript/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
new file mode 100644
index 0000000..3d33bff
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/home/components/to-be-done-card/to-be-done-modal.vue
@@ -0,0 +1,65 @@
+<template>
+  <div>
+    <a-modal v-model:open="visible" title="新建待办" @close="onClose">
+      <a-form ref="formRef" :model="form" :rules="rules">
+        <a-form-item label="标题" name="title">
+          <a-input v-model:value="form.title" placeholder="请输入标题" />
+        </a-form-item>
+      </a-form>
+      <template #footer>
+        <a-button @click="onClose">取消</a-button>
+        <a-button type="primary" @click="onSubmit">确定</a-button>
+      </template>
+    </a-modal>
+  </div>
+</template>
+<script setup lang="ts">
+  import { reactive, ref } from 'vue';
+  import { message } from 'ant-design-vue';
+  import _ from 'lodash';
+
+  defineExpose({
+    showModal,
+  });
+
+  const emit = defineEmits(['addToBeDone']);
+
+  // 组件ref
+  const formRef = ref();
+
+  const formDefault = {
+    title: undefined,
+    doneFlag: false,
+    starFlag: false,
+    starTime: 0,
+  };
+  let form = reactive({ ...formDefault });
+  const rules = {
+    title: [{ required: true, message: '标题不能为空' }],
+  };
+
+  const visible = ref(false);
+
+  function showModal() {
+    visible.value = true;
+  }
+
+  function onClose() {
+    Object.assign(form, formDefault);
+    visible.value = false;
+  }
+
+  function onSubmit() {
+    formRef.value
+      .validate()
+      .then(() => {
+        emit('addToBeDone', _.cloneDeep(form));
+        onClose();
+      })
+      .catch((error) => {
+        console.log('error', error);
+        message.error('参数验证错误，请仔细填写表单数据!');
+      });
+  }
+</script>
+<style lang="less" scoped></style>
diff --git a/smart-admin-web-typescript/src/views/system/home/heart-sentence.ts b/smart-admin-web-typescript/src/views/system/home/heart-sentence.ts
new file mode 100644
index 0000000..e952175
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/home/heart-sentence.ts
@@ -0,0 +1,11 @@
+export default [
+  '梦想不会自动成真，奋斗是其桥梁；目标不会自动抵达，奔跑才有远方!',
+  '成长是一场和自己的比赛，不要担心别人会做得比你好，只要你每天都比前一天做得好!',
+  '最慢的步伐不是跬步，而是徘徊；最快的脚步不是冲刺，而是坚持!',
+  '平日里的千锤百炼，才能托举出光彩时刻；逆境中的亮剑、失败后的奋起，才能让梦想成真。哪有什么一战成名，其实都是百炼成钢。“天才”都是汗水浇灌出来的，天赋或许可以决定起点，但唯有坚持和努力才能达到终点。',
+  '历尽天华成此景，人间万事出艰辛。志不求易者成，事不避难者进!',
+  '每一个不向命运低头、努力生活的人，都值得被尊重。',
+  '青年的肩上，从不只有清风明月，更有责任担当。岁月因青春慨然以赴而更加美好，世间因少年挺身向前而更加瑰丽。请相信，不会有人永远年轻，但永远有人年轻。',
+  '人生路上，总有人走得比你快，但不必介意，也不必着急。一味羡慕别人的成绩，只会给自己平添压力、徒增烦恼。不盲从别人的脚步，坚定目标，才能找到自己的节奏，进而逢山开路、遇水搭桥。',
+  '没有理所当然的成功，也没有毫无道理的平庸。值得拥有的东西，永远都来之不易。所以在徘徊迷茫时，不要质疑你的付出，这些累积都会变成一种沉淀，默默为你铺路!',
+];
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/home-header.vue b/smart-admin-web-typescript/src/views/system/home/home-header.vue
similarity index 50%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/home/home-header.vue
rename to smart-admin-web-typescript/src/views/system/home/home-header.vue
index 85fc4fa..80eb034 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/home-header.vue
+++ b/smart-admin-web-typescript/src/views/system/home/home-header.vue
@@ -10,29 +10,26 @@
 -->
 <template>
   <div class="user-header">
-    <a-page-header :title="welcomeSentence" :sub-title="departmentName" >
-      <template #tags>
-        <a-tag color="blue">努力工作</a-tag>
-        <a-tag color="success">主动 / 皮实 / 可靠 </a-tag>
-        <a-tag color="error">自省 / 精进 / 创新</a-tag>
+    <a-page-header :title="welcomeSentence">
+      <template #subTitle>
+        <span style="color: #666; margin-left: 20px">所属部门：{{ departmentName }} </span>
       </template>
       <template #extra>
-        <p>{{ dayInfo }}</p>
+        <p style="color: #333">{{ dayInfo }}</p>
       </template>
       <a-row class="content">
-        <span class="heart-sentence">
-          <h3>{{ heartSentence }}</h3>
-          <p class="last-login-info">{{ lastLoginInfo }}</p>
-          <div></div>
+        <span class="left-content">
+          <p class="last-login-info"><AlertOutlined />{{ lastLoginInfo }}</p>
+          <a class="sentence" href="#" target="_blank"> <smile-outlined spin /> {{ heartSentence }} </a>
         </span>
         <div class="weather">
           <iframe
             width="100%"
             scrolling="no"
-            height="60"
+            height="50"
             frameborder="0"
             allowtransparency="true"
-            src="//i.tianqi.com/index.php?c=code&id=12&icon=1&num=5&site=12"
+            src="//i.tianqi.com/index.php?c=code&id=12&icon=1&num=3&site=12"
           ></iframe>
         </div>
       </a-row>
@@ -45,10 +42,11 @@
   import uaparser from 'ua-parser-js';
   import { Solar, Lunar } from 'lunar-javascript';
   import _ from 'lodash';
+  import heartSentenceArray from './heart-sentence';
 
   const userStore = useUserStore();
 
-  const departmentName = computed(() => useUserStore.departmentName);
+  const departmentName = computed(() => userStore.departmentName);
 
   // 欢迎语
   const welcomeSentence = computed(() => {
@@ -74,9 +72,7 @@
     if (userStore.$state.lastLoginTime) {
       info = info + '上次登录:' + userStore.$state.lastLoginTime;
     }
-    if (userStore.$state.lastLoginIp) {
-      info = info + '; IP:' + userStore.$state.lastLoginIp;
-    }
+
     if (userStore.$state.lastLoginUserAgent) {
       let ua = uaparser(userStore.$state.lastLoginUserAgent);
       info = info + '; 设备:';
@@ -88,9 +84,16 @@
       }
       let device = ua.device.vendor ? ua.device.vendor + ua.device.model : null;
       if (device) {
-        info = info + ' ' + device;
+        info = info + ' ' + device + ';';
       }
     }
+
+    if (userStore.$state.lastLoginIpRegion) {
+      info = info + '; ' + userStore.$state.lastLoginIpRegion;
+    }
+    if (userStore.$state.lastLoginIp) {
+      info = info + '; ' + userStore.$state.lastLoginIp;
+    }
     return info;
   });
 
@@ -109,22 +112,10 @@
     let next = lunar.getNextJieQi();
     let nextJieqi = next.getName() + ' ' + next.getSolar().toYmd();
 
-    return `${day} 星期${week}，农历${lunarMonth}${lunarDay}（当前${jieqi}，${nextJieqi} ）`;
+    return `${day} 星期${week}，农历${lunarMonth}月${lunarDay}（当前${jieqi}，${nextJieqi} ）`;
   });
 
   // 毒鸡汤
-  const heartSentenceArray = [
-    '每个人的一生好比一根蜡烛，看似不经意间散发的光和热，都可能照亮和温暖他人。这是生活赋予我们的智慧，也让我们在寻常的日子成为一个温暖善良的人。',
-    '立规矩的目的，不是禁锢、限制，而是教育；孩子犯了错，父母不能帮孩子逃避，而应该让孩子学会承担责任。让孩子有面对错误的诚实和勇气，这才是立规矩的意义所在。',
-    '人这一辈子，格局大了、善良有了，成功自然也就近了。格局越大，人生越宽。你的人生会是什么样，与你在为人处世时的表现有很大关系。世间美好都是环环相扣的，善良的人总不会被亏待。',
-    '平日里的千锤百炼，才能托举出光彩时刻；逆境中的亮剑、失败后的奋起，才能让梦想成真。哪有什么一战成名，其实都是百炼成钢。“天才”都是汗水浇灌出来的，天赋或许可以决定起点，但唯有坚持和努力才能达到终点。',
-    '家，不在于奢华，而在于温馨；家，不在于大小，而在于珍惜。在家里，有父母的呵护，有爱人的陪伴，有子女的欢笑。一家人整整齐齐、和和睦睦，就是人生最大的幸福！',
-    '每一个不向命运低头、努力生活的人，都值得被尊重。',
-    '青年的肩上，从不只有清风明月，更有责任担当。岁月因青春慨然以赴而更加美好，世间因少年挺身向前而更加瑰丽。请相信，不会有人永远年轻，但永远有人年轻。',
-    '人生路上，总有人走得比你快，但不必介意，也不必着急。一味羡慕别人的成绩，只会给自己平添压力、徒增烦恼。不盲从别人的脚步，坚定目标，才能找到自己的节奏，进而逢山开路、遇水搭桥。',
-    '如果你真的在乎一个人，首先要学会的就是感恩对方的好。这样，对方才会在和你的相处中找到价值感，相处起来也会更加舒适愉悦。',
-    '一个人只有心里装得下别人，有换位思考的品质，有为他人谋幸福的信念，才能真正做到慷慨施予。同样，也只有赠人玫瑰而无所求时，你才会手有余香、真有所得。',
-  ];
   const heartSentence = computed(() => {
     return heartSentenceArray[_.random(0, heartSentenceArray.length - 1)];
   });
@@ -135,8 +126,8 @@
     background-color: #fff;
     margin-bottom: 10px;
 
-    .heart-sentence {
-      width: calc(100% -660px);
+    .left-content {
+      width: calc(100% - 420px);
       h3 {
         color: rgba(0, 0, 0, 0.75);
       }
@@ -146,14 +137,29 @@
       display: flex;
       justify-content: space-between;
       .weather {
-        width: 650px;
+        width: 400px;
       }
     }
 
     .last-login-info {
       font-size: 13px;
-      color: rgba(0, 0, 0, 0.45);
+      color: #333;
       overflow-wrap: break-word;
+      padding: 0;
+      margin: 1px 0 0 0;
+    }
+
+    .sentence {
+      display: block;
+      font-size: 12px;
+      color: #acacac;
+      overflow-wrap: break-word;
+      padding: 5px 0 0 0;
+      margin: 6px 0 0 0;
+    }
+    .sentence:hover {
+      cursor: pointer;
+      text-decoration: underline;
     }
   }
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/home-notice.vue b/smart-admin-web-typescript/src/views/system/home/home-notice.vue
similarity index 57%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/home/home-notice.vue
rename to smart-admin-web-typescript/src/views/system/home/home-notice.vue
index a3c26f2..0816296 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/home-notice.vue
+++ b/smart-admin-web-typescript/src/views/system/home/home-notice.vue
@@ -1,42 +1,42 @@
 <!--
   * 首页的 通知公告
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 22:34:00 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 22:34:00
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
-  <default-home-card extra="更多" icon="SoundTwoTone" title="通知公告" @extraClick="onMore">
+  <default-home-card extra="更多" icon="SoundOutlined" title="通知公告" @extraClick="onMore">
     <a-spin :spinning="loading">
-    <div class="content-wrapper">
-      <a-empty v-if="$lodash.isEmpty(data)" />
-      <ul v-else>
-        <li v-for="(item, index) in data" :key="index" :class="[item.viewFlag ? 'read' : 'un-read']">
-          <a-tooltip placement="top">
-            <template #title>
-              <span>{{ item.title }}</span>
-            </template>
-            <a class="content" @click="toDetail(item.noticeId)">
-              <a-badge :status="item.viewFlag ? 'default' : 'error'" />
-              {{ item.title }}
-            </a>
-          </a-tooltip>
-          <span class="time"> {{ item.publishDate }}</span>
-        </li>
-      </ul>
-    </div>
+      <div class="content-wrapper">
+        <a-empty v-if="$lodash.isEmpty(data)" />
+        <ul v-else>
+          <li v-for="(item, index) in data" :key="index" :class="[item.viewFlag ? 'read' : 'un-read']">
+            <a-tooltip placement="top">
+              <template #title>
+                <span>{{ item.title }}</span>
+              </template>
+              <a class="content" @click="toDetail(item.noticeId)">
+                <a-badge :status="item.viewFlag ? 'default' : 'error'" />
+                {{ item.title }}
+              </a>
+            </a-tooltip>
+            <span class="time"> {{ item.publishDate }}</span>
+          </li>
+        </ul>
+      </div>
     </a-spin>
   </default-home-card>
 </template>
 <script setup lang="ts">
   import { onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
-import { noticeApi } from '/@/api/business/oa/notice-api';
-import { smartSentry } from '/@/lib/smart-sentry';
-import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
+  import { useRouter } from 'vue-router';
+  import { noticeApi } from '/@/api/business/oa/notice-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
 
   const props = defineProps({
     noticeTypeId: {
@@ -90,7 +90,7 @@ import DefaultHomeCard from '/@/views/system/home/components/default-home-card.v
 </script>
 <style lang="less" scoped>
   @read-color: #666;
-  .content-wrapper{
+  .content-wrapper {
     height: 150px;
     overflow-y: hidden;
     overflow-x: hidden;
@@ -115,15 +115,7 @@ import DefaultHomeCard from '/@/views/system/home/components/default-home-card.v
     }
   }
 
-  ul li :hover {
-    color: @primary-color;
-  }
-
-  .un-read a {
-    color: @text-color;
-  }
-
   .read a {
-    color: @read-color;
+    color: @read-color !important;
   }
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/index.less b/smart-admin-web-typescript/src/views/system/home/index.less
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/home/index.less
rename to smart-admin-web-typescript/src/views/system/home/index.less
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/index.vue b/smart-admin-web-typescript/src/views/system/home/index.vue
similarity index 83%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/home/index.vue
rename to smart-admin-web-typescript/src/views/system/home/index.vue
index 393a6ef..383463d 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/index.vue
+++ b/smart-admin-web-typescript/src/views/system/home/index.vue
@@ -1,11 +1,11 @@
 <!--
   * 首页
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 22:34:00 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 22:34:00
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -52,7 +52,7 @@
         <a-col :span="24">
           <OfficialAccountCard />
         </a-col>
-           <!--待办、已办-->
+        <!--待办、已办-->
         <a-col :span="24">
           <ToBeDoneCard />
         </a-col>
@@ -62,25 +62,25 @@
         </a-col>
       </a-row>
     </a-col>
+<!--    <AdModal/>-->
   </a-row>
 </template>
 <script setup lang="ts">
   import { computed } from 'vue';
   import HomeHeader from './home-header.vue';
   import HomeNotice from './home-notice.vue';
-  import HomeQuickEntry from './components/quick-entry/home-quick-entry.vue';
   import OfficialAccountCard from './components/official-account-card.vue';
-  import ToBeDoneCard from './components/to-be-done-card.vue';
+  import ToBeDoneCard from './components/to-be-done-card/home-to-be-done.vue';
   import ChangelogCard from './components/changelog-card.vue';
-  import Gauge from './components/echarts/gauge.vue';
   import Category from './components/echarts/category.vue';
   import Pie from './components/echarts/pie.vue';
   import Gradient from './components/echarts/gradient.vue';
+  // import AdModal from './ad-modal.vue';
+
   // 业绩完成百分比
   const saleTargetPercent = computed(() => {
     return 75;
   });
-  defineExpose({});
 </script>
 <style lang="less" scoped>
   @import './index.less';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login/login.less b/smart-admin-web-typescript/src/views/system/login/login.less
similarity index 96%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/login/login.less
rename to smart-admin-web-typescript/src/views/system/login/login.less
index 7199ae0..f6f95fe 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login/login.less
+++ b/smart-admin-web-typescript/src/views/system/login/login.less
@@ -8,7 +8,7 @@
   justify-content: center;
   .box-item {
     width: 444px;
-    height: 570px;
+    height: 600px;
     &.desc {
       background: #003b94;
       border-radius: 12px 0px 0px 12px;
@@ -47,7 +47,7 @@
         font-weight: 500;
         margin: 40px 0 60px 0;
         line-height: 21px;
-        
+
         .setence {
           font-size: 13px;
           // text-decoration: underline;
@@ -77,7 +77,7 @@
           width: 112px;
           height: 112px;
         }
-        
+
         .qr-desc {
           display: flex;
           align-items: center;
@@ -92,7 +92,7 @@
             margin-right: 9px;
           }
         }
-        
+
         .qr-desc-marquee {
           width: 100%;
           display: flex;
@@ -102,7 +102,7 @@
           font-weight: 500;
           text-align: center;
           color: #ffffff;
-          
+
           @keyframes marquee {
             0% {
               transform: translateX(0);
@@ -111,7 +111,7 @@
               transform: translateX(-30%);
             }
           }
-          
+
           .marquee {
             flex: 1;
             overflow: hidden;
@@ -119,7 +119,7 @@
               display: inline-block;
               width: 100%;
               white-space: nowrap;
-              animation: marquee 5s linear infinite;
+               animation: marquee 5s linear infinite;
             }
           }
         }
@@ -136,7 +136,7 @@
       .captcha-input {
         width: 60%;
       }
-      
+
       .captcha-img {
         cursor: pointer;
       }
@@ -147,7 +147,13 @@
       border: 1px solid #ededed;
       border-radius: 4px;
     }
-    
+
+    .code-btn{
+      height: 44px;
+      padding: 4px 5px;
+      width: 108px;
+    }
+
     .eye-box {
       position: absolute;
       right: 15px;
@@ -171,7 +177,7 @@
       cursor: pointer;
     }
   }
-  
+
   .more {
     margin-top: 30px;
     .title-box {
diff --git a/smart-admin-web-typescript/src/views/system/login/login.vue b/smart-admin-web-typescript/src/views/system/login/login.vue
new file mode 100644
index 0000000..b90a443
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/login/login.vue
@@ -0,0 +1,299 @@
+<!--
+  * 登录
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 22:34:00
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+  *
+-->
+<template>
+  <div class="login-container">
+    <div class="box-item desc">
+      <div class="welcome">
+        <p>欢迎登录 SmartAdmin V3</p>
+        <p class="desc">
+          SmartAdmin 是由 河南·洛阳
+          <a target="_blank" href="https://www.1024lab.net" style="color: white; weight: bolder; font-size: 15px; text-decoration: underline"
+            >1024创新实验室（1024Lab）</a
+          >
+          基于SpringBoot + Sa-Token + Mybatis-Plus 和 Vue3 + Vite5 + Ant Design Vue 4 (同时支持JavaScript和TypeScript双版本)
+          以「高质量代码」为核心，「简洁、高效、安全」的快速开发平台。
+          <br />
+          <br />
+          <span class="setence">
+            致伟大的开发者 ：
+            <br />
+            &nbsp;&nbsp;&nbsp;&nbsp;我们希望用一套漂亮优雅的代码和一套整洁高效的代码规范，让大家在这浮躁的世界里感受到一股把代码写好的清流 !
+            <br />
+            保持谦逊，保持学习，热爱代码，更热爱生活 !<br />
+            永远年轻，永远前行 !<br />
+            <span class="author">
+              <a target="_blank" href="https://zhuoda.vip" style="color: white; font-size: 13px; text-decoration: underline">
+                1024创新实验室-主任：卓大
+              </a>
+            </span>
+          </span>
+        </p>
+      </div>
+      <div class="app-qr-box">
+        <div class="app-qr">
+          <img :src="zhuoda" />
+          <span class="qr-desc"> 加微信，骚扰卓大 :) </span>
+        </div>
+        <div class="app-qr">
+          <img :src="gzh" />
+          <div class="qr-desc-marquee">
+            <div class="marquee">
+              <span>关注：六边形工程师，分享：赚钱、代码、生活</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="box-item login">
+      <img class="login-qr" :src="loginQR" />
+      <div class="login-title">账号登录</div>
+      <a-form ref="formRef" class="login-form" :model="loginForm" :rules="rules">
+        <a-form-item name="loginName">
+          <a-input v-model:value.trim="loginForm.loginName" placeholder="请输入用户名" />
+        </a-form-item>
+        <a-form-item name="emailCode" v-if="emailCodeShowFlag">
+          <a-input-group compact>
+            <a-input style="width: calc(100% - 110px)" v-model:value="loginForm.emailCode" autocomplete="on" placeholder="请输入邮箱验证码" />
+            <a-button @click="sendSmsCode" class="code-btn" type="primary" :disabled="emailCodeButtonDisabled">
+              {{ emailCodeTips }}
+            </a-button>
+          </a-input-group>
+        </a-form-item>
+        <a-form-item name="password">
+          <a-input-password
+            v-model:value="loginForm.password"
+            autocomplete="on"
+            :type="showPassword ? 'text' : 'password'"
+            placeholder="请输入密码"
+          />
+        </a-form-item>
+        <a-form-item name="captchaCode">
+          <a-input class="captcha-input" v-model:value.trim="loginForm.captchaCode" placeholder="请输入验证码" />
+          <img class="captcha-img" :src="captchaBase64Image" @click="getCaptcha" />
+        </a-form-item>
+        <a-form-item>
+          <a-checkbox v-model:checked="rememberPwd">记住密码</a-checkbox>
+          <span> ( 账号：admin, 密码：123456)</span>
+        </a-form-item>
+        <a-form-item>
+          <div class="btn" @click="onLogin">登录</div>
+        </a-form-item>
+      </a-form>
+      <div class="more">
+        <div class="title-box">
+          <p class="line"></p>
+          <p class="title">其他方式登录</p>
+          <p class="line"></p>
+        </div>
+        <div class="login-type">
+          <img :src="wechatIcon" />
+          <img :src="aliIcon" />
+          <img :src="douyinIcon" />
+          <img :src="qqIcon" />
+          <img :src="weiboIcon" />
+          <img :src="feishuIcon" />
+          <img :src="googleIcon" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import { message, notification, Button } from 'ant-design-vue';
+  import { onMounted, onUnmounted, reactive, ref } from 'vue';
+  import { useRouter } from 'vue-router';
+  import { loginApi } from '/@/api/system/login-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
+  import { useUserStore } from '/@/store/modules/system/user';
+  import zhuoda from '/@/assets/images/1024lab/zhuoda-wechat.jpg';
+  import loginQR from '/@/assets/images/login/login-qr.png';
+  import gzh from '/@/assets/images/1024lab/gzh.jpg';
+  import wechatIcon from '/@/assets/images/login/wechat-icon.png';
+  import aliIcon from '/@/assets/images/login/ali-icon.png';
+  import douyinIcon from '/@/assets/images/login/douyin-icon.png';
+  import qqIcon from '/@/assets/images/login/qq-icon.png';
+  import weiboIcon from '/@/assets/images/login/weibo-icon.png';
+  import feishuIcon from '/@/assets/images/login/feishu-icon.png';
+  import googleIcon from '/@/assets/images/login/google-icon.png';
+
+  import { buildRoutes } from '/@/router/index';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import { encryptData } from '/@/lib/encrypt';
+  import { h } from 'vue';
+  import { localSave } from '/@/utils/local-util.js';
+  import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
+
+  //--------------------- 登录表单 ---------------------------------
+
+  const loginForm = reactive({
+    loginName: 'admin',
+    password: '',
+    captchaCode: '',
+    captchaUuid: '',
+    loginDevice: LOGIN_DEVICE_ENUM.PC.value,
+  });
+  const rules = {
+    loginName: [{ required: true, message: '用户名不能为空' }],
+    password: [{ required: true, message: '密码不能为空' }],
+    captchaCode: [{ required: true, message: '验证码不能为空' }],
+  };
+
+  const showPassword = ref(false);
+  const router = useRouter();
+  const formRef = ref();
+  const rememberPwd = ref(false);
+
+  onMounted(() => {
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        onLogin();
+      }
+    };
+
+    notification['success']({
+      message: '温馨提示',
+      description: 'SmartAdmin 提供 9种 登录背景风格哦！',
+      duration: 8,
+      onClick: () => {},
+      btn: () =>
+        h(
+          Button,
+          {
+            type: 'primary',
+            target: '_blank',
+            size: 'small',
+            href: 'https://smartadmin.vip/views/doc/front/Login.html',
+            onClick: () => {},
+          },
+          { default: () => '去看看' }
+        ),
+    });
+  });
+
+  onUnmounted(() => {
+    document.onkeyup = null;
+  });
+
+  //登录
+  async function onLogin() {
+    formRef.value.validate().then(async () => {
+      try {
+        SmartLoading.show();
+        // 密码加密
+        let encryptPasswordForm = Object.assign({}, loginForm, {
+          password: encryptData(loginForm.password),
+        });
+        const res = await loginApi.login(encryptPasswordForm);
+        stopRefreshCaptchaInterval();
+        localSave(LocalStorageKeyConst.USER_TOKEN, res.data.token ? res.data.token : '');
+        message.success('登录成功');
+        //更新用户信息到pinia
+        useUserStore().setUserLoginInfo(res.data);
+        //构建系统的路由
+        buildRoutes();
+        router.push('/home');
+      } catch (e) {
+        if (e.data && e.data.code !== 0) {
+          loginForm.captchaCode = '';
+          getCaptcha();
+        }
+        smartSentry.captureError(e);
+      } finally {
+        SmartLoading.hide();
+      }
+    });
+  }
+
+  //--------------------- 验证码 ---------------------------------
+
+  const captchaBase64Image = ref('');
+  async function getCaptcha() {
+    try {
+      let captchaResult = await loginApi.getCaptcha();
+      captchaBase64Image.value = captchaResult.data.captchaBase64Image;
+      loginForm.captchaUuid = captchaResult.data.captchaUuid;
+      beginRefreshCaptchaInterval(captchaResult.data.expireSeconds);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
+  let refreshCaptchaInterval = null;
+  function beginRefreshCaptchaInterval(expireSeconds) {
+    if (refreshCaptchaInterval === null) {
+      refreshCaptchaInterval = setInterval(getCaptcha, (expireSeconds - 5) * 1000);
+    }
+  }
+
+  function stopRefreshCaptchaInterval() {
+    if (refreshCaptchaInterval != null) {
+      clearInterval(refreshCaptchaInterval);
+      refreshCaptchaInterval = null;
+    }
+  }
+
+  onMounted(() => {
+    getCaptcha();
+    getTwoFactorLoginFlag();
+  });
+
+  //--------------------- 邮箱验证码 ---------------------------------
+
+  const emailCodeShowFlag = ref(false);
+  let emailCodeTips = ref('获取邮箱验证码');
+  let emailCodeButtonDisabled = ref(false);
+  // 定时器
+  let countDownTimer = null;
+  // 开始倒计时
+  function runCountDown() {
+    emailCodeButtonDisabled.value = true;
+    let countDown = 60;
+    emailCodeTips.value = `${countDown}秒后重新获取`;
+    countDownTimer = setInterval(() => {
+      if (countDown > 1) {
+        countDown--;
+        emailCodeTips.value = `${countDown}秒后重新获取`;
+      } else {
+        clearInterval(countDownTimer);
+        emailCodeButtonDisabled.value = false;
+        emailCodeTips.value = '获取验证码';
+      }
+    }, 1000);
+  }
+
+  // 获取双因子登录标识
+  async function getTwoFactorLoginFlag() {
+    try {
+      let result = await loginApi.getTwoFactorLoginFlag();
+      emailCodeShowFlag.value = result.data;
+    } catch (e) {
+      smartSentry.captureError(e);
+    }
+  }
+
+  // 发送邮箱验证码
+  async function sendSmsCode() {
+    try {
+      SmartLoading.show();
+      let result = await loginApi.sendLoginEmailCode(loginForm.loginName);
+      message.success('验证码发送成功!请登录邮箱查看验证码~');
+      runCountDown();
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+</script>
+<style lang="less" scoped>
+  @import './login.less';
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login2/login.less b/smart-admin-web-typescript/src/views/system/login2/login.less
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/login2/login.less
rename to smart-admin-web-typescript/src/views/system/login2/login.less
index 242490e..f3d17ac 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login2/login.less
+++ b/smart-admin-web-typescript/src/views/system/login2/login.less
@@ -8,7 +8,7 @@
   justify-content: center;
   .box-item {
     width: 444px;
-    height: 570px;
+    height: 600px;
     &.desc {
       background: #ffffff;
       border-radius: 12px 0px 0px 12px;
@@ -135,6 +135,11 @@
       border: 1px solid #ededed;
       border-radius: 4px;
     }
+    .code-btn{
+      height: 44px;
+      padding: 4px 5px;
+      width: 108px;
+    }
 
     .eye-box {
       position: absolute;
diff --git a/smart-admin-web-typescript/src/views/system/login2/login.vue b/smart-admin-web-typescript/src/views/system/login2/login.vue
new file mode 100644
index 0000000..46f4b93
--- /dev/null
+++ b/smart-admin-web-typescript/src/views/system/login2/login.vue
@@ -0,0 +1,241 @@
+<!--
+  * 登录
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 22:34:00
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
+  *
+-->
+<template>
+  <div class="login-container">
+    <div class="box-item desc">
+      <div class="welcome">
+        <p>欢迎登录 SmartAdmin V3</p>
+        <p class="sub-welcome">「高质量代码、简洁、安全」的开发平台</p>
+      </div>
+    </div>
+    <div class="box-item login">
+      <img class="login-qr" :src="loginQR" />
+      <div class="login-title">账号登录</div>
+      <a-form ref="formRef" class="login-form" :model="loginForm" :rules="rules">
+        <a-form-item name="loginName">
+          <a-input v-model:value.trim="loginForm.loginName" placeholder="请输入用户名" />
+        </a-form-item>
+        <a-form-item name="emailCode" v-if="emailCodeShowFlag">
+          <a-input-group compact>
+            <a-input style="width: calc(100% - 110px)" v-model:value="loginForm.emailCode" autocomplete="on" placeholder="请输入邮箱验证码" />
+            <a-button @click="sendSmsCode" class="code-btn" type="primary" :disabled="emailCodeButtonDisabled">
+              {{ emailCodeTips }}
+            </a-button>
+          </a-input-group>
+        </a-form-item>
+        <a-form-item name="password">
+          <a-input-password
+            v-model:value="loginForm.password"
+            autocomplete="on"
+            :type="showPassword ? 'text' : 'password'"
+            placeholder="请输入密码"
+          />
+        </a-form-item>
+        <a-form-item name="captchaCode">
+          <a-input class="captcha-input" v-model:value.trim="loginForm.captchaCode" placeholder="请输入验证码" />
+          <img class="captcha-img" :src="captchaBase64Image" @click="getCaptcha" />
+        </a-form-item>
+        <a-form-item>
+          <a-checkbox v-model:checked="rememberPwd">记住密码</a-checkbox>
+          <span> ( 账号：admin, 密码：123456)</span>
+        </a-form-item>
+        <a-form-item>
+          <div class="btn" @click="onLogin">登录</div>
+        </a-form-item>
+      </a-form>
+      <div class="more">
+        <div class="title-box">
+          <p class="line"></p>
+          <p class="title">其他方式登录</p>
+          <p class="line"></p>
+        </div>
+        <div class="login-type">
+          <img :src="wechatIcon" />
+          <img :src="aliIcon" />
+          <img :src="douyinIcon" />
+          <img :src="qqIcon" />
+          <img :src="weiboIcon" />
+          <img :src="feishuIcon" />
+          <img :src="googleIcon" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import { message } from 'ant-design-vue';
+  import { onMounted, onUnmounted, reactive, ref } from 'vue';
+  import { useRouter } from 'vue-router';
+  import { loginApi } from '/@/api/system/login-api';
+  import { SmartLoading } from '/@/components/framework/smart-loading';
+  import { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
+  import { useUserStore } from '/@/store/modules/system/user';
+  import loginQR from '/@/assets/images/login/login-qr.png';
+  import wechatIcon from '/@/assets/images/login/wechat-icon.png';
+  import aliIcon from '/@/assets/images/login/ali-icon.png';
+  import douyinIcon from '/@/assets/images/login/douyin-icon.png';
+  import qqIcon from '/@/assets/images/login/qq-icon.png';
+  import weiboIcon from '/@/assets/images/login/weibo-icon.png';
+  import feishuIcon from '/@/assets/images/login/feishu-icon.png';
+  import googleIcon from '/@/assets/images/login/google-icon.png';
+
+  import { buildRoutes } from '/@/router/index';
+  import { smartSentry } from '/@/lib/smart-sentry';
+  import { encryptData } from '/@/lib/encrypt';
+  import { localSave } from '/@/utils/local-util.js';
+  import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
+
+  //--------------------- 登录表单 ---------------------------------
+
+  const loginForm = reactive({
+    loginName: 'admin',
+    password: '',
+    captchaCode: '',
+    captchaUuid: '',
+    loginDevice: LOGIN_DEVICE_ENUM.PC.value,
+  });
+  const rules = {
+    loginName: [{ required: true, message: '用户名不能为空' }],
+    password: [{ required: true, message: '密码不能为空' }],
+    captchaCode: [{ required: true, message: '验证码不能为空' }],
+  };
+
+  const showPassword = ref(false);
+  const router = useRouter();
+  const formRef = ref();
+  const rememberPwd = ref(false);
+
+  onMounted(() => {
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        onLogin();
+      }
+    };
+  });
+
+  onUnmounted(() => {
+    document.onkeyup = null;
+  });
+
+  //登录
+  async function onLogin() {
+    formRef.value.validate().then(async () => {
+      try {
+        SmartLoading.show();
+        // 密码加密
+        let encryptPasswordForm = Object.assign({}, loginForm, {
+          password: encryptData(loginForm.password),
+        });
+        const res = await loginApi.login(encryptPasswordForm);
+        stopRefreshCaptchaInterval();
+        localSave(LocalStorageKeyConst.USER_TOKEN, res.data.token ? res.data.token : '');
+        message.success('登录成功');
+        //更新用户信息到pinia
+        useUserStore().setUserLoginInfo(res.data);
+        //构建系统的路由
+        buildRoutes();
+        router.push('/home');
+      } catch (e) {
+        if (e.data && e.data.code !== 0) {
+          loginForm.captchaCode = '';
+          getCaptcha();
+        }
+        smartSentry.captureError(e);
+      } finally {
+        SmartLoading.hide();
+      }
+    });
+  }
+
+  //--------------------- 验证码 ---------------------------------
+
+  const captchaBase64Image = ref('');
+  async function getCaptcha() {
+    try {
+      let captchaResult = await loginApi.getCaptcha();
+      captchaBase64Image.value = captchaResult.data.captchaBase64Image;
+      loginForm.captchaUuid = captchaResult.data.captchaUuid;
+      beginRefreshCaptchaInterval(captchaResult.data.expireSeconds);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
+  let refreshCaptchaInterval = null;
+  function beginRefreshCaptchaInterval(expireSeconds) {
+    if (refreshCaptchaInterval === null) {
+      refreshCaptchaInterval = setInterval(getCaptcha, (expireSeconds - 5) * 1000);
+    }
+  }
+
+  function stopRefreshCaptchaInterval() {
+    if (refreshCaptchaInterval != null) {
+      clearInterval(refreshCaptchaInterval);
+      refreshCaptchaInterval = null;
+    }
+  }
+
+  onMounted(() => {
+    getCaptcha();
+    getTwoFactorLoginFlag();
+  });
+
+  //--------------------- 邮箱验证码 ---------------------------------
+
+  const emailCodeShowFlag = ref(false);
+  let emailCodeTips = ref('获取邮箱验证码');
+  let emailCodeButtonDisabled = ref(false);
+  // 定时器
+  let countDownTimer = null;
+  // 开始倒计时
+  function runCountDown() {
+    emailCodeButtonDisabled.value = true;
+    let countDown = 60;
+    emailCodeTips.value = `${countDown}秒后重新获取`;
+    countDownTimer = setInterval(() => {
+      if (countDown > 1) {
+        countDown--;
+        emailCodeTips.value = `${countDown}秒后重新获取`;
+      } else {
+        clearInterval(countDownTimer);
+        emailCodeButtonDisabled.value = false;
+        emailCodeTips.value = '获取验证码';
+      }
+    }, 1000);
+  }
+
+  // 获取双因子登录标识
+  async function getTwoFactorLoginFlag() {
+    try {
+      let result = await loginApi.getTwoFactorLoginFlag();
+      emailCodeShowFlag.value = result.data;
+    } catch (e) {
+      smartSentry.captureError(e);
+    }
+  }
+
+  // 发送邮箱验证码
+  async function sendSmsCode() {
+    try {
+      SmartLoading.show();
+      let result = await loginApi.sendLoginEmailCode(loginForm.loginName);
+      message.success('验证码发送成功!请登录邮箱查看验证码~');
+      runCountDown();
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
+</script>
+<style lang="less" scoped>
+  @import './login.less';
+</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login3/login.less b/smart-admin-web-typescript/src/views/system/login3/login.less
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/login3/login.less
rename to smart-admin-web-typescript/src/views/system/login3/login.less
index 0004918..d0d8665 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login3/login.less
+++ b/smart-admin-web-typescript/src/views/system/login3/login.less
@@ -8,7 +8,7 @@
   justify-content: center;
   .box-item {
     width: 444px;
-    height: 570px;
+    height: 600px;
     &.desc {
       background: #ffffff;
       border-radius: 12px 0px 0px 12px;
@@ -143,7 +143,11 @@
       border: 1px solid #ededed;
       border-radius: 4px;
     }
-
+    .code-btn{
+      height: 44px;
+      padding: 4px 5px;
+      width: 108px;
+    }
     .eye-box {
       position: absolute;
       right: 15px;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login3/login.vue b/smart-admin-web-typescript/src/views/system/login3/login.vue
similarity index 67%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/login3/login.vue
rename to smart-admin-web-typescript/src/views/system/login3/login.vue
index 01646a0..f63411e 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login3/login.vue
+++ b/smart-admin-web-typescript/src/views/system/login3/login.vue
@@ -24,6 +24,14 @@
         <a-form-item name="loginName">
           <a-input v-model:value.trim="loginForm.loginName" placeholder="请输入用户名" />
         </a-form-item>
+        <a-form-item name="emailCode" v-if="emailCodeShowFlag">
+          <a-input-group compact>
+            <a-input style="width: calc(100% - 110px)" v-model:value="loginForm.emailCode" autocomplete="on" placeholder="请输入邮箱验证码" />
+            <a-button @click="sendSmsCode" class="code-btn" type="primary" :disabled="emailCodeButtonDisabled">
+              {{ emailCodeTips }}
+            </a-button>
+          </a-input-group>
+        </a-form-item>
         <a-form-item name="password">
           <a-input-password
             v-model:value="loginForm.password"
@@ -63,11 +71,11 @@
     </div>
   </div>
 </template>
-<script setup>
+<script setup lang="ts">
   import { message } from 'ant-design-vue';
   import { onMounted, onUnmounted, reactive, ref } from 'vue';
   import { useRouter } from 'vue-router';
-  import { loginApi } from '/@/api/system/login/login-api';
+  import { loginApi } from '/@/api/system/login-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
   import { useUserStore } from '/@/store/modules/system/user';
@@ -84,9 +92,8 @@
   import { buildRoutes } from '/@/router/index';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { encryptData } from '/@/lib/encrypt';
-  import { localSave } from '/@/utils/local-util.ts';
-  import LocalStorageKeyConst from '/@/constants/local-storage-key-const.ts';
-  import { saveTokenToCookie } from '/@/utils/cookie-util';
+  import { localSave } from '/@/utils/local-util.js';
+  import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
 
   //--------------------- 登录表单 ---------------------------------
 
@@ -110,7 +117,7 @@
 
   onMounted(() => {
     document.onkeyup = (e) => {
-      if (e.keyCode == 13) {
+      if (e.keyCode === 13) {
         onLogin();
       }
     };
@@ -130,9 +137,8 @@
           password: encryptData(loginForm.password),
         });
         const res = await loginApi.login(encryptPasswordForm);
-        stopRefrestCaptchaInterval();
-        // localSave(LocalStorageKeyConst.USER_TOKEN, res.data.token ? res.data.token : '');
-        saveTokenToCookie(res.data.token ? res.data.token : '');
+        stopRefreshCaptchaInterval();
+        localSave(LocalStorageKeyConst.USER_TOKEN, res.data.token ? res.data.token : '');
         message.success('登录成功');
         //更新用户信息到pinia
         useUserStore().setUserLoginInfo(res.data);
@@ -159,27 +165,78 @@
       let captchaResult = await loginApi.getCaptcha();
       captchaBase64Image.value = captchaResult.data.captchaBase64Image;
       loginForm.captchaUuid = captchaResult.data.captchaUuid;
-      beginRefrestCaptchaInterval(captchaResult.data.expireSeconds);
+      beginRefreshCaptchaInterval(captchaResult.data.expireSeconds);
     } catch (e) {
       console.log(e);
     }
   }
 
-  let refrestCaptchaInterval = null;
-  function beginRefrestCaptchaInterval(expireSeconds) {
-    if (refrestCaptchaInterval === null) {
-      refrestCaptchaInterval = setInterval(getCaptcha, (expireSeconds - 5) * 1000);
+  let refreshCaptchaInterval = null;
+  function beginRefreshCaptchaInterval(expireSeconds) {
+    if (refreshCaptchaInterval === null) {
+      refreshCaptchaInterval = setInterval(getCaptcha, (expireSeconds - 5) * 1000);
     }
   }
 
-  function stopRefrestCaptchaInterval() {
-    if (refrestCaptchaInterval != null) {
-      clearInterval(refrestCaptchaInterval);
-      refrestCaptchaInterval = null;
+  function stopRefreshCaptchaInterval() {
+    if (refreshCaptchaInterval != null) {
+      clearInterval(refreshCaptchaInterval);
+      refreshCaptchaInterval = null;
     }
   }
 
-  onMounted(getCaptcha);
+  onMounted(() => {
+    getCaptcha();
+    getTwoFactorLoginFlag();
+  });
+
+  //--------------------- 邮箱验证码 ---------------------------------
+
+  const emailCodeShowFlag = ref(false);
+  let emailCodeTips = ref('获取邮箱验证码');
+  let emailCodeButtonDisabled = ref(false);
+  // 定时器
+  let countDownTimer = null;
+  // 开始倒计时
+  function runCountDown() {
+    emailCodeButtonDisabled.value = true;
+    let countDown = 60;
+    emailCodeTips.value = `${countDown}秒后重新获取`;
+    countDownTimer = setInterval(() => {
+      if (countDown > 1) {
+        countDown--;
+        emailCodeTips.value = `${countDown}秒后重新获取`;
+      } else {
+        clearInterval(countDownTimer);
+        emailCodeButtonDisabled.value = false;
+        emailCodeTips.value = '获取验证码';
+      }
+    }, 1000);
+  }
+
+  // 获取双因子登录标识
+  async function getTwoFactorLoginFlag() {
+    try {
+      let result = await loginApi.getTwoFactorLoginFlag();
+      emailCodeShowFlag.value = result.data;
+    } catch (e) {
+      smartSentry.captureError(e);
+    }
+  }
+
+  // 发送邮箱验证码
+  async function sendSmsCode() {
+    try {
+      SmartLoading.show();
+      let result = await loginApi.sendLoginEmailCode(loginForm.loginName);
+      message.success('验证码发送成功!请登录邮箱查看验证码~');
+      runCountDown();
+    } catch (e) {
+      smartSentry.captureError(e);
+    } finally {
+      SmartLoading.hide();
+    }
+  }
 </script>
 <style lang="less" scoped>
   @import './login.less';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue b/smart-admin-web-typescript/src/views/system/menu/components/menu-operate-modal.vue
similarity index 78%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue
rename to smart-admin-web-typescript/src/views/system/menu/components/menu-operate-modal.vue
index 53ded59..220177b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue
+++ b/smart-admin-web-typescript/src/views/system/menu/components/menu-operate-modal.vue
@@ -13,7 +13,7 @@
     :maskClosable="true"
     :title="form.menuId ? '编辑' : '添加'"
     :open="visible"
-    :width="550"
+    :width="600"
     @close="onClose"
   >
     <a-form ref="formRef" :labelCol="{ span: labelColSpan }" :labelWrap="true" :model="form" :rules="rules">
@@ -28,7 +28,7 @@
         <MenuTreeSelect ref="parentMenuTreeSelect" v-model:value="form.parentId" />
       </a-form-item>
       <!--      目录 菜单 start   -->
-      <template v-if="form.menuType == MENU_TYPE_ENUM.CATALOG.value || form.menuType == MENU_TYPE_ENUM.MENU.value">
+      <template v-if="form.menuType === MENU_TYPE_ENUM.CATALOG.value || form.menuType === MENU_TYPE_ENUM.MENU.value">
         <a-form-item label="菜单名称" name="menuName">
           <a-input v-model:value="form.menuName" placeholder="请输入菜单名称" />
         </a-form-item>
@@ -40,38 +40,33 @@
             </template>
           </IconSelect>
         </a-form-item>
-        <a-form-item v-if="form.menuType == MENU_TYPE_ENUM.MENU.value" label="路由地址" name="path">
+        <a-form-item v-if="form.menuType === MENU_TYPE_ENUM.MENU.value" label="路由地址" name="path">
           <a-input v-model:value="form.path" placeholder="请输入路由地址" />
         </a-form-item>
-        <a-form-item label="排序" name="sort">
-          <a-input-number v-model:value="form.sort" :min="0" placeholder="请输入排序" style="width: 100%" />
-          <h6 style="color: #ababab">值越小越靠前</h6>
-        </a-form-item>
-        <template v-if="form.menuType == MENU_TYPE_ENUM.MENU.value">
+        <template v-if="form.menuType === MENU_TYPE_ENUM.MENU.value">
           <a-form-item v-if="form.frameFlag" label="外链地址" name="frameUrl">
             <a-input v-model:value="form.frameUrl" placeholder="请输入外链地址" />
           </a-form-item>
-          <a-form-item v-else label="组件地址" name="component">
+          <a-form-item v-else label="组件地址" name="component" help="比如 商品列表：/business/erp/goods/goods-list.vue">
             <a-input v-model:value="form.component" placeholder="请输入组件地址 默认带有开头/@/views" />
           </a-form-item>
         </template>
-
-        <a-form-item v-if="form.menuType == MENU_TYPE_ENUM.MENU.value" label="是否缓存" name="cacheFlag">
+        <a-form-item v-if="form.menuType === MENU_TYPE_ENUM.MENU.value" label="是否缓存" name="cacheFlag">
           <a-switch v-model:checked="form.cacheFlag" checked-children="开启缓存" un-checked-children="不缓存" />
         </a-form-item>
-        <a-form-item v-if="form.menuType == MENU_TYPE_ENUM.MENU.value" label="是否外链" name="frameFlag">
+        <a-form-item v-if="form.menuType === MENU_TYPE_ENUM.MENU.value" label="是否外链" name="frameFlag">
           <a-switch v-model:checked="form.frameFlag" checked-children="是外链" un-checked-children="不是外链" />
         </a-form-item>
         <a-form-item label="显示状态" name="frameFlag">
           <a-switch v-model:checked="form.visibleFlag" checked-children="显示" un-checked-children="不显示" />
         </a-form-item>
         <a-form-item label="禁用状态" name="frameFlag">
-          <a-switch v-model:checked="form.disabledFlag" checked-children="启用" un-checked-children="禁用" />
+          <a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
         </a-form-item>
       </template>
       <!--      目录 菜单 end   -->
       <!--      按钮 start   -->
-      <template v-if="form.menuType == MENU_TYPE_ENUM.POINTS.value">
+      <template v-if="form.menuType === MENU_TYPE_ENUM.POINTS.value">
         <a-form-item label="功能点名称" name="menuName">
           <a-input v-model:value="form.menuName" placeholder="请输入功能点名称" />
         </a-form-item>
@@ -79,25 +74,26 @@
           <MenuTreeSelect ref="contextMenuTreeSelect" v-model:value="form.contextMenuId" />
         </a-form-item>
         <a-form-item label="功能点状态" name="frameFlag">
-          <a-switch v-model:checked="form.disabledFlag" checked-children="启用" un-checked-children="禁用" />
+          <a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
         </a-form-item>
         <a-form-item label="权限类型" name="permsType">
-          <a-radio-group v-model:value="form.permsType" >
+          <a-radio-group v-model:value="form.permsType">
             <a-radio v-for="item in MENU_PERMS_TYPE_ENUM" :key="item.value" :value="item.value">
               {{ item.desc }}
             </a-radio>
           </a-radio-group>
         </a-form-item>
-        <a-form-item :label="form.permsType === MENU_PERMS_TYPE_ENUM.SPRING_SECURITY.value ? '权限字符' : '前端权限字符'" name="webPerms">
-          <a-input v-model:value="form.webPerms" placeholder="请输入权限字符" />
+        <a-form-item label="前端权限" name="webPerms" help="用于前端按钮等功能的展示和隐藏，搭配v-privilege使用">
+          <a-input v-model:value="form.webPerms" placeholder="请输入前端权限" />
         </a-form-item>
-        <a-form-item label="权限URL" name="apiPermsList" v-if="form.permsType === MENU_PERMS_TYPE_ENUM.URL.value">
-          <a-select v-model:value="form.apiPermsList" mode="multiple" placeholder="请选择接口权限" style="width: 100%">
-            <a-select-option v-for="item in allUrlData" :key="item.name">{{ item.url }} </a-select-option>
-          </a-select>
+        <a-form-item label="后端权限" name="apiPerms" help="后端@SaCheckPermission中的权限字符串，多个以英文逗号,分割">
+          <a-input v-model:value="form.apiPerms" placeholder="请输入后端权限" />
         </a-form-item>
       </template>
       <!--      按钮 end   -->
+      <a-form-item label="排序" name="sort" help="值越小越靠前">
+        <a-input-number v-model:value="form.sort" :min="0" placeholder="请输入排序" style="width: 100px" />
+      </a-form-item>
     </a-form>
     <div class="footer">
       <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
@@ -109,11 +105,11 @@
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
-  import { computed, nextTick, reactive, ref, watch } from 'vue';
+  import { computed, nextTick, reactive, ref } from 'vue';
   import MenuTreeSelect from './menu-tree-select.vue';
-  import { menuApi } from '/@/api/system/menu/menu-api';
+  import { menuApi } from '/@/api/system/menu-api';
   import IconSelect from '/@/components/framework/icon-select/index.vue';
-  import { MENU_DEFAULT_PARENT_ID, MENU_TYPE_ENUM, MENU_PERMS_TYPE_ENUM } from '/@/constants/system/menu-const';
+  import { MENU_DEFAULT_PARENT_ID, MENU_PERMS_TYPE_ENUM, MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { SmartLoading } from '/@/components/framework/smart-loading';
 
@@ -127,18 +123,12 @@
   const visible = ref(false);
 
   const labelColSpan = computed(() => {
-    if (form.menuType == MENU_TYPE_ENUM.POINTS.value) {
+    if (form.menuType === MENU_TYPE_ENUM.POINTS.value) {
       return 6;
     }
     return 4;
   });
 
-  watch(visible, (e) => {
-    if (e) {
-      getAuthUrl();
-    }
-  });
-
   const contextMenuTreeSelect = ref();
   const parentMenuTreeSelect = ref();
 
@@ -173,16 +163,6 @@
     visible.value = false;
   }
 
-  // ----------------------- 预加载数据 ------------------------
-
-  let allUrlData = ref([]);
-
-  // url数据
-  async function getAuthUrl() {
-    let res = await menuApi.getAuthUrl();
-    allUrlData.value = res.data;
-  }
-
   // ----------------------- form表单相关操作 ------------------------
 
   const formRef = ref();
@@ -193,12 +173,12 @@
     icon: undefined,
     parentId: undefined,
     path: undefined,
-    permsType: MENU_PERMS_TYPE_ENUM.SPRING_SECURITY.value,
+    permsType: MENU_PERMS_TYPE_ENUM.SA_TOKEN.value,
     webPerms: undefined,
-    apiPermsList: undefined,
+    apiPerms: undefined,
     sort: undefined,
     visibleFlag: true,
-    cacheFlag: false,
+    cacheFlag: true,
     component: undefined,
     contextMenuId: undefined,
     disabledFlag: false,
@@ -237,7 +217,6 @@
       { required: true, message: '路由地址不能为空' },
       { max: 100, message: '路由地址不能大于100个字符', trigger: 'blur' },
     ],
-    webPerms: [{ required: true, message: '前端权限字符不能为空' }],
   };
 
   function validateForm(formRef) {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/components/menu-tree-select.vue b/smart-admin-web-typescript/src/views/system/menu/components/menu-tree-select.vue
similarity index 89%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/components/menu-tree-select.vue
rename to smart-admin-web-typescript/src/views/system/menu/components/menu-tree-select.vue
index b1832f9..f3a719d 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/components/menu-tree-select.vue
+++ b/smart-admin-web-typescript/src/views/system/menu/components/menu-tree-select.vue
@@ -23,9 +23,8 @@
   />
 </template>
 <script setup lang="ts">
-  import { onMounted, ref, watch } from 'vue';
-  import { menuApi } from '/@/api/system/menu/menu-api';
-  import _ from 'lodash';
+  import { onMounted, ref } from 'vue';
+  import { menuApi } from '/@/api/system/menu-api';
 
   const props = defineProps({
     value: Number,
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/menu-data-handler.ts b/smart-admin-web-typescript/src/views/system/menu/menu-data-handler.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/menu-data-handler.ts
rename to smart-admin-web-typescript/src/views/system/menu/menu-data-handler.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/menu-list-table-columns.ts b/smart-admin-web-typescript/src/views/system/menu/menu-list-table-columns.ts
similarity index 68%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/menu-list-table-columns.ts
rename to smart-admin-web-typescript/src/views/system/menu/menu-list-table-columns.ts
index 8dd11c2..dabb661 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/menu-list-table-columns.ts
+++ b/smart-admin-web-typescript/src/views/system/menu/menu-list-table-columns.ts
@@ -35,11 +35,6 @@ export const columns = ref([
     dataIndex: 'component',
     ellipsis: true,
   },
-  // {
-  //   title: '权限模式',
-  //   dataIndex: 'permsType',
-  //   width: 100,
-  // },
   {
     title: '后端权限',
     dataIndex: 'apiPerms',
@@ -50,26 +45,6 @@ export const columns = ref([
     dataIndex: 'webPerms',
     ellipsis: true,
   },
-  // {
-  //   title: '外链',
-  //   dataIndex: 'frameFlag',
-  //   width: 45,
-  // },
-  // {
-  //   title: '缓存',
-  //   dataIndex: 'cacheFlag',
-  //   width: 45,
-  // },
-  // {
-  //   title: '显示',
-  //   dataIndex: 'visibleFlag',
-  //   width: 45,
-  // },
-  // {
-  //   title: '禁用',
-  //   dataIndex: 'disabledFlag',
-  //   width: 45,
-  // },
   {
     title: '顺序',
     dataIndex: 'sort',
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/menu-list.vue b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/menu-list.vue
rename to smart-admin-web-typescript/src/views/system/menu/menu-list.vue
index ff99b5f..cf596fb 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/menu/menu-list.vue
+++ b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
@@ -14,15 +14,15 @@
         <a-form-item label="关键字" class="smart-query-form-item">
           <a-input style="width: 300px" v-model:value="queryForm.keywords" placeholder="菜单名称/路由地址/组件路径/权限字符串" />
         </a-form-item>
-        
+
         <a-form-item label="类型" class="smart-query-form-item">
           <SmartEnumSelect width="120px" v-model:value="queryForm.menuType" placeholder="请选择类型" enum-name="MENU_TYPE_ENUM" />
         </a-form-item>
-        
+
         <a-form-item label="禁用" class="smart-query-form-item">
           <SmartEnumSelect width="120px" enum-name="FLAG_NUMBER_ENUM" v-model:value="queryForm.disabledFlag" />
         </a-form-item>
-        
+
         <a-form-item class="smart-query-form-item smart-margin-left10">
           <a-button-group>
             <a-button type="primary" @click="query">
@@ -31,7 +31,7 @@
               </template>
               查询
             </a-button>
-            
+
             <a-button @click="resetQuery">
               <template #icon>
                 <ReloadOutlined />
@@ -47,22 +47,22 @@
           </a-button>
         </a-form-item>
       </a-row>
-      
+
       <a-row class="smart-query-form-row" v-show="moreQueryConditionFlag">
         <a-form-item label="外链" class="smart-query-form-item">
           <SmartEnumSelect width="120px" enum-name="FLAG_NUMBER_ENUM" v-model:value="queryForm.frameFlag" />
         </a-form-item>
-        
+
         <a-form-item label="缓存" class="smart-query-form-item">
           <SmartEnumSelect width="120px" enum-name="FLAG_NUMBER_ENUM" v-model:value="queryForm.cacheFlag" />
         </a-form-item>
-        
+
         <a-form-item label="显示" class="smart-query-form-item">
           <SmartEnumSelect width="120px" enum-name="FLAG_NUMBER_ENUM" v-model:value="queryForm.visibleFlag" />
         </a-form-item>
       </a-row>
     </a-form>
-    
+
     <a-card size="small" :bordered="false" :hoverable="true">
       <a-row class="smart-table-btn-block">
         <div class="smart-table-operate-block">
@@ -72,7 +72,7 @@
             </template>
             添加菜单
           </a-button>
-          
+
           <a-button v-privilege="'system:menu:batchDelete'" type="primary" danger @click="batchDelete" :disabled="!hasSelected">
             <template #icon>
               <DeleteOutlined />
@@ -84,7 +84,7 @@
           <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.SYSTEM.MENU" :refresh="query" />
         </div>
       </a-row>
-      
+
       <a-table
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         size="small"
@@ -100,35 +100,35 @@
           <template v-if="column.dataIndex === 'menuType'">
             <a-tag :color="menuTypeColorArray[text]">{{ $smartEnumPlugin.getDescByValue('MENU_TYPE_ENUM', text) }}</a-tag>
           </template>
-          
+
           <template v-if="column.dataIndex === 'component'">
             <span>{{ record.frameFlag ? record.frameUrl : record.component }}</span>
           </template>
-          
+
           <template v-if="column.dataIndex === 'frameFlag'">
             <span>{{ $smartEnumPlugin.getDescByValue('FLAG_NUMBER_ENUM', text) }}</span>
           </template>
-          
+
           <template v-if="column.dataIndex === 'permsType'">
             <span>{{ $smartEnumPlugin.getDescByValue('MENU_PERMS_TYPE_ENUM', text) }}</span>
           </template>
-          
+
           <template v-if="column.dataIndex === 'cacheFlag'">
             <span>{{ $smartEnumPlugin.getDescByValue('FLAG_NUMBER_ENUM', text) }}</span>
           </template>
-          
+
           <template v-if="column.dataIndex === 'visibleFlag'">
             <span>{{ $smartEnumPlugin.getDescByValue('FLAG_NUMBER_ENUM', text) }}</span>
           </template>
-          
+
           <template v-if="column.dataIndex === 'disabledFlag'">
             <span>{{ $smartEnumPlugin.getDescByValue('FLAG_NUMBER_ENUM', text) }}</span>
           </template>
-          
+
           <template v-if="column.dataIndex === 'icon'">
             <component :is="$antIcons[text]" />
           </template>
-          
+
           <template v-if="column.dataIndex === 'operate'">
             <div class="smart-table-operate">
               <a-button v-privilege="'system:menu:update'" type="link" size="small" @click="showDrawer(record)">编辑</a-button>
@@ -138,7 +138,7 @@
         </template>
       </a-table>
     </a-card>
-    
+
     <MenuOperateModal ref="menuOperateModal" @reloadList="query" />
   </div>
 </template>
@@ -150,7 +150,7 @@
   import MenuOperateModal from './components/menu-operate-modal.vue';
   import { buildMenuTableTree, filterMenuByQueryForm } from './menu-data-handler';
   import { columns } from './menu-list-table-columns';
-  import { menuApi } from '/@/api/system/menu/menu-api';
+  import { menuApi } from '/@/api/system/menu-api';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/position/position-form.vue b/smart-admin-web-typescript/src/views/system/position/position-form.vue
similarity index 97%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/position/position-form.vue
rename to smart-admin-web-typescript/src/views/system/position/position-form.vue
index f381f47..cd8586e 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/position/position-form.vue
+++ b/smart-admin-web-typescript/src/views/system/position/position-form.vue
@@ -38,12 +38,12 @@
     </template>
   </a-modal>
 </template>
-<script setup>
+<script setup lang="ts">
 import { reactive, ref, nextTick } from 'vue';
 import _ from 'lodash';
 import { message } from 'ant-design-vue';
 import { SmartLoading } from '/@/components/framework/smart-loading';
-import { positionApi } from '/@/api/system/position/position-api';
+import { positionApi } from '/@/api/system/position-api';
 import { smartSentry } from '/@/lib/smart-sentry';
 
 // ------------------------ 事件 ------------------------
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/position/position-list.vue b/smart-admin-web-typescript/src/views/system/position/position-list.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/position/position-list.vue
rename to smart-admin-web-typescript/src/views/system/position/position-list.vue
index e052300..2269464 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/position/position-list.vue
+++ b/smart-admin-web-typescript/src/views/system/position/position-list.vue
@@ -94,11 +94,11 @@
     <PositionForm ref="formRef" @reloadList="queryData" />
   </a-card>
 </template>
-<script setup>
+<script setup lang="ts">
   import { reactive, ref, onMounted } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-  import { positionApi } from '/@/api/system/position/position-api';
+  import { positionApi } from '/@/api/system/position-api';
   import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-data-scope/index.vue b/smart-admin-web-typescript/src/views/system/role/components/role-data-scope/index.vue
similarity index 95%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-data-scope/index.vue
rename to smart-admin-web-typescript/src/views/system/role/components/role-data-scope/index.vue
index 9b68afb..cf9ae81 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-data-scope/index.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-data-scope/index.vue
@@ -12,7 +12,7 @@
   <div>
     <div class="btn-group">
       <a-button class="button-style" type="primary" @click="updateDataScope" v-privilege="'system:role:dataScope:update'"> 保存 </a-button>
-      <a-button class="button-style" @click="getDataScope" v-privilege="'role:query'"> 刷新 </a-button>
+      <a-button class="button-style" @click="getDataScope"> 刷新 </a-button>
     </div>
     <a-row class="header">
       <a-col class="tab-margin" :span="4">业务单据</a-col>
@@ -46,7 +46,7 @@
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
   import { inject, onMounted, ref, watch } from 'vue';
-  import { roleApi } from '/@/api/system/role/role-api';
+  import { roleApi } from '/@/api/system/role-api';
   import { smartSentry } from '/@/lib/smart-sentry';
 
   const props = defineProps({
@@ -107,7 +107,7 @@
         roleId: selectRoleId.value,
         dataScopeItemList: selectedDataScopeList.value.filter((e) => !_.isUndefined(e.viewType)),
       };
-      await roleApi.updateRoleDataScopeList(data);
+      await roleApi.updateDataScope(data);
       message.success('保存成功');
       getDataScope();
     } catch (e) {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-employee-list/index.vue b/smart-admin-web-typescript/src/views/system/role/components/role-employee-list/index.vue
similarity index 94%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-employee-list/index.vue
rename to smart-admin-web-typescript/src/views/system/role/components/role-employee-list/index.vue
index 895e055..39b0442 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-employee-list/index.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-employee-list/index.vue
@@ -14,8 +14,7 @@
       <div>
         关键字：
         <a-input style="width: 250px" v-model:value="queryForm.keywords" placeholder="姓名/手机号/登录账号" />
-
-        <a-button class="button-style" v-if="selectRoleId" type="primary" @click="queryRoleEmployee">搜索</a-button>
+        <a-button class="button-style" v-if="selectRoleId" type="primary" @click="onSearch">搜索</a-button>
         <a-button class="button-style" v-if="selectRoleId" type="default" @click="resetQueryRoleEmployee">重置</a-button>
       </div>
 
@@ -23,11 +22,18 @@
         <a-button class="button-style" v-if="selectRoleId" type="primary" @click="addRoleEmployee" v-privilege="'system:role:employee:add'"
           >添加员工</a-button
         >
-        <a-button class="button-style" v-if="selectRoleId" type="primary" danger @click="batchDelete" v-privilege="'system:role:employee:batch:delete'"
+        <a-button
+          class="button-style"
+          v-if="selectRoleId"
+          type="primary"
+          danger
+          @click="batchDelete"
+          v-privilege="'system:role:employee:batch:delete'"
           >批量移除</a-button
         >
       </div>
     </div>
+
     <a-table
       :loading="tableLoading"
       :dataSource="tableData"
@@ -73,7 +79,7 @@
   import { message, Modal } from 'ant-design-vue';
   import _ from 'lodash';
   import { computed, inject, onMounted, reactive, ref, watch } from 'vue';
-  import { roleApi } from '/@/api/system/role/role-api';
+  import { roleApi } from '/@/api/system/role-api';
   import { PAGE_SIZE, showTableTotal, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import EmployeeTableSelectModal from '/@/components/system/employee-table-select-modal/index.vue';
@@ -110,6 +116,11 @@
     queryRoleEmployee();
   }
 
+  function onSearch() {
+    queryForm.pageNum = 1;
+    queryRoleEmployee();
+  }
+
   async function queryRoleEmployee() {
     try {
       tableLoading.value = true;
@@ -157,7 +168,7 @@
 
   async function addRoleEmployee() {
     let res = await roleApi.getRoleAllEmployee(selectRoleId.value);
-    let selectedIdList = res.data.map((e) => e.roleId) || [];
+    let selectedIdList = res.data.map((e) => e.employeeId) || [];
     selectEmployeeModal.value.showModal(selectedIdList);
   }
 
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-form-modal/index.vue b/smart-admin-web-typescript/src/views/system/role/components/role-form-modal/index.vue
similarity index 82%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-form-modal/index.vue
rename to smart-admin-web-typescript/src/views/system/role/components/role-form-modal/index.vue
index a4eaf01..a3e9229 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-form-modal/index.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-form-modal/index.vue
@@ -1,11 +1,11 @@
 <!--
-  * 角色 表单 
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 22:34:00 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * 角色 表单
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 22:34:00
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -14,6 +14,9 @@
       <a-form-item label="角色名称" name="roleName">
         <a-input style="width: 100%" placeholder="请输入角色名称" v-model:value="form.roleName" />
       </a-form-item>
+      <a-form-item label="角色编码" name="roleCode">
+        <a-input style="width: 100%" placeholder="请输入角色编码" v-model:value="form.roleCode" />
+      </a-form-item>
       <a-form-item label="角色备注">
         <a-input style="width: 100%" placeholder="请输入角色备注" v-model:value="form.remark" />
       </a-form-item>
@@ -29,8 +32,8 @@
 <script setup lang="ts">
   import { message } from 'ant-design-vue';
   import { reactive, ref } from 'vue';
-  import { roleApi } from '/@/api/system/role/role-api';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { roleApi } from '/@/api/system/role-api';
+  import { smartSentry } from '/@/lib/smart-sentry';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   // ----------------------- 以下是字段定义 emits props ---------------------
   let emits = defineEmits(['refresh']);
@@ -60,8 +63,9 @@ import { smartSentry } from '/@/lib/smart-sentry';
   const formRef = ref();
 
   const formDefault = {
-    id: undefined,
+    roleId: undefined,
     remark: undefined,
+    roleCode: undefined,
     roleName: undefined,
   };
 
@@ -70,6 +74,7 @@ import { smartSentry } from '/@/lib/smart-sentry';
   // 表单规则
   const rules = {
     roleName: [{ required: true, message: '请输入角色名称' }],
+    roleCode: [{ required: true, message: '请输入角色编码' }],
   };
 
   // 提交表单
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-list/index.vue b/smart-admin-web-typescript/src/views/system/role/components/role-list/index.vue
similarity index 98%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-list/index.vue
rename to smart-admin-web-typescript/src/views/system/role/components/role-list/index.vue
index 6a6a4b6..8ecb8a2 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-list/index.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-list/index.vue
@@ -33,7 +33,7 @@
   import { message, Modal } from 'ant-design-vue';
   import _ from 'lodash';
   import { computed, onMounted, ref } from 'vue';
-  import { roleApi } from '/@/api/system/role/role-api';
+  import { roleApi } from '/@/api/system/role-api';
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import RoleFormModal from '../role-form-modal/index.vue';
   import { smartSentry } from '/@/lib/smart-sentry';
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-setting/index.vue b/smart-admin-web-typescript/src/views/system/role/components/role-setting/index.vue
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-setting/index.vue
rename to smart-admin-web-typescript/src/views/system/role/components/role-setting/index.vue
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/index.less b/smart-admin-web-typescript/src/views/system/role/components/role-tree/index.less
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/index.less
rename to smart-admin-web-typescript/src/views/system/role/components/role-tree/index.less
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/index.vue b/smart-admin-web-typescript/src/views/system/role/components/role-tree/index.vue
similarity index 93%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/index.vue
rename to smart-admin-web-typescript/src/views/system/role/components/role-tree/index.vue
index 586c39b..ac3e49b 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/index.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-tree/index.vue
@@ -23,10 +23,10 @@
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
   import RoleTreeCheckbox from './role-tree-checkbox.vue';
-  import { roleMenuApi } from '/@/api/system/role-menu/role-menu-api';
+  import { roleMenuApi } from '/@/api/system/role-menu-api';
   import { useRoleStore } from '/@/store/modules/system/role';
   import { SmartLoading } from '/@/components/framework/smart-loading';
-import { smartSentry } from '/@/lib/smart-sentry';
+  import { smartSentry } from '/@/lib/smart-sentry';
 
   let roleStore = useRoleStore();
   let tree = ref();
@@ -70,5 +70,5 @@ import { smartSentry } from '/@/lib/smart-sentry';
   }
 </script>
 <style scoped lang="less">
-  @import './index.less';
+  @import 'index.less';
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/role-tree-checkbox.vue b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
similarity index 70%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/role-tree-checkbox.vue
rename to smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
index a77145e..cd077f8 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/role-tree-checkbox.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-checkbox.vue
@@ -1,15 +1,15 @@
 <!--
-  * 角色 
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 22:34:00 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  * 角色
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 22:34:00
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
-  <div style="height: 542px; overflow: auto">
+  <div style="overflow: auto">
     <a-checkbox-group v-model:value="checkedData">
       <div class="checked-box">
         <ul>
@@ -24,7 +24,7 @@
 <script setup lang="ts">
   import { ref, watch } from 'vue';
   import { useRoleStore } from '/@/store/modules/system/role';
-  import RoleTreeMenu from '../role-tree/role-tree-menu.vue';
+  import RoleTreeMenu from './role-tree-menu.vue';
 
   let props = defineProps({
     tree: {
@@ -32,7 +32,7 @@
       default: [],
     },
   });
-  defineEmits('update:value');
+  defineEmits(['update:value']);
 
   let roleStore = useRoleStore();
   let checkedData = ref();
@@ -45,5 +45,5 @@
   );
 </script>
 <style scoped lang="less">
-  @import './index.less';
+  @import 'index.less';
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/role-tree-menu.vue b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-menu.vue
similarity index 87%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/role-tree-menu.vue
rename to smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-menu.vue
index 424fbc5..3c98439 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/role-tree-menu.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-menu.vue
@@ -1,11 +1,11 @@
 <!--
   * 角色 菜单
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 22:34:00 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
+  *
+  * @Author:    1024创新实验室-主任：卓大
+  * @Date:      2022-09-12 22:34:00
+  * @Wechat:    zhuda1024
+  * @Email:     lab1024@163.com
+  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
   *
 -->
 <template>
@@ -25,7 +25,7 @@
   import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const';
   import { useRoleStore } from '/@/store/modules/system/role';
   import RoleTreePoint from './role-tree-point.vue';
-  import RoleTreeMenu from '../role-tree/role-tree-menu.vue';
+  import RoleTreeMenu from './role-tree-menu.vue';
 
   const props = defineProps({
     tree: {
@@ -37,7 +37,7 @@
       default: 0,
     },
   });
-  defineEmits('update:value');
+  defineEmits(['update:value']);
   let roleStore = useRoleStore();
   function selectCheckbox(module) {
     if (!module.menuId) {
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/role-tree-point.vue b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-point.vue
similarity index 94%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/role-tree-point.vue
rename to smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-point.vue
index b1384bc..ebe5392 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/components/role-tree/role-tree-point.vue
+++ b/smart-admin-web-typescript/src/views/system/role/components/role-tree/role-tree-point.vue
@@ -28,6 +28,6 @@
       default: 0,
     },
   });
-  let emits = defineEmits('selectCheckbox');
+  let emits = defineEmits(['selectCheckbox']);
 </script>
 <style scoped lang="less"></style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/index.vue b/smart-admin-web-typescript/src/views/system/role/index.vue
similarity index 88%
rename from smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/index.vue
rename to smart-admin-web-typescript/src/views/system/role/index.vue
index 9708fd2..2d91d76 100644
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/role/index.vue
+++ b/smart-admin-web-typescript/src/views/system/role/index.vue
@@ -14,7 +14,7 @@
       <a-col flex="200px">
         <RoleList ref="roleList" />
       </a-col>
-      <a-col flex="1">
+      <a-col flex="1" class="role-setting">
         <RoleSetting />
       </a-col>
     </a-row>
@@ -27,7 +27,7 @@
   defineProps({
     value: Object,
   });
-  defineEmits('update:value');
+  defineEmits(['update:value']);
 
   let roleList = ref();
   const selectRoleId = computed(() => {
@@ -42,4 +42,7 @@
   .height100 {
     height: 100%;
   }
+  .role-setting {
+    width: calc(100% - 250px);
+  }
 </style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/vite-env.d.ts b/smart-admin-web-typescript/src/vite-env.d.ts
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/src/vite-env.d.ts
rename to smart-admin-web-typescript/src/vite-env.d.ts
diff --git a/smart-admin-web/typescript-ant-design-vue3/tsconfig.json b/smart-admin-web-typescript/tsconfig.json
similarity index 100%
rename from smart-admin-web/typescript-ant-design-vue3/tsconfig.json
rename to smart-admin-web-typescript/tsconfig.json
diff --git a/smart-admin-web/typescript-ant-design-vue3/vite.config.ts b/smart-admin-web-typescript/vite.config.ts
similarity index 50%
rename from smart-admin-web/typescript-ant-design-vue3/vite.config.ts
rename to smart-admin-web-typescript/vite.config.ts
index 453c281..7071345 100644
--- a/smart-admin-web/typescript-ant-design-vue3/vite.config.ts
+++ b/smart-admin-web-typescript/vite.config.ts
@@ -5,16 +5,17 @@
  * @Date:      2022-05-02 23:44:56
  * @Wechat:    zhuda1024
  * @Email:     lab1024@163.com
- * @Copyright  1024创新实验室 （ https://1024lab.net ），2012-2022
+ * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
  */
 import { resolve } from 'path';
 import vue from '@vitejs/plugin-vue';
+import customVariables from '/@/theme/custom-variables';
 
 const pathResolve = (dir) => {
   return resolve(__dirname, '.', dir);
 };
 export default {
-  base: process.env.NODE_ENV === 'production' ? '/manages/' : '/',
+  base: process.env.NODE_ENV === 'production' ? '/' : '/',
   root: process.cwd(),
   resolve: {
     alias: [
@@ -45,15 +46,39 @@ export default {
     exclude: ['vue-demi'],
   },
   build: {
-    brotliSize: false,
-    chunkSizeWarningLimit: 2000,
+    // 清除console和debugger
+    terserOptions: {
+      compress: {
+        drop_console: true,
+        drop_debugger: true,
+      },
+    },
+    rollupOptions: {
+      output: {
+        //配置这个是让不同类型文件放在不同文件夹，不会显得太乱
+        chunkFileNames: 'js/[name]-[hash].js',
+        entryFileNames: 'js/[name]-[hash].js',
+        assetFileNames: '[ext]/[name]-[hash].[ext]',
+        manualChunks(id) {
+          //静态资源分拆打包
+          if (id.includes('node_modules')) {
+            return id.toString().split('node_modules/')[1].split('/')[0].toString();
+          }
+        },
+      },
+    },
+    target: 'modules',
+    outDir: 'dist', // 指定输出路径
+    assetsDir: 'assets', // 指定生成静态文件目录
+    assetsInlineLimit: '4096', // 小于此阈值的导入或引用资源将内联为 base64 编码
+    chunkSizeWarningLimit: 500, // chunk 大小警告的限制
+    minify: 'terser', // 混淆器，terser构建后文件体积更小
+    emptyOutDir: true, //打包前先清空原有打包文件
   },
   css: {
     preprocessorOptions: {
       less: {
-        modifyVars: {
-          hack: `true; @import (reference) "${resolve('src/theme/index.less')}";`,
-        },
+        modifyVars: customVariables,
         javascriptEnabled: true,
       },
     },
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
deleted file mode 100644
index 9ce7c71..0000000
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-<!--
-  * 消息通知
-  *
-  * @Author:    1024创新实验室-主任：卓大
-  * @Date:      2022-09-06 20:17:18
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
--->
-
-<template>
-  <div>
-    <a-popover v-model:open="show" trigger="click" placement="bottomLeft">
-      <a-button type="text" @click="showMessage" style="padding: 4px 5px">
-        <a-badge :count="unreadMessageCount + toBeDoneCount">
-          <div style="width: 26px; height: 26px">
-            <BellOutlined :style="{ fontSize: '16px' }"/>
-          </div>
-        </a-badge>
-      </a-button>
-
-      <template #content>
-        <a-spin :spinning="loading">
-          <a-tabs class="dropdown-tabs" centered :tabBarStyle="{ textAlign: 'center' }" style="width: 300px">
-            <a-tab-pane key="message">
-              <template #tab>
-                未读消息
-                <a-badge :count="unreadMessageCount" :show-zero="false" :offset="[-5, -15]"/>
-              </template>
-              <a-list class="tab-pane" size="small">
-                <a-list-item v-for="item in messageList" :key="item.messageId">
-                  <a-list-item-meta>
-                    <template #title>
-                      <div class="title">
-                        <a-badge status="error"/>
-                        <a @click="showMessageDetail(item)">{{ item.title }}</a>
-                      </div>
-                    </template>
-                    <template #description>
-                      <span> {{ timeago(item.createTime) }}</span>
-                    </template>
-                  </a-list-item-meta>
-                </a-list-item>
-                <a-list-item v-if="unreadMessageCount > 3">
-                  <a-button type="link" @click="gotoMessage" style="margin: 0 auto"> 查看更多</a-button>
-                </a-list-item>
-              </a-list>
-            </a-tab-pane>
-            <a-tab-pane key="to_be_done">
-              <template #tab>
-                待办工作
-                <a-badge :count="toBeDoneCount" :show-zero="false" :offset="[-5, -15]"/>
-              </template>
-              <a-list class="tab-pane" size="small" :locale="{ emptyText: '暂无待办' }">
-                <a-list-item v-for="(item, index) in toBeDoneList" :key="index">
-                  <a-list-item-meta>
-                    <template #title>
-                      <a-badge status="error"/>
-                      <a-tag v-if="item.starFlag" color="red">重要</a-tag>
-                      <span>{{ item.title }}</span>
-                    </template>
-                  </a-list-item-meta>
-                </a-list-item>
-              </a-list>
-            </a-tab-pane>
-          </a-tabs>
-        </a-spin>
-      </template>
-    </a-popover>
-    <MessageDetailModal ref="messageDetailModalRef" @refresh="queryMessage"/>
-  </div>
-</template>
-
-<script setup>
-import {computed, ref} from 'vue';
-import {BellOutlined} from '@ant-design/icons-vue';
-import {useUserStore} from '/@/store/modules/system/user.js';
-import {smartSentry} from '/@/lib/smart-sentry.js';
-import {messageApi} from '/@/api/support/message-api.js';
-import dayjs from 'dayjs';
-import {theme} from 'ant-design-vue';
-import {useRouter} from 'vue-router';
-import MessageDetailModal from './header-message-detail-modal.vue';
-import localKey from '/@/constants/local-storage-key-const';
-import {localRead} from '/@/utils/local-util';
-
-const {useToken} = theme;
-const {token} = useToken();
-
-const loading = ref(false);
-const show = ref(false);
-
-// 点击按钮打开消息气泡卡片的同时刷新消息
-function showMessage() {
-  show.value = true;
-  queryMessage();
-  loadToBeDoneList();
-}
-
-function closeMessage() {
-  show.value = false;
-}
-
-// ------------------------- 查询消息  -------------------------
-
-// 未读消息
-const unreadMessageCount = computed(() => {
-  return useUserStore().unreadMessageCount;
-});
-
-// 消息列表
-const messageList = ref([]);
-
-// 查询我的未读消息
-async function queryMessage() {
-  try {
-    loading.value = true;
-    let responseModel = await messageApi.queryMessage({
-      pageNum: 1,
-      pageSize: 3,
-      readFlag: false,
-    });
-    messageList.value = responseModel.data.list;
-    // 若中途有新消息了 打开列表也能及时更新未读数量
-    useUserStore().queryUnreadMessageCount();
-  } catch (e) {
-    smartSentry.captureError(e);
-  } finally {
-    loading.value = false;
-  }
-}
-
-const messageDetailModalRef = ref();
-
-function showMessageDetail(data) {
-  messageDetailModalRef.value.show(data);
-  closeMessage();
-}
-
-const router = useRouter();
-
-function gotoMessage() {
-  show.value = false;
-  router.push({path: '/account', query: {menuId: 'message'}});
-}
-
-// ------------------------- 待办工作  -------------------------
-
-// 待办工作数
-const toBeDoneCount = computed(() => {
-  return useUserStore().toBeDoneCount;
-});
-
-// 待办工作列表
-const toBeDoneList = ref([]);
-
-const loadToBeDoneList = async () => {
-  try {
-    loading.value = true;
-    let localToBeDoneList = localRead(localKey.TO_BE_DONE);
-    if (localToBeDoneList) {
-      toBeDoneList.value = JSON.parse(localToBeDoneList).filter((e) => !e.doneFlag);
-    }
-  } catch (err) {
-    smartSentry.captureError(err);
-  } finally {
-    loading.value = false;
-  }
-};
-
-// ------------------------- 时间计算  -------------------------
-function timeago(dateStr) {
-  let dateTimeStamp = dayjs(dateStr).toDate().getTime();
-  let result = '';
-  let minute = 1000 * 60; //把分，时，天，周，半个月，一个月用毫秒表示
-  let hour = minute * 60;
-  let day = hour * 24;
-  let week = day * 7;
-  let month = day * 30;
-  let now = new Date().getTime(); //获取当前时间毫秒
-  let diffValue = now - dateTimeStamp; //时间差
-
-  if (diffValue < 0) {
-    return '刚刚';
-  }
-  let minC = diffValue / minute; //计算时间差的分，时，天，周，月
-  let hourC = diffValue / hour;
-  let dayC = diffValue / day;
-  let weekC = diffValue / week;
-  let monthC = diffValue / month;
-  if (monthC >= 1 && monthC <= 3) {
-    result = ' ' + parseInt(monthC) + '月前';
-  } else if (weekC >= 1 && weekC <= 3) {
-    result = ' ' + parseInt(weekC) + '周前';
-  } else if (dayC >= 1 && dayC <= 6) {
-    result = ' ' + parseInt(dayC) + '天前';
-  } else if (hourC >= 1 && hourC <= 23) {
-    result = ' ' + parseInt(hourC) + '小时前';
-  } else if (minC >= 1 && minC <= 59) {
-    result = ' ' + parseInt(minC) + '分钟前';
-  } else if (diffValue >= 0 && diffValue <= minute) {
-    result = '刚刚';
-  } else {
-    let datetime = new Date();
-    datetime.setTime(dateTimeStamp);
-    let year = datetime.getFullYear();
-    let month = datetime.getMonth() + 1 < 10 ? '0' + (datetime.getMonth() + 1) : datetime.getMonth() + 1;
-    let date = datetime.getDate() < 10 ? '0' + datetime.getDate() : datetime.getDate();
-    result = year + '-' + month + '-' + date;
-  }
-  return result;
-}
-</script>
-
-<style lang="less" scoped>
-@smart-page-tag-operate-width: 40px;
-@color-primary: v-bind('token.colorPrimary');
-
-.message-icon-div {
-  cursor: pointer;
-  height: 32px;
-  width: 42px;
-  padding-left: 10px;
-}
-
-.message-icon-div:hover {
-  background: @hover-bg-color !important;
-}
-
-.header-notice {
-  display: inline-block;
-  transition: all 0.3s;
-
-  span {
-    vertical-align: initial;
-  }
-
-  .notice-badge {
-    color: inherit;
-  }
-}
-
-.title {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  cursor: pointer;
-}
-
-.dropdown-tabs {
-  background-color: @base-bg-color;
-  border-radius: 4px;
-}
-
-.tab-pane {
-  height: auto;
-}
-</style>
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/system/department/components/department-form-modal.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/system/department/components/department-form-modal.vue
deleted file mode 100644
index bdec90d..0000000
--- a/smart-admin-web/javascript-ant-design-vue3/src/views/system/department/components/department-form-modal.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<!--
-  * 部门表单 弹窗
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-08 20:46:18
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
--->
-<template>
-  <a-modal v-model:open="visible" :title="formState.departmentId ? '编辑部门' : '添加部门'" @ok="handleOk" destroyOnClose>
-    <a-form ref="formRef" :model="formState" :rules="rules" layout="vertical">
-      <a-form-item label="上级部门" name="parentId" v-if="formState.parentId != 0">
-        <DepartmentTreeSelect ref="departmentTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false" width="100%" />
-      </a-form-item>
-      <a-form-item label="部门名称" name="name">
-        <a-input v-model:value.trim="formState.name" placeholder="请输入部门名称" />
-      </a-form-item>
-      <a-form-item label="部门负责人" name="managerId">
-        <EmployeeSelect ref="employeeSelect" placeholder="请选择部门负责人" width="100%" v-model:value="formState.managerId" :leaveFlag="false" />
-      </a-form-item>
-      <a-form-item label="部门排序 （值越大越靠前！）" name="sort">
-        <a-input-number style="width: 100%" v-model:value="formState.sort" :min="0" placeholder="请输入部门名称" />
-      </a-form-item>
-    </a-form>
-  </a-modal>
-</template>
-<script setup lang="ts">
-  import message from 'ant-design-vue/lib/message';
-  import { reactive, ref } from 'vue';
-  import { departmentApi } from '/@/api/system/department-api';
-  import DepartmentTreeSelect from '/@/components/system/department-tree-select/index.vue';
-  import EmployeeSelect from '/@/components/system/employee-select/index.vue';
-  import { smartSentry } from '/@/lib/smart-sentry';
-  import { SmartLoading } from '/@/components/framework/smart-loading';
-
-  // ----------------------- 对外暴漏 ---------------------
-
-  defineExpose({
-    showModal,
-  });
-
-  // ----------------------- modal 的显示与隐藏 ---------------------
-  const emits = defineEmits(['refresh']);
-
-  const visible = ref(false);
-  function showModal(data) {
-    visible.value = true;
-    updateFormData(data);
-  }
-  function closeModal() {
-    visible.value = false;
-    resetFormData();
-  }
-
-  // ----------------------- form 表单操作 ---------------------
-  const formRef = ref();
-  const departmentTreeSelect = ref();
-  const defaultDepartmentForm = {
-    id: undefined,
-    managerId: undefined, //部门负责人
-    name: undefined,
-    parentId: undefined,
-    sort: 0,
-  };
-  const employeeSelect = ref();
-
-  let formState = reactive({
-    ...defaultDepartmentForm,
-  });
-  // 表单校验规则
-  const rules = {
-    parentId: [{ required: true, message: '上级部门不能为空' }],
-    name: [
-      { required: true, message: '部门名称不能为空' },
-      { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
-    ],
-    managerId: [{ required: true, message: '部门负责人不能为空' }],
-  };
-  // 更新表单数据
-  function updateFormData(data) {
-    Object.assign(formState, defaultDepartmentForm);
-    if (data) {
-      Object.assign(formState, data);
-    }
-    visible.value = true;
-  }
-  // 重置表单数据
-  function resetFormData() {
-    Object.assign(formState, defaultDepartmentForm);
-  }
-
-  async function handleOk() {
-    try {
-      await formRef.value.validate();
-      if (formState.departmentId) {
-        updateDepartment();
-      } else {
-        addDepartment();
-      }
-    } catch (error) {
-      message.error('参数验证错误，请仔细填写表单数据!');
-    }
-  }
-
-  // ----------------------- form 表单  ajax 操作 ---------------------
-  //添加部门ajax请求
-  async function addDepartment() {
-    SmartLoading.show();
-    try {
-      await departmentApi.addDepartment(formState);
-      emits('refresh');
-      closeModal();
-    } catch (error) {
-      smartSentry.captureError(error);
-    } finally {
-      SmartLoading.hide();
-    }
-  }
-
-  //更新部门ajax请求
-  async function updateDepartment() {
-    SmartLoading.show();
-    try {
-      if (formState.parentId == formState.departmentId) {
-        message.warning('上级菜单不能为自己');
-        return;
-      }
-      await departmentApi.updateDepartment(formState);
-      emits('refresh');
-      closeModal();
-    } catch (error) {
-      smartSentry.captureError(error);
-    } finally {
-      SmartLoading.hide();
-    }
-  }
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/.env.development b/smart-admin-web/typescript-ant-design-vue3/.env.development
deleted file mode 100644
index 00c5223..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/.env.development
+++ /dev/null
@@ -1,8 +0,0 @@
-
-VITE_APP_API_URL = 'http://smartadmin.dev.1024lab.net/sa-api/'
-
-VITE_APP_PROJECT_TITLE = 'SmartAdmin 开发环境(Dev)'
-
-VITE_APP_PROFILE = 'dev'
-
-VITE_APP_MODE = 'development'
diff --git a/smart-admin-web/typescript-ant-design-vue3/.env.localhost b/smart-admin-web/typescript-ant-design-vue3/.env.localhost
deleted file mode 100644
index 1313266..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/.env.localhost
+++ /dev/null
@@ -1,8 +0,0 @@
-
-VITE_APP_API_URL = 'http://127.0.0.1:1024'
-
-VITE_APP_PROJECT_TITLE = 'SmartAdmin 本地环境(Localhost)'
-
-VITE_APP_PROFILE = 'local'
-
-VITE_APP_MODE = 'local'
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/.env.pre b/smart-admin-web/typescript-ant-design-vue3/.env.pre
deleted file mode 100644
index c5c3327..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/.env.pre
+++ /dev/null
@@ -1,8 +0,0 @@
-
-VITE_APP_API_URL = 'http://127.0.0.1:1024'
-
-VITE_APP_PROJECT_TITLE = 'SmartAdmin 预发布环境(Pre)'
-
-VITE_APP_PROFILE = 'pre'
-
-VITE_APP_MODE = 'production'
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/.env.production b/smart-admin-web/typescript-ant-design-vue3/.env.production
deleted file mode 100644
index 2c249e8..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/.env.production
+++ /dev/null
@@ -1,8 +0,0 @@
-
-VITE_APP_API_URL = 'http://127.0.0.1:1024'
-
-VITE_APP_PROJECT_TITLE = 'SmartAdmin'
-
-VITE_APP_PROFILE = 'prod'
-
-VITE_APP_MODE = 'production'
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/.env.test b/smart-admin-web/typescript-ant-design-vue3/.env.test
deleted file mode 100644
index c55c879..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/.env.test
+++ /dev/null
@@ -1,8 +0,0 @@
-
-VITE_APP_API_URL = 'http://smartadmin.dev.1024lab.net/sa-api/'
-
-VITE_APP_PROJECT_TITLE = 'SmartAdmin 测试环境(Test)'
-
-VITE_APP_PROFILE = 'test'
-
-VITE_APP_MODE = 'development'
diff --git a/smart-admin-web/typescript-ant-design-vue3/.eslintrc.js b/smart-admin-web/typescript-ant-design-vue3/.eslintrc.js
deleted file mode 100644
index 43d5824..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/.eslintrc.js
+++ /dev/null
@@ -1,76 +0,0 @@
-module.exports = {
-    root: true,
-    env: {
-        browser: true,
-        es2021: true,
-        node: true,
-    },
-    parser: 'vue-eslint-parser',
-    parserOptions: {
-        ecmaVersion: 12,
-        parser: '@typescript-eslint/parser',
-        sourceType: 'module',
-    },
-    extends: [
-        'plugin:vue/vue3-essential',
-        'eslint:recommended',
-        'plugin:vue/base'
-    ],
-    globals: {
-        defineProps: "readonly",
-        defineEmits: "readonly",
-        defineExpose: "readonly",
-        withDefaults: "readonly"
-    },
-    plugins: ['vue', '@typescript-eslint'],
-    rules: {
-        '@typescript-eslint/ban-ts-ignore': 'off',
-        '@typescript-eslint/explicit-function-return-type': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-var-requires': 'off',
-        '@typescript-eslint/no-empty-function': 'off',
-        'vue/custom-event-name-casing': 'off',
-        'no-use-before-define': 'off',
-        '@typescript-eslint/no-use-before-define': 'off',
-        '@typescript-eslint/ban-ts-comment': 'off',
-        '@typescript-eslint/ban-types': 'off',
-        '@typescript-eslint/no-non-null-assertion': 'off',
-        '@typescript-eslint/explicit-module-boundary-types': 'off',
-        '@typescript-eslint/no-unused-vars': [
-            'error',
-            // we are only using this rule to check for unused arguments since TS
-            // catches unused variables but not args.
-            { varsIgnorePattern: '.*', args: 'none' }
-        ],
-        'no-unused-vars': [
-            'error',
-            // we are only using this rule to check for unused arguments since TS
-            // catches unused variables but not args.
-            { varsIgnorePattern: '.*', args: 'none' }
-        ],
-        'space-before-function-paren': 'off',
-
-        'vue/attributes-order': 'off',
-        'vue/one-component-per-file': 'off',
-        'vue/html-closing-bracket-newline': 'off',
-        'vue/max-attributes-per-line': 'off',
-        'vue/multiline-html-element-content-newline': 'off',
-        'vue/singleline-html-element-content-newline': 'off',
-        'vue/attribute-hyphenation': 'off',
-        'vue/require-default-prop': 'off',
-        'vue/html-self-closing': [
-            'error',
-            {
-                html: {
-                    void: 'always',
-                    normal: 'never',
-                    component: 'always',
-                },
-                svg: 'always',
-                math: 'always',
-            },
-        ],
-        // Enable vue/script-setup-uses-vars rule
-        'vue/script-setup-uses-vars': 'error',
-    }
-};
diff --git a/smart-admin-web/typescript-ant-design-vue3/.prettierrc.js b/smart-admin-web/typescript-ant-design-vue3/.prettierrc.js
deleted file mode 100644
index 5a298a5..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/.prettierrc.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 代码格式化配置
- *
- * @Author:    1024创新实验室-主任：卓大
- * @Date:      2022-09-12 14:44:18
- * @Wechat:    zhuda1024
- * @Email:     lab1024@163.com
- * @Copyright  1024创新实验室 （ https://1024lab.net ），2012-2022
- */
-module.exports = {
-	printWidth: 150, // 每行代码长度（默认80）
-	tabWidth: 2, // 缩进空格数
-	useTabs: false, //不用tab缩进
-	semi: true, //// 在语句末尾打印分号
-	singleQuote: true, // 使用单引号而不是双引号
-	vueIndentScriptAndStyle: true, //Vue文件脚本和样式标签缩进
-	quoteProps: 'as-needed', // 更改引用对象属性的时间 可选值"<as-needed|consistent|preserve>"
-	jsxSingleQuote: true, // 在JSX中使用单引号而不是双引号
-	trailingComma: 'es5', //多行时尽可能打印尾随逗号。（例如，单行数组永远不会出现逗号结尾。） 可选值"<none|es5|all>"，默认none
-	bracketSpacing: true, // 在对象文字中的括号之间打印空格
-	jsxBracketSameLine: false, //jsx 标签的反尖括号需要换行
-	arrowParens: 'always', // 在单独的箭头函数参数周围包括括号 always：(x) => x \ avoid：x => x
-	rangeStart: 0, // 这两个选项可用于格式化以给定字符偏移量（分别包括和不包括）开始和结束的代码
-	rangeEnd: Infinity,
-	requirePragma: false, // 指定要使用的解析器，不需要写文件开头的 @prettier
-	insertPragma: false, // 不需要自动在文件开头插入 @prettier
-	proseWrap: 'preserve', // 使用默认的折行标准 always\never\preserve
-	htmlWhitespaceSensitivity: 'css', // 指定HTML文件的全局空格敏感度 css\strict\ignore
-	endOfLine: 'auto', // 因为prettier的规范和eslint的换行规则不同，所以这个必须配置。要不然每次打开文件都会有一堆的警告;换行符使用 lf 结尾是 可选值"<auto|lf|crlf|cr
-  };
-  
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/index.html b/smart-admin-web/typescript-ant-design-vue3/index.html
deleted file mode 100644
index 83bc906..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- * @Description:
- * @Author: zhuoda
- * @Date: 2021-08-03
- * @LastEditTime: 2022-03-01
- * @LastEditors: zhuoda
--->
-<!DOCTYPE html>
-<html lang="en" id="htmlRoot">
-<head>
-  <meta charset="UTF-8"/>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-  <meta name="renderer" content="webkit"/>
-  <meta name="viewport"
-        content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
-  />
-  <title> %VITE_APP_PROJECT_TITLE%</title>
-  <link rel="icon" href="/favicon.ico"/>
-</head>
-<body>
-<div id="app"></div>
-<script type="module" src="/src/main.ts"></script>
-</body>
-</html>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/App.vue b/smart-admin-web/typescript-ant-design-vue3/src/App.vue
deleted file mode 100644
index c3fa06b..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/App.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-  * 主应用页面
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 23:46:47 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
--->
-
-<template>
-  <a-config-provider :locale="antdLocale">
-    <!---全局loading--->
-    <a-spin :spinning="spinning" tip="稍等片刻，我在拼命加载中..." size="large">
-      <!--- 路由 -->
-      <RouterView />
-    </a-spin>
-  </a-config-provider>
-</template>
-
-<script setup lang="ts">
-  import dayjs from 'dayjs';
-  import { computed, ComputedRef } from 'vue';
-  import { messages } from '/@/i18n/index';
-  import { useAppConfigStore } from '/@/store/modules/system/app-config';
-  import { useSpinStore } from './store/modules/system/spin';
-  import { LanguageType } from '/@/types/config';
-
-  let language: LanguageType = useAppConfigStore().language;
-  let lang: string = language.toString();
-
-  const antdLocale: ComputedRef<string> = computed(() => messages[lang].antdLocale);
-  const dayjsLocale = computed(() => messages[lang].dayjsLocale);
-  dayjs.locale(dayjsLocale.value);
-
-  let spinStore = useSpinStore();
-  const spinning = computed(() => spinStore.loading);
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/business/message/message-api.js b/smart-admin-web/typescript-ant-design-vue3/src/api/business/message/message-api.js
deleted file mode 100644
index 7383c84..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/business/message/message-api.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import {getRequest, postRequest} from "/@/lib/axios";
-
-export const messageApi = {
-    // 通知消息-分页查询
-    queryMessage: (param) => {
-        return postRequest('/message/query', param);
-    },
-    // 通知消息-查询未读消息数
-    queryUnreadCount: () => {
-        return getRequest('/message/query/unread/count');
-    },
-    // 通知消息-标记已读
-    updateReadFlag: (msgId) => {
-        return getRequest(`/message/update/read/${msgId}`);
-    },
-    // 通知消息-以及消息类型更新已读
-    updateReadFlagByMsgType: (msgType) => {
-        return getRequest(`/message/update/read/msgType/${msgType}`);
-    },
-
-
-};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/api/business/oa/enterprise-api.js b/smart-admin-web/typescript-ant-design-vue3/src/api/business/oa/enterprise-api.js
deleted file mode 100644
index 3441cb9..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/api/business/oa/enterprise-api.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 企业信息
- *
- * @Author:    开云
- * @Date:      2022-09-03 21:47:28
- * @Wechat:    zhuda1024
- * @Email:     lab1024@163.com
- * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
- */
-import { postRequest, getRequest, postDownload } from '/@/lib/axios';
-
-export const enterpriseApi = {
-  // 新建企业 @author 开云
-  create: (param) => {
-    return postRequest('/oa/enterprise/create', param);
-  },
-
-  // 删除企业 @author 开云
-  delete: (enterpriseId) => {
-    return getRequest(`/oa/enterprise/delete/${enterpriseId}`);
-  },
-
-  // 查询企业详情 @author 开云
-  detail: (enterpriseId) => {
-    return getRequest(`/oa/enterprise/get/${enterpriseId}`);
-  },
-
-  // 分页查询企业模块 @author 开云
-  pageQuery: (param) => {
-    return postRequest('/oa/enterprise/page/query', param);
-  },
-  
-  // 导出企业数据excel @author 卓大
-  exportExcel: (param) => {
-    return postDownload('/oa/enterprise/exportExcel', param);
-  },
-
-  //企业列表查询 含数据范围 @author 开云
-  queryList: (type) => {
-    let query = '';
-    if (type) {
-      query = `?type=${type}`;
-    }
-    return getRequest(`/oa/enterprise/query/list${query}`);
-  },
-
-  // 编辑企业 @author 开云
-  update: (param) => {
-    return postRequest('/oa/enterprise/update', param);
-  },
-  // 企业全部员工List @author yandy
-  employeeList: (param) => {
-    return postRequest('/oa/enterprise/employee/list', param);
-  },
-  // 分页查询企业员工List @author 卓大
-  queryPageEmployeeList: (param) => {
-    return postRequest('/oa/enterprise/employee/queryPage', param);
-  },
-  // 添加员工 @author yandy
-  addEmployee: (param) => {
-    return postRequest('/oa/enterprise/employee/add', param);
-  },
-
-  // 删除员工 @author yandy
-  deleteEmployee: (param) => {
-    return postRequest('/oa/enterprise/employee/delete', param);
-  },
-
-};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/i18n/lang/en-US/index.ts b/smart-admin-web/typescript-ant-design-vue3/src/i18n/lang/en-US/index.ts
deleted file mode 100644
index b9fd13e..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/i18n/lang/en-US/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 英文国际化
- *
- * @Author:    1024创新实验室-主任：卓大
- * @Date:      2022-09-06 20:00:57
- * @Wechat:    zhuda1024
- * @Email:     lab1024@163.com
- * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
- */
-import antd from 'ant-design-vue/es/locale/en_US';
-import dayjs from 'dayjs/locale/eu';
-
-export default {
-  antdLocale: antd,
-  dayjsLocale: dayjs,
-  'setting.title': 'Setting',
-};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/i18n/lang/zh-CN/index.ts b/smart-admin-web/typescript-ant-design-vue3/src/i18n/lang/zh-CN/index.ts
deleted file mode 100644
index 97669c0..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/i18n/lang/zh-CN/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 中文国际化
- *
- * @Author:    1024创新实验室-主任：卓大
- * @Date:      2022-09-06 20:01:06
- * @Wechat:    zhuda1024
- * @Email:     lab1024@163.com
- * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
- */
-import antd from 'ant-design-vue/es/locale/zh_CN';
-import dayjs from 'dayjs/locale/zh-cn';
-
-export default {
-  antdLocale: antd,
-  dayjsLocale: dayjs,
-  'setting.title': '网站设置',
-};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue b/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
deleted file mode 100644
index fa0911f..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/header-user-space/header-message.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--
-  * 消息通知
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:17:18 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
--->
-
-<template>
-  <a-dropdown trigger="click" v-model:open="show">
-    <div @click="fetchMessage">
-      <a-badge count="12">
-        <div style="width: 26px; height: 26px">
-          <BellOutlined :style="{ fontSize: '18px' }" />
-        </div>
-      </a-badge>
-    </div>
-
-    <template #overlay>
-      <div>
-        <a-spin :spinning="loading">
-          <a-tabs class="dropdown-tabs" centered :tabBarStyle="{ textAlign: 'center' }" style="width: 300px">
-            <a-tab-pane tab="通知" key="1">
-              <a-list class="tab-pane" size="small">
-                <a-list-item>
-                  <a-list-item-meta description="7天前">
-                    <template #title>
-                      <a href="#">今天洛阳天气39°c，洛阳变各阳...</a>
-                    </template>
-                    <template #avatar>
-                      <a-avatar src="https://zhuoda.vip/images/blog/profile-128-128.jpg" />
-                    </template>
-                  </a-list-item-meta>
-                </a-list-item>
-                <a-list-item>
-                  <a-list-item-meta description="7天前">
-                    <template #title>
-                      <a href="#">六月的雨　就是无情的你...</a>
-                    </template>
-                    <template #avatar>
-                      <a-avatar src="https://zhuoda.vip/images/blog/profile-128-128.jpg" />
-                    </template>
-                  </a-list-item-meta>
-                </a-list-item>
-                <a-list-item>
-                  <a-list-item-meta description="7天前">
-                    <template #title>
-                      <a href="#">今年河南天气炎热，河南变可南...</a>
-                    </template>
-                    <template #avatar>
-                      <a-avatar src="https://zhuoda.vip/images/blog/profile-128-128.jpg" />
-                    </template>
-                  </a-list-item-meta>
-                </a-list-item>
-              </a-list>
-            </a-tab-pane>
-            <a-tab-pane tab="消息" key="2">
-              <a-list class="tab-pane" />
-            </a-tab-pane>
-            <a-tab-pane tab="待办" key="3">
-              <a-list class="tab-pane" />
-            </a-tab-pane>
-          </a-tabs>
-        </a-spin>
-      </div>
-    </template>
-  </a-dropdown>
-</template>
-
-<script setup lang="ts">
-  import { ref } from 'vue';
-  import { BellOutlined } from '@ant-design/icons-vue';
-
-  defineExpose({ showMessage });
-
-  function showMessage() {
-    show.value = true;
-  }
-
-  const loading = ref(false);
-  const show = ref(false);
-
-  const fetchMessage = () => {
-    if (loading.value) {
-      loading.value = false;
-      return;
-    }
-    loading.value = true;
-    setTimeout(() => {
-      loading.value = false;
-    }, 700);
-  };
-</script>
-
-<style lang="less">
-  .header-notice {
-    display: inline-block;
-    transition: all 0.3s;
-
-    span {
-      vertical-align: initial;
-    }
-
-    .notice-badge {
-      color: inherit;
-    }
-  }
-
-  .dropdown-tabs {
-    background-color: @base-bg-color;
-    box-shadow: 0 2px 8px @shadow-color;
-    border-radius: 4px;
-  }
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/page-tag/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/layout/components/page-tag/index.vue
deleted file mode 100644
index d81a684..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/page-tag/index.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  * 标签页 入口，支持三种模式：默认、a-tabs, chrome-tabs
-  *
-  * @Author:    1024创新实验室-主任：卓大
-  * @Date:      2024-06-12 20:55:04
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
--->
-<template>
-  <DefaultTab v-if="pageTagStyle === PAGE_TAG_ENUM.DEFAULT.value" />
-  <AntdTab v-if="pageTagStyle === PAGE_TAG_ENUM.ANTD.value" />
-</template>
-
-<script setup>
-import { computed, onMounted } from 'vue';
-import { useAppConfigStore } from '/@/store/modules/system/app-config';
-import DefaultTab from './components/default-tab.vue';
-import AntdTab from './components/antd-tab.vue';
-import { PAGE_TAG_ENUM } from '/@/constants/layout-const.ts';
-
-const pageTagStyle = computed(() => useAppConfigStore().$state.pageTagStyle);
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/index.vue
deleted file mode 100644
index fe2e75c..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/components/side-expand-menu/index.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  * 展开菜单
-  *
-  * @Author:    1024创新实验室-主任：卓大
-  * @Date:      2022-09-06 20:29:12
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
--->
-<template>
-  <div class="menu-container">
-    <!-- logo 第一列：一级导航 -->
-    <TopMenu ref="topMenu" class="topMenu" :menuTree="menuTree" />
-    <!-- 第二列：导航 -->
-    <RecursionMenu v-if="showRecursionMenu" class="recursion-menu" :selectedMenu="selectedMenu" />
-  </div>
-</template>
-<script setup lang="ts">
-  import { computed, ref } from 'vue';
-  import RecursionMenu from './recursion-menu.vue';
-  import TopMenu from './top-menu.vue';
-  import { useUserStore } from '/@/store/modules/system/user';
-
-  defineEmits(['update:value']);
-  const menuTree = computed(() => useUserStore().getMenuTree || []);
-
-  const topMenu = ref();
-  const selectedMenu = computed(() => {
-    if (topMenu.value) {
-      return topMenu.value.selectedMenu;
-    }
-    return {};
-  });
-  const showRecursionMenu = computed(() => {
-    return selectedMenu.value && selectedMenu.value.children && selectedMenu.value.children.some((e) => e.visibleFlag);
-  });
-</script>
-<style scoped lang="less">
-  .menu-container {
-    display: flex;
-    height: 100%;
-    .topMenu {
-      width: 114px;
-      flex-shrink: 0;
-    }
-    .recursion-menu {
-      min-width: 126px;
-      flex: 1;
-    }
-  }
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-layout.vue b/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-layout.vue
deleted file mode 100644
index 05481f9..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/layout/smart-layout.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  *  layout 多种模式
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-06 20:40:16 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
--->
-<template>
-  <!--左侧菜单 模式-->
-  <SmartSideLayout v-if="layout === LAYOUT_ENUM.SIDE.value" />
-  <!--左侧展开菜单 模式-->
-  <SmartSideExpandLayout v-if="layout === LAYOUT_ENUM.SIDE_EXPAND.value" />
-</template>
-<script setup lang="ts">
-  import { computed } from 'vue';
-  import SmartSideExpandLayout from './smart-side-expand-layout.vue';
-  import { LAYOUT_ENUM } from '/@/constants/layout-const';
-  import SmartSideLayout from '/@/layout/smart-side-layout.vue';
-  import { useAppConfigStore } from '/@/store/modules/system/app-config';
-
-  const layout = computed(() => useAppConfigStore().$state.layout);
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/lib/default-time-ranges.ts b/smart-admin-web/typescript-ant-design-vue3/src/lib/default-time-ranges.ts
deleted file mode 100644
index 6f29ccc..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/lib/default-time-ranges.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 时间选择框快捷选择
- *
- * @Author:    1024创新实验室-主任：卓大
- * @Date:      2022-09-06 20:49:28
- * @Wechat:    zhuda1024
- * @Email:     lab1024@163.com
- * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
- */
-
-import dayjs from 'dayjs';
-import { ref } from "vue";
-
-export const defaultTimeRanges = ref([
-  {
-    label:'今日',
-    value:[dayjs().startOf('date'), dayjs().endOf('days')],
-  },
-  {
-    label:'昨日',
-    value:[dayjs().subtract(1, 'days').startOf('days'), dayjs().subtract(1, 'days').endOf('days')],
-  },
-  {
-    label:'本月',
-    value:[dayjs().startOf('month'), dayjs().endOf('month')],
-  },
-  {
-    label:'上个月',
-    value: [dayjs().subtract(1, 'months').startOf('month'), dayjs().subtract(1, 'months').endOf('month')],
-  },
-  {
-    label:'本年度',
-    value: [dayjs().startOf('year'), dayjs().endOf('year')],
-  },
-  {
-    label:'上年度',
-    value: [dayjs().subtract(1, 'years').startOf('year'), dayjs().subtract(1, 'years').endOf('year')],
-  },
-]);
-
-// 不可跨月
-export const defaultLimitMonth =ref([
-  {
-    label:'今日',
-    value:[dayjs(), dayjs()],
-  },
-  {
-    label:'昨日',
-    value:[dayjs().subtract(1, 'days'), dayjs().subtract(1, 'days')],
-  },
-  {
-    label:'本月',
-    value:[dayjs().startOf('month'), dayjs().endOf('month')],
-  },
-  {
-    label:'上个月',
-    value:[dayjs().subtract(1, 'months').startOf('month'), dayjs().subtract(1, 'months').endOf('month')],
-  },
-  {
-    label:'下个月',
-    value:[dayjs().subtract(-1, 'months').startOf('month'), dayjs().subtract(-1, 'months').endOf('month')],
-  },
-]);
-
-// 线索：今日，昨日，本月，上个月
-export const defaultDaysLastMonth = ref([
-  {
-    label:'今日',
-    value:[dayjs(), dayjs()],
-  },
-  {
-    label:'昨日',
-    value:[dayjs().subtract(1, 'days'), dayjs().subtract(1, 'days')],
-  },
-  {
-    label:'本月',
-    value:[dayjs().startOf('month'), dayjs().endOf('month')],
-  },
-  {
-    label:'上个月',
-    value:[dayjs().subtract(1, 'months').startOf('month'), dayjs().subtract(1, 'months').endOf('month')],
-  },
-])
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/lib/smart-sentry.ts b/smart-admin-web/typescript-ant-design-vue3/src/lib/smart-sentry.ts
deleted file mode 100644
index 68c599c..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/lib/smart-sentry.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 错误上报sentry
- *
- * @Author:    1024创新实验室-主任：卓大
- * @Date:      2022-09-06 20:49:28
- * @Wechat:    zhuda1024
- * @Email:     lab1024@163.com
- * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
- */
-
-import { AxiosError } from 'axios';
-
-export const smartSentry = {
-  /**
-   * sentry 主动上报
-   */
-  captureError: (error: Error | AxiosError | any) => {
-    if (error.config && error.data && error && error.headers && error.request && error.status) {
-      return;
-    }
-    // Sentry.captureException(error);
-    console.error(error);
-  },
-};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/lib/smart-wartermark.ts b/smart-admin-web/typescript-ant-design-vue3/src/lib/smart-wartermark.ts
deleted file mode 100644
index 29134cb..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/lib/smart-wartermark.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 水印
- *
- * @Author:    1024创新实验室-主任：卓大
- * @Date:      2022-09-06 20:50:10
- * @Wechat:    zhuda1024
- * @Email:     lab1024@163.com
- * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
- */
-
-import dayjs from 'dayjs';
-
-/**
- *  水印DOM id
- */
-const WATER_MARK_DOM_ID = 'smart_admin_water_mark';
-let smartAdminWaterMarkIntervalId: NodeJS.Timer | null = null;
-
-/**
- *
- * 因为modal的z-index为1000，所以为了modal的黑色背景隐藏掉，z-index为 999
- *
- * @param id
- * @param str
- * @param watermarkId
- * @returns
- */
-
-function setWatermark(id: string, str: string): void {
-  //删掉之前的水印
-  if (document.getElementById(WATER_MARK_DOM_ID) !== null) {
-    document.getElementById(WATER_MARK_DOM_ID)?.remove();
-  }
-
-  str = str + ' ' + dayjs().format('YYYY-MM-DD HH:mm');
-
-  //创建一个画布
-  const can = document.createElement('canvas');
-  //设置画布的长宽
-  can.width = 400;
-  can.height = 200;
-
-  const cans = can.getContext('2d');
-  if (cans) {
-    //旋转角度
-    cans.rotate((-15 * Math.PI) / 150);
-    cans.font = '16px Microsoft JhengHei';
-    //设置填充绘画的颜色、渐变或者模式
-    cans.fillStyle = 'rgba(190, 190, 190, 0.30)';
-    //设置文本内容的当前对齐方式
-    cans.textAlign = 'left';
-    //设置在绘制文本时使用的当前文本基线
-    cans.textBaseline = 'middle';
-    //在画布上绘制填色的文本（输出的文本，开始绘制文本的X坐标位置，开始绘制文本的Y坐标位置）
-    cans.fillText(str, can.width / 8, can.height / 2);
-  }
-
-  const div = document.createElement('div');
-  div.id = WATER_MARK_DOM_ID;
-  div.style.pointerEvents = 'none';
-  div.style.top = '0px';
-  div.style.left = '0px';
-  div.style.position = 'absolute';
-  div.style.zIndex = '999';
-  div.style.width = '100%';
-  div.style.height = '100%';
-  div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat';
-  document.getElementById(id)?.appendChild(div);
-}
-
-const watermark = {
-  show: function (): void {
-    const dom = document.getElementById(WATER_MARK_DOM_ID);
-    if (dom) {
-      dom.style.display = 'block';
-    }
-  },
-  hide: function (): void {
-    const dom = document.getElementById(WATER_MARK_DOM_ID);
-    if (dom) {
-      dom.style.display = 'hide';
-    }
-  },
-  // 该方法只允许调用一次
-  set: function (id: string, str: string): void {
-    // 如果存在水印，则不允许再调用了
-    if (document.getElementById(WATER_MARK_DOM_ID) !== null) {
-      alert('已经添加过全局水印了，请不要再重复添加!');
-      return;
-    }
-
-    setWatermark(id, str);
-
-    //每隔1分钟检查一次水印
-    smartAdminWaterMarkIntervalId = setInterval(() => {
-      setWatermark(id, str);
-    }, 60000);
-
-    window.onresize = () => {
-      setWatermark(id, str);
-    };
-  },
-  // 清空水印
-  clear: function (): void {
-    document.getElementById(WATER_MARK_DOM_ID)?.remove();
-    window.removeEventListener('resize', () => {
-      setWatermark;
-    });
-    if (smartAdminWaterMarkIntervalId) {
-      clearInterval(smartAdminWaterMarkIntervalId);
-    }
-  },
-};
-export default watermark;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/theme/color/bezierEasing.less b/smart-admin-web/typescript-ant-design-vue3/src/theme/color/bezierEasing.less
deleted file mode 100644
index f53ffb3..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/theme/color/bezierEasing.less
+++ /dev/null
@@ -1,110 +0,0 @@
-/* stylelint-disable */
-.bezierEasingMixin() {
-@functions: ~`(function() {
-  var NEWTON_ITERATIONS = 4;
-  var NEWTON_MIN_SLOPE = 0.001;
-  var SUBDIVISION_PRECISION = 0.0000001;
-  var SUBDIVISION_MAX_ITERATIONS = 10;
-
-  var kSplineTableSize = 11;
-  var kSampleStepSize = 1.0 / (kSplineTableSize - 1.0);
-
-  var float32ArraySupported = typeof Float32Array === 'function';
-
-  function A (aA1, aA2) { return 1.0 - 3.0 * aA2 + 3.0 * aA1; }
-  function B (aA1, aA2) { return 3.0 * aA2 - 6.0 * aA1; }
-  function C (aA1)      { return 3.0 * aA1; }
-
-  // Returns x(t) given t, x1, and x2, or y(t) given t, y1, and y2.
-  function calcBezier (aT, aA1, aA2) { return ((A(aA1, aA2) * aT + B(aA1, aA2)) * aT + C(aA1)) * aT; }
-
-  // Returns dx/dt given t, x1, and x2, or dy/dt given t, y1, and y2.
-  function getSlope (aT, aA1, aA2) { return 3.0 * A(aA1, aA2) * aT * aT + 2.0 * B(aA1, aA2) * aT + C(aA1); }
-
-  function binarySubdivide (aX, aA, aB, mX1, mX2) {
-    var currentX, currentT, i = 0;
-    do {
-      currentT = aA + (aB - aA) / 2.0;
-      currentX = calcBezier(currentT, mX1, mX2) - aX;
-      if (currentX > 0.0) {
-        aB = currentT;
-      } else {
-        aA = currentT;
-      }
-    } while (Math.abs(currentX) > SUBDIVISION_PRECISION && ++i < SUBDIVISION_MAX_ITERATIONS);
-    return currentT;
-  }
-
-  function newtonRaphsonIterate (aX, aGuessT, mX1, mX2) {
-   for (var i = 0; i < NEWTON_ITERATIONS; ++i) {
-     var currentSlope = getSlope(aGuessT, mX1, mX2);
-     if (currentSlope === 0.0) {
-       return aGuessT;
-     }
-     var currentX = calcBezier(aGuessT, mX1, mX2) - aX;
-     aGuessT -= currentX / currentSlope;
-   }
-   return aGuessT;
-  }
-
-  var BezierEasing = function (mX1, mY1, mX2, mY2) {
-    if (!(0 <= mX1 && mX1 <= 1 && 0 <= mX2 && mX2 <= 1)) {
-      throw new Error('bezier x values must be in [0, 1] range');
-    }
-
-    // Precompute samples table
-    var sampleValues = float32ArraySupported ? new Float32Array(kSplineTableSize) : new Array(kSplineTableSize);
-    if (mX1 !== mY1 || mX2 !== mY2) {
-      for (var i = 0; i < kSplineTableSize; ++i) {
-        sampleValues[i] = calcBezier(i * kSampleStepSize, mX1, mX2);
-      }
-    }
-
-    function getTForX (aX) {
-      var intervalStart = 0.0;
-      var currentSample = 1;
-      var lastSample = kSplineTableSize - 1;
-
-      for (; currentSample !== lastSample && sampleValues[currentSample] <= aX; ++currentSample) {
-        intervalStart += kSampleStepSize;
-      }
-      --currentSample;
-
-      // Interpolate to provide an initial guess for t
-      var dist = (aX - sampleValues[currentSample]) / (sampleValues[currentSample + 1] - sampleValues[currentSample]);
-      var guessForT = intervalStart + dist * kSampleStepSize;
-
-      var initialSlope = getSlope(guessForT, mX1, mX2);
-      if (initialSlope >= NEWTON_MIN_SLOPE) {
-        return newtonRaphsonIterate(aX, guessForT, mX1, mX2);
-      } else if (initialSlope === 0.0) {
-        return guessForT;
-      } else {
-        return binarySubdivide(aX, intervalStart, intervalStart + kSampleStepSize, mX1, mX2);
-      }
-    }
-
-    return function BezierEasing (x) {
-      if (mX1 === mY1 && mX2 === mY2) {
-        return x; // linear
-      }
-      // Because JavaScript number are imprecise, we should guarantee the extremes are right.
-      if (x === 0) {
-        return 0;
-      }
-      if (x === 1) {
-        return 1;
-      }
-      return calcBezier(getTForX(x), mY1, mY2);
-    };
-  };
-
-  this.colorEasing = BezierEasing(0.26, 0.09, 0.37, 0.18);
-  // less 3 requires a return
-  return '';
-})()`;
-}
-// It is hacky way to make this function will be compiled preferentially by less
-// resolve error: `ReferenceError: colorPalette is not defined`
-// https://github.com/ant-design/ant-motion/issues/44
-.bezierEasingMixin();
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/theme/color/colorPalette.less b/smart-admin-web/typescript-ant-design-vue3/src/theme/color/colorPalette.less
deleted file mode 100644
index f3e175d..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/theme/color/colorPalette.less
+++ /dev/null
@@ -1,81 +0,0 @@
-/* stylelint-disable no-duplicate-selectors */
-@import "bezierEasing";
-@import "tinyColor";
-
-// We create a very complex algorithm which take the place of original tint/shade color system
-// to make sure no one can understand it 👻
-// and create an entire color palette magicly by inputing just a single primary color.
-// We are using bezier-curve easing function and some color manipulations like tint/shade/darken/spin
-.colorPaletteMixin() {
-@functions: ~`(function() {
-  var hueStep = 2;
-  var saturationStep = 0.16;
-  var saturationStep2 = 0.05;
-  var brightnessStep1 = 0.05;
-  var brightnessStep2 = 0.15;
-  var lightColorCount = 5;
-  var darkColorCount = 4;
-
-  var getHue = function(hsv, i, isLight) {
-    var hue;
-    if (hsv.h >= 60 && hsv.h <= 240) {
-      hue = isLight ? hsv.h - hueStep * i : hsv.h + hueStep * i;
-    } else {
-      hue = isLight ? hsv.h + hueStep * i : hsv.h - hueStep * i;
-    }
-    if (hue < 0) {
-      hue += 360;
-    } else if (hue >= 360) {
-      hue -= 360;
-    }
-    return Math.round(hue);
-  };
-  var getSaturation = function(hsv, i, isLight) {
-    var saturation;
-    if (isLight) {
-      saturation = hsv.s - saturationStep * i;
-    } else if (i === darkColorCount) {
-      saturation = hsv.s + saturationStep;
-    } else {
-      saturation = hsv.s + saturationStep2 * i;
-    }
-    if (saturation > 1) {
-      saturation = 1;
-    }
-    if (isLight && i === lightColorCount && saturation > 0.1) {
-      saturation = 0.1;
-    }
-    if (saturation < 0.06) {
-      saturation = 0.06;
-    }
-    return Number(saturation.toFixed(2));
-  };
-  var getValue = function(hsv, i, isLight) {
-    var value;
-    if (isLight) {
-      value = hsv.v + brightnessStep1 * i;
-    }else{
-      value = hsv.v - brightnessStep2 * i
-    }
-    if (value > 1) {
-      value = 1;
-    }
-    return Number(value.toFixed(2))
-  };
-
-  this.colorPalette = function(color, index) {
-    var isLight = index <= 6;
-    var hsv = tinycolor(color).toHsv();
-    var i = isLight ? lightColorCount + 1 - index : index - lightColorCount - 1;
-    return tinycolor({
-      h: getHue(hsv, i, isLight),
-      s: getSaturation(hsv, i, isLight),
-      v: getValue(hsv, i, isLight),
-    }).toHexString();
-  };
-})()`;
-}
-// It is hacky way to make this function will be compiled preferentially by less
-// resolve error: `ReferenceError: colorPalette is not defined`
-// https://github.com/ant-design/ant-motion/issues/44
-.colorPaletteMixin();
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/theme/color/colors.less b/smart-admin-web/typescript-ant-design-vue3/src/theme/color/colors.less
deleted file mode 100644
index 51540bf..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/theme/color/colors.less
+++ /dev/null
@@ -1,162 +0,0 @@
-@import 'colorPalette';
-
-// color palettes
-@blue-base: #1890ff;
-@blue-1: color(~`colorPalette('@{blue-6}', 1) `);
-@blue-2: color(~`colorPalette('@{blue-6}', 2) `);
-@blue-3: color(~`colorPalette('@{blue-6}', 3) `);
-@blue-4: color(~`colorPalette('@{blue-6}', 4) `);
-@blue-5: color(~`colorPalette('@{blue-6}', 5) `);
-@blue-6: @blue-base;
-@blue-7: color(~`colorPalette('@{blue-6}', 7) `);
-@blue-8: color(~`colorPalette('@{blue-6}', 8) `);
-@blue-9: color(~`colorPalette('@{blue-6}', 9) `);
-@blue-10: color(~`colorPalette('@{blue-6}', 10) `);
-
-@purple-base: #722ed1;
-@purple-1: color(~`colorPalette('@{purple-6}', 1) `);
-@purple-2: color(~`colorPalette('@{purple-6}', 2) `);
-@purple-3: color(~`colorPalette('@{purple-6}', 3) `);
-@purple-4: color(~`colorPalette('@{purple-6}', 4) `);
-@purple-5: color(~`colorPalette('@{purple-6}', 5) `);
-@purple-6: @purple-base;
-@purple-7: color(~`colorPalette('@{purple-6}', 7) `);
-@purple-8: color(~`colorPalette('@{purple-6}', 8) `);
-@purple-9: color(~`colorPalette('@{purple-6}', 9) `);
-@purple-10: color(~`colorPalette('@{purple-6}', 10) `);
-
-@cyan-base: #13c2c2;
-@cyan-1: color(~`colorPalette('@{cyan-6}', 1) `);
-@cyan-2: color(~`colorPalette('@{cyan-6}', 2) `);
-@cyan-3: color(~`colorPalette('@{cyan-6}', 3) `);
-@cyan-4: color(~`colorPalette('@{cyan-6}', 4) `);
-@cyan-5: color(~`colorPalette('@{cyan-6}', 5) `);
-@cyan-6: @cyan-base;
-@cyan-7: color(~`colorPalette('@{cyan-6}', 7) `);
-@cyan-8: color(~`colorPalette('@{cyan-6}', 8) `);
-@cyan-9: color(~`colorPalette('@{cyan-6}', 9) `);
-@cyan-10: color(~`colorPalette('@{cyan-6}', 10) `);
-
-@green-base: #52c41a;
-@green-1: color(~`colorPalette('@{green-6}', 1) `);
-@green-2: color(~`colorPalette('@{green-6}', 2) `);
-@green-3: color(~`colorPalette('@{green-6}', 3) `);
-@green-4: color(~`colorPalette('@{green-6}', 4) `);
-@green-5: color(~`colorPalette('@{green-6}', 5) `);
-@green-6: @green-base;
-@green-7: color(~`colorPalette('@{green-6}', 7) `);
-@green-8: color(~`colorPalette('@{green-6}', 8) `);
-@green-9: color(~`colorPalette('@{green-6}', 9) `);
-@green-10: color(~`colorPalette('@{green-6}', 10) `);
-
-@magenta-base: #eb2f96;
-@magenta-1: color(~`colorPalette('@{magenta-6}', 1) `);
-@magenta-2: color(~`colorPalette('@{magenta-6}', 2) `);
-@magenta-3: color(~`colorPalette('@{magenta-6}', 3) `);
-@magenta-4: color(~`colorPalette('@{magenta-6}', 4) `);
-@magenta-5: color(~`colorPalette('@{magenta-6}', 5) `);
-@magenta-6: @magenta-base;
-@magenta-7: color(~`colorPalette('@{magenta-6}', 7) `);
-@magenta-8: color(~`colorPalette('@{magenta-6}', 8) `);
-@magenta-9: color(~`colorPalette('@{magenta-6}', 9) `);
-@magenta-10: color(~`colorPalette('@{magenta-6}', 10) `);
-
-// alias of magenta
-@pink-base: #eb2f96;
-@pink-1: color(~`colorPalette('@{pink-6}', 1) `);
-@pink-2: color(~`colorPalette('@{pink-6}', 2) `);
-@pink-3: color(~`colorPalette('@{pink-6}', 3) `);
-@pink-4: color(~`colorPalette('@{pink-6}', 4) `);
-@pink-5: color(~`colorPalette('@{pink-6}', 5) `);
-@pink-6: @pink-base;
-@pink-7: color(~`colorPalette('@{pink-6}', 7) `);
-@pink-8: color(~`colorPalette('@{pink-6}', 8) `);
-@pink-9: color(~`colorPalette('@{pink-6}', 9) `);
-@pink-10: color(~`colorPalette('@{pink-6}', 10) `);
-
-@red-base: #f5222d;
-@red-1: color(~`colorPalette('@{red-6}', 1) `);
-@red-2: color(~`colorPalette('@{red-6}', 2) `);
-@red-3: color(~`colorPalette('@{red-6}', 3) `);
-@red-4: color(~`colorPalette('@{red-6}', 4) `);
-@red-5: color(~`colorPalette('@{red-6}', 5) `);
-@red-6: @red-base;
-@red-7: color(~`colorPalette('@{red-6}', 7) `);
-@red-8: color(~`colorPalette('@{red-6}', 8) `);
-@red-9: color(~`colorPalette('@{red-6}', 9) `);
-@red-10: color(~`colorPalette('@{red-6}', 10) `);
-
-@orange-base: #fa8c16;
-@orange-1: color(~`colorPalette('@{orange-6}', 1) `);
-@orange-2: color(~`colorPalette('@{orange-6}', 2) `);
-@orange-3: color(~`colorPalette('@{orange-6}', 3) `);
-@orange-4: color(~`colorPalette('@{orange-6}', 4) `);
-@orange-5: color(~`colorPalette('@{orange-6}', 5) `);
-@orange-6: @orange-base;
-@orange-7: color(~`colorPalette('@{orange-6}', 7) `);
-@orange-8: color(~`colorPalette('@{orange-6}', 8) `);
-@orange-9: color(~`colorPalette('@{orange-6}', 9) `);
-@orange-10: color(~`colorPalette('@{orange-6}', 10) `);
-
-@yellow-base: #fadb14;
-@yellow-1: color(~`colorPalette('@{yellow-6}', 1) `);
-@yellow-2: color(~`colorPalette('@{yellow-6}', 2) `);
-@yellow-3: color(~`colorPalette('@{yellow-6}', 3) `);
-@yellow-4: color(~`colorPalette('@{yellow-6}', 4) `);
-@yellow-5: color(~`colorPalette('@{yellow-6}', 5) `);
-@yellow-6: @yellow-base;
-@yellow-7: color(~`colorPalette('@{yellow-6}', 7) `);
-@yellow-8: color(~`colorPalette('@{yellow-6}', 8) `);
-@yellow-9: color(~`colorPalette('@{yellow-6}', 9) `);
-@yellow-10: color(~`colorPalette('@{yellow-6}', 10) `);
-
-@volcano-base: #fa541c;
-@volcano-1: color(~`colorPalette('@{volcano-6}', 1) `);
-@volcano-2: color(~`colorPalette('@{volcano-6}', 2) `);
-@volcano-3: color(~`colorPalette('@{volcano-6}', 3) `);
-@volcano-4: color(~`colorPalette('@{volcano-6}', 4) `);
-@volcano-5: color(~`colorPalette('@{volcano-6}', 5) `);
-@volcano-6: @volcano-base;
-@volcano-7: color(~`colorPalette('@{volcano-6}', 7) `);
-@volcano-8: color(~`colorPalette('@{volcano-6}', 8) `);
-@volcano-9: color(~`colorPalette('@{volcano-6}', 9) `);
-@volcano-10: color(~`colorPalette('@{volcano-6}', 10) `);
-
-@geekblue-base: #2f54eb;
-@geekblue-1: color(~`colorPalette('@{geekblue-6}', 1) `);
-@geekblue-2: color(~`colorPalette('@{geekblue-6}', 2) `);
-@geekblue-3: color(~`colorPalette('@{geekblue-6}', 3) `);
-@geekblue-4: color(~`colorPalette('@{geekblue-6}', 4) `);
-@geekblue-5: color(~`colorPalette('@{geekblue-6}', 5) `);
-@geekblue-6: @geekblue-base;
-@geekblue-7: color(~`colorPalette('@{geekblue-6}', 7) `);
-@geekblue-8: color(~`colorPalette('@{geekblue-6}', 8) `);
-@geekblue-9: color(~`colorPalette('@{geekblue-6}', 9) `);
-@geekblue-10: color(~`colorPalette('@{geekblue-6}', 10) `);
-
-@lime-base: #a0d911;
-@lime-1: color(~`colorPalette('@{lime-6}', 1) `);
-@lime-2: color(~`colorPalette('@{lime-6}', 2) `);
-@lime-3: color(~`colorPalette('@{lime-6}', 3) `);
-@lime-4: color(~`colorPalette('@{lime-6}', 4) `);
-@lime-5: color(~`colorPalette('@{lime-6}', 5) `);
-@lime-6: @lime-base;
-@lime-7: color(~`colorPalette('@{lime-6}', 7) `);
-@lime-8: color(~`colorPalette('@{lime-6}', 8) `);
-@lime-9: color(~`colorPalette('@{lime-6}', 9) `);
-@lime-10: color(~`colorPalette('@{lime-6}', 10) `);
-
-@gold-base: #faad14;
-@gold-1: color(~`colorPalette('@{gold-6}', 1) `);
-@gold-2: color(~`colorPalette('@{gold-6}', 2) `);
-@gold-3: color(~`colorPalette('@{gold-6}', 3) `);
-@gold-4: color(~`colorPalette('@{gold-6}', 4) `);
-@gold-5: color(~`colorPalette('@{gold-6}', 5) `);
-@gold-6: @gold-base;
-@gold-7: color(~`colorPalette('@{gold-6}', 7) `);
-@gold-8: color(~`colorPalette('@{gold-6}', 8) `);
-@gold-9: color(~`colorPalette('@{gold-6}', 9) `);
-@gold-10: color(~`colorPalette('@{gold-6}', 10) `);
-
-@preset-colors: pink, magenta, red, volcano, orange, yellow, gold, cyan, lime, green, blue, geekblue,
-  purple;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/theme/color/tinyColor.less b/smart-admin-web/typescript-ant-design-vue3/src/theme/color/tinyColor.less
deleted file mode 100644
index e576c78..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/theme/color/tinyColor.less
+++ /dev/null
@@ -1,1184 +0,0 @@
-/* stylelint-disable declaration-bang-space-before,no-duplicate-selectors,string-no-newline */
-.tinyColorMixin() {
-@functions: ~`(function() {
-// TinyColor v1.4.1
-// https://github.com/bgrins/TinyColor
-// 2016-07-07, Brian Grinstead, MIT License
-var trimLeft = /^\s+/,
-    trimRight = /\s+$/,
-    tinyCounter = 0,
-    mathRound = Math.round,
-    mathMin = Math.min,
-    mathMax = Math.max,
-    mathRandom = Math.random;
-
-function tinycolor (color, opts) {
-
-    color = (color) ? color : '';
-    opts = opts || { };
-
-    // If input is already a tinycolor, return itself
-    if (color instanceof tinycolor) {
-       return color;
-    }
-    // If we are called as a function, call using new instead
-    if (!(this instanceof tinycolor)) {
-        return new tinycolor(color, opts);
-    }
-
-    var rgb = inputToRGB(color);
-    this._originalInput = color,
-    this._r = rgb.r,
-    this._g = rgb.g,
-    this._b = rgb.b,
-    this._a = rgb.a,
-    this._roundA = mathRound(100*this._a) / 100,
-    this._format = opts.format || rgb.format;
-    this._gradientType = opts.gradientType;
-
-    // Don't let the range of [0,255] come back in [0,1].
-    // Potentially lose a little bit of precision here, but will fix issues where
-    // .5 gets interpreted as half of the total, instead of half of 1
-    // If it was supposed to be 128, this was already taken care of by inputToRgb
-    if (this._r < 1) { this._r = mathRound(this._r); }
-    if (this._g < 1) { this._g = mathRound(this._g); }
-    if (this._b < 1) { this._b = mathRound(this._b); }
-
-    this._ok = rgb.ok;
-    this._tc_id = tinyCounter++;
-}
-
-tinycolor.prototype = {
-    isDark: function() {
-        return this.getBrightness() < 128;
-    },
-    isLight: function() {
-        return !this.isDark();
-    },
-    isValid: function() {
-        return this._ok;
-    },
-    getOriginalInput: function() {
-      return this._originalInput;
-    },
-    getFormat: function() {
-        return this._format;
-    },
-    getAlpha: function() {
-        return this._a;
-    },
-    getBrightness: function() {
-        //http://www.w3.org/TR/AERT#color-contrast
-        var rgb = this.toRgb();
-        return (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1000;
-    },
-    getLuminance: function() {
-        //http://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
-        var rgb = this.toRgb();
-        var RsRGB, GsRGB, BsRGB, R, G, B;
-        RsRGB = rgb.r/255;
-        GsRGB = rgb.g/255;
-        BsRGB = rgb.b/255;
-
-        if (RsRGB <= 0.03928) {R = RsRGB / 12.92;} else {R = Math.pow(((RsRGB + 0.055) / 1.055), 2.4);}
-        if (GsRGB <= 0.03928) {G = GsRGB / 12.92;} else {G = Math.pow(((GsRGB + 0.055) / 1.055), 2.4);}
-        if (BsRGB <= 0.03928) {B = BsRGB / 12.92;} else {B = Math.pow(((BsRGB + 0.055) / 1.055), 2.4);}
-        return (0.2126 * R) + (0.7152 * G) + (0.0722 * B);
-    },
-    setAlpha: function(value) {
-        this._a = boundAlpha(value);
-        this._roundA = mathRound(100*this._a) / 100;
-        return this;
-    },
-    toHsv: function() {
-        var hsv = rgbToHsv(this._r, this._g, this._b);
-        return { h: hsv.h * 360, s: hsv.s, v: hsv.v, a: this._a };
-    },
-    toHsvString: function() {
-        var hsv = rgbToHsv(this._r, this._g, this._b);
-        var h = mathRound(hsv.h * 360), s = mathRound(hsv.s * 100), v = mathRound(hsv.v * 100);
-        return (this._a == 1) ?
-          "hsv("  + h + ", " + s + "%, " + v + "%)" :
-          "hsva(" + h + ", " + s + "%, " + v + "%, "+ this._roundA + ")";
-    },
-    toHsl: function() {
-        var hsl = rgbToHsl(this._r, this._g, this._b);
-        return { h: hsl.h * 360, s: hsl.s, l: hsl.l, a: this._a };
-    },
-    toHslString: function() {
-        var hsl = rgbToHsl(this._r, this._g, this._b);
-        var h = mathRound(hsl.h * 360), s = mathRound(hsl.s * 100), l = mathRound(hsl.l * 100);
-        return (this._a == 1) ?
-          "hsl("  + h + ", " + s + "%, " + l + "%)" :
-          "hsla(" + h + ", " + s + "%, " + l + "%, "+ this._roundA + ")";
-    },
-    toHex: function(allow3Char) {
-        return rgbToHex(this._r, this._g, this._b, allow3Char);
-    },
-    toHexString: function(allow3Char) {
-        return '#' + this.toHex(allow3Char);
-    },
-    toHex8: function(allow4Char) {
-        return rgbaToHex(this._r, this._g, this._b, this._a, allow4Char);
-    },
-    toHex8String: function(allow4Char) {
-        return '#' + this.toHex8(allow4Char);
-    },
-    toRgb: function() {
-        return { r: mathRound(this._r), g: mathRound(this._g), b: mathRound(this._b), a: this._a };
-    },
-    toRgbString: function() {
-        return (this._a == 1) ?
-          "rgb("  + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ")" :
-          "rgba(" + mathRound(this._r) + ", " + mathRound(this._g) + ", " + mathRound(this._b) + ", " + this._roundA + ")";
-    },
-    toPercentageRgb: function() {
-        return { r: mathRound(bound01(this._r, 255) * 100) + "%", g: mathRound(bound01(this._g, 255) * 100) + "%", b: mathRound(bound01(this._b, 255) * 100) + "%", a: this._a };
-    },
-    toPercentageRgbString: function() {
-        return (this._a == 1) ?
-          "rgb("  + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%)" :
-          "rgba(" + mathRound(bound01(this._r, 255) * 100) + "%, " + mathRound(bound01(this._g, 255) * 100) + "%, " + mathRound(bound01(this._b, 255) * 100) + "%, " + this._roundA + ")";
-    },
-    toName: function() {
-        if (this._a === 0) {
-            return "transparent";
-        }
-
-        if (this._a < 1) {
-            return false;
-        }
-
-        return hexNames[rgbToHex(this._r, this._g, this._b, true)] || false;
-    },
-    toFilter: function(secondColor) {
-        var hex8String = '#' + rgbaToArgbHex(this._r, this._g, this._b, this._a);
-        var secondHex8String = hex8String;
-        var gradientType = this._gradientType ? "GradientType = 1, " : "";
-
-        if (secondColor) {
-            var s = tinycolor(secondColor);
-            secondHex8String = '#' + rgbaToArgbHex(s._r, s._g, s._b, s._a);
-        }
-
-        return "progid:DXImageTransform.Microsoft.gradient("+gradientType+"startColorstr="+hex8String+",endColorstr="+secondHex8String+")";
-    },
-    toString: function(format) {
-        var formatSet = !!format;
-        format = format || this._format;
-
-        var formattedString = false;
-        var hasAlpha = this._a < 1 && this._a >= 0;
-        var needsAlphaFormat = !formatSet && hasAlpha && (format === "hex" || format === "hex6" || format === "hex3" || format === "hex4" || format === "hex8" || format === "name");
-
-        if (needsAlphaFormat) {
-            // Special case for "transparent", all other non-alpha formats
-            // will return rgba when there is transparency.
-            if (format === "name" && this._a === 0) {
-                return this.toName();
-            }
-            return this.toRgbString();
-        }
-        if (format === "rgb") {
-            formattedString = this.toRgbString();
-        }
-        if (format === "prgb") {
-            formattedString = this.toPercentageRgbString();
-        }
-        if (format === "hex" || format === "hex6") {
-            formattedString = this.toHexString();
-        }
-        if (format === "hex3") {
-            formattedString = this.toHexString(true);
-        }
-        if (format === "hex4") {
-            formattedString = this.toHex8String(true);
-        }
-        if (format === "hex8") {
-            formattedString = this.toHex8String();
-        }
-        if (format === "name") {
-            formattedString = this.toName();
-        }
-        if (format === "hsl") {
-            formattedString = this.toHslString();
-        }
-        if (format === "hsv") {
-            formattedString = this.toHsvString();
-        }
-
-        return formattedString || this.toHexString();
-    },
-    clone: function() {
-        return tinycolor(this.toString());
-    },
-
-    _applyModification: function(fn, args) {
-        var color = fn.apply(null, [this].concat([].slice.call(args)));
-        this._r = color._r;
-        this._g = color._g;
-        this._b = color._b;
-        this.setAlpha(color._a);
-        return this;
-    },
-    lighten: function() {
-        return this._applyModification(lighten, arguments);
-    },
-    brighten: function() {
-        return this._applyModification(brighten, arguments);
-    },
-    darken: function() {
-        return this._applyModification(darken, arguments);
-    },
-    desaturate: function() {
-        return this._applyModification(desaturate, arguments);
-    },
-    saturate: function() {
-        return this._applyModification(saturate, arguments);
-    },
-    greyscale: function() {
-        return this._applyModification(greyscale, arguments);
-    },
-    spin: function() {
-        return this._applyModification(spin, arguments);
-    },
-
-    _applyCombination: function(fn, args) {
-        return fn.apply(null, [this].concat([].slice.call(args)));
-    },
-    analogous: function() {
-        return this._applyCombination(analogous, arguments);
-    },
-    complement: function() {
-        return this._applyCombination(complement, arguments);
-    },
-    monochromatic: function() {
-        return this._applyCombination(monochromatic, arguments);
-    },
-    splitcomplement: function() {
-        return this._applyCombination(splitcomplement, arguments);
-    },
-    triad: function() {
-        return this._applyCombination(triad, arguments);
-    },
-    tetrad: function() {
-        return this._applyCombination(tetrad, arguments);
-    }
-};
-
-// If input is an object, force 1 into "1.0" to handle ratios properly
-// String input requires "1.0" as input, so 1 will be treated as 1
-tinycolor.fromRatio = function(color, opts) {
-    if (typeof color == "object") {
-        var newColor = {};
-        for (var i in color) {
-            if (color.hasOwnProperty(i)) {
-                if (i === "a") {
-                    newColor[i] = color[i];
-                }
-                else {
-                    newColor[i] = convertToPercentage(color[i]);
-                }
-            }
-        }
-        color = newColor;
-    }
-
-    return tinycolor(color, opts);
-};
-
-// Given a string or object, convert that input to RGB
-// Possible string inputs:
-//
-//     "red"
-//     "#f00" or "f00"
-//     "#ff0000" or "ff0000"
-//     "#ff000000" or "ff000000"
-//     "rgb 255 0 0" or "rgb (255, 0, 0)"
-//     "rgb 1.0 0 0" or "rgb (1, 0, 0)"
-//     "rgba (255, 0, 0, 1)" or "rgba 255, 0, 0, 1"
-//     "rgba (1.0, 0, 0, 1)" or "rgba 1.0, 0, 0, 1"
-//     "hsl(0, 100%, 50%)" or "hsl 0 100% 50%"
-//     "hsla(0, 100%, 50%, 1)" or "hsla 0 100% 50%, 1"
-//     "hsv(0, 100%, 100%)" or "hsv 0 100% 100%"
-//
-function inputToRGB(color) {
-
-    var rgb = { r: 0, g: 0, b: 0 };
-    var a = 1;
-    var s = null;
-    var v = null;
-    var l = null;
-    var ok = false;
-    var format = false;
-
-    if (typeof color == "string") {
-        color = stringInputToObject(color);
-    }
-
-    if (typeof color == "object") {
-        if (isValidCSSUnit(color.r) && isValidCSSUnit(color.g) && isValidCSSUnit(color.b)) {
-            rgb = rgbToRgb(color.r, color.g, color.b);
-            ok = true;
-            format = String(color.r).substr(-1) === "%" ? "prgb" : "rgb";
-        }
-        else if (isValidCSSUnit(color.h) && isValidCSSUnit(color.s) && isValidCSSUnit(color.v)) {
-            s = convertToPercentage(color.s);
-            v = convertToPercentage(color.v);
-            rgb = hsvToRgb(color.h, s, v);
-            ok = true;
-            format = "hsv";
-        }
-        else if (isValidCSSUnit(color.h) && isValidCSSUnit(color.s) && isValidCSSUnit(color.l)) {
-            s = convertToPercentage(color.s);
-            l = convertToPercentage(color.l);
-            rgb = hslToRgb(color.h, s, l);
-            ok = true;
-            format = "hsl";
-        }
-
-        if (color.hasOwnProperty("a")) {
-            a = color.a;
-        }
-    }
-
-    a = boundAlpha(a);
-
-    return {
-        ok: ok,
-        format: color.format || format,
-        r: mathMin(255, mathMax(rgb.r, 0)),
-        g: mathMin(255, mathMax(rgb.g, 0)),
-        b: mathMin(255, mathMax(rgb.b, 0)),
-        a: a
-    };
-}
-
-// Conversion Functions
-// --------------------
-
-// rgbToHsl, rgbToHsv, hslToRgb, hsvToRgb modified from:
-// <http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript>
-
-// rgbToRgb
-// Handle bounds / percentage checking to conform to CSS color spec
-// <http://www.w3.org/TR/css3-color/>
-// *Assumes:* r, g, b in [0, 255] or [0, 1]
-// *Returns:* { r, g, b } in [0, 255]
-function rgbToRgb(r, g, b){
-    return {
-        r: bound01(r, 255) * 255,
-        g: bound01(g, 255) * 255,
-        b: bound01(b, 255) * 255
-    };
-}
-
-// rgbToHsl
-// Converts an RGB color value to HSL.
-// *Assumes:* r, g, and b are contained in [0, 255] or [0, 1]
-// *Returns:* { h, s, l } in [0,1]
-function rgbToHsl(r, g, b) {
-
-    r = bound01(r, 255);
-    g = bound01(g, 255);
-    b = bound01(b, 255);
-
-    var max = mathMax(r, g, b), min = mathMin(r, g, b);
-    var h, s, l = (max + min) / 2;
-
-    if(max == min) {
-        h = s = 0; // achromatic
-    }
-    else {
-        var d = max - min;
-        s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-        switch(max) {
-            case r: h = (g - b) / d + (g < b ? 6 : 0); break;
-            case g: h = (b - r) / d + 2; break;
-            case b: h = (r - g) / d + 4; break;
-        }
-
-        h /= 6;
-    }
-
-    return { h: h, s: s, l: l };
-}
-
-// hslToRgb
-// Converts an HSL color value to RGB.
-// *Assumes:* h is contained in [0, 1] or [0, 360] and s and l are contained [0, 1] or [0, 100]
-// *Returns:* { r, g, b } in the set [0, 255]
-function hslToRgb(h, s, l) {
-    var r, g, b;
-
-    h = bound01(h, 360);
-    s = bound01(s, 100);
-    l = bound01(l, 100);
-
-    function hue2rgb(p, q, t) {
-        if(t < 0) t += 1;
-        if(t > 1) t -= 1;
-        if(t < 1/6) return p + (q - p) * 6 * t;
-        if(t < 1/2) return q;
-        if(t < 2/3) return p + (q - p) * (2/3 - t) * 6;
-        return p;
-    }
-
-    if(s === 0) {
-        r = g = b = l; // achromatic
-    }
-    else {
-        var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-        var p = 2 * l - q;
-        r = hue2rgb(p, q, h + 1/3);
-        g = hue2rgb(p, q, h);
-        b = hue2rgb(p, q, h - 1/3);
-    }
-
-    return { r: r * 255, g: g * 255, b: b * 255 };
-}
-
-// rgbToHsv
-// Converts an RGB color value to HSV
-// *Assumes:* r, g, and b are contained in the set [0, 255] or [0, 1]
-// *Returns:* { h, s, v } in [0,1]
-function rgbToHsv(r, g, b) {
-
-    r = bound01(r, 255);
-    g = bound01(g, 255);
-    b = bound01(b, 255);
-
-    var max = mathMax(r, g, b), min = mathMin(r, g, b);
-    var h, s, v = max;
-
-    var d = max - min;
-    s = max === 0 ? 0 : d / max;
-
-    if(max == min) {
-        h = 0; // achromatic
-    }
-    else {
-        switch(max) {
-            case r: h = (g - b) / d + (g < b ? 6 : 0); break;
-            case g: h = (b - r) / d + 2; break;
-            case b: h = (r - g) / d + 4; break;
-        }
-        h /= 6;
-    }
-    return { h: h, s: s, v: v };
-}
-
-// hsvToRgb
-// Converts an HSV color value to RGB.
-// *Assumes:* h is contained in [0, 1] or [0, 360] and s and v are contained in [0, 1] or [0, 100]
-// *Returns:* { r, g, b } in the set [0, 255]
- function hsvToRgb(h, s, v) {
-
-    h = bound01(h, 360) * 6;
-    s = bound01(s, 100);
-    v = bound01(v, 100);
-
-    var i = Math.floor(h),
-        f = h - i,
-        p = v * (1 - s),
-        q = v * (1 - f * s),
-        t = v * (1 - (1 - f) * s),
-        mod = i % 6,
-        r = [v, q, p, p, t, v][mod],
-        g = [t, v, v, q, p, p][mod],
-        b = [p, p, t, v, v, q][mod];
-
-    return { r: r * 255, g: g * 255, b: b * 255 };
-}
-
-// rgbToHex
-// Converts an RGB color to hex
-// Assumes r, g, and b are contained in the set [0, 255]
-// Returns a 3 or 6 character hex
-function rgbToHex(r, g, b, allow3Char) {
-
-    var hex = [
-        pad2(mathRound(r).toString(16)),
-        pad2(mathRound(g).toString(16)),
-        pad2(mathRound(b).toString(16))
-    ];
-
-    // Return a 3 character hex if possible
-    if (allow3Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1)) {
-        return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0);
-    }
-
-    return hex.join("");
-}
-
-// rgbaToHex
-// Converts an RGBA color plus alpha transparency to hex
-// Assumes r, g, b are contained in the set [0, 255] and
-// a in [0, 1]. Returns a 4 or 8 character rgba hex
-function rgbaToHex(r, g, b, a, allow4Char) {
-
-    var hex = [
-        pad2(mathRound(r).toString(16)),
-        pad2(mathRound(g).toString(16)),
-        pad2(mathRound(b).toString(16)),
-        pad2(convertDecimalToHex(a))
-    ];
-
-    // Return a 4 character hex if possible
-    if (allow4Char && hex[0].charAt(0) == hex[0].charAt(1) && hex[1].charAt(0) == hex[1].charAt(1) && hex[2].charAt(0) == hex[2].charAt(1) && hex[3].charAt(0) == hex[3].charAt(1)) {
-        return hex[0].charAt(0) + hex[1].charAt(0) + hex[2].charAt(0) + hex[3].charAt(0);
-    }
-
-    return hex.join("");
-}
-
-// rgbaToArgbHex
-// Converts an RGBA color to an ARGB Hex8 string
-// Rarely used, but required for "toFilter()"
-function rgbaToArgbHex(r, g, b, a) {
-
-    var hex = [
-        pad2(convertDecimalToHex(a)),
-        pad2(mathRound(r).toString(16)),
-        pad2(mathRound(g).toString(16)),
-        pad2(mathRound(b).toString(16))
-    ];
-
-    return hex.join("");
-}
-
-// equals
-// Can be called with any tinycolor input
-tinycolor.equals = function (color1, color2) {
-    if (!color1 || !color2) { return false; }
-    return tinycolor(color1).toRgbString() == tinycolor(color2).toRgbString();
-};
-
-tinycolor.random = function() {
-    return tinycolor.fromRatio({
-        r: mathRandom(),
-        g: mathRandom(),
-        b: mathRandom()
-    });
-};
-
-// Modification Functions
-// ----------------------
-// Thanks to less.js for some of the basics here
-// <https://github.com/cloudhead/less.js/blob/master/lib/less/functions.js>
-
-function desaturate(color, amount) {
-    amount = (amount === 0) ? 0 : (amount || 10);
-    var hsl = tinycolor(color).toHsl();
-    hsl.s -= amount / 100;
-    hsl.s = clamp01(hsl.s);
-    return tinycolor(hsl);
-}
-
-function saturate(color, amount) {
-    amount = (amount === 0) ? 0 : (amount || 10);
-    var hsl = tinycolor(color).toHsl();
-    hsl.s += amount / 100;
-    hsl.s = clamp01(hsl.s);
-    return tinycolor(hsl);
-}
-
-function greyscale(color) {
-    return tinycolor(color).desaturate(100);
-}
-
-function lighten (color, amount) {
-    amount = (amount === 0) ? 0 : (amount || 10);
-    var hsl = tinycolor(color).toHsl();
-    hsl.l += amount / 100;
-    hsl.l = clamp01(hsl.l);
-    return tinycolor(hsl);
-}
-
-function brighten(color, amount) {
-    amount = (amount === 0) ? 0 : (amount || 10);
-    var rgb = tinycolor(color).toRgb();
-    rgb.r = mathMax(0, mathMin(255, rgb.r - mathRound(255 * - (amount / 100))));
-    rgb.g = mathMax(0, mathMin(255, rgb.g - mathRound(255 * - (amount / 100))));
-    rgb.b = mathMax(0, mathMin(255, rgb.b - mathRound(255 * - (amount / 100))));
-    return tinycolor(rgb);
-}
-
-function darken (color, amount) {
-    amount = (amount === 0) ? 0 : (amount || 10);
-    var hsl = tinycolor(color).toHsl();
-    hsl.l -= amount / 100;
-    hsl.l = clamp01(hsl.l);
-    return tinycolor(hsl);
-}
-
-// Spin takes a positive or negative amount within [-360, 360] indicating the change of hue.
-// Values outside of this range will be wrapped into this range.
-function spin(color, amount) {
-    var hsl = tinycolor(color).toHsl();
-    var hue = (hsl.h + amount) % 360;
-    hsl.h = hue < 0 ? 360 + hue : hue;
-    return tinycolor(hsl);
-}
-
-// Combination Functions
-// ---------------------
-// Thanks to jQuery xColor for some of the ideas behind these
-// <https://github.com/infusion/jQuery-xcolor/blob/master/jquery.xcolor.js>
-
-function complement(color) {
-    var hsl = tinycolor(color).toHsl();
-    hsl.h = (hsl.h + 180) % 360;
-    return tinycolor(hsl);
-}
-
-function triad(color) {
-    var hsl = tinycolor(color).toHsl();
-    var h = hsl.h;
-    return [
-        tinycolor(color),
-        tinycolor({ h: (h + 120) % 360, s: hsl.s, l: hsl.l }),
-        tinycolor({ h: (h + 240) % 360, s: hsl.s, l: hsl.l })
-    ];
-}
-
-function tetrad(color) {
-    var hsl = tinycolor(color).toHsl();
-    var h = hsl.h;
-    return [
-        tinycolor(color),
-        tinycolor({ h: (h + 90) % 360, s: hsl.s, l: hsl.l }),
-        tinycolor({ h: (h + 180) % 360, s: hsl.s, l: hsl.l }),
-        tinycolor({ h: (h + 270) % 360, s: hsl.s, l: hsl.l })
-    ];
-}
-
-function splitcomplement(color) {
-    var hsl = tinycolor(color).toHsl();
-    var h = hsl.h;
-    return [
-        tinycolor(color),
-        tinycolor({ h: (h + 72) % 360, s: hsl.s, l: hsl.l}),
-        tinycolor({ h: (h + 216) % 360, s: hsl.s, l: hsl.l})
-    ];
-}
-
-function analogous(color, results, slices) {
-    results = results || 6;
-    slices = slices || 30;
-
-    var hsl = tinycolor(color).toHsl();
-    var part = 360 / slices;
-    var ret = [tinycolor(color)];
-
-    for (hsl.h = ((hsl.h - (part * results >> 1)) + 720) % 360; --results; ) {
-        hsl.h = (hsl.h + part) % 360;
-        ret.push(tinycolor(hsl));
-    }
-    return ret;
-}
-
-function monochromatic(color, results) {
-    results = results || 6;
-    var hsv = tinycolor(color).toHsv();
-    var h = hsv.h, s = hsv.s, v = hsv.v;
-    var ret = [];
-    var modification = 1 / results;
-
-    while (results--) {
-        ret.push(tinycolor({ h: h, s: s, v: v}));
-        v = (v + modification) % 1;
-    }
-
-    return ret;
-}
-
-// Utility Functions
-// ---------------------
-
-tinycolor.mix = function(color1, color2, amount) {
-    amount = (amount === 0) ? 0 : (amount || 50);
-
-    var rgb1 = tinycolor(color1).toRgb();
-    var rgb2 = tinycolor(color2).toRgb();
-
-    var p = amount / 100;
-
-    var rgba = {
-        r: ((rgb2.r - rgb1.r) * p) + rgb1.r,
-        g: ((rgb2.g - rgb1.g) * p) + rgb1.g,
-        b: ((rgb2.b - rgb1.b) * p) + rgb1.b,
-        a: ((rgb2.a - rgb1.a) * p) + rgb1.a
-    };
-
-    return tinycolor(rgba);
-};
-
-// Readability Functions
-// ---------------------
-// <http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef (WCAG Version 2)
-
-// contrast
-// Analyze the 2 colors and returns the color contrast defined by (WCAG Version 2)
-tinycolor.readability = function(color1, color2) {
-    var c1 = tinycolor(color1);
-    var c2 = tinycolor(color2);
-    return (Math.max(c1.getLuminance(),c2.getLuminance())+0.05) / (Math.min(c1.getLuminance(),c2.getLuminance())+0.05);
-};
-
-// isReadable
-// Ensure that foreground and background color combinations meet WCAG2 guidelines.
-// The third argument is an optional Object.
-//      the 'level' property states 'AA' or 'AAA' - if missing or invalid, it defaults to 'AA';
-//      the 'size' property states 'large' or 'small' - if missing or invalid, it defaults to 'small'.
-// If the entire object is absent, isReadable defaults to {level:"AA",size:"small"}.
-
-// *Example*
-//    tinycolor.isReadable("#000", "#111") => false
-//    tinycolor.isReadable("#000", "#111",{level:"AA",size:"large"}) => false
-tinycolor.isReadable = function(color1, color2, wcag2) {
-    var readability = tinycolor.readability(color1, color2);
-    var wcag2Parms, out;
-
-    out = false;
-
-    wcag2Parms = validateWCAG2Parms(wcag2);
-    switch (wcag2Parms.level + wcag2Parms.size) {
-        case "AAsmall":
-        case "AAAlarge":
-            out = readability >= 4.5;
-            break;
-        case "AAlarge":
-            out = readability >= 3;
-            break;
-        case "AAAsmall":
-            out = readability >= 7;
-            break;
-    }
-    return out;
-
-};
-
-// mostReadable
-// Given a base color and a list of possible foreground or background
-// colors for that base, returns the most readable color.
-// Optionally returns Black or White if the most readable color is unreadable.
-// *Example*
-//    tinycolor.mostReadable(tinycolor.mostReadable("#123", ["#124", "#125"],{includeFallbackColors:false}).toHexString(); // "#112255"
-//    tinycolor.mostReadable(tinycolor.mostReadable("#123", ["#124", "#125"],{includeFallbackColors:true}).toHexString();  // "#ffffff"
-//    tinycolor.mostReadable("#a8015a", ["#faf3f3"],{includeFallbackColors:true,level:"AAA",size:"large"}).toHexString(); // "#faf3f3"
-//    tinycolor.mostReadable("#a8015a", ["#faf3f3"],{includeFallbackColors:true,level:"AAA",size:"small"}).toHexString(); // "#ffffff"
-tinycolor.mostReadable = function(baseColor, colorList, args) {
-    var bestColor = null;
-    var bestScore = 0;
-    var readability;
-    var includeFallbackColors, level, size ;
-    args = args || {};
-    includeFallbackColors = args.includeFallbackColors ;
-    level = args.level;
-    size = args.size;
-
-    for (var i= 0; i < colorList.length ; i++) {
-        readability = tinycolor.readability(baseColor, colorList[i]);
-        if (readability > bestScore) {
-            bestScore = readability;
-            bestColor = tinycolor(colorList[i]);
-        }
-    }
-
-    if (tinycolor.isReadable(baseColor, bestColor, {"level":level,"size":size}) || !includeFallbackColors) {
-        return bestColor;
-    }
-    else {
-        args.includeFallbackColors=false;
-        return tinycolor.mostReadable(baseColor,["#fff", "#000"],args);
-    }
-};
-
-// Big List of Colors
-// ------------------
-// <http://www.w3.org/TR/css3-color/#svg-color>
-var names = tinycolor.names = {
-    aliceblue: "f0f8ff",
-    antiquewhite: "faebd7",
-    aqua: "0ff",
-    aquamarine: "7fffd4",
-    azure: "f0ffff",
-    beige: "f5f5dc",
-    bisque: "ffe4c4",
-    black: "000",
-    blanchedalmond: "ffebcd",
-    blue: "00f",
-    blueviolet: "8a2be2",
-    brown: "a52a2a",
-    burlywood: "deb887",
-    burntsienna: "ea7e5d",
-    cadetblue: "5f9ea0",
-    chartreuse: "7fff00",
-    chocolate: "d2691e",
-    coral: "ff7f50",
-    cornflowerblue: "6495ed",
-    cornsilk: "fff8dc",
-    crimson: "dc143c",
-    cyan: "0ff",
-    darkblue: "00008b",
-    darkcyan: "008b8b",
-    darkgoldenrod: "b8860b",
-    darkgray: "a9a9a9",
-    darkgreen: "006400",
-    darkgrey: "a9a9a9",
-    darkkhaki: "bdb76b",
-    darkmagenta: "8b008b",
-    darkolivegreen: "556b2f",
-    darkorange: "ff8c00",
-    darkorchid: "9932cc",
-    darkred: "8b0000",
-    darksalmon: "e9967a",
-    darkseagreen: "8fbc8f",
-    darkslateblue: "483d8b",
-    darkslategray: "2f4f4f",
-    darkslategrey: "2f4f4f",
-    darkturquoise: "00ced1",
-    darkviolet: "9400d3",
-    deeppink: "ff1493",
-    deepskyblue: "00bfff",
-    dimgray: "696969",
-    dimgrey: "696969",
-    dodgerblue: "1e90ff",
-    firebrick: "b22222",
-    floralwhite: "fffaf0",
-    forestgreen: "228b22",
-    fuchsia: "f0f",
-    gainsboro: "dcdcdc",
-    ghostwhite: "f8f8ff",
-    gold: "ffd700",
-    goldenrod: "daa520",
-    gray: "808080",
-    green: "008000",
-    greenyellow: "adff2f",
-    grey: "808080",
-    honeydew: "f0fff0",
-    hotpink: "ff69b4",
-    indianred: "cd5c5c",
-    indigo: "4b0082",
-    ivory: "fffff0",
-    khaki: "f0e68c",
-    lavender: "e6e6fa",
-    lavenderblush: "fff0f5",
-    lawngreen: "7cfc00",
-    lemonchiffon: "fffacd",
-    lightblue: "add8e6",
-    lightcoral: "f08080",
-    lightcyan: "e0ffff",
-    lightgoldenrodyellow: "fafad2",
-    lightgray: "d3d3d3",
-    lightgreen: "90ee90",
-    lightgrey: "d3d3d3",
-    lightpink: "ffb6c1",
-    lightsalmon: "ffa07a",
-    lightseagreen: "20b2aa",
-    lightskyblue: "87cefa",
-    lightslategray: "789",
-    lightslategrey: "789",
-    lightsteelblue: "b0c4de",
-    lightyellow: "ffffe0",
-    lime: "0f0",
-    limegreen: "32cd32",
-    linen: "faf0e6",
-    magenta: "f0f",
-    maroon: "800000",
-    mediumaquamarine: "66cdaa",
-    mediumblue: "0000cd",
-    mediumorchid: "ba55d3",
-    mediumpurple: "9370db",
-    mediumseagreen: "3cb371",
-    mediumslateblue: "7b68ee",
-    mediumspringgreen: "00fa9a",
-    mediumturquoise: "48d1cc",
-    mediumvioletred: "c71585",
-    midnightblue: "191970",
-    mintcream: "f5fffa",
-    mistyrose: "ffe4e1",
-    moccasin: "ffe4b5",
-    navajowhite: "ffdead",
-    navy: "000080",
-    oldlace: "fdf5e6",
-    olive: "808000",
-    olivedrab: "6b8e23",
-    orange: "ffa500",
-    orangered: "ff4500",
-    orchid: "da70d6",
-    palegoldenrod: "eee8aa",
-    palegreen: "98fb98",
-    paleturquoise: "afeeee",
-    palevioletred: "db7093",
-    papayawhip: "ffefd5",
-    peachpuff: "ffdab9",
-    peru: "cd853f",
-    pink: "ffc0cb",
-    plum: "dda0dd",
-    powderblue: "b0e0e6",
-    purple: "800080",
-    rebeccapurple: "663399",
-    red: "f00",
-    rosybrown: "bc8f8f",
-    royalblue: "4169e1",
-    saddlebrown: "8b4513",
-    salmon: "fa8072",
-    sandybrown: "f4a460",
-    seagreen: "2e8b57",
-    seashell: "fff5ee",
-    sienna: "a0522d",
-    silver: "c0c0c0",
-    skyblue: "87ceeb",
-    slateblue: "6a5acd",
-    slategray: "708090",
-    slategrey: "708090",
-    snow: "fffafa",
-    springgreen: "00ff7f",
-    steelblue: "4682b4",
-    tan: "d2b48c",
-    teal: "008080",
-    thistle: "d8bfd8",
-    tomato: "ff6347",
-    turquoise: "40e0d0",
-    violet: "ee82ee",
-    wheat: "f5deb3",
-    white: "fff",
-    whitesmoke: "f5f5f5",
-    yellow: "ff0",
-    yellowgreen: "9acd32"
-};
-
-// Make it easy to access colors via hexNames[hex]
-var hexNames = tinycolor.hexNames = flip(names);
-
-// Utilities
-// ---------
-
-// { 'name1': 'val1' } becomes { 'val1': 'name1' }
-function flip(o) {
-    var flipped = { };
-    for (var i in o) {
-        if (o.hasOwnProperty(i)) {
-            flipped[o[i]] = i;
-        }
-    }
-    return flipped;
-}
-
-// Return a valid alpha value [0,1] with all invalid values being set to 1
-function boundAlpha(a) {
-    a = parseFloat(a);
-
-    if (isNaN(a) || a < 0 || a > 1) {
-        a = 1;
-    }
-
-    return a;
-}
-
-// Take input from [0, n] and return it as [0, 1]
-function bound01(n, max) {
-    if (isOnePointZero(n)) { n = "100%"; }
-
-    var processPercent = isPercentage(n);
-    n = mathMin(max, mathMax(0, parseFloat(n)));
-
-    // Automatically convert percentage into number
-    if (processPercent) {
-        n = parseInt(n * max, 10) / 100;
-    }
-
-    // Handle floating point rounding errors
-    if ((Math.abs(n - max) < 0.000001)) {
-        return 1;
-    }
-
-    // Convert into [0, 1] range if it isn't already
-    return (n % max) / parseFloat(max);
-}
-
-// Force a number between 0 and 1
-function clamp01(val) {
-    return mathMin(1, mathMax(0, val));
-}
-
-// Parse a base-16 hex value into a base-10 integer
-function parseIntFromHex(val) {
-    return parseInt(val, 16);
-}
-
-// Need to handle 1.0 as 100%, since once it is a number, there is no difference between it and 1
-// <http://stackoverflow.com/questions/7422072/javascript-how-to-detect-number-as-a-decimal-including-1-0>
-function isOnePointZero(n) {
-    return typeof n == "string" && n.indexOf('.') != -1 && parseFloat(n) === 1;
-}
-
-// Check to see if string passed in is a percentage
-function isPercentage(n) {
-    return typeof n === "string" && n.indexOf('%') != -1;
-}
-
-// Force a hex value to have 2 characters
-function pad2(c) {
-    return c.length == 1 ? '0' + c : '' + c;
-}
-
-// Replace a decimal with it's percentage value
-function convertToPercentage(n) {
-    if (n <= 1) {
-        n = (n * 100) + "%";
-    }
-
-    return n;
-}
-
-// Converts a decimal to a hex value
-function convertDecimalToHex(d) {
-    return Math.round(parseFloat(d) * 255).toString(16);
-}
-// Converts a hex value to a decimal
-function convertHexToDecimal(h) {
-    return (parseIntFromHex(h) / 255);
-}
-
-var matchers = (function() {
-
-    // <http://www.w3.org/TR/css3-values/#integers>
-    var CSS_INTEGER = "[-\\+]?\\d+%?";
-
-    // <http://www.w3.org/TR/css3-values/#number-value>
-    var CSS_NUMBER = "[-\\+]?\\d*\\.\\d+%?";
-
-    // Allow positive/negative integer/number.  Don't capture the either/or, just the entire outcome.
-    var CSS_UNIT = "(?:" + CSS_NUMBER + ")|(?:" + CSS_INTEGER + ")";
-
-    // Actual matching.
-    // Parentheses and commas are optional, but not required.
-    // Whitespace can take the place of commas or opening paren
-    var PERMISSIVE_MATCH3 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
-    var PERMISSIVE_MATCH4 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
-
-    return {
-        CSS_UNIT: new RegExp(CSS_UNIT),
-        rgb: new RegExp("rgb" + PERMISSIVE_MATCH3),
-        rgba: new RegExp("rgba" + PERMISSIVE_MATCH4),
-        hsl: new RegExp("hsl" + PERMISSIVE_MATCH3),
-        hsla: new RegExp("hsla" + PERMISSIVE_MATCH4),
-        hsv: new RegExp("hsv" + PERMISSIVE_MATCH3),
-        hsva: new RegExp("hsva" + PERMISSIVE_MATCH4),
-        hex3: /^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
-        hex6: /^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/,
-        hex4: /^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/,
-        hex8: /^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/
-    };
-})();
-
-// isValidCSSUnit
-// Take in a single string / number and check to see if it looks like a CSS unit
-// (see matchers above for definition).
-function isValidCSSUnit(color) {
-    return !!matchers.CSS_UNIT.exec(color);
-}
-
-// stringInputToObject
-// Permissive string parsing.  Take in a number of formats, and output an object
-// based on detected format.  Returns { r, g, b } or { h, s, l } or { h, s, v}
-function stringInputToObject(color) {
-
-    color = color.replace(trimLeft, '').replace(trimRight, '').toLowerCase();
-    var named = false;
-    if (names[color]) {
-        color = names[color];
-        named = true;
-    }
-    else if (color == 'transparent') {
-        return { r: 0, g: 0, b: 0, a: 0, format: "name" };
-    }
-
-    // Try to match string input using regular expressions.
-    // Keep most of the number bounding out of this function - don't worry about [0,1] or [0,100] or [0,360]
-    // Just return an object and let the conversion functions handle that.
-    // This way the result will be the same whether the tinycolor is initialized with string or object.
-    var match;
-    if ((match = matchers.rgb.exec(color))) {
-        return { r: match[1], g: match[2], b: match[3] };
-    }
-    if ((match = matchers.rgba.exec(color))) {
-        return { r: match[1], g: match[2], b: match[3], a: match[4] };
-    }
-    if ((match = matchers.hsl.exec(color))) {
-        return { h: match[1], s: match[2], l: match[3] };
-    }
-    if ((match = matchers.hsla.exec(color))) {
-        return { h: match[1], s: match[2], l: match[3], a: match[4] };
-    }
-    if ((match = matchers.hsv.exec(color))) {
-        return { h: match[1], s: match[2], v: match[3] };
-    }
-    if ((match = matchers.hsva.exec(color))) {
-        return { h: match[1], s: match[2], v: match[3], a: match[4] };
-    }
-    if ((match = matchers.hex8.exec(color))) {
-        return {
-            r: parseIntFromHex(match[1]),
-            g: parseIntFromHex(match[2]),
-            b: parseIntFromHex(match[3]),
-            a: convertHexToDecimal(match[4]),
-            format: named ? "name" : "hex8"
-        };
-    }
-    if ((match = matchers.hex6.exec(color))) {
-        return {
-            r: parseIntFromHex(match[1]),
-            g: parseIntFromHex(match[2]),
-            b: parseIntFromHex(match[3]),
-            format: named ? "name" : "hex"
-        };
-    }
-    if ((match = matchers.hex4.exec(color))) {
-        return {
-            r: parseIntFromHex(match[1] + '' + match[1]),
-            g: parseIntFromHex(match[2] + '' + match[2]),
-            b: parseIntFromHex(match[3] + '' + match[3]),
-            a: convertHexToDecimal(match[4] + '' + match[4]),
-            format: named ? "name" : "hex8"
-        };
-    }
-    if ((match = matchers.hex3.exec(color))) {
-        return {
-            r: parseIntFromHex(match[1] + '' + match[1]),
-            g: parseIntFromHex(match[2] + '' + match[2]),
-            b: parseIntFromHex(match[3] + '' + match[3]),
-            format: named ? "name" : "hex"
-        };
-    }
-
-    return false;
-}
-
-function validateWCAG2Parms(parms) {
-    // return valid WCAG2 parms for isReadable.
-    // If input parms are invalid, return {"level":"AA", "size":"small"}
-    var level, size;
-    parms = parms || {"level":"AA", "size":"small"};
-    level = (parms.level || "AA").toUpperCase();
-    size = (parms.size || "small").toLowerCase();
-    if (level !== "AA" && level !== "AAA") {
-        level = "AA";
-    }
-    if (size !== "small" && size !== "large") {
-        size = "small";
-    }
-    return {"level":level, "size":size};
-}
-
-this.tinycolor = tinycolor;
-
-})()`;
-}
-// It is hacky way to make this function will be compiled preferentially by less
-// resolve error: `ReferenceError: colorPalette is not defined`
-// https://github.com/ant-design/ant-motion/issues/44
-.tinyColorMixin();
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/theme/default.less b/smart-admin-web/typescript-ant-design-vue3/src/theme/default.less
deleted file mode 100644
index 54663fe..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/theme/default.less
+++ /dev/null
@@ -1,872 +0,0 @@
-/* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
-@import './color/colors';
-
-@theme: default;
-
-// The prefix to use on all css classes from ant.
-@ant-prefix: ant;
-
-// An override for the html selector for theme prefixes
-@html-selector: html;
-
-// -------- Colors -----------
-@primary-color: @blue-6;
-@info-color: @primary-color;
-@success-color: @green-6;
-@processing-color: @blue-6;
-@error-color: @red-5;
-@highlight-color: @red-5;
-@warning-color: @gold-6;
-@normal-color: #d9d9d9;
-@white: #fff;
-@black: #000;
-
-// Color used by default to control hover and active backgrounds and for
-// alert info backgrounds.
-@primary-1: color(~`colorPalette('@{primary-color}', 1) `); // replace tint(@primary-color, 90%)
-@primary-2: color(~`colorPalette('@{primary-color}', 2) `); // replace tint(@primary-color, 80%)
-@primary-3: color(~`colorPalette('@{primary-color}', 3) `); // unused
-@primary-4: color(~`colorPalette('@{primary-color}', 4) `); // unused
-@primary-5: color(
-  ~`colorPalette('@{primary-color}', 5) `
-); // color used to control the text color in many active and hover states, replace tint(@primary-color, 20%)
-@primary-6: @primary-color; // color used to control the text color of active buttons, don't use, use @primary-color
-@primary-7: color(~`colorPalette('@{primary-color}', 7) `); // replace shade(@primary-color, 5%)
-@primary-8: color(~`colorPalette('@{primary-color}', 8) `); // unused
-@primary-9: color(~`colorPalette('@{primary-color}', 9) `); // unused
-@primary-10: color(~`colorPalette('@{primary-color}', 10) `); // unused
-
-// Base Scaffolding Variables
-// ---
-
-// Background color for `<body>`
-@body-background: #fff;
-// Base background color for most components
-@component-background: #fff;
-// Popover background color
-@popover-background: @component-background;
-@popover-customize-border-color: @border-color-split;
-@font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
-  'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
-  'Noto Color Emoji';
-@code-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-@text-color: fade(@black, 85%);
-@text-color-secondary: fade(@black, 45%);
-@text-color-inverse: @white;
-@icon-color: inherit;
-@icon-color-hover: fade(@black, 75%);
-@heading-color: fade(@black, 85%);
-@text-color-dark: fade(@white, 85%);
-@text-color-secondary-dark: fade(@white, 65%);
-@text-selection-bg: @primary-color;
-@font-variant-base: tabular-nums;
-@font-feature-settings-base: 'tnum';
-@font-size-base: 14px;
-@font-size-lg: @font-size-base + 2px;
-@font-size-sm: 12px;
-@heading-1-size: ceil(@font-size-base * 2.71);
-@heading-2-size: ceil(@font-size-base * 2.14);
-@heading-3-size: ceil(@font-size-base * 1.71);
-@heading-4-size: ceil(@font-size-base * 1.42);
-@heading-5-size: ceil(@font-size-base * 1.14);
-// https://github.com/ant-design/ant-design/issues/20210
-@line-height-base: 1.5715;
-@border-radius-base: 2px;
-@border-radius-sm: @border-radius-base;
-
-// vertical paddings
-@padding-lg: 24px; // containers
-@padding-md: 16px; // small containers and buttons
-@padding-sm: 12px; // Form controls and items
-@padding-xs: 8px; // small items
-@padding-xss: 4px; // more small
-
-// vertical padding for all form controls
-@control-padding-horizontal: @padding-sm;
-@control-padding-horizontal-sm: @padding-xs;
-
-// vertical margins
-@margin-lg: 24px; // containers
-@margin-md: 16px; // small containers and buttons
-@margin-sm: 12px; // Form controls and items
-@margin-xs: 8px; // small items
-@margin-xss: 4px; // more small
-
-// height rules
-@height-base: 32px;
-@height-lg: 40px;
-@height-sm: 24px;
-
-// The background colors for active and hover states for things like
-// list items or table cells.
-@item-active-bg: @primary-1;
-@item-hover-bg: #f5f5f5;
-
-// ICONFONT
-@iconfont-css-prefix: anticon;
-
-// LINK
-@link-color: @primary-color;
-@link-hover-color: color(~`colorPalette('@{link-color}', 5) `);
-@link-active-color: color(~`colorPalette('@{link-color}', 7) `);
-@link-decoration: none;
-@link-hover-decoration: none;
-@link-focus-decoration: none;
-@link-focus-outline: 0;
-
-// Animation
-@ease-base-out: cubic-bezier(0.7, 0.3, 0.1, 1);
-@ease-base-in: cubic-bezier(0.9, 0, 0.3, 0.7);
-@ease-out: cubic-bezier(0.215, 0.61, 0.355, 1);
-@ease-in: cubic-bezier(0.55, 0.055, 0.675, 0.19);
-@ease-in-out: cubic-bezier(0.645, 0.045, 0.355, 1);
-@ease-out-back: cubic-bezier(0.12, 0.4, 0.29, 1.46);
-@ease-in-back: cubic-bezier(0.71, -0.46, 0.88, 0.6);
-@ease-in-out-back: cubic-bezier(0.71, -0.46, 0.29, 1.46);
-@ease-out-circ: cubic-bezier(0.08, 0.82, 0.17, 1);
-@ease-in-circ: cubic-bezier(0.6, 0.04, 0.98, 0.34);
-@ease-in-out-circ: cubic-bezier(0.78, 0.14, 0.15, 0.86);
-@ease-out-quint: cubic-bezier(0.23, 1, 0.32, 1);
-@ease-in-quint: cubic-bezier(0.755, 0.05, 0.855, 0.06);
-@ease-in-out-quint: cubic-bezier(0.86, 0, 0.07, 1);
-
-// Border color
-@border-color-base: hsv(0, 0, 85%); // base border outline a component
-@border-color-split: hsv(0, 0, 94%); // split border inside a component
-@border-color-inverse: @white;
-@border-width-base: 1px; // width of the border for a component
-@border-style-base: solid; // style of a components border
-
-// Outline
-@outline-blur-size: 0;
-@outline-width: 2px;
-@outline-color: @primary-color;
-
-@background-color-light: hsv(0, 0, 98%); // background of header and selected item
-@background-color-base: hsv(0, 0, 96%); // Default grey background color
-
-// Disabled states
-@disabled-color: fade(#000, 25%);
-@disabled-bg: @background-color-base;
-@disabled-color-dark: fade(#fff, 35%);
-
-// Shadow
-@shadow-color: rgba(0, 0, 0, 0.15);
-@shadow-color-inverse: @component-background;
-@box-shadow-base: @shadow-1-down;
-@shadow-1-up: 0 -2px 8px @shadow-color;
-@shadow-1-down: 0 2px 8px @shadow-color;
-@shadow-1-left: -2px 0 8px @shadow-color;
-@shadow-1-right: 2px 0 8px @shadow-color;
-@shadow-2: 0 4px 12px @shadow-color;
-
-// Buttons
-@btn-font-weight: 400;
-@btn-border-radius-base: @border-radius-base;
-@btn-border-radius-sm: @border-radius-base;
-@btn-border-width: @border-width-base;
-@btn-border-style: @border-style-base;
-@btn-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
-@btn-primary-shadow: 0 2px 0 rgba(0, 0, 0, 0.045);
-@btn-text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.12);
-
-@btn-primary-color: #fff;
-@btn-primary-bg: @primary-color;
-
-@btn-default-color: @text-color;
-@btn-default-bg: @component-background;
-@btn-default-border: @border-color-base;
-
-@btn-danger-color: #fff;
-@btn-danger-bg: color(~`colorPalette('@{error-color}', 5) `);
-@btn-danger-border: color(~`colorPalette('@{error-color}', 5) `);
-
-@btn-disable-color: @disabled-color;
-@btn-disable-bg: @disabled-bg;
-@btn-disable-border: @border-color-base;
-
-@btn-default-ghost-color: @component-background;
-@btn-default-ghost-bg: transparent;
-@btn-default-ghost-border: @component-background;
-
-@btn-font-size-lg: @font-size-lg;
-@btn-font-size-sm: @font-size-base;
-@btn-padding-horizontal-base: @padding-md - 1px;
-@btn-padding-horizontal-lg: @btn-padding-horizontal-base;
-@btn-padding-horizontal-sm: @padding-xs - 1px;
-
-@btn-height-base: 32px;
-@btn-height-lg: 40px;
-@btn-height-sm: 24px;
-
-@btn-line-height: @line-height-base;
-
-@btn-circle-size: @btn-height-base;
-@btn-circle-size-lg: @btn-height-lg;
-@btn-circle-size-sm: @btn-height-sm;
-
-@btn-square-size: @btn-height-base;
-@btn-square-size-lg: @btn-height-lg;
-@btn-square-size-sm: @btn-height-sm;
-@btn-square-only-icon-size: @font-size-base + 2px;
-@btn-square-only-icon-size-sm: @font-size-base;
-@btn-square-only-icon-size-lg: @btn-font-size-lg + 2px;
-
-@btn-group-border: @primary-5;
-
-@btn-link-hover-bg: transparent;
-@btn-text-hover-bg: rgba(0, 0, 0, 0.018);
-
-// Checkbox
-@checkbox-size: 16px;
-@checkbox-color: @primary-color;
-@checkbox-check-color: #fff;
-@checkbox-check-bg: @checkbox-check-color;
-@checkbox-border-width: @border-width-base;
-
-// Descriptions
-@descriptions-bg: #fafafa;
-@descriptions-title-margin-bottom: 20px;
-@descriptions-default-padding: @padding-md @padding-lg;
-@descriptions-middle-padding: @padding-sm @padding-lg;
-@descriptions-small-padding: @padding-xs @padding-md;
-@descriptions-item-padding-bottom: @padding-md;
-@descriptions-item-trailing-colon: true;
-@descriptions-item-label-colon-margin-right: 8px;
-@descriptions-item-label-colon-margin-left: 2px;
-@descriptions-extra-color: @text-color;
-
-// Divider
-@divider-text-padding: 1em;
-@divider-orientation-margin: 5%;
-@divider-color: rgba(0, 0, 0, 6%);
-
-// Dropdown
-@dropdown-selected-color: @primary-color;
-@dropdown-menu-submenu-disabled-bg: @component-background;
-
-// Empty
-@empty-font-size: @font-size-base;
-
-// Radio
-@radio-size: 16px;
-@radio-top: 0px;
-@radio-border-width: 1px;
-@radio-dot-size: @radio-size - 8px;
-@radio-dot-color: @primary-color;
-@radio-dot-disabled-color: fade(@black, 20%);
-@radio-solid-checked-color: @component-background;
-
-// Radio buttons
-@radio-button-bg: @btn-default-bg;
-@radio-button-checked-bg: @btn-default-bg;
-@radio-button-color: @btn-default-color;
-@radio-button-hover-color: @primary-5;
-@radio-button-active-color: @primary-7;
-@radio-disabled-button-checked-bg: tint(@black, 90%);
-@radio-disabled-button-checked-color: @disabled-color;
-@radio-wrapper-margin-right: 8px;
-
-// Media queries breakpoints
-// Extra small screen / phone
-@screen-xs: 480px;
-@screen-xs-min: @screen-xs;
-
-// Small screen / tablet
-@screen-sm: 576px;
-@screen-sm-min: @screen-sm;
-
-// Medium screen / desktop
-@screen-md: 768px;
-@screen-md-min: @screen-md;
-
-// Large screen / wide desktop
-@screen-lg: 992px;
-@screen-lg-min: @screen-lg;
-
-// Extra large screen / full hd
-@screen-xl: 1200px;
-@screen-xl-min: @screen-xl;
-
-// Extra extra large screen / large desktop
-@screen-xxl: 1600px;
-@screen-xxl-min: @screen-xxl;
-
-// provide a maximum
-@screen-xs-max: (@screen-sm-min - 1px);
-@screen-sm-max: (@screen-md-min - 1px);
-@screen-md-max: (@screen-lg-min - 1px);
-@screen-lg-max: (@screen-xl-min - 1px);
-@screen-xl-max: (@screen-xxl-min - 1px);
-
-// Grid system
-@grid-columns: 24;
-@grid-gutter-width: 0;
-
-// Layout
-@layout-body-background: #f0f2f5;
-@layout-header-background: #001529;
-@layout-header-height: 64px;
-@layout-header-padding: 0 50px;
-@layout-header-color: @text-color;
-@layout-footer-padding: 24px 50px;
-@layout-footer-background: @layout-body-background;
-@layout-sider-background: @layout-header-background;
-@layout-trigger-height: 48px;
-@layout-trigger-background: #002140;
-@layout-trigger-color: #fff;
-@layout-zero-trigger-width: 36px;
-@layout-zero-trigger-height: 42px;
-// Layout light theme
-@layout-sider-background-light: #fff;
-@layout-trigger-background-light: #fff;
-@layout-trigger-color-light: @text-color;
-
-// z-index list, order by `z-index`
-@zindex-badge: 1;
-@zindex-table-fixed: 1;
-@zindex-affix: 10;
-@zindex-back-top: 10;
-@zindex-picker-panel: 10;
-@zindex-popup-close: 10;
-@zindex-modal: 1000;
-@zindex-modal-mask: 1000;
-@zindex-message: 1010;
-@zindex-notification: 1010;
-@zindex-popover: 1030;
-@zindex-dropdown: 1050;
-@zindex-picker: 1050;
-@zindex-tooltip: 1060;
-@zindex-image: 1080;
-
-// Animation
-@animation-duration-slow: 0.3s; // Modal
-@animation-duration-base: 0.2s;
-@animation-duration-fast: 0.1s; // Tooltip
-
-//CollapsePanel
-@collapse-panel-border-radius: @border-radius-base;
-
-//Dropdown
-@dropdown-menu-bg: @component-background;
-@dropdown-vertical-padding: 5px;
-@dropdown-edge-child-vertical-padding: 4px;
-@dropdown-font-size: @font-size-base;
-@dropdown-line-height: 22px;
-
-// Form
-// ---
-@label-required-color: @highlight-color;
-@label-color: @heading-color;
-@form-warning-input-bg: @input-bg;
-@form-item-margin-bottom: 24px;
-@form-item-trailing-colon: true;
-@form-vertical-label-padding: 0 0 8px;
-@form-vertical-label-margin: 0;
-@form-item-label-font-size: @font-size-base;
-@form-item-label-height: @input-height-base;
-@form-item-label-colon-margin-right: 8px;
-@form-item-label-colon-margin-left: 2px;
-@form-error-input-bg: @input-bg;
-
-// Input
-// ---
-@input-height-base: 32px;
-@input-height-lg: 40px;
-@input-height-sm: 24px;
-@input-padding-horizontal: @control-padding-horizontal - 1px;
-@input-padding-horizontal-base: @input-padding-horizontal;
-@input-padding-horizontal-sm: @control-padding-horizontal-sm - 1px;
-@input-padding-horizontal-lg: @input-padding-horizontal;
-@input-padding-vertical-base: 4px;
-@input-padding-vertical-sm: 0px;
-@input-padding-vertical-lg: 6.5px;
-@input-placeholder-color: hsv(0, 0, 75%);
-@input-color: @text-color;
-@input-icon-color: @input-color;
-@input-border-color: @border-color-base;
-@input-bg: @component-background;
-@input-number-hover-border-color: @input-hover-border-color;
-@input-number-handler-active-bg: #f4f4f4;
-@input-number-handler-hover-bg: @primary-5;
-@input-number-handler-bg: @component-background;
-@input-number-handler-border-color: @border-color-base;
-@input-addon-bg: @background-color-light;
-@input-hover-border-color: @primary-5;
-@input-disabled-bg: @disabled-bg;
-@input-outline-offset: 0 0;
-@input-icon-hover-color: fade(@black, 85%);
-
-// Mentions
-// ---
-@mentions-dropdown-bg: @component-background;
-@mentions-dropdown-menu-item-hover-bg: @mentions-dropdown-bg;
-
-// Select
-// ---
-@select-border-color: @border-color-base;
-@select-item-selected-color: @text-color;
-@select-item-selected-font-weight: 600;
-@select-dropdown-bg: @component-background;
-@select-item-selected-bg: @primary-1;
-@select-item-active-bg: @item-hover-bg;
-@select-dropdown-vertical-padding: @dropdown-vertical-padding;
-@select-dropdown-font-size: @dropdown-font-size;
-@select-dropdown-line-height: @dropdown-line-height;
-@select-dropdown-height: 32px;
-@select-background: @component-background;
-@select-clear-background: @select-background;
-@select-selection-item-bg: @background-color-base;
-@select-selection-item-border-color: @border-color-split;
-@select-single-item-height-lg: 40px;
-@select-multiple-item-height: @input-height-base - @input-padding-vertical-base * 2; // Normal 24px
-@select-multiple-item-height-lg: 32px;
-@select-multiple-item-spacing-half: ceil((@input-padding-vertical-base / 2));
-@select-multiple-disabled-background: @input-disabled-bg;
-@select-multiple-item-disabled-color: #bfbfbf;
-@select-multiple-item-disabled-border-color: @select-border-color;
-
-// Cascader
-// ---
-@cascader-bg: @component-background;
-@cascader-item-selected-bg: @primary-1;
-@cascader-menu-bg: @component-background;
-@cascader-menu-border-color-split: @border-color-split;
-
-// Cascader
-// ----
-@cascader-dropdown-vertical-padding: @dropdown-vertical-padding;
-@cascader-dropdown-edge-child-vertical-padding: @dropdown-edge-child-vertical-padding;
-@cascader-dropdown-font-size: @dropdown-font-size;
-@cascader-dropdown-line-height: @dropdown-line-height;
-
-// Anchor
-// ---
-@anchor-bg: transparent;
-@anchor-border-color: @border-color-split;
-@anchor-link-top: 7px;
-@anchor-link-left: 16px;
-@anchor-link-padding: @anchor-link-top 0 @anchor-link-top @anchor-link-left;
-
-// Tooltip
-// ---
-// Tooltip max width
-@tooltip-max-width: 250px;
-// Tooltip text color
-@tooltip-color: #fff;
-// Tooltip background color
-@tooltip-bg: rgba(0, 0, 0, 0.75);
-// Tooltip arrow width
-@tooltip-arrow-width: 5px;
-// Tooltip distance with trigger
-@tooltip-distance: @tooltip-arrow-width - 1px + 4px;
-// Tooltip arrow color
-@tooltip-arrow-color: @tooltip-bg;
-
-// Popover
-// ---
-// Popover body background color
-@popover-bg: @component-background;
-// Popover text color
-@popover-color: @text-color;
-// Popover maximum width
-@popover-min-width: 177px;
-// Popover arrow width
-@popover-arrow-width: 6px;
-// Popover arrow color
-@popover-arrow-color: @popover-bg;
-// Popover outer arrow width
-// Popover outer arrow color
-@popover-arrow-outer-color: @popover-bg;
-// Popover distance with trigger
-@popover-distance: @popover-arrow-width + 4px;
-
-// Modal
-// --
-@modal-body-padding: 24px;
-@modal-header-bg: @component-background;
-@modal-header-border-color-split: @border-color-split;
-@modal-content-bg: @component-background;
-@modal-heading-color: @heading-color;
-@modal-footer-bg: transparent;
-@modal-footer-border-color-split: @border-color-split;
-@modal-mask-bg: fade(@black, 45%);
-
-// Progress
-// --
-@progress-default-color: @processing-color;
-@progress-remaining-color: @background-color-base;
-@progress-text-color: @text-color;
-@progress-radius: 100px;
-
-// Menu
-// ---
-@menu-inline-toplevel-item-height: 40px;
-@menu-item-height: 40px;
-@menu-item-group-height: @line-height-base;
-@menu-collapsed-width: 80px;
-@menu-bg: @component-background;
-@menu-popup-bg: @component-background;
-@menu-item-color: @text-color;
-@menu-inline-submenu-bg: @background-color-light;
-@menu-highlight-color: @primary-color;
-@menu-highlight-danger-color: @error-color;
-@menu-item-active-bg: @primary-1;
-@menu-item-active-danger-bg: @red-1;
-@menu-item-active-border-width: 3px;
-@menu-item-group-title-color: @text-color-secondary;
-@menu-item-vertical-margin: 4px;
-@menu-item-font-size: @font-size-base;
-@menu-item-boundary-margin: 8px;
-@menu-item-padding-horizontal: 20px;
-@menu-item-padding: 0 @menu-item-padding-horizontal;
-@menu-horizontal-line-height: 46px;
-@menu-icon-margin-right: 10px;
-@menu-icon-size: @menu-item-font-size;
-@menu-icon-size-lg: @font-size-lg;
-@menu-item-group-title-font-size: @menu-item-font-size;
-
-// dark theme
-@menu-dark-color: @text-color-secondary-dark;
-@menu-dark-danger-color: @error-color;
-@menu-dark-bg: @layout-header-background;
-@menu-dark-arrow-color: #fff;
-@menu-dark-inline-submenu-bg: #000c17;
-@menu-dark-highlight-color: #fff;
-@menu-dark-item-active-bg: @primary-color;
-@menu-dark-item-active-danger-bg: @error-color;
-@menu-dark-selected-item-icon-color: @white;
-@menu-dark-selected-item-text-color: @white;
-@menu-dark-item-hover-bg: transparent;
-// Spin
-// ---
-@spin-dot-size-sm: 14px;
-@spin-dot-size: 20px;
-@spin-dot-size-lg: 32px;
-
-// Table
-// --
-@table-bg: @component-background;
-@table-header-bg: @background-color-light;
-@table-header-color: @heading-color;
-@table-header-sort-bg: @background-color-base;
-@table-body-sort-bg: rgba(0, 0, 0, 0.01);
-@table-row-hover-bg: @primary-1;
-@table-selected-row-color: inherit;
-@table-selected-row-bg: @primary-1;
-@table-body-selected-sort-bg: @table-selected-row-bg;
-@table-selected-row-hover-bg: darken(@table-selected-row-bg, 2%);
-@table-expanded-row-bg: #fbfbfb;
-@table-padding-vertical: 16px;
-@table-padding-horizontal: 16px;
-@table-border-radius-base: @border-radius-base;
-@table-footer-bg: @background-color-light;
-@table-footer-color: @heading-color;
-@table-header-bg-sm: transparent;
-// Sorter
-// Legacy: `table-header-sort-active-bg` is used for hover not real active
-@table-header-sort-active-bg: darken(@table-header-bg, 3%);
-// Filter
-@table-header-filter-active-bg: darken(@table-header-sort-active-bg, 5%);
-
-// Tag
-// --
-@tag-default-bg: @background-color-light;
-@tag-default-color: @text-color;
-@tag-font-size: @font-size-sm;
-@tag-line-height: 20px;
-
-// TimePicker
-// ---
-@time-picker-panel-column-width: 56px;
-@time-picker-panel-width: @time-picker-panel-column-width * 3;
-@time-picker-selected-bg: @background-color-base;
-
-// Carousel
-// ---
-@carousel-dot-width: 16px;
-@carousel-dot-height: 3px;
-@carousel-dot-active-width: 24px;
-
-// Badge
-// ---
-@badge-height: 20px;
-@badge-height-sm: 14px;
-@badge-dot-size: 6px;
-@badge-font-size: @font-size-sm;
-@badge-font-size-sm: @font-size-sm;
-@badge-font-weight: normal;
-@badge-status-size: 6px;
-@badge-text-color: @component-background;
-@badge-color: @highlight-color;
-
-// Rate
-// ---
-@rate-star-color: @yellow-6;
-@rate-star-bg: @border-color-split;
-@rate-star-size: 20px;
-@rate-star-hover-scale: scale(1.1);
-
-// Card
-// ---
-@card-head-color: @heading-color;
-@card-head-background: transparent;
-@card-head-padding: 16px;
-@card-inner-head-padding: 12px;
-@card-padding-base: 24px;
-@card-actions-background: @background-color-light;
-@card-skeleton-bg: #cfd8dc;
-@card-background: @component-background;
-@card-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
-@card-radius: @border-radius-sm;
-
-// Comment
-// ---
-@comment-bg: inherit;
-@comment-padding-base: @padding-md 0;
-@comment-nest-indent: 44px;
-@comment-font-size-base: @font-size-base;
-@comment-font-size-sm: @font-size-sm;
-@comment-author-name-color: @text-color-secondary;
-@comment-author-time-color: #ccc;
-@comment-action-color: @text-color-secondary;
-@comment-action-hover-color: #595959;
-@comment-actions-margin-bottom: inherit;
-@comment-actions-margin-top: @margin-sm;
-@comment-content-detail-p-margin-bottom: inherit;
-
-// Tabs
-// ---
-@tabs-card-head-background: @background-color-light;
-@tabs-card-height: 40px;
-@tabs-card-active-color: @primary-color;
-@tabs-title-font-size: @font-size-base;
-@tabs-title-font-size-lg: @font-size-lg;
-@tabs-title-font-size-sm: @font-size-base;
-@tabs-ink-bar-color: @primary-color;
-@tabs-bar-margin: 0 0 16px 0;
-@tabs-horizontal-margin: 0 32px 0 0;
-@tabs-horizontal-padding: 12px 16px;
-@tabs-horizontal-padding-lg: 16px;
-@tabs-horizontal-padding-sm: 8px 16px;
-@tabs-vertical-padding: 8px 24px;
-@tabs-vertical-margin: 0 0 16px 0;
-@tabs-scrolling-size: 32px;
-@tabs-highlight-color: @primary-color;
-@tabs-hover-color: @primary-5;
-@tabs-active-color: @primary-7;
-@tabs-card-gutter: 2px;
-@tabs-card-tab-active-border-top: 2px solid transparent;
-
-// BackTop
-// ---
-@back-top-color: #fff;
-@back-top-bg: @text-color-secondary;
-@back-top-hover-bg: @text-color;
-
-// Avatar
-// ---
-@avatar-size-base: 32px;
-@avatar-size-lg: 40px;
-@avatar-size-sm: 24px;
-@avatar-font-size-base: 18px;
-@avatar-font-size-lg: 24px;
-@avatar-font-size-sm: 14px;
-@avatar-bg: #ccc;
-@avatar-color: #fff;
-@avatar-border-radius: @border-radius-base;
-@avatar-group-overlapping: -8px;
-@avatar-group-space: 3px;
-@avatar-group-border-color: #fff;
-
-// Switch
-// ---
-@switch-height: 22px;
-@switch-sm-height: 16px;
-@switch-sm-checked-margin-left: -(@switch-sm-height - 3px);
-@switch-disabled-opacity: 0.4;
-@switch-color: @primary-color;
-@switch-bg: @component-background;
-@switch-shadow-color: fade(#00230b, 20%);
-
-// Pagination
-// ---
-@pagination-item-bg: @component-background;
-@pagination-item-size: 32px;
-@pagination-item-size-sm: 24px;
-@pagination-font-family: Arial;
-@pagination-font-weight-active: 500;
-@pagination-item-bg-active: @component-background;
-@pagination-item-link-bg: @component-background;
-@pagination-item-disabled-color-active: @white;
-@pagination-item-disabled-bg-active: darken(@disabled-bg, 10%);
-@pagination-item-input-bg: @component-background;
-
-// PageHeader
-// ---
-@page-header-padding: @padding-lg;
-@page-header-padding-vertical: @padding-md;
-@page-header-padding-breadcrumb: @padding-sm;
-@page-header-content-padding-vertical: @padding-sm;
-@page-header-back-color: #000;
-@page-header-ghost-bg: inherit;
-@page-header-heading-title: @heading-4-size;
-@page-header-heading-sub-title: 14px;
-@page-header-tabs-tab-font-size: 16px;
-
-// Breadcrumb
-// ---
-@breadcrumb-base-color: @text-color-secondary;
-@breadcrumb-last-item-color: @text-color;
-@breadcrumb-font-size: @font-size-base;
-@breadcrumb-icon-font-size: @font-size-base;
-@breadcrumb-link-color: @text-color-secondary;
-@breadcrumb-link-color-hover: @primary-5;
-@breadcrumb-separator-color: @text-color-secondary;
-@breadcrumb-separator-margin: 0 @padding-xs;
-
-// Slider
-// ---
-@slider-margin: 14px 6px 10px;
-@slider-rail-background-color: @background-color-base;
-@slider-rail-background-color-hover: #e1e1e1;
-@slider-track-background-color: @primary-3;
-@slider-track-background-color-hover: @primary-4;
-@slider-handle-border-width: 2px;
-@slider-handle-background-color: @component-background;
-@slider-handle-color: @primary-3;
-@slider-handle-color-hover: @primary-4;
-@slider-handle-color-focus: tint(@primary-color, 20%);
-@slider-handle-color-focus-shadow: fade(@primary-color, 20%);
-@slider-handle-color-tooltip-open: @primary-color;
-@slider-handle-shadow: 0;
-@slider-dot-border-color: @border-color-split;
-@slider-dot-border-color-active: tint(@primary-color, 50%);
-@slider-disabled-color: @disabled-color;
-@slider-disabled-background-color: @component-background;
-
-// Tree
-// ---
-@tree-title-height: 24px;
-@tree-child-padding: 18px;
-@tree-directory-selected-color: #fff;
-@tree-directory-selected-bg: @primary-color;
-@tree-node-hover-bg: @item-hover-bg;
-@tree-node-selected-bg: @primary-2;
-
-// Collapse
-// ---
-@collapse-header-padding: 12px 16px;
-@collapse-header-padding-extra: 40px;
-@collapse-header-bg: @background-color-light;
-@collapse-content-padding: @padding-md;
-@collapse-content-bg: @component-background;
-
-// Skeleton
-// ---
-@skeleton-color: rgba(190, 190, 190, 0.2);
-@skeleton-to-color: shade(@skeleton-color, 5%);
-@skeleton-paragraph-margin-top: 28px;
-@skeleton-paragraph-li-margin-top: @margin-md;
-@skeleton-paragraph-li-height: 16px;
-@skeleton-title-height: 16px;
-@skeleton-title-paragraph-margin-top: @margin-lg;
-
-// Transfer
-// ---
-@transfer-header-height: 40px;
-@transfer-disabled-bg: @disabled-bg;
-@transfer-list-height: 200px;
-@transfer-item-hover-bg: @item-hover-bg;
-
-// Message
-// ---
-@message-notice-content-padding: 10px 16px;
-@message-notice-content-bg: @component-background;
-
-// Motion
-// ---
-@wave-animation-width: 6px;
-
-// Alert
-// ---
-@alert-success-border-color: ~`colorPalette('@{success-color}', 3) `;
-@alert-success-bg-color: ~`colorPalette('@{success-color}', 1) `;
-@alert-success-icon-color: @success-color;
-@alert-info-border-color: ~`colorPalette('@{info-color}', 3) `;
-@alert-info-bg-color: ~`colorPalette('@{info-color}', 1) `;
-@alert-info-icon-color: @info-color;
-@alert-warning-border-color: ~`colorPalette('@{warning-color}', 3) `;
-@alert-warning-bg-color: ~`colorPalette('@{warning-color}', 1) `;
-@alert-warning-icon-color: @warning-color;
-@alert-error-border-color: ~`colorPalette('@{error-color}', 3) `;
-@alert-error-bg-color: ~`colorPalette('@{error-color}', 1) `;
-@alert-error-icon-color: @error-color;
-
-// List
-// ---
-@list-header-background: transparent;
-@list-footer-background: transparent;
-@list-empty-text-padding: @padding-md;
-@list-item-padding: @padding-sm 0;
-@list-item-padding-sm: @padding-xs @padding-md;
-@list-item-padding-lg: 16px 24px;
-@list-item-meta-margin-bottom: @padding-md;
-@list-item-meta-avatar-margin-right: @padding-md;
-@list-item-meta-title-margin-bottom: @padding-sm;
-@list-customize-card-bg: @component-background;
-@list-item-meta-description-font-size: @font-size-base;
-
-// Statistic
-// ---
-@statistic-title-font-size: @font-size-base;
-@statistic-content-font-size: 24px;
-@statistic-unit-font-size: 16px;
-@statistic-font-family: @font-family;
-
-// Drawer
-// ---
-@drawer-header-padding: 16px 24px;
-@drawer-body-padding: 24px;
-@drawer-bg: @component-background;
-
-// Timeline
-// ---
-@timeline-width: 2px;
-@timeline-color: @border-color-split;
-@timeline-dot-border-width: 2px;
-@timeline-dot-color: @primary-color;
-@timeline-dot-bg: @component-background;
-
-// Typography
-// ---
-@typography-title-font-weight: 600;
-@typography-title-margin-top: 1.2em;
-@typography-title-margin-bottom: 0.5em;
-
-// Image
-// ---
-@image-size-base: 48px;
-@image-font-size-base: 24px;
-@image-bg: #f5f5f5;
-@image-color: #fff;
-@image-preview-operation-size: 18px;
-@image-preview-operation-color: @text-color-dark;
-@image-preview-operation-disabled-color: fade(@image-preview-operation-color, 45%);
-
-// Steps
-@steps-nav-arrow-color: fade(@black, 25%);
-@steps-background: @component-background;
-
-// Notification
-// ---
-@notification-bg: @component-background;
-@notification-padding-vertical: 16px;
-@notification-padding-horizontal: 24px;
-
-//  Result
-// ---
-@result-title-font-size: 24px;
-@result-subtitle-font-size: @font-size-base;
-@result-icon-font-size: 72px;
-@result-extra-margin: 24px 0 0 0;
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/theme/index.less b/smart-admin-web/typescript-ant-design-vue3/src/theme/index.less
deleted file mode 100644
index 24bf0df..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/theme/index.less
+++ /dev/null
@@ -1,154 +0,0 @@
-/* 
- * 默认样式的修改
- * 
- * @Author:    1024创新实验室-主任：卓大 
- * @Date:      2022-09-12 14:41:59 
- * @Wechat:    zhuda1024 
- * @Email:     lab1024@163.com 
- * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
- */
-
- @import 'ant-design-vue/dist/reset.css';
- @import './smart-admin.less';
- @import './default.less';
- 
- @gray-1: #ffffff;
- @gray-2: #fafafa;
- @gray-3: #f5f5f5;
- @gray-4: #f0f0f0;
- @gray-5: #d9d9d9;
- @gray-6: #bfbfbf;
- @gray-7: #8c8c8c;
- @gray-8: #595959;
- @gray-9: #434343;
- @gray-10: #262626;
- @gray-11: #1f1f1f;
- @gray-12: #141414;
- @gray-13: #000000;
- 
- @title-color: @heading-color;
- 
- @layout-bg-color: @layout-body-background;
- @base-bg-color: @body-background;
- @hover-bg-color: rgba(0, 0, 0, 0.025);
- @border-color: @border-color-split;
- 
- @hover-bg-color-light: @hover-bg-color;
- @hover-bg-color-dark: @primary-7;
- @hover-bg-color-night: rgba(255, 255, 255, 0.025);
- @header-bg-color-dark: @layout-header-background;
- 
- @header-light-bg-hover-color: #f6f6f6;
- @header-height: 80px;
- @header-user-height: 40px;
- @page-tag-height: 40px;
- 
- @shadow-down: @shadow-1-down;
- @shadow-up: @shadow-1-up;
- @shadow-left: @shadow-1-left;
- @shadow-right: @shadow-1-right;
- 
- @theme-list: light, dark, night;
- 
- /**********************************  基础样式 **********************************/
- * {
-   margin: 0;
-   padding: 0;
-   box-sizing: border-box;
-   outline: none !important;
- }
- 
- html,
- body {
-   margin: 0;
-   padding: 0;
-   width: 100%;
-   height: 100%;
-   -webkit-font-smoothing: antialiased;
-   -webkit-tap-highlight-color: transparent;
-   background-color: #f8f8f8;
-   font-size: 14px;
-   position: relative;
- }
- 
- #app {
-   width: 100%;
-   height: 100%;
- }
- 
- /**********************************  ant design spin **********************************/
- .ant-spin-blur{
-   opacity: 0.2;
- }
- 
- /**********************************  ant design table **********************************/
- .ant-table-tbody :deep(.smart-table-striped) {
-   background-color: #fafafa;
- }
- 
- /**********************************  ant design form **********************************/
- .ant-form-inline .ant-form-item-with-help {
-   margin-bottom: 0px !important;
- }
- 
- /**********************************  ant design spin **********************************/
- .ant-spin-nested-loading {
-   width: 100%;
-   height: 100%;
- }
- 
- .ant-spin-container {
-   width: 100%;
-   height: 100%;
- }
- 
- /**********************************  富文本HTML样式 **********************************/
- .html-content {
-   /* table 样式 */
-   table {
-     border-top: 1px solid #ccc;
-     border-left: 1px solid #ccc;
-   }
-   table td,
-   table th {
-     border-bottom: 1px solid #ccc;
-     border-right: 1px solid #ccc;
-     padding: 3px 5px;
-   }
-   table th {
-     border-bottom: 2px solid #ccc;
-     text-align: center;
-   }
- 
-   /* blockquote 样式 */
-   blockquote {
-     display: block;
-     border-left: 8px solid #d0e5f2;
-     padding: 5px 10px;
-     margin: 10px 0;
-     line-height: 1.4;
-     font-size: 100%;
-     background-color: #f1f1f1;
-   }
- 
-   /* code 样式 */
-   code {
-     display: inline-block;
-     *display: inline;
-     *zoom: 1;
-     background-color: #f1f1f1;
-     border-radius: 3px;
-     padding: 3px 5px;
-     margin: 0 3px;
-   }
-   pre code {
-     display: block;
-   }
- 
-   /* ul ol 样式 */
-   ul,
-   ol {
-     margin: 10px 0 10px 20px;
-   }
- }
- 
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/utils/cookie-util.ts b/smart-admin-web/typescript-ant-design-vue3/src/utils/cookie-util.ts
deleted file mode 100644
index ac88c48..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/utils/cookie-util.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * cookie相关操作
- *
- * @Author:    1024创新实验室-主任：卓大
- * @Date:      2022-09-06 20:58:49
- * @Wechat:    zhuda1024
- * @Email:     lab1024@163.com
- * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
- */
-import Cookies from 'js-cookie';
-
-export const COOKIE_TOKEN_KEY = 'user_token';
-
-export const clearAllCoolies = (): void => {
-  Cookies.remove(COOKIE_TOKEN_KEY);
-};
-
-export const getTokenFromCookie = (): string | undefined => {
-  return Cookies.get(COOKIE_TOKEN_KEY);
-};
-
-/**
- * 7 一年后cookie过期
- *
- * @param token
- */
-export const saveTokenToCookie = (token: string): void => {
-  Cookies.set(COOKIE_TOKEN_KEY, token, { expires: 365 });
-};
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/message/components/message-handle-setup.js b/smart-admin-web/typescript-ant-design-vue3/src/views/business/message/components/message-handle-setup.js
deleted file mode 100644
index ad0039f..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/message/components/message-handle-setup.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useRouter } from 'vue-router';
-import { MESSAGE_TYPE_ENUM } from '/src/constants/business/message/message-const';
-import { messageApi } from '/@/api/business/message/message-api';
-
-export function messageSetup() {
-  // 去处理
-  const router = useRouter();
-  
-  function toHandle(record) {
-    //标记已读
-    readHandle(record.messageId);
-    // 订单
-    if (record.messageType == MESSAGE_TYPE_ENUM.ORDER.value) {
-      router.push({
-        path: '/order/detail',
-        query: {
-          receiveOrderId: record.dataId
-        }
-      });
-      return;
-    }
-  }
-  
-  // 标记已读
-  async function readHandle(msgId) {
-    try {
-      await messageApi.updateReadFlag(msgId);
-    } catch (e) {
-      console.log(e);
-    } finally {
-    }
-  }
-  
-  return {
-    toHandle
-  };
-}
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/message/components/receiver-select.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/business/message/components/receiver-select.vue
deleted file mode 100644
index b017b15..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/message/components/receiver-select.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <a-select
-    v-model:value="selectValue"
-    :style="`width: ${width}`"
-    :placeholder="props.placeholder"
-    :showSearch="true"
-    :allowClear="true"
-    :size="size"
-    @change="handleChange"
-    @focus="handleVisibleChange"
-    :disabled="disabled"
-    :mode="multiple ? 'multiple' : ''"
-    optionFilterProp="label"
-  >
-    <a-select-option v-for="(item, index) in dataList" :key="receiverType == MESSAGE_RECEIVE_TYPE_ENUM.EMPLOYEE.value?item.employeeId : index">
-      <span v-if="receiverType == MESSAGE_RECEIVE_TYPE_ENUM.EMPLOYEE.value">
-        {{ item.actualName }}
-      </span>
-    </a-select-option>
-  </a-select>
-</template>
-
-<script setup>
-import { onMounted, ref, watch } from 'vue';
-import { employeeApi } from '/@/api/system/employee/employee-api';
-
-import {MESSAGE_RECEIVE_TYPE_ENUM} from '/src/constants/business/message/message-const.ts'
-import { message } from 'ant-design-vue';
-
-const props = defineProps({
-  value: [Number, String, Object],
-  width: {
-    type: String,
-    default: '200px',
-  },
-  placeholder: {
-    type: String,
-    default: '请选择',
-  },
-  size: {
-    type: String,
-    default: 'default',
-  },
-  disabled: {
-    type: Boolean,
-    default: false,
-  },
-  multiple:{
-    type: Boolean,
-    default: false,
-  },
-  receiverType:{
-    type: Number,
-  },
-  auditStatus: {
-    type: Number
-  },
-});
-const emit = defineEmits(['update:value', 'change']);
-
-const selectValue = ref(props.value);
-
-// 箭头value变化
-watch(
-  () => props.value,
-  (newValue) => {
-    selectValue.value = newValue;
-  }
-);
-watch(
-  () => props.receiverType,
-  (newValue) => {
-    selectValue.value=null
-    dataList.value=[]
-    queryData()
-  }
-);
-
-function handleChange (value) {
-  let obj = null;
-  if (value) {
-    if(props.receiverType == MESSAGE_RECEIVE_TYPE_ENUM.EMPLOYEE.value){
-      obj = dataList.value.find(e => e.employeeId == value);
-    }
-  }
-  emit('update:value', value);
-  emit('change', value, obj);
-}
-
-const dataList = ref([]);
-async function queryData() {
-  if(props.receiverType == MESSAGE_RECEIVE_TYPE_ENUM.EMPLOYEE.value){
-    const res = await employeeApi.queryAll();
-    dataList.value = res.data;
-    return;
-  }
-}
-const handleVisibleChange=()=>{
-  if(!props.receiverType){
-    message.error('请先选择接收方类型')
-  }
-
-}
-onMounted(queryData);
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/message/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/business/message/index.vue
deleted file mode 100644
index e918646..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/message/index.vue
+++ /dev/null
@@ -1,214 +0,0 @@
-<template>
-  <a-form class="smart-query-form">
-    <a-row class="smart-query-form-row">
-      <a-form-item label="关键字" class="smart-query-form-item">
-        <a-input style="width: 200px" v-model:value.trim="queryForm.searchWord" placeholder="标题/内容"/>
-      </a-form-item>
-
-      <a-form-item label="消息类型" class="smart-query-form-item">
-        <smart-enum-select v-model:value="queryForm.messageType" placeholder="请选择消息类型"
-                           enum-name="MESSAGE_TYPE_ENUM"/>
-      </a-form-item>
-
-      <a-form-item label="接收方类型" class="smart-query-form-item">
-        <smart-enum-select v-model:value="queryForm.receiverType" placeholder="请选择接收方类型"
-                           enum-name="MESSAGE_RECEIVE_TYPE_ENUM"/>
-      </a-form-item>
-
-      <a-form-item class="smart-query-form-item" label="接收者">
-        <ReceiverSelect v-model:value="queryForm.receiverId" placeholder="请选择接收者" :receiverType="queryForm.receiverType"/>
-      </a-form-item>
-
-      <a-form-item label="创建时间" class="smart-query-form-item">
-        <a-space direction="vertical" :size="12">
-          <a-range-picker v-model:value="searchDate" @change="dateChange"/>
-        </a-space>
-      </a-form-item>
-
-      <a-form-item label="是否已读" class="smart-query-form-item">
-        <a-radio-group v-model:value="queryForm.readFlag" @change="quickQuery">
-          <a-radio-button :value="null">全部</a-radio-button>
-          <a-radio-button :value="false">未读</a-radio-button>
-          <a-radio-button :value="true">已读</a-radio-button>
-        </a-radio-group>
-      </a-form-item>
-
-      <a-form-item class="smart-query-form-item smart-margin-left10">
-        <a-button type="primary" @click="quickQuery">
-          <template #icon>
-            <SearchOutlined/>
-          </template>
-          查询
-        </a-button>
-        <a-button @click="resetQuery">
-          <template #icon>
-            <ReloadOutlined/>
-          </template>
-          重置
-        </a-button>
-      </a-form-item>
-    </a-row>
-  </a-form>
-
-  <a-card size="small" :bordered="false" :hoverable="true">
-
-    <a-table
-        :scroll="{ x: 1800 }"
-        size="small"
-        :dataSource="tableData"
-        :columns="columns"
-        rowKey="messageId"
-        :pagination="false"
-        bordered
-    >
-      <template #bodyCell="{ text, record, index, column }">
-        <template v-if="column.dataIndex === 'messageType'">
-          <span>{{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', text) }}</span>
-        </template>
-        <template v-if="column.dataIndex === 'receiverType'">
-          <span>{{ $smartEnumPlugin.getDescByValue('MESSAGE_RECEIVE_TYPE_ENUM', text) }}</span>
-        </template>
-        <template v-if="column.dataIndex === 'readFlag'">
-          <span>{{ record.readFlag ? '已读' : '未读' }}</span>
-        </template>
-        <template v-else-if="column.dataIndex === 'action'">
-          <div class="smart-table-operate">
-            <a-button type="link" @click="toHandle(record)">去处理</a-button>
-          </div>
-        </template>
-      </template>
-    </a-table>
-
-    <div class="smart-query-table-page">
-      <a-pagination
-          showSizeChanger
-          showQuickJumper
-          show-less-items
-          :pageSizeOptions="PAGE_SIZE_OPTIONS"
-          :defaultPageSize="queryForm.pageSize"
-          v-model:current="queryForm.pageNum"
-          v-model:pageSize="queryForm.pageSize"
-          :total="total"
-          @change="ajaxQuery"
-          @showSizeChange="ajaxQuery"
-          :show-total="(total) => `共${total}条`"
-      />
-    </div>
-  </a-card>
-</template>
-<script setup>
-import {reactive, ref, onMounted} from 'vue';
-import {messageApi} from '/@/api/business/message/message-api';
-import {PAGE_SIZE, PAGE_SIZE_OPTIONS} from '/@/constants/common-const';
-import SmartEnumSelect from '/@/components/framework/smart-enum-select//index.vue';
-import {messageSetup} from "./components/message-handle-setup.js";
-import ReceiverSelect from './components/receiver-select.vue';
-
-const columns = reactive([
-  {
-    title: 'ID',
-    width: 50,
-    dataIndex: 'messageId',
-  },
-  {
-    title: '消息类型',
-    width: 80,
-    dataIndex: 'messageType',
-  },
-  {
-    title: '接收方',
-    width: 150,
-    dataIndex: 'receiverType',
-  },
-  {
-    title: '接收者',
-    width: 150,
-    dataIndex: 'receiveName',
-  },
-  {
-    title: '是否已读',
-    width: 80,
-    dataIndex: 'readFlag',
-  },
-  {
-    title: '消息标题',
-    dataIndex: 'title',
-    width: 250,
-  },
-  {
-    title: '消息内容',
-    dataIndex: 'content',
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 180
-  },
-  {
-    title: '操作',
-    dataIndex: 'action',
-    fixed: 'right',
-    width: 60
-  },
-]);
-
-const queryFormState = {
-  searchWord: '',
-  messageType: null,
-  dataId: null,
-  readFlag: null,
-  endDate: null,
-  startDate: null,
-  pageNum: 1,
-  pageSize: PAGE_SIZE,
-  searchCount: true,
-  receiverType: null,
-  receiverId:null
-};
-const queryForm = reactive({...queryFormState});
-const tableLoading = ref(false);
-const tableData = ref([]);
-const total = ref(0);
-const operateModal = ref();
-
-// 日期选择
-let searchDate = ref();
-
-function dateChange(dates, dateStrings) {
-  queryForm.startDate = dateStrings[0];
-  queryForm.endDate = dateStrings[1];
-}
-
-function resetQuery() {
-  searchDate.value = [];
-  Object.assign(queryForm, queryFormState);
-  ajaxQuery();
-}
-
-function quickQuery() {
-  queryForm.pageNum = 1;
-  ajaxQuery();
-}
-
-// 查询 管理员查全部
-async function ajaxQuery() {
-  try {
-    tableLoading.value = true;
-    let responseModel = await messageApi.queryMessage(queryForm);
-    const list = responseModel.data.list;
-    total.value = responseModel.data.total;
-    tableData.value = list;
-  } catch (e) {
-    console.log(e);
-  } finally {
-    tableLoading.value = false;
-  }
-}
-
-let {toHandle} = messageSetup();
-
-
-
-
-onMounted(ajaxQuery);
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
deleted file mode 100644
index 3671b98..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
-  * 企业 银行 表单
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-15 20:15:49
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
--->
-<template>
-  <a-modal :open="visible" :title="form.bankId ? '编辑' : '添加'" ok-text="确认" cancel-text="取消" @ok="onSubmit"
-           @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 18 }">
-      <a-form-item label="开户银行" name="bankName">
-        <a-input v-model:value="form.bankName" placeholder="请输入开户银行"/>
-      </a-form-item>
-      <a-form-item label="账户名称" name="accountName">
-        <a-input v-model:value="form.accountName" placeholder="请输入账户名称"/>
-      </a-form-item>
-      <a-form-item label="账号" name="accountNumber">
-        <a-input v-model:value="form.accountNumber" placeholder="请输入账号"/>
-      </a-form-item>
-      <a-form-item label="是否对公" name="businessFlag">
-        <a-switch v-model:checked="businessFlagChecked" @change="businessFlagCheckedChange"/>
-      </a-form-item>
-      <a-form-item label="启用状态" name="disabledFlag">
-        <a-switch v-model:checked="enabledChecked" @change="enabledCheckedChange"/>
-      </a-form-item>
-      <a-form-item label="备注" name="remark">
-        <a-textarea v-model:value="form.remark" :rows="2"/>
-      </a-form-item>
-    </a-form>
-  </a-modal>
-</template>
-<script setup lang="ts">
-import {ref, reactive} from 'vue';
-import {message} from 'ant-design-vue';
-import { SmartLoading } from "/@/components/framework/smart-loading";
-import {bankApi} from '/@/api/business/oa/bank-api';
-import { smartSentry } from '/@/lib/smart-sentry';
-
-const props = defineProps({
-  enterpriseId: {
-    type: Number,
-    default: null,
-  }
-});
-// emit
-const emit = defineEmits(['reloadList']);
-
-// ---------------------- 显示、隐藏 ----------------------
-// 是否展示
-const visible = ref(false);
-function showModal(rowData) {
-  Object.assign(form, formDefault);
-  if (rowData) {
-    Object.assign(form, rowData);
-    businessFlagChecked.value = rowData.businessFlag;
-    enabledChecked.value = !rowData.disabledFlag;
-  }
-  form.enterpriseId = props.enterpriseId;
-  visible.value = true;
-}
-
-function onClose() {
-  Object.assign(form, formDefault);
-  formRef.value.resetFields();
-  visible.value = false;
-}
-
-// ---------------------- 表单 ----------------------
-
-//  组件
-const formRef = ref();
-
-const formDefault = {
-  bankId: undefined,
-  enterpriseId: undefined,
-  bankName: '',
-  accountName: '',
-  accountNumber: '',
-  businessFlag: false,
-  disabledFlag: false,
-  remark: '',
-};
-let form = reactive({...formDefault});
-const rules = {
-  bankName: [{required: true, message: '请输入开户银行'}],
-  accountName: [{required: true, message: '请输入账户名称'}],
-  accountNumber: [{required: true, message: '请输入账号'}],
-};
-
-const businessFlagChecked = ref(false);
-const enabledChecked = ref(true);
-
-function businessFlagCheckedChange(checked) {
-  form.businessFlag = checked;
-}
-function enabledCheckedChange(checked) {
-  form.disabledFlag = !checked;
-}
-
-function onSubmit() {
-  formRef.value
-      .validate()
-      .then(async () => {
-        SmartLoading.show();
-        try {
-          if (form.bankId) {
-            await bankApi.update(form);
-          } else {
-            await bankApi.create(form);
-          }
-          message.success(`${form.bankId ? '修改' : '添加'}成功`);
-          emit('reloadList');
-          onClose();
-        } catch (error) {
-          smartSentry.captureError(error);
-        } finally {
-          SmartLoading.hide();
-        }
-      })
-      .catch((error) => {
-        debugger
-        console.log('error', error);
-        message.error('参数验证错误，请仔细填写表单数据!');
-      });
-}
-
-defineExpose({
-  showModal,
-});
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue
deleted file mode 100644
index cd6b969..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue
+++ /dev/null
@@ -1,283 +0,0 @@
-<!--
-  * 公司列表
-  *
-  * @Author:    1024创新实验室-主任：卓大
-  * @Date:      2022-08-15 20:15:49
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
--->
-<template>
-  <a-form class="smart-query-form" v-privilege="'oa:enterprise:query'">
-    <a-row class="smart-query-form-row">
-      <a-form-item label="关键字" class="smart-query-form-item">
-        <a-input style="width: 300px" v-model:value="queryForm.keywords" placeholder="企业名称/联系人/联系电话" />
-      </a-form-item>
-      
-      <a-form-item label="创建时间" class="smart-query-form-item">
-        <a-space direction="vertical" :size="12">
-          <a-range-picker v-model:value="searchDate" :presets="defaultTimeRanges" @change="dateChange" />
-        </a-space>
-      </a-form-item>
-      
-      <a-form-item class="smart-query-form-item smart-margin-left10">
-        <a-button-group>
-          <a-button type="primary" @click="onSearch">
-            <template #icon>
-              <SearchOutlined />
-            </template>
-            查询
-          </a-button>
-          <a-button @click="resetQuery">
-            <template #icon>
-              <ReloadOutlined />
-            </template>
-            重置
-          </a-button>
-        </a-button-group>
-      </a-form-item>
-    </a-row>
-  </a-form>
-  
-  <a-card size="small" :bordered="false" :hoverable="true">
-    <a-row class="smart-table-btn-block">
-      <div class="smart-table-operate-block">
-        <a-button @click="add()" v-privilege="'oa:enterprise:add'" type="primary">
-          <template #icon>
-            <PlusOutlined />
-          </template>
-          新建企业
-        </a-button>
-        <a-button @click="exportExcel()" v-privilege="'oa:enterprise:exportExcel'" type="primary">
-          <template #icon>
-            <FileExcelOutlined />
-          </template>
-          导出数据（带水印）
-        </a-button>
-      </div>
-      <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.OA.ENTERPRISE" :refresh="ajaxQuery" />
-      </div>
-    </a-row>
-    
-    <a-table
-      :scroll="{ x: 1300 }"
-      size="small"
-      :dataSource="tableData"
-      :columns="columns"
-      rowKey="enterpriseId"
-      :pagination="false"
-      :loading="tableLoading"
-      bordered
-    >
-      <template #bodyCell="{ column, record, text }">
-        <template v-if="column.dataIndex === 'disabledFlag'">
-          {{ text ? '禁用' : '启用' }}
-        </template>
-        <template v-if="column.dataIndex === 'enterpriseName'">
-          <a @click="detail(record.enterpriseId)">{{ record.enterpriseName }}</a>
-        </template>
-        <template v-if="column.dataIndex === 'type'">
-          <span>{{ $smartEnumPlugin.getDescByValue('ENTERPRISE_TYPE_ENUM', text) }}</span>
-        </template>
-        <template v-if="column.dataIndex === 'action'">
-          <div class="smart-table-operate">
-            <a-button @click="update(record.enterpriseId)" size="small" v-privilege="'oa:enterprise:update'" type="link">编辑</a-button>
-            <a-button @click="confirmDelete(record.enterpriseId)" size="small" danger v-privilege="'oa:enterprise:delete'" type="link">删除</a-button>
-          </div>
-        </template>
-      </template>
-    </a-table>
-    
-    <div class="smart-query-table-page">
-      <a-pagination
-        showSizeChanger
-        showQuickJumper
-        show-less-items
-        :pageSizeOptions="PAGE_SIZE_OPTIONS"
-        :defaultPageSize="queryForm.pageSize"
-        v-model:current="queryForm.pageNum"
-        v-model:pageSize="queryForm.pageSize"
-        :total="total"
-        @change="ajaxQuery"
-        @showSizeChange="ajaxQuery"
-        :show-total="(total) => `共${total}条`"
-      />
-    </div>
-    <EnterpriseOperate ref="operateRef" @refresh="ajaxQuery" />
-  </a-card>
-</template>
-<script setup lang="ts">
-import { reactive, ref, onMounted } from 'vue';
-import { message, Modal } from 'ant-design-vue';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
-import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
-import { useRouter } from 'vue-router';
-import EnterpriseOperate from './components/enterprise-operate-modal.vue';
-import { smartSentry } from '/@/lib/smart-sentry';
-import { defaultTimeRanges } from '/@/lib/default-time-ranges';
-import TableOperator from '/@/components/support/table-operator/index.vue';
-import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
-
-// --------------------------- 企业表格 列 ---------------------------
-
-const columns = ref([
-  {
-    title: '企业名称',
-    dataIndex: 'enterpriseName',
-    minWidth: 180,
-    ellipsis: true,
-  },
-  {
-    title: '统一社会信用代码',
-    dataIndex: 'unifiedSocialCreditCode',
-    minWidth: 170,
-    ellipsis: true,
-  },
-  {
-    title: '企业类型',
-    dataIndex: 'type',
-    width: 100,
-  },
-  {
-    title: '联系人',
-    width: 100,
-    dataIndex: 'contact',
-    ellipsis: true,
-  },
-  {
-    title: '联系人电话',
-    width: 120,
-    dataIndex: 'contactPhone',
-    ellipsis: true,
-  },
-  {
-    title: '邮箱',
-    minWidth: 100,
-    dataIndex: 'email',
-    ellipsis: true,
-  },
-  {
-    title: '状态',
-    width: 50,
-    dataIndex: 'disabledFlag',
-  },
-  {
-    title: '创建人',
-    width: 60,
-    dataIndex: 'createUserName',
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 150,
-  },
-  {
-    title: '操作',
-    dataIndex: 'action',
-    // fixed: 'right',
-    width: 100,
-  },
-]);
-
-// --------------------------- 查询 ---------------------------
-
-const queryFormState = {
-  keywords: '',
-  endTime: null,
-  startTime: null,
-  pageNum: 1,
-  pageSize: PAGE_SIZE,
-  searchCount: true,
-};
-const queryForm = reactive({ ...queryFormState });
-const tableLoading = ref(false);
-const tableData = ref([]);
-const total = ref(0);
-
-// 日期选择
-let searchDate = ref();
-
-function dateChange(dates, dateStrings) {
-  queryForm.startTime = dateStrings[0];
-  queryForm.endTime = dateStrings[1];
-}
-
-function onSearch() {
-  queryForm.pageNum = 1;
-  ajaxQuery();
-}
-
-function resetQuery() {
-  searchDate.value = [];
-  Object.assign(queryForm, queryFormState);
-  ajaxQuery();
-}
-
-async function ajaxQuery() {
-  try {
-    tableLoading.value = true;
-    let responseModel = await enterpriseApi.pageQuery(queryForm);
-    const list = responseModel.data.list;
-    total.value = responseModel.data.total;
-    tableData.value = list;
-  } catch (e) {
-    smartSentry.captureError(e);
-  } finally {
-    tableLoading.value = false;
-  }
-}
-
-// --------------------------- 导出 ---------------------------
-async function exportExcel() {
-  await enterpriseApi.exportExcel(queryForm);
-}
-
-// --------------------------- 删除 ---------------------------
-
-function confirmDelete(enterpriseId) {
-  Modal.confirm({
-    title: '确定要删除吗？',
-    content: '删除后，该信息将不可恢复',
-    okText: '删除',
-    okType: 'danger',
-    onOk() {
-      del(enterpriseId);
-    },
-    cancelText: '取消',
-    onCancel() {},
-  });
-}
-
-async function del(enterpriseId) {
-  try {
-    SmartLoading.show();
-    await enterpriseApi.delete(enterpriseId);
-    message.success('删除成功');
-    ajaxQuery();
-  } catch (e) {
-    smartSentry.captureError(e);
-  } finally {
-    SmartLoading.hide();
-  }
-}
-
-// --------------------------- 增加、修改、详情 ---------------------------
-
-let router = useRouter();
-const operateRef = ref();
-function add() {
-  operateRef.value.showModal();
-}
-
-function update(enterpriseId) {
-  operateRef.value.showModal(enterpriseId);
-}
-
-function detail(enterpriseId) {
-  router.push({ path: '/oa/enterprise/enterprise-detail', query: { enterpriseId: enterpriseId } });
-}
-
-onMounted(ajaxQuery);
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue
deleted file mode 100644
index 72a6937..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-department.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<!--
-  * 通知  可见范围 选择部门
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-21 19:52:43 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
--->
-<template>
-  <div class="wrapper">
-    <div class="sider-fl">
-      <a-tree :tree-data="treeData" :fieldNames="{ title: 'name', key: 'departmentId' }" :selectable="false" v-model:expandedKeys="expandedKeys">
-        <template #switcherIcon="{ switcherCls }">
-          <caret-down-outlined :class="switcherCls" />
-        </template>
-        <template #title="{ name, departmentId }">
-          <div class="list-item" :class="{ active: checkExists(departmentId) }">
-            <div class="list-item-title">{{ name }}</div>
-            <check-circle-filled class="check-icon-style" @click="onSelectAdd(name, departmentId)" />
-          </div>
-        </template>
-      </a-tree>
-    </div>
-    <div class="sider-fr">
-      <div class="selected-list">
-        <div class="list-item" v-for="(item, index) in selectedList" :key="item.dataId">
-          <div class="list-item-title">{{ item.dataName }}</div>
-          <close-circle-two-tone @click="onRemove(index)" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { reactive, ref, onMounted, watch, computed, nextTick } from 'vue';
-import lodash from 'lodash';
-import { NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM } from '/@/constants/business/oa/notice-const';
-import { departmentApi } from '/@/api/system/department/department-api';
-import { smartSentry } from '/@/lib/smart-sentry';
-
-const props = defineProps({
-  // 已选择的部门数据列表
-  departmentList: {
-    type: Array,
-    default: () => [],
-  },
-});
-
-const emits = defineEmits(['onChange']);
-
-const treeData = ref([]);
-async function queryDepartmentTree() {
-  try {
-    const result = await departmentApi.queryDepartmentTree();
-    if (!lodash.isEmpty(result.data)) {
-      treeData.value = result.data;
-      setExpanded();
-    }
-  } catch (err) {
-    smartSentry.captureError(err);
-  }
-}
-
-// 设置默认展开的节点
-const expandedKeys = ref([]);
-function setExpanded() {
-  expandedKeys.value = [treeData.value[0].departmentId];
-}
-
-// 选择的部门列表数据
-const selectedList = ref([]);
-
-// 选择的部门列表Ids
-const selectedIds = computed(() => {
-  return selectedList.value.map((item) => item.dataId);
-});
-
-watch(
-  () => props.departmentList,
-  (newVal) => {
-    selectedList.value = newVal;
-  },
-  { immediate: true }
-);
-
-// 检查是否已选
-function checkExists(dataId) {
-  return selectedIds.value.includes(dataId);
-}
-
-// 点击左边添加
-function onSelectAdd(name, departmentId) {
-  if (checkExists(departmentId)) {
-    return;
-  }
-  selectedList.value.push({
-    dataName: name,
-    dataId: departmentId,
-    dataType: NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.DEPARTMENT.value,
-  });
-  onChangeEmit();
-}
-
-// 点击右边移除
-function onRemove(index) {
-  selectedList.value.splice(index, 1);
-  onChangeEmit();
-}
-
-function onChangeEmit() {
-  emits('onChange', { selectedList: selectedList.value, selectedIds: selectedIds.value });
-}
-
-onMounted(() => {
-  queryDepartmentTree();
-});
-</script>
-
-<style lang="less" scoped>
-:deep(.ant-tree-list-holder-inner) {
-  display: block !important;
-  .ant-tree-treenode {
-    align-items: center;
-    padding-bottom: 0;
-    &:hover {
-      background-color: #f9f9f9;
-    }
-    .ant-tree-switcher {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      .ant-tree-switcher-icon {
-        font-size: 12px;
-      }
-    }
-    .ant-tree-node-content-wrapper {
-      display: block;
-      flex: 1;
-      &:hover {
-        cursor: auto;
-      }
-      .ant-tree-title {
-        display: block;
-      }
-    }
-  }
-}
-
-.wrapper {
-  display: flex;
-  .sider-fl,
-  .sider-fr {
-    flex: 1;
-    height: 500px;
-    border: 1px solid #d9d9d9;
-    overflow: hidden;
-    overflow-y: auto;
-    &::-webkit-scrollbar {
-      width: 6px;
-    }
-    &::-webkit-scrollbar-track-piece {
-      background-color: #ededed;
-    }
-    &::-webkit-scrollbar-thumb {
-      height: 50px;
-      background-color: #a1a1a1;
-      border-radius: 4px;
-    }
-  }
-  .sider-fr {
-    margin-left: 15px;
-    .list-item {
-      padding-left: 14px;
-    }
-  }
-}
-.list-item {
-  display: flex;
-  align-items: center;
-  padding: 0 14px 0 0;
-  height: 32px;
-  &:hover {
-    background-color: #f9f9f9;
-  }
-  &.active {
-    .check-icon-style {
-      cursor: auto;
-      color: @primary-color;
-    }
-  }
-  .list-item-title {
-    flex: 1;
-    margin-right: 10px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .check-icon-style {
-    color: #d9d9d9;
-  }
-}
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue
deleted file mode 100644
index 769d744..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/components/notice-form-visible-transfer-employee.vue
+++ /dev/null
@@ -1,252 +0,0 @@
-<!--
-  * 通知  可见范围 选择员工
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-21 19:52:43 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
--->
-<template>
-  <div class="wrapper">
-    <div class="sider-left">
-      <a-tree :tree-data="treeData" :fieldNames="{ title: 'name' }" :selectable="false" v-model:expandedKeys="expandedKeys">
-        <template #switcherIcon="{ switcherCls }">
-          <caret-down-outlined :class="switcherCls" />
-        </template>
-        <template #title="{ name, id, dataType }">
-          <div class="list-item" :class="{ active: checkExists(id) }">
-            <div class="list-item-title">
-              <user-outlined v-if="dataType === NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value" />
-              {{ name }}
-            </div>
-            <check-circle-filled
-              v-if="dataType === NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value"
-              class="check-icon-style"
-              @click="onSelectAdd(name, id, dataType)"
-            />
-          </div>
-        </template>
-      </a-tree>
-    </div>
-    <div class="sider-right">
-      <div class="selected-list">
-        <div class="list-item" v-for="(item, index) in selectedList" :key="item.id">
-          <div class="list-item-title">{{ item.dataName }}</div>
-          <close-circle-two-tone @click="onRemove(index)" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { reactive, ref, onMounted, watch, computed, nextTick } from 'vue';
-import lodash from 'lodash';
-import { NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM } from '/@/constants/business/oa/notice-const';
-import { departmentApi } from '/@/api/system/department/department-api';
-import { employeeApi } from '/@/api/system/employee/employee-api';
-import { smartSentry } from '/@/lib/smart-sentry';
-
-const props = defineProps({
-  // 已选择的员工数据列表
-  employeeList: {
-    type: Array,
-    default: () => [],
-  },
-});
-
-const emits = defineEmits(['onChange']);
-
-const treeData = ref([]);
-
-// 查询部门树形
-async function queryDepartmentTree() {
-  try {
-    const departmentResult = await departmentApi.queryDepartmentTree();
-    const employeeResult = await employeeApi.queryAll();
-    const departmentTree = departmentResult.data;
-    buildDepartmentEmployeeTree(departmentTree, employeeResult.data);
-
-    if (!lodash.isEmpty(departmentTree)) {
-      treeData.value = departmentTree;
-      console.log(treeData.value);
-      nextTick(() => {
-        setExpanded();
-      });
-    }
-  } catch (err) {
-    smartSentry.captureError(err);
-  }
-}
-
-// 递归构建部门员工树
-function buildDepartmentEmployeeTree(departmentTree, employeeList) {
-  for (const department of departmentTree) {
-    if (department.dataType && department.dataType === NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value) {
-      continue;
-    }
-
-    department.id = department.departmentId;
-    department.key = 'department_' + department.departmentId;
-    department.dataType = NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.DEPARTMENT.value;
-    let employeeChildren = employeeList
-      .filter((e) => e.departmentId === department.departmentId)
-      .map((e) =>
-        Object.assign(
-          {},
-          {
-            id: e.employeeId,
-            key: 'employee_' + e.employeeId,
-            name: e.actualName,
-            dataType: NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value,
-          }
-        )
-      );
-    if (!department.children) {
-      department.children = [];
-    }
-    department.children.push(...employeeChildren);
-    buildDepartmentEmployeeTree(department.children, employeeList);
-  }
-}
-
-// 设置默认展开的节点
-const expandedKeys = ref([]);
-function setExpanded() {
-  expandedKeys.value = [treeData.value[0].key];
-}
-
-// 选择的员工列表数据
-const selectedList = ref([]);
-
-// 选择的员工列表Ids
-const selectedIds = computed(() => {
-  return selectedList.value.map((item) => item.dataId);
-});
-
-watch(
-  () => props.employeeList,
-  (newVal) => {
-    selectedList.value = newVal;
-  },
-  { immediate: true }
-);
-
-// 检查是否已选
-function checkExists(id) {
-  return selectedIds.value.includes(id);
-}
-
-// 点击左边添加
-function onSelectAdd(name, id, dataType) {
-  if (checkExists(id)) {
-    return;
-  }
-  selectedList.value.push({
-    dataName: name,
-    dataId: id,
-    dataType: NOTICE_VISIBLE_RANGE_DATA_TYPE_ENUM.EMPLOYEE.value,
-  });
-  onChangeEmit();
-}
-
-// 点击右边移除
-function onRemove(index) {
-  selectedList.value.splice(index, 1);
-  onChangeEmit();
-}
-
-function onChangeEmit() {
-  emits('onChange', { selectedList: selectedList.value, selectedIds: selectedIds.value });
-}
-
-onMounted(() => {
-  queryDepartmentTree();
-});
-</script>
-
-<style lang="less" scoped>
-:deep(.ant-tree-list-holder-inner) {
-  display: block !important;
-  .ant-tree-treenode {
-    align-items: center;
-    padding-bottom: 0;
-    &:hover {
-      background-color: #f9f9f9;
-    }
-    .ant-tree-switcher {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      .ant-tree-switcher-icon {
-        font-size: 12px;
-      }
-    }
-    .ant-tree-node-content-wrapper {
-      display: block;
-      flex: 1;
-      &:hover {
-        cursor: auto;
-      }
-      .ant-tree-title {
-        display: block;
-      }
-    }
-  }
-}
-
-.wrapper {
-  display: flex;
-  .sider-left,
-  .sider-right {
-    flex: 1;
-    height: 500px;
-    border: 1px solid #d9d9d9;
-    overflow: hidden;
-    overflow-y: auto;
-    &::-webkit-scrollbar {
-      width: 6px;
-    }
-    &::-webkit-scrollbar-track-piece {
-      background-color: #ededed;
-    }
-    &::-webkit-scrollbar-thumb {
-      height: 50px;
-      background-color: #a1a1a1;
-      border-radius: 4px;
-    }
-  }
-  .sider-right {
-    margin-left: 15px;
-    .list-item {
-      padding-left: 14px;
-    }
-  }
-}
-.list-item {
-  display: flex;
-  align-items: center;
-  padding: 0 14px 0 0;
-  height: 32px;
-  &:hover {
-    background-color: #f9f9f9;
-  }
-  &.active {
-    .check-icon-style {
-      cursor: auto;
-      color: @primary-color;
-    }
-  }
-  .list-item-title {
-    flex: 1;
-    margin-right: 10px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .check-icon-style {
-    color: #d9d9d9;
-  }
-}
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue
deleted file mode 100644
index cdd648b..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/business/oa/notice/notice-employee-detail.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<!--
-  * 通知  详情 （员工）
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-08-21 19:52:43 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
--->
-<template>
-  <a-card size="small">
-    <div>
-      <div class="content-header">
-        <!--startprint-->
-        <div class="content-header-title">
-          {{ noticeDetail.title }}
-        </div>
-        <div class="content-header-info">
-          <span v-show="noticeDetail.author">作者：{{ noticeDetail.author }}</span>
-          <span v-show="noticeDetail.source">来源：{{ noticeDetail.source }}</span>
-          <span>发布时间：{{ noticeDetail.publishTime }}</span>
-          <span>阅读量：{{ noticeDetail.pageViewCount }}</span>
-          <span @click="print">【打印本页】</span>
-        </div>
-      </div>
-      <div class="content-html" v-html="noticeDetail.contentHtml"></div>
-      <!--endprint-->
-    </div>
-    <a-divider />
-    <div>附件：<file-preview :fileList="noticeDetail.attachment" /></div>
-  </a-card>
-
-  <a-card title="记录" size="small" class="smart-margin-top10">
-    <NoticeViewRecordList ref="noticeViewRecordList" :noticeId="route.query.noticeId" />
-  </a-card>
-
-  <!-- 预览附件 -->
-  <FilePreviewModal ref="filePreviewRef" />
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import NoticeViewRecordList from './components/notice-view-record-list.vue';
-import { noticeApi } from '/@/api/business/oa/notice-api';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import FilePreviewModal from '/@/components/support/file-preview-modal/index.vue';
-import FilePreview from '/@/components/support/file-preview/index.vue';
-import { smartSentry } from '/@/lib/smart-sentry';
-
-const route = useRoute();
-
-const activeKey = ref(1);
-
-const noticeDetail = ref({});
-
-onMounted(() => {
-  if (route.query.noticeId) {
-    queryNoticeDetail();
-  }
-});
-
-const noticeViewRecordList = ref();
-
-// 查询详情
-async function queryNoticeDetail() {
-  try {
-    SmartLoading.show();
-    const result = await noticeApi.view(route.query.noticeId);
-    noticeDetail.value = result.data;
-
-    noticeViewRecordList.value.onSearch();
-  } catch (err) {
-    smartSentry.captureError(err);
-  } finally {
-    SmartLoading.hide();
-  }
-}
-
-// 点击编辑
-const noticeFormDrawerRef = ref();
-function onEdit() {
-  noticeFormDrawerRef.value.showModal(noticeDetail.value.noticeId);
-}
-
-// 预览附件
-const filePreviewRef = ref();
-function onPrevFile(fileItem) {
-  filePreviewRef.value.showPreview(fileItem);
-}
-
-// 打印
-function print() {
-  let bdhtml = window.document.body.innerHTML;
-  let sprnstr = '<!--startprint-->'; //必须在页面添加<!--startprint-->和<!--endprint-->而且需要打印的内容必须在它们之间
-  let eprnstr = '<!--endprint-->';
-  let prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
-  prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
-  let newWin = window.open(''); //新打开一个空窗口
-  newWin.document.body.innerHTML = prnhtml;
-  newWin.document.close(); //在IE浏览器中使用必须添加这一句
-  newWin.focus(); //在IE浏览器中使用必须添加这一句
-  newWin.print(); //打印
-  newWin.close(); //关闭窗口
-}
-</script>
-
-<style lang="less" scoped>
-:deep(.ant-descriptions-item-content) {
-  flex: 1;
-  overflow: hidden;
-}
-.file-list {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  .file-item {
-    display: block;
-    margin-right: 10px;
-  }
-}
-.visible-list {
-  display: flex;
-  flex-wrap: wrap;
-  .visible-item {
-    margin-right: 10px;
-    color: #666;
-  }
-}
-.content-header {
-  .content-header-title {
-    margin: 10px 0px;
-    font-size: 18px;
-    font-weight: bold;
-    text-align: center;
-  }
-  .content-header-info {
-    margin: 10px 0px;
-    font-size: 14px;
-    color: #888;
-    text-align: center;
-    span {
-      margin: 0 10px;
-      cursor: pointer;
-    }
-  }
-}
-.content-html {
-  img {
-    max-width: 100%;
-  }
-}
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/job/job-list.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/support/job/job-list.vue
deleted file mode 100644
index f60ca58..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/job/job-list.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<!--
-  * JOB 列表
-  * @Author:    huke
-  * @Date:      2024/06/25
--->
-<template>
-  <div>
-    <a-form class="smart-query-form">
-      <a-row class="smart-query-form-row">
-        <a-form-item label="关键字" class="smart-query-form-item">
-          <a-input style="width: 300px" v-model:value="queryForm.searchWord" placeholder="请输入关键字"
-                   :maxlength="30"/>
-        </a-form-item>
-        
-        <a-form-item class="smart-query-form-item smart-margin-left10">
-          <a-button-group>
-            <a-button type="primary" @click="onSearch" v-privilege="'support:job:query'">
-              <template #icon>
-                <ReloadOutlined/>
-              </template>
-              查询
-            </a-button>
-            <a-button @click="resetQuery" v-privilege="'support:job:query'">
-              <template #icon>
-                <SearchOutlined/>
-              </template>
-              重置
-            </a-button>
-          </a-button-group>
-        </a-form-item>
-      </a-row>
-    </a-form>
-    
-    <a-card size="small" :bordered="false" :hoverable="true">
-      <a-row justify="end">
-        <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.JOB"
-                       :refresh="ajaxQuery"/>
-      </a-row>
-      
-      <a-table size="small" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="jobId"
-               :pagination="false">
-        <template #bodyCell="{ record, column }">
-          <template v-if="column.dataIndex === 'jobClass'">
-            <a-tooltip>
-              <template #title>{{ record.jobClass }}</template>
-              {{ record.jobClass.split('.').pop() }}
-            </a-tooltip>
-          </template>
-          <template v-if="column.dataIndex === 'triggerType'">
-            <a-tag v-if="record.cron" color="success">CRON表达式</a-tag>
-            <a-tag v-else color="processing">固定间隔</a-tag>
-          </template>
-          <template v-if="column.dataIndex === 'triggerTime'">
-            <span>{{ record.cron ? record.cron : record.fixedDelay }}</span>
-          </template>
-          <template v-if="column.dataIndex === 'lastJob'">
-            <div v-if="record.lastJobLog">
-              <a-tooltip>
-                <template #title>{{ handleExecuteResult(record.lastJobLog.executeResult) }}</template>
-                <CheckOutlined v-if="record.lastJobLog.successFlag" style="color:#87d068"/>
-                <WarningOutlined v-else style="color:#f50"/>
-                {{ record.lastJobLog.executeStartTime }}
-              </a-tooltip>
-            </div>
-          </template>
-          <template v-if="column.dataIndex === 'nextJob'">
-            <a-tooltip>
-              <template #title>
-                <div>下次执行</div>
-                <div v-for="item in record.nextJobExecuteTimeList" :key="item">{{ item }}</div>
-              </template>
-              {{ record.nextJobExecuteTimeList[0] }}
-            </a-tooltip>
-          </template>
-          <template v-if="column.dataIndex === 'enabledFlag'">
-            <a-switch v-model:checked="record.enabledFlag"/>
-          </template>
-          <template v-if="column.dataIndex === 'action'">
-            <div class="smart-table-operate">
-              <a-button v-privilege="'support:job:execute'" type="link">执行</a-button>
-              <a-button v-privilege="'support:job:update'" type="link">编辑</a-button>
-            </div>
-          </template>
-        </template>
-      </a-table>
-      
-      <div class="smart-query-table-page">
-        <a-pagination
-          showSizeChanger
-          showQuickJumper
-          show-less-items
-          :pageSizeOptions="PAGE_SIZE_OPTIONS"
-          :defaultPageSize="queryForm.pageSize"
-          v-model:current="queryForm.pageNum"
-          v-model:pageSize="queryForm.pageSize"
-          :total="total"
-          @change="ajaxQuery"
-          @showSizeChange="ajaxQuery"
-          :show-total="(total) => `共${total}条`"
-        />
-      </div>
-    </a-card>
-  </div>
-</template>
-<script setup>
-import { computed, onMounted, reactive, ref } from 'vue';
-import { jobApi } from '/@/api/support/job/job-api';
-import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
-import { smartSentry } from '/@/lib/smart-sentry';
-import TableOperator from '/@/components/support/table-operator/index.vue';
-import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
-
-const columns = ref([
-  {
-    title: 'id',
-    width: 50,
-    dataIndex: 'jobId'
-  },
-  {
-    title: '任务名称',
-    dataIndex: 'jobName',
-    width: 150,
-    ellipsis: true
-  },
-  {
-    title: '执行类',
-    dataIndex: 'jobClass',
-    width: 180
-  },
-  {
-    title: '触发类型',
-    dataIndex: 'triggerType',
-    width: 110
-  },
-  {
-    title: '触发时间',
-    dataIndex: 'triggerTime',
-    width: 150
-  },
-  {
-    title: '上次执行',
-    width: 180,
-    dataIndex: 'lastJob'
-  },
-  {
-    title: '下次执行',
-    width: 150,
-    dataIndex: 'nextJob'
-  },
-  {
-    title: '状态',
-    dataIndex: 'enabledFlag',
-    width: 80
-  },
-  {
-    title: '执行参数',
-    dataIndex: 'param',
-    width: 300,
-    ellipsis: true
-  },
-  {
-    title: '任务描述',
-    dataIndex: 'remark',
-    ellipsis: true,
-    width: 180
-  },
-  {
-    title: '更新人',
-    dataIndex: 'updateName',
-    width: 90
-  },
-  {
-    title: '更新时间',
-    dataIndex: 'updateTime',
-    width: 150
-  },
-  {
-    title: '操作',
-    dataIndex: 'action',
-    fixed: 'right',
-    width: 100
-  }
-]);
-
-// ---------------- 查询数据 -----------------------
-
-const queryFormState = {
-  searchWord: '',
-  enabledFlag: null,
-  pageNum: 1,
-  pageSize: 10
-};
-const queryForm = reactive({...queryFormState});
-
-const tableLoading = ref(false);
-const tableData = ref([]);
-const total = ref(0);
-
-function resetQuery() {
-  Object.assign(queryForm, queryFormState);
-  ajaxQuery();
-}
-
-function onSearch() {
-  queryForm.pageNum = 1;
-  ajaxQuery();
-}
-
-// 上次处理结果展示 最多展示300
-function handleExecuteResult(result) {
-  let num = 400;
-  return result
-    ? result.substring(0, num) + (result.length > num ? ' ...' : '')
-    : '';
-}
-
-async function ajaxQuery() {
-  try {
-    tableLoading.value = true;
-    let responseModel = await jobApi.queryJob(queryForm);
-    const list = responseModel.data.list;
-    total.value = responseModel.data.total;
-    tableData.value = list;
-  } catch (e) {
-    smartSentry.captureError(e);
-  } finally {
-    tableLoading.value = false;
-  }
-}
-
-const jobClass = computed(() => {
-
-});
-
-// ------------------------- 表单操作 弹窗 ------------------------------
-
-
-onMounted(ajaxQuery);
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/support/level3protect/data-masking-list.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/support/level3protect/data-masking-list.vue
deleted file mode 100644
index ebedc2e..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/support/level3protect/data-masking-list.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<!--
-  * 数据脱敏
-  *
-  * @Author:    1024创新实验室-主任：卓大
-  * @Date:      2024-08-02 20:23:08
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
--->
-<template>
-  <a-card size="small" :bordered="false" :hoverable="true">
-    <a-alert>
-      <template v-slot:message>
-        <h4>数据脱敏 Data Masking介绍：</h4>
-      </template>
-      <template v-slot:description>
-        <pre>
-简介：《信息安全技术 网络安全等级保护基本要求》明确规定，二级以上保护则需要对敏感数据进行脱敏处理。
-原理：数据脱敏是指对某些敏感信息通过脱敏规则进行数据的变形，实现敏感隐私数据的可靠保护。
-举例：在不违反系统规则条件下，身份证号、手机号、卡号、客户号等个人信息都需要进行数据脱敏。
-
-使用方式：
-1）脱敏注解 @DataMasking ，支持数据类型如：用户ID、手机号、密码、地址、银行卡、车牌号等；
-2）脱敏工具类： SmartDataMaskingUtil ；
-</pre
->
-      </template>
-    </a-alert>
-    
-    <a-form class="smart-query-form">
-      <a-row class="smart-query-form-row">
-        <a-form-item class="smart-query-form-item smart-margin-left10">
-          <a-button-group>
-            <a-button type="primary" @click="onSearch">
-              <template #icon>
-                <ReloadOutlined/>
-              </template>
-              查询
-            </a-button>
-          </a-button-group>
-        </a-form-item>
-      </a-row>
-    </a-form>
-    
-    <a-table
-      size="small"
-      bordered
-      :scroll="{ x: 1100 }"
-      :loading="tableLoading"
-      class="smart-margin-top10"
-      :dataSource="tableData"
-      :columns="columns"
-      :pagination="false"
-    />
-  </a-card>
-</template>
-<script setup>
-import { onMounted, reactive, ref } from 'vue';
-import { heartBeatApi } from '/@/api/support/heart-beat/heart-beat-api';
-import { PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
-import { defaultTimeRanges } from '/@/lib/default-time-ranges';
-import { smartSentry } from '/@/lib/smart-sentry';
-import TableOperator from '/@/components/support/table-operator/index.vue';
-import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
-import { dataMaskingApi } from '/@/api/support/data-masking/data-masking-api.js';
-
-//------------------------ 表格渲染 ---------------------
-
-const columns = ref([
-  {
-    title: '用户ID',
-    dataIndex: 'userId',
-    width: 70
-  },
-  {
-    title: '默认',
-    dataIndex: 'other',
-    width: 100
-  },
-  {
-    title: '手机号',
-    dataIndex: 'phone',
-    width: 100
-  },
-  {
-    title: '身份证',
-    dataIndex: 'idCard',
-    width: 150
-  },
-  {
-    title: '密码',
-    dataIndex: 'password',
-    width: 100
-  },
-  {
-    title: '邮箱',
-    dataIndex: 'email',
-    width: 120
-  },
-  {
-    title: '车牌号',
-    dataIndex: 'carLicense',
-    width: 120
-  },
-  {
-    title: '银行卡',
-    dataIndex: 'bankCard',
-    width: 170
-  },
-  {
-    title: '地址',
-    dataIndex: 'address',
-    width: 210
-  }
-]);
-
-const tableLoading = ref(false);
-const tableData = ref([]);
-
-function onSearch() {
-  ajaxQuery();
-}
-
-async function ajaxQuery() {
-  try {
-    tableLoading.value = true;
-    let responseModel = await dataMaskingApi.query();
-    tableData.value = responseModel.data;
-  } catch (e) {
-    smartSentry.captureError(e);
-  } finally {
-    tableLoading.value = false;
-  }
-}
-
-onMounted(ajaxQuery);
-</script>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/center/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/center/index.vue
deleted file mode 100644
index 8823535..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/center/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  个人中心
-</template>
-<script setup>
-</script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/message/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/message/index.vue
deleted file mode 100644
index aa102fc..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/message/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  我的消息
-</template>
-<script setup>
-</script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/password/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/password/index.vue
deleted file mode 100644
index f08f357..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/password/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  修改密码
-</template>
-<script setup>
-</script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/safe/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/safe/index.vue
deleted file mode 100644
index 8f00dee..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/components/safe/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  安全设置
-</template>
-<script setup>
-</script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/index.vue
deleted file mode 100644
index 539617a..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/account/index.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-  <div class="account-container">
-    <!--菜单列-->
-    <div class="account-menu-list">
-      <a-menu
-          v-model:selectedKeys="selectedKeys"
-          mode="inline"
-          @click="selectMenu($event.key)"
-      >
-        <a-menu-item v-for="item in menuList" :key="item.menuId">
-          {{ item.menuName }}
-        </a-menu-item>
-      </a-menu>
-    </div>
-    <!--内容区域-->
-    <div class="account-content">
-      <component :is="selectedMenu.components"/>
-    </div>
-  </div>
-</template>
-<script setup>
-import {computed, defineAsyncComponent, markRaw, onMounted, ref} from "vue";
-import _ from 'lodash';
-
-/**
- * 菜单展示
- * defineAsyncComponent 异步组件
- * markRaw  将一个Vue组件对象转换为响应式对象时，可能会导致不必要的性能开销。使用markRaw方法将组件对象标记为非响应式对象
- */
-let menuList = ref([
-  {
-    menuId: 1,
-    menuName: '个人中心',
-    components: markRaw(defineAsyncComponent(() => import('./components/center/index.vue')))
-  },
-  {
-    menuId: 2,
-    menuName: '我的消息',
-    components: markRaw(defineAsyncComponent(() => import('./components/message/index.vue')))
-  },
-  {
-    menuId: 3,
-    menuName: '修改密码',
-    components: markRaw(defineAsyncComponent(() => import('./components/password/index.vue')))
-  },
-  {
-    menuId: 4,
-    menuName: '安全设置',
-    components: markRaw(defineAsyncComponent(() => import('./components/safe/index.vue')))
-  }
-])
-// 选中的菜单
-let selectedMenu = ref({menuId: 0});
-let selectedKeys = computed(() => {
-  return _.isEmpty(selectedMenu.value) ? [] : [selectedMenu.value.menuId];
-})
-
-function selectMenu(menuId) {
-  selectedMenu.value = menuList.value.find(e => e.menuId === menuId);
-}
-
-onMounted(() => {
-  if (_.isEmpty(menuList.value)) {
-    return;
-  }
-  let firstMenu = menuList.value[0];
-  selectMenu(firstMenu.menuId)
-})
-</script>
-<style lang="less" scoped>
-.account-container {
-  display: flex;
-  height: 100%;
-
-  .account-menu-list {
-    width: 224px;
-    height: 100%;
-
-    :deep(.ant-menu) {
-      border-radius: 8px;
-    }
-
-    :deep(.ant-menu-item) {
-      height: 60px !important;
-    }
-  }
-
-  .account-content {
-    flex: 1;
-    margin-left: 10px;
-    background: #FFFFFF;
-    padding: 8px 40px;
-    border-radius: 8px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department-manage/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department-manage/index.vue
deleted file mode 100644
index bedff18..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department-manage/index.vue
+++ /dev/null
@@ -1,252 +0,0 @@
-<template>
-  <a-form class="smart-query-form">
-    <a-row class="smart-query-form-row">
-      <a-form-item label="部门名称" class="smart-query-form-item">
-        <a-input style="width: 300px" v-model:value="keywords" placeholder="请输入部门名称"/>
-      </a-form-item>
-      
-      <a-form-item class="smart-query-form-item smart-margin-left10">
-        <a-button-group>
-          <a-button v-privilege="'support:department:query'" type="primary" @click="onSearch">
-            <template #icon>
-              <ReloadOutlined/>
-            </template>
-            查询
-          </a-button>
-          <a-button v-privilege="'support:department:query'" @click="resetQuery">
-            <template #icon>
-              <SearchOutlined/>
-            </template>
-            重置
-          </a-button>
-        </a-button-group>
-        <a-button v-privilege="'system:department:add'"
-                  type="primary"
-                  @click="addDepartment"
-                  class="smart-margin-left20">
-          <template #icon>
-            <PlusOutlined/>
-          </template>
-          新建
-        </a-button>
-      </a-form-item>
-    </a-row>
-  </a-form>
-  
-  <a-card size="small" :bordered="true">
-    <a-table size="small"
-             bordered
-             :loading="tableLoading"
-             rowKey="departmentId"
-             :columns="columns"
-             :data-source="departmentTreeData"
-             :defaultExpandAllRows="false"
-             :defaultExpandedRowKeys="defaultExpandedRowList"
-             :pagination="false">
-      <template #bodyCell="{ record, column }">
-        <template v-if="column.dataIndex === 'action'">
-          <div class="smart-table-operate">
-            <a-button @click="addDepartment(record)" v-privilege="'system:department:add'" type="link">添加下级
-            </a-button>
-            <a-button @click="updateDepartment(record)" v-privilege="'system:department:update'" type="link">编辑
-            </a-button>
-            <a-button v-if="record.departmentId != topDepartmentId" v-privilege="'system:department:delete'"
-                      @click="deleteDepartment(record.departmentId)" type="link">删除
-            </a-button>
-          </div>
-        </template>
-      </template>
-    </a-table>
-    <!-- 添加编辑部门弹窗 -->
-    <DepartmentFormModal ref="departmentFormModal" @refresh="queryDepartmentTree"/>
-  </a-card>
-</template>
-
-<script setup>
-import { onMounted, reactive, ref, watch, createVNode } from 'vue';
-import { departmentApi } from '/@/api/system/department/department-api';
-import { Modal } from 'ant-design-vue';
-import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-import _ from 'lodash';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import DepartmentFormModal from '../department/components/department-form-modal/index.vue';
-import { smartSentry } from '/@/lib/smart-sentry';
-
-const DEPARTMENT_PARENT_ID = 0;
-
-// -----------------------  筛选 ---------------------
-const keywords = ref('');
-
-// ----------------------- 部门树的展示 ---------------------
-const tableLoading = ref(false);
-
-const topDepartmentId = ref();
-// 所有部门列表
-const departmentList = ref([]);
-// 部门树形数据
-const departmentTreeData = ref([]);
-// 存放部门id和部门，用于查找
-const idInfoMap = ref(new Map());
-// 默认展开的行
-const defaultExpandedRowList = reactive([]);
-
-const columns = ref([
-  {
-    title: '部门名称',
-    dataIndex: 'name',
-    key: 'name'
-  },
-  {
-    title: '部门ID',
-    dataIndex: 'departmentId',
-    key: 'departmentId',
-    width: 120
-  },
-  {
-    title: '负责人',
-    dataIndex: 'managerName',
-    key: 'managerName',
-    width: 200
-  },
-  {
-    title: '操作',
-    dataIndex: 'action',
-    fixed: 'right',
-    width: 120
-  }
-]);
-
-onMounted(() => {
-  queryDepartmentTree();
-});
-
-// 查询部门列表并构建 部门树
-async function queryDepartmentTree() {
-  try {
-    tableLoading.value = true;
-    let res = await departmentApi.queryAllDepartment();
-    let data = res.data;
-    
-    data.forEach((e) => {
-      idInfoMap.value.set(e.departmentId, e);
-    });
-    
-    departmentList.value = data;
-    departmentTreeData.value = buildDepartmentTree(data, DEPARTMENT_PARENT_ID);
-    
-    // 默认显示 最顶级ID为列表中返回的第一条数据的ID
-    if (!_.isEmpty(departmentTreeData.value) && departmentTreeData.value.length > 0) {
-      topDepartmentId.value = departmentTreeData.value[0].departmentId;
-    }
-    
-    defaultExpandedRowList.value = [];
-    defaultExpandedRowList.push(topDepartmentId.value);
-  } catch (e) {
-    smartSentry.captureError(e);
-  } finally {
-    tableLoading.value = false;
-  }
-}
-
-// 构建部门树
-function buildDepartmentTree(data, parentId) {
-  let children = data.filter((e) => e.parentId === parentId) || [];
-  if (!_.isEmpty(children)) {
-    children.forEach((e) => {
-      e.children = buildDepartmentTree(data, e.departmentId);
-    });
-    return children;
-  }
-  return null;
-}
-
-// 重置
-function resetQuery() {
-  keywords.value = '';
-  onSearch();
-}
-
-// 搜索
-function onSearch() {
-  if (!keywords.value) {
-    departmentTreeData.value = buildDepartmentTree(departmentList.value, DEPARTMENT_PARENT_ID);
-    return;
-  }
-  let originData = departmentList.value.concat();
-  if (!originData) {
-    return;
-  }
-  // 筛选出名称符合的部门
-  let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
-  let filterDepartmentList = [];
-  // 循环筛选出的部门 构建部门树
-  filterDepartment.forEach((e) => {
-    recursionFilterDepartment(filterDepartmentList, e.departmentId, false);
-  });
-  departmentTreeData.value = buildDepartmentTree(filterDepartmentList, DEPARTMENT_PARENT_ID);
-}
-
-// 根据ID递归筛选部门
-function recursionFilterDepartment(resList, id, unshift) {
-  let info = idInfoMap.value.get(id);
-  if (!info || resList.some((e) => e.departmentId == id)) {
-    return;
-  }
-  if (unshift) {
-    resList.unshift(info);
-  } else {
-    resList.push(info);
-  }
-  if (info.parentId && info.parentId != 0) {
-    recursionFilterDepartment(resList, info.parentId, unshift);
-  }
-}
-
-// ----------------------- 表单操作：添加部门/修改部门/删除部门/上下移动 ---------------------
-const departmentFormModal = ref();
-
-// 添加
-function addDepartment(e) {
-  let data = {
-    departmentId: 0,
-    name: '',
-    parentId: e.departmentId || null
-  };
-  departmentFormModal.value.showModal(data);
-}
-
-// 编辑
-function updateDepartment(e) {
-  departmentFormModal.value.showModal(e);
-}
-
-// 删除
-function deleteDepartment(id) {
-  Modal.confirm({
-    title: '提醒',
-    icon: createVNode(ExclamationCircleOutlined),
-    content: '确定要删除该部门吗?',
-    okText: '删除',
-    okType: 'danger',
-    async onOk() {
-      SmartLoading.show();
-      try {
-        await departmentApi.deleteDepartment(id);
-        await queryDepartmentTree();
-      } catch (error) {
-        smartSentry.captureError(error);
-      } finally {
-        SmartLoading.hide();
-      }
-    },
-    cancelText: '取消',
-    onCancel() {
-    }
-  });
-}
-
-</script>
-
-<style scoped lang="less">
-
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/index.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/index.vue
deleted file mode 100644
index 2dc50a9..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/employee/department/index.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
-  * 组织架构
-  *
-  * @Author:    1024创新实验室-主任：卓大
-  * @Date:      2022-08-08 20:46:18
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
--->
-<template>
-  <div class="height100">
-    <a-row :gutter="16" class="height100">
-      <a-col :span="6">
-        <DepartmentTree ref="departmentTree" />
-      </a-col>
-      
-      <a-col :span="18" class="height100">
-        <div class="employee-box height100">
-          <!-- <DepartmentChildren style="flex-grow: 1" :breadcrumb="breadcrumb" :selectedDepartmentChildren="selectedDepartmentChildren" /> -->
-          <EmployeeList style="flex-grow: 2.5" class="employee" :departmentId="selectedDepartmentId" />
-        </div>
-      </a-col>
-    </a-row>
-  </div>
-</template>
-<script setup>
-import _ from 'lodash';
-import { computed, ref } from 'vue';
-import DepartmentChildren from './components/department-children/index.vue';
-import DepartmentTree from './components/department-tree/index.vue';
-import EmployeeList from './components/employee-list/index.vue';
-
-const departmentTree = ref();
-
-// 部门 面包屑
-const breadcrumb = computed(() => {
-  if (departmentTree.value) {
-    return departmentTree.value.breadcrumb;
-  }
-  return [];
-});
-
-// 当前选中部门的孩子
-const selectedDepartmentChildren = computed(() => {
-  if (departmentTree.value) {
-    return departmentTree.value.selectedDepartmentChildren;
-  }
-  return [];
-});
-
-// 当前选中的部门id
-const selectedDepartmentId = computed(() => {
-  if (departmentTree.value) {
-    let selectedKeys = departmentTree.value.selectedKeys;
-    return _.isEmpty(selectedKeys) ? null : selectedKeys[0];
-  }
-  return null;
-});
-</script>
-<style scoped lang="less">
-.height100 {
-  height: 100%;
-}
-.employee-box {
-  display: flex;
-  flex-direction: column;
-  
-  .employee {
-    flex-grow: 2;
-  }
-}
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/gauge.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/gauge.vue
deleted file mode 100644
index ea2573a..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/gauge.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<!--
- * @Author: zhuoda
- * @Date: 2021-08-24 16:35:45
- * @LastEditTime: 2022-06-11
- * @LastEditors: zhuoda
- * @Description:
- * @FilePath: /smart-admin/src/views/system/home/components/gauge.vue
--->
-<template>
-  <default-home-card icon="RocketTwoTone" title="业绩完成度">
-    <div class="echarts-box">
-      <div id="gauge-main" class="gauge-main"></div>
-    </div>
-  </default-home-card>
-</template>
-<script setup lang="ts">
-import DefaultHomeCard from "/@/views/system/home/components/default-home-card.vue";
-import * as echarts from "echarts";
-import {onMounted, watch} from "vue";
-import {reactive} from "vue";
-
-const props = defineProps({
-  percent: {
-    type: Number,
-    default: 0
-  },
-});
-
-let option = reactive({});
-watch(
-    () => props.percent,
-    () => {
-      init();
-    }
-);
-onMounted(() => {
-  init();
-});
-
-function init() {
-  option = {
-    series: [
-      {
-        type: "gauge",
-        startAngle: 90,
-        endAngle: -270,
-        pointer: {
-          show: false,
-        },
-        progress: {
-          show: true,
-          overlap: false,
-          roundCap: true,
-          clip: false,
-          itemStyle: {
-            borderWidth: 1,
-            borderColor: "#464646",
-          },
-        },
-        axisLine: {
-          lineStyle: {
-            width: 20,
-          },
-        },
-        splitLine: {
-          show: false,
-          distance: 0,
-          length: 10,
-        },
-        axisTick: {
-          show: false,
-        },
-        axisLabel: {
-          show: false,
-          distance: 50,
-        },
-        data: [
-          {
-            value: props.percent,
-            name: "完成度",
-            title: {
-              offsetCenter: ["0%", "-10%"],
-            },
-            detail: {
-              offsetCenter: ["0%", "20%"],
-            },
-          },
-        ],
-        title: {
-          fontSize: 18,
-        },
-        detail: {
-          fontSize: 16,
-          color: "auto",
-          formatter: "{value}%",
-        },
-      },
-    ],
-  };
-  let chartDom = document.getElementById("gauge-main");
-  if (chartDom) {
-    let myChart = echarts.init(chartDom);
-    option && myChart.setOption(option);
-  }
-}
-
-</script>
-<style lang="less" scoped>
-.echarts-box {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  .gauge-main {
-    width: 260px;
-    height: 260px;
-    background: #fff;
-  }
-}
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/gradient.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/gradient.vue
deleted file mode 100644
index 9109b23..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/gradient.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
-  <default-home-card icon="FundTwoTone" title="【1024创新实验室】代码提交量">
-    <div class="echarts-box">
-      <div class="gradient-main" id="gradient-main"></div>
-    </div>
-  </default-home-card>
-</template>
-<script setup lang="ts">
-import DefaultHomeCard from "/@/views/system/home/components/default-home-card.vue";
-import * as echarts from 'echarts';
-import {onMounted} from "vue";
-
-onMounted(() => {
-  init();
-});
-
-function init(){
-  let option = {
-    color: ['#80FFA5', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],
-    tooltip: {
-      trigger: 'axis',
-      axisPointer: {
-        type: 'cross',
-        label: {
-          backgroundColor: '#6a7985'
-        }
-      }
-    },
-    legend: {
-      data: ['罗伊', '佩弦', '开云', '清野', '飞叶']
-    },
-    grid: {
-      left: '3%',
-      right: '4%',
-      bottom: '3%',
-      containLabel: true
-    },
-    xAxis: [
-      {
-        type: 'category',
-        boundaryGap: false,
-        data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value'
-      }
-    ],
-    series: [
-      {
-        name: '罗伊',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(128, 255, 165)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(1, 191, 236)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [140, 232, 101, 264, 90, 340, 250]
-      },
-      {
-        name: '佩弦',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(0, 221, 255)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(77, 119, 255)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [120, 282, 111, 234, 220, 340, 310]
-      },
-      {
-        name: '开云',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(55, 162, 255)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(116, 21, 219)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [320, 132, 201, 334, 190, 130, 220]
-      },
-      {
-        name: '清野',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(255, 0, 135)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(135, 0, 157)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [220, 402, 231, 134, 190, 230, 120]
-      },
-      {
-        name: '飞叶',
-        type: 'line',
-        stack: 'Total',
-        smooth: true,
-        lineStyle: {
-          width: 0
-        },
-        showSymbol: false,
-        label: {
-          show: true,
-          position: 'top'
-        },
-        areaStyle: {
-          opacity: 0.8,
-          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            {
-              offset: 0,
-              color: 'rgb(255, 191, 0)'
-            },
-            {
-              offset: 1,
-              color: 'rgb(224, 62, 76)'
-            }
-          ])
-        },
-        emphasis: {
-          focus: 'series'
-        },
-        data: [220, 302, 181, 234, 210, 290, 150]
-      }
-    ]
-  };
-  let chartDom = document.getElementById("gradient-main");
-  if (chartDom) {
-    let myChart = echarts.init(chartDom);
-    option && myChart.setOption(option);
-  }
-}
-</script>
-<style lang='less' scoped>
-.echarts-box {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  .gradient-main {
-    width: 1200px;
-    height: 300px;
-    background: #fff;
-  }
-}
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/pie.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/pie.vue
deleted file mode 100644
index 207d4d1..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/echarts/pie.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <default-home-card icon="PieChartTwoTone" title="【1024创新实验室】上班摸鱼次数">
-    <div class="echarts-box">
-      <div class="pie-main" id="pie-main"></div>
-    </div>
-  </default-home-card>
-</template>
-<script setup lang="ts">
-import DefaultHomeCard from "/@/views/system/home/components/default-home-card.vue";
-import * as echarts from 'echarts';
-import {onMounted} from "vue";
-
-onMounted(() => {
-  init();
-});
-
-function init(){
-  let option = {
-    tooltip: {
-      trigger: 'item'
-    },
-    legend: {
-      top: '5%',
-      left: 'center'
-    },
-    series: [
-      {
-        name: '摸鱼次数',
-        type: 'pie',
-        radius: ['40%', '70%'],
-        avoidLabelOverlap: false,
-        itemStyle: {
-          borderRadius: 10,
-          borderColor: '#fff',
-          borderWidth: 2
-        },
-        label: {
-          show: false,
-          position: 'center'
-        },
-        emphasis: {
-          label: {
-            show: true,
-            fontSize: '40',
-            fontWeight: 'bold'
-          }
-        },
-        labelLine: {
-          show: false
-        },
-        data: [
-          { value: 10, name: '初晓' },
-          { value: 8, name: '善逸' },
-          { value: 3, name: '胡克' },
-          { value: 1, name: '罗伊' },
-        ]
-      }
-    ]
-  };
-  let chartDom = document.getElementById("pie-main");
-  if (chartDom) {
-    let myChart = echarts.init(chartDom);
-    option && myChart.setOption(option);
-  }
-}
-</script>
-<style lang='less' scoped>
-.echarts-box {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  .pie-main {
-    width: 260px;
-    height: 260px;
-    background: #fff;
-  }
-}
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue
deleted file mode 100644
index 86ae96f..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry-modal.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <a-modal v-model:open="visible" title="新建快捷入口" @close="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules">
-      <a-form-item label="图标" name="icon">
-        <IconSelect @updateIcon="selectIcon">
-          <template #iconSelect>
-            <a-input v-model:value="form.icon" placeholder="请输入菜单图标" style="width: 200px"/>
-            <component :is="$antIcons[form.icon]" class="smart-margin-left15" style="font-size: 20px"/>
-          </template>
-        </IconSelect>
-      </a-form-item>
-      <a-form-item label="标题" name="title">
-        <a-input v-model:value="form.title" placeholder="请输入标题"/>
-      </a-form-item>
-      <a-form-item label="路径" name="path">
-        <a-input v-model:value="form.path" placeholder="请输入路径"/>
-      </a-form-item>
-    </a-form>
-    <template #footer>
-      <a-button @click="onClose">取消</a-button>
-      <a-button type="primary" @click="onSubmit">提交</a-button>
-    </template>
-  </a-modal>
-</template>
-<script setup lang="ts">
-import {reactive, ref} from "vue";
-import {message} from "ant-design-vue";
-import IconSelect from '/@/components/framework/icon-select/index.vue';
-import _ from "lodash";
-
-defineExpose({
-  showModal
-})
-
-const emit = defineEmits("addQuickEntry");
-
-// 组件ref
-const formRef = ref();
-
-const formDefault = {
-  icon: undefined,
-  title: "",
-  path: "",
-};
-let form = reactive({...formDefault});
-const rules = {
-  icon: [{required: true, message: "请选择图标"}],
-  title: [{required: true, message: "标题不能为空"}],
-  path: [{required: true, message: "路径不能为空"}],
-};
-
-const visible = ref(false);
-
-function showModal() {
-  visible.value = true;
-}
-
-function selectIcon(icon) {
-  form.icon = icon;
-}
-
-function onClose() {
-  Object.assign(form, formDefault);
-  visible.value = false;
-}
-
-function onSubmit() {
-  formRef.value
-      .validate()
-      .then(() => {
-        emit("addQuickEntry", _.cloneDeep(form));
-        onClose();
-      })
-      .catch((error) => {
-        console.log("error", error);
-        message.error("参数验证错误，请仔细填写表单数据!");
-      });
-}
-
-</script>
-<style lang='less' scoped></style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry.vue
deleted file mode 100644
index ec59793..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/quick-entry/home-quick-entry.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<template>
-  <default-home-card
-      :extra="`${editFlag ? '完成' : '编辑'}`"
-      icon="ThunderboltTwoTone"
-      title="快捷入口"
-      @extraClick="editFlag = !editFlag"
-  >
-    <div class="quick-entry-list">
-      <a-row>
-        <a-col v-for="(item,index) in quickEntry" :key="index" span="4">
-          <div class="quick-entry" @click="turnToPage(item.path)">
-            <div class="icon">
-              <component :is='$antIcons[item.icon]' :style="{ fontSize:'30px'}"/>
-              <close-circle-outlined v-if="editFlag" class="delete-icon" @click="deleteQuickEntry(index)"/>
-            </div>
-            <span class="entry-title">{{ item.title }}</span>
-          </div>
-        </a-col>
-        <a-col v-if="editFlag && quickEntry.length < maxCount" span="4">
-          <div class="add-quick-entry" @click="addHomeQuickEntry">
-            <div class="add-icon">
-              <plus-outlined :style="{ fontSize:'30px'}"/>
-            </div>
-          </div>
-        </a-col>
-      </a-row>
-    </div>
-  </default-home-card>
-  <HomeQuickEntryModal ref="homeQuickEntryModal" @addQuickEntry="addQuickEntry"/>
-</template>
-<script setup lang="ts">
-import {onMounted, ref} from "vue";
-import {router} from "/@/router";
-import HomeQuickEntryModal from './home-quick-entry-modal.vue'
-import localKey from '/@/constants/local-storage-key-const';
-import {localRead, localSave} from '/@/utils/local-util';
-import _ from "lodash";
-import InitQuickEntryList from './init-quick-entry-list';
-import DefaultHomeCard from "/@/views/system/home/components/default-home-card.vue";
-
-//---------------- 初始化展示 --------------------
-onMounted(() => {
-  initQuickEntry();
-})
-let quickEntry = ref([])
-
-function initQuickEntry() {
-  let quickEntryJson = localRead(localKey.HOME_QUICK_ENTRY);
-  if (!quickEntryJson) {
-    quickEntry.value = _.cloneDeep(InitQuickEntryList);
-    return;
-  }
-  let quickEntryList = JSON.parse(quickEntryJson);
-  if (_.isEmpty(quickEntryList)) {
-    quickEntry.value = _.cloneDeep(InitQuickEntryList);
-    return;
-  }
-  quickEntry.value = quickEntryList;
-}
-
-// 页面跳转
-function turnToPage(path) {
-  if (editFlag.value) {
-    return;
-  }
-  router.push({path});
-}
-
-//----------------  编辑快捷入口 --------------------
-let editFlag = ref(false);
-let maxCount = ref(6);
-
-// 快捷入口删除
-function deleteQuickEntry(index) {
-  quickEntry.value.splice(index, 1)
-  localSave(localKey.HOME_QUICK_ENTRY, JSON.stringify(quickEntry.value));
-}
-
-// 添加快捷入口
-let homeQuickEntryModal = ref();
-
-function addHomeQuickEntry() {
-  homeQuickEntryModal.value.showModal();
-}
-
-function addQuickEntry(row) {
-  quickEntry.value.push(row);
-  localSave(localKey.HOME_QUICK_ENTRY, JSON.stringify(quickEntry.value));
-}
-</script>
-<style lang='less' scoped>
-.quick-entry-list {
-  height: 100%;
-
-  .quick-entry {
-    padding: 10px 0;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    cursor: pointer;
-    border-radius: 4px;
-
-    .entry-title {
-      margin-top: 5px;
-    }
-
-    .icon {
-      position: relative;
-    }
-
-    &:hover {
-      background-color: #F0FFFF;
-    }
-
-    .delete-icon {
-      position: absolute;
-      color: #F08080;
-      top: -5px;
-      right: -5px;
-    }
-  }
-
-  .add-quick-entry {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .add-icon {
-      width: 70px;
-      height: 70px;
-      background-color: #fafafa;
-      border: 1px dashed #d9d9d9;
-      border-radius: 2px;
-      cursor: pointer;
-      transition: border-color .3s;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #A9A9A9;
-
-      &:hover {
-        border-color: @primary-color;
-        color: @primary-color;
-      }
-    }
-  }
-}
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/to-be-done-card.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/to-be-done-card.vue
deleted file mode 100644
index f3c5eb7..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/home/components/to-be-done-card.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
-  * 已办/代办
-  * 
-  * @Author:    1024创新实验室-主任：卓大 
-  * @Date:      2022-09-12 22:34:00 
-  * @Wechat:    zhuda1024 
-  * @Email:     lab1024@163.com 
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
-  *
--->
-<template>
-  <default-home-card icon="StarTwoTone" title="已办待办">
-    <div style="height: 280px;">
-      <div class="center column">
-        <a-space direction="vertical" style="width: 100%">
-          <div v-for="(item, index) in toDoList" :key="index" :class="['to-do', { done: item.doneFlag }]">
-            <a-checkbox v-model:checked="item.doneFlag">
-              <span class="task">{{ item.title }}</span>
-            </a-checkbox>
-            <div class="star-icon" @click="itemStar(item)">
-              <StarFilled v-if="item.starFlag" style="color: #ff8c00" />
-              <StarOutlined v-else style="color: #c0c0c0" />
-            </div>
-          </div>
-          <div v-for="(item, index) in doneList" :key="index" :class="['to-do', { done: item.doneFlag }]">
-            <a-checkbox v-model:checked="item.doneFlag">
-              <span class="task">{{ item.title }}</span>
-            </a-checkbox>
-            <div class="star-icon" @click="itemStar(item)">
-              <StarFilled v-if="item.starFlag" style="color: #ff8c00" />
-              <StarOutlined v-else style="color: #c0c0c0" />
-            </div>
-          </div>
-        </a-space>
-      </div>
-    </div>
-  </default-home-card>
-</template>
-<script setup lang="ts">
-  import DefaultHomeCard from '/@/views/system/home/components/default-home-card.vue';
-  import { computed, ref } from 'vue';
-  import dayjs from 'dayjs';
-  import { message } from 'ant-design-vue';
-
-  let taskList = ref([
-    {
-      title: '周五下班前需要提交周报',
-      doneFlag: true,
-      starFlag: true,
-      starTime: 0,
-    },
-    {
-      title: '为SmartAdmin前端小组分配任务',
-      doneFlag: false,
-      starFlag: false,
-      starTime: 0,
-    },
-    {
-      title: '跟进团建内容事宜',
-      doneFlag: false,
-      starFlag: true,
-      starTime: 0,
-    },
-    {
-      title: '跟进客户定制一个软件平台',
-      doneFlag: false,
-      starFlag: false,
-      starTime: 0,
-    },
-    {
-      title: '下个版本的需求确认',
-      doneFlag: false,
-      starFlag: false,
-      starTime: 0,
-    },
-    {
-      title: '线上版本发布',
-      doneFlag: true,
-      starFlag: true,
-      starTime: dayjs().unix(),
-    },
-    {
-      title: '周一财务报销',
-      doneFlag: true,
-      starFlag: false,
-      starTime: 0,
-    },
-  ]);
-
-  let toDoList = computed(() => {
-    return taskList.value.filter((e) => !e.doneFlag).sort((a, b) => b.starTime - a.starTime);
-  });
-
-  let doneList = computed(() => {
-    return taskList.value.filter((e) => e.doneFlag);
-  });
-
-  function itemStar(item) {
-    item.starFlag = !item.starFlag;
-    if (item.starFlag) {
-      item.starTime = dayjs().unix();
-    }
-  }
-
-  //-------------------------任务新建-----------------------
-  let taskTitle = ref('');
-  function addTask() {
-    if (!taskTitle.value) {
-      message.warn('请输入任务标题');
-      return;
-    }
-    let data = {
-      title: taskTitle.value,
-      doneFlag: false,
-      starFlag: false,
-      starTime: 0,
-    };
-    taskList.value.unshift(data);
-    taskTitle.value = '';
-  }
-</script>
-<style lang="less" scoped>
-  .center {
-    display: flex;
-    justify-content: center;
-    height: 100%;
-
-    &.column {
-      flex-direction: column;
-      width: 100%;
-      padding: 0 10px;
-      justify-content: flex-start;
-    }
-  }
-
-  .to-do {
-    width: 100%;
-    border: 1px solid #d3d3d3;
-    border-radius: 4px;
-    padding: 4px;
-    display: flex;
-    align-items: center;
-
-    .star-icon {
-      margin-left: auto;
-      cursor: pointer;
-    }
-
-    &.done {
-      text-decoration: line-through;
-      color: #8c8c8c;
-
-      .task {
-        color: #8c8c8c;
-      }
-    }
-  }
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login/login.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/login/login.vue
deleted file mode 100644
index afc13f1..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login/login.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-<!--
-  * 登录
-  *
-  * @Author:    1024创新实验室-主任：卓大
-  * @Date:      2022-09-12 22:34:00
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
-  *
--->
-<template>
-  <div class="login-container">
-    <div class="box-item desc">
-      <div class="welcome">
-        <p>欢迎登录 SmartAdmin V3</p>
-        <p class="desc">
-          SmartAdmin 是由 河南·洛阳
-          <a target="_blank" href="https://www.1024lab.net" style="color: white; weight: bolder; font-size: 15px; text-decoration: underline"
-          >1024创新实验室（1024Lab）</a
-          >
-          基于SpringBoot + Sa-Token + Mybatis-Plus 和 Vue3 + Vite5 + Ant Design Vue 4 (同时支持JavaScript和TypeScript双版本)
-          以「高质量代码」为核心，「简洁、高效、安全」的快速开发平台。
-          <br />
-          <br />
-          <span class="setence">
-            致伟大的开发者 ：
-            <br />
-            &nbsp;&nbsp;&nbsp;&nbsp;我们希望用一套漂亮优雅的代码和一套整洁高效的代码规范，让大家在这浮躁的世界里感受到一股把代码写好的清流 !
-            <br />
-            保持谦逊，保持学习，热爱代码，更热爱生活 !<br />
-            永远年轻，永远前行 !<br />
-            <span class="author">
-              <a target="_blank" href="https://zhuoda.vip" style="color: white; font-size: 13px; text-decoration: underline">
-                1024创新实验室-主任：卓大
-              </a>
-            </span>
-          </span>
-        </p>
-      </div>
-      <div class="app-qr-box">
-        <div class="app-qr">
-          <img :src="zhuoda" />
-          <span class="qr-desc"> 加微信，骚扰卓大 :) </span>
-        </div>
-        <div class="app-qr">
-          <img :src="gzh" />
-          <div class="qr-desc-marquee">
-            <div class="marquee">
-              <span>关注：六边形工程师，分享：赚钱、代码、生活</span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="box-item login">
-      <img class="login-qr" :src="loginQR" />
-      <div class="login-title">账号登录</div>
-      <a-form ref="formRef" class="login-form" :model="loginForm" :rules="rules">
-        <a-form-item name="loginName">
-          <a-input v-model:value.trim="loginForm.loginName" placeholder="请输入用户名" />
-        </a-form-item>
-        <a-form-item name="password">
-          <a-input-password
-            v-model:value="loginForm.password"
-            autocomplete="on"
-            :type="showPassword ? 'text' : 'password'"
-            placeholder="请输入密码：至少三种字符，最小 8 位"
-          />
-        </a-form-item>
-        <a-form-item name="captchaCode">
-          <a-input class="captcha-input" v-model:value.trim="loginForm.captchaCode" placeholder="请输入验证码" />
-          <img class="captcha-img" :src="captchaBase64Image" @click="getCaptcha" />
-        </a-form-item>
-        <a-form-item>
-          <a-checkbox v-model:checked="rememberPwd">记住密码</a-checkbox>
-          <span> ( 账号：admin, 密码：123456)</span>
-        </a-form-item>
-        <a-form-item>
-          <div class="btn" @click="onLogin">登录</div>
-        </a-form-item>
-      </a-form>
-      <div class="more">
-        <div class="title-box">
-          <p class="line"></p>
-          <p class="title">其他方式登录</p>
-          <p class="line"></p>
-        </div>
-        <div class="login-type">
-          <img :src="wechatIcon" />
-          <img :src="aliIcon" />
-          <img :src="douyinIcon" />
-          <img :src="qqIcon" />
-          <img :src="weiboIcon" />
-          <img :src="feishuIcon" />
-          <img :src="googleIcon" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import { message, notification, Button } from 'ant-design-vue';
-import { onMounted, onUnmounted, reactive, ref } from 'vue';
-import { useRouter } from 'vue-router';
-import { loginApi } from '/@/api/system/login/login-api';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
-import { useUserStore } from '/@/store/modules/system/user';
-import zhuoda from '/@/assets/images/1024lab/zhuoda-wechat.jpg';
-import loginQR from '/@/assets/images/login/login-qr.png';
-import gzh from '/@/assets/images/1024lab/gzh.jpg';
-import wechatIcon from '/@/assets/images/login/wechat-icon.png';
-import aliIcon from '/@/assets/images/login/ali-icon.png';
-import douyinIcon from '/@/assets/images/login/douyin-icon.png';
-import qqIcon from '/@/assets/images/login/qq-icon.png';
-import weiboIcon from '/@/assets/images/login/weibo-icon.png';
-import feishuIcon from '/@/assets/images/login/feishu-icon.png';
-import googleIcon from '/@/assets/images/login/google-icon.png';
-
-import { buildRoutes } from '/@/router/index';
-import { smartSentry } from '/@/lib/smart-sentry';
-import { encryptData } from '/@/lib/encrypt';
-import { h } from 'vue';
-import { localSave } from '/@/utils/local-util.js';
-import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
-import {saveTokenToCookie} from '/@/utils/cookie-util';
-
-//--------------------- 登录表单 ---------------------------------
-
-const loginForm = reactive({
-  loginName: 'admin',
-  password: '',
-  captchaCode: '',
-  captchaUuid: '',
-  loginDevice: LOGIN_DEVICE_ENUM.PC.value,
-});
-const rules = {
-  loginName: [{ required: true, message: '用户名不能为空' }],
-  password: [{ required: true, message: '密码不能为空' }],
-  captchaCode: [{ required: true, message: '验证码不能为空' }],
-};
-
-const showPassword = ref(false);
-const router = useRouter();
-const formRef = ref();
-const rememberPwd = ref(false);
-
-onMounted(() => {
-  document.onkeyup = (e) => {
-    if (e.keyCode == 13) {
-      onLogin();
-    }
-  };
-  
-  notification['success']({
-    message: '温馨提示',
-    description: 'SmartAdmin 提供 9种 登录背景风格哦！',
-    duration: 8,
-    onClick: () => {},
-    btn: () =>
-      h(
-        Button,
-        {
-          type: 'primary',
-          target: '_blank',
-          size: 'small',
-          href: 'https://smartadmin.vip/views/v3/front/Login.html',
-          onClick: () => {},
-        },
-        { default: () => '去看看' }
-      ),
-  });
-});
-
-onUnmounted(() => {
-  document.onkeyup = null;
-});
-
-  //登录
-  async function onLogin() {
-    formRef.value.validate().then(async () => {
-      try {
-        SmartLoading.show();
-        // 密码加密
-        let encryptPasswordForm = Object.assign({}, loginForm, {
-          password: encryptData(loginForm.password),
-        });
-        const res = await loginApi.login(encryptPasswordForm);
-        stopRefrestCaptchaInterval();
-        saveTokenToCookie(res.data.token ? res.data.token : '');
-        message.success('登录成功');
-        //更新用户信息到pinia
-        useUserStore().setUserLoginInfo(res.data);
-        //构建系统的路由
-        buildRoutes();
-        router.push('/home');
-      } catch (e: any) {
-        if (e.data && e.data.code === 30001) {
-          loginForm.captchaCode = '';
-          getCaptcha();
-        }
-        smartSentry.captureError(e);
-      } finally {
-        SmartLoading.hide();
-      }
-    });
-  }
-
-//--------------------- 验证码 ---------------------------------
-
-const captchaBase64Image = ref('');
-async function getCaptcha() {
-  try {
-    let captchaResult = await loginApi.getCaptcha();
-    captchaBase64Image.value = captchaResult.data.captchaBase64Image;
-    loginForm.captchaUuid = captchaResult.data.captchaUuid;
-    beginRefrestCaptchaInterval(captchaResult.data.expireSeconds);
-  } catch (e) {
-    console.log(e);
-  }
-}
-
-let refrestCaptchaInterval = null;
-function beginRefrestCaptchaInterval(expireSeconds) {
-  if (refrestCaptchaInterval === null) {
-    refrestCaptchaInterval = setInterval(getCaptcha, (expireSeconds - 5) * 1000);
-  }
-}
-
-function stopRefrestCaptchaInterval() {
-  if (refrestCaptchaInterval != null) {
-    clearInterval(refrestCaptchaInterval);
-    refrestCaptchaInterval = null;
-  }
-}
-
-onMounted(getCaptcha);
-</script>
-<style lang="less" scoped>
-@import './login.less';
-</style>
diff --git a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login2/login.vue b/smart-admin-web/typescript-ant-design-vue3/src/views/system/login2/login.vue
deleted file mode 100644
index f5832b0..0000000
--- a/smart-admin-web/typescript-ant-design-vue3/src/views/system/login2/login.vue
+++ /dev/null
@@ -1,246 +0,0 @@
-<!--
-  * 登录
-  *
-  * @Author:    1024创新实验室-主任：卓大
-  * @Date:      2022-09-12 22:34:00
-  * @Wechat:    zhuda1024
-  * @Email:     lab1024@163.com
-  * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012
-  *
--->
-<template>
-  <div class="login-container">
-    <div class="box-item desc">
-      <div class="welcome">
-        <p>欢迎登录 SmartAdmin V3</p>
-        <p class="sub-welcome">「高质量代码、简洁、安全」的开发平台</p>
-      </div>
-    </div>
-    <div class="box-item login">
-      <img class="login-qr" :src="loginQR"/>
-      <div class="login-title">账号登录</div>
-      <a-form ref="formRef" class="login-form" :model="loginForm" :rules="rules">
-        <a-form-item name="loginName">
-          <a-input v-model:value.trim="loginForm.loginName" placeholder="请输入用户名"/>
-        </a-form-item>
-        <a-form-item name="emailCode" v-if="emailCodeShowFlag">
-          <a-input-group compact>
-            <a-input style="width: calc(100% - 110px)" v-model:value="loginForm.emailCode" autocomplete="on"
-                     placeholder="请输入邮箱验证码"/>
-            <a-button @click="sendSmsCode" class="code-btn" type="primary" :disabled="emailCodeButtonDisabled">
-              {{ emailCodeTips }}
-            </a-button>
-          </a-input-group>
-        </a-form-item>
-        <a-form-item name="password">
-          <a-input-password
-            v-model:value="loginForm.password"
-            autocomplete="on"
-            :type="showPassword ? 'text' : 'password'"
-            placeholder="请输入密码：至少三种字符，最小 8 位"
-          />
-        </a-form-item>
-        <a-form-item name="captchaCode">
-          <a-input class="captcha-input" v-model:value.trim="loginForm.captchaCode" placeholder="请输入验证码"/>
-          <img class="captcha-img" :src="captchaBase64Image" @click="getCaptcha"/>
-        </a-form-item>
-        <a-form-item>
-          <a-checkbox v-model:checked="rememberPwd">记住密码</a-checkbox>
-          <span> ( 账号：admin, 密码：123456)</span>
-        </a-form-item>
-        <a-form-item>
-          <div class="btn" @click="onLogin">登录</div>
-        </a-form-item>
-      </a-form>
-      <div class="more">
-        <div class="title-box">
-          <p class="line"></p>
-          <p class="title">其他方式登录</p>
-          <p class="line"></p>
-        </div>
-        <div class="login-type">
-          <img :src="wechatIcon"/>
-          <img :src="aliIcon"/>
-          <img :src="douyinIcon"/>
-          <img :src="qqIcon"/>
-          <img :src="weiboIcon"/>
-          <img :src="feishuIcon"/>
-          <img :src="googleIcon"/>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script setup>
-import { message } from 'ant-design-vue';
-import { onMounted, onUnmounted, reactive, ref } from 'vue';
-import { useRouter } from 'vue-router';
-import { loginApi } from '/src/api/system/login/login-api';
-import { SmartLoading } from '/@/components/framework/smart-loading';
-import { LOGIN_DEVICE_ENUM } from '/@/constants/system/login-device-const';
-import { useUserStore } from '/@/store/modules/system/user';
-import loginQR from '/@/assets/images/login/login-qr.png';
-import wechatIcon from '/@/assets/images/login/wechat-icon.png';
-import aliIcon from '/@/assets/images/login/ali-icon.png';
-import douyinIcon from '/@/assets/images/login/douyin-icon.png';
-import qqIcon from '/@/assets/images/login/qq-icon.png';
-import weiboIcon from '/@/assets/images/login/weibo-icon.png';
-import feishuIcon from '/@/assets/images/login/feishu-icon.png';
-import googleIcon from '/@/assets/images/login/google-icon.png';
-
-import { buildRoutes } from '/@/router/index';
-import { smartSentry } from '/@/lib/smart-sentry';
-import { encryptData } from '/@/lib/encrypt';
-import { saveTokenToCookie } from '/@/utils/cookie-util';
-
-//--------------------- 登录表单 ---------------------------------
-
-const loginForm = reactive({
-  loginName: 'admin',
-  password: '',
-  emailCode: '', // 邮箱验证码
-  captchaCode: '',
-  captchaUuid: '',
-  loginDevice: LOGIN_DEVICE_ENUM.PC.value
-});
-const rules = {
-  loginName: [{required: true, message: '用户名不能为空'}],
-  password: [{required: true, message: '密码不能为空'}],
-  captchaCode: [{required: true, message: '验证码不能为空'}]
-};
-
-const showPassword = ref(false);
-const router = useRouter();
-const formRef = ref();
-const rememberPwd = ref(false);
-
-onMounted(() => {
-  document.onkeyup = (e) => {
-    if (e.keyCode == 13) {
-      onLogin();
-    }
-  };
-});
-
-onUnmounted(() => {
-  document.onkeyup = null;
-});
-
-//登录
-async function onLogin() {
-  formRef.value.validate().then(async() => {
-    try {
-      SmartLoading.show();
-      // 密码加密
-      let encryptPasswordForm = Object.assign({}, loginForm, {
-        password: encryptData(loginForm.password)
-      });
-      const res = await loginApi.login(encryptPasswordForm);
-      stopRefrestCaptchaInterval();
-      // localSave(LocalStorageKeyConst.USER_TOKEN, res.data.token ? res.data.token : '');
-      saveTokenToCookie(res.data.token ? res.data.token : '');
-      message.success('登录成功');
-      //更新用户信息到pinia
-      useUserStore().setUserLoginInfo(res.data);
-      //构建系统的路由
-      buildRoutes();
-      router.push('/home');
-    } catch (e) {
-      if (e.data && e.data.code !== 0) {
-        loginForm.captchaCode = '';
-        getCaptcha();
-      }
-      smartSentry.captureError(e);
-    } finally {
-      SmartLoading.hide();
-    }
-  });
-}
-
-//--------------------- 验证码 ---------------------------------
-
-const captchaBase64Image = ref('');
-
-async function getCaptcha() {
-  try {
-    let captchaResult = await loginApi.getCaptcha();
-    captchaBase64Image.value = captchaResult.data.captchaBase64Image;
-    loginForm.captchaUuid = captchaResult.data.captchaUuid;
-    beginRefrestCaptchaInterval(captchaResult.data.expireSeconds);
-  } catch (e) {
-    console.log(e);
-  }
-}
-
-let refrestCaptchaInterval = null;
-
-function beginRefrestCaptchaInterval(expireSeconds) {
-  if (refrestCaptchaInterval === null) {
-    refrestCaptchaInterval = setInterval(getCaptcha, (expireSeconds - 5) * 1000);
-  }
-}
-
-function stopRefrestCaptchaInterval() {
-  if (refrestCaptchaInterval != null) {
-    clearInterval(refrestCaptchaInterval);
-    refrestCaptchaInterval = null;
-  }
-}
-
-onMounted(() => {
-  getCaptcha();
-  getTwoFactorLoginFlag();
-});
-
-//--------------------- 邮箱验证码 ---------------------------------
-
-const emailCodeShowFlag = ref(false);
-let emailCodeTips = ref('获取邮箱验证码');
-let emailCodeButtonDisabled = ref(false);
-// 定时器
-let countDownTimer = null;
-
-// 开始倒计时
-function runCountDown() {
-  emailCodeButtonDisabled.value = true;
-  let countDown = 60;
-  emailCodeTips.value = `${ countDown }秒后重新获取`;
-  countDownTimer = setInterval(() => {
-    if (countDown > 1) {
-      countDown--;
-      emailCodeTips.value = `${ countDown }秒后重新获取`;
-    } else {
-      clearInterval(countDownTimer);
-      emailCodeButtonDisabled.value = false;
-      emailCodeTips.value = '获取验证码';
-    }
-  }, 1000);
-}
-
-// 获取双因子登录标识
-async function getTwoFactorLoginFlag() {
-  try {
-    let result = await loginApi.getTwoFactorLoginFlag();
-    emailCodeShowFlag.value = result.data;
-  } catch (e) {
-    smartSentry.captureError(e);
-  }
-}
-
-// 发送邮箱验证码
-async function sendSmsCode() {
-  try {
-    SmartLoading.show();
-    let result = await loginApi.sendLoginEmailCode(loginForm.loginName);
-    message.success('验证码发送成功!请登录邮箱查看验证码~');
-    runCountDown();
-  } catch (e) {
-    smartSentry.captureError(e);
-  } finally {
-    SmartLoading.hide();
-  }
-}
-</script>
-<style lang="less" scoped>
-@import "./login.less";
-</style>
diff --git a/smart-app/.env.development b/smart-app/.env.development
index 357c54a..cdef9fa 100644
--- a/smart-app/.env.development
+++ b/smart-app/.env.development
@@ -1,3 +1,3 @@
 NODE_ENV=development
 VITE_APP_TITLE='SmartAdmin 开发环境(Dev)'
-VITE_APP_API_URL='https://app.smartadmin.vip/smart-app-api'
\ No newline at end of file
+VITE_APP_API_URL='http://127.0.0.1:1024'
diff --git a/smart-app/src/api/support/message-api.js b/smart-app/src/api/support/message-api.js
new file mode 100644
index 0000000..575785b
--- /dev/null
+++ b/smart-app/src/api/support/message-api.js
@@ -0,0 +1,16 @@
+import { postRequest, getRequest } from '@/lib/smart-request';
+
+export const messageApi = {
+  // 通知消息-分页查询
+  queryMessage: (param) => {
+    return postRequest('/support/message/queryMyMessage', param);
+  },
+  // 通知消息-查询未读消息数
+  queryUnreadCount: () => {
+    return getRequest('/support/message/getUnreadCount');
+  },
+  // 通知消息-标记已读
+  updateReadFlag: (messageId) => {
+    return getRequest(`/support/message/read/${messageId}`);
+  },
+};
diff --git a/smart-app/src/constants/index.js b/smart-app/src/constants/index.js
index 2fbf42c..b92569e 100644
--- a/smart-app/src/constants/index.js
+++ b/smart-app/src/constants/index.js
@@ -13,6 +13,7 @@ import enterpriseConst from './business/oa/enterprise-const';
 import goodsConst from './business/erp/goods-const';
 import changeLogConst from './support/change-log-const';
 import fileConst from './support/file-const';
+import messageConst from "./support/message-const";
 
 export default {
   FLAG_NUMBER_ENUM,
@@ -23,4 +24,5 @@ export default {
   ...goodsConst,
   ...changeLogConst,
   ...fileConst,
+  ...messageConst
 };
diff --git a/smart-app/src/constants/support/message-const.js b/smart-app/src/constants/support/message-const.js
new file mode 100644
index 0000000..b71d130
--- /dev/null
+++ b/smart-app/src/constants/support/message-const.js
@@ -0,0 +1,30 @@
+/*
+ * @Description: file content
+ * @Author: yandy
+ * @Date: 2022-07-24 21:43:43
+ * @LastEditors:
+ * @LastEditTime: 2022-07-24 21:43:43
+ */
+export const MESSAGE_TYPE_ENUM = {
+    MAIL: {
+        value: 1,
+        desc: '站内信'
+    },
+    ORDER: {
+        value: 2,
+        desc: '订单'
+    },
+  };
+
+
+export const MESSAGE_RECEIVE_TYPE_ENUM = {
+    EMPLOYEE: {
+        value: 1,
+        desc: '员工'
+    },
+  };
+
+export default {
+    MESSAGE_TYPE_ENUM,
+    MESSAGE_RECEIVE_TYPE_ENUM
+};
diff --git a/smart-app/src/lib/encrypt.js b/smart-app/src/lib/encrypt.js
index 8f2fbee..3ba986b 100644
--- a/smart-app/src/lib/encrypt.js
+++ b/smart-app/src/lib/encrypt.js
@@ -2,7 +2,7 @@ import CryptoJS from 'crypto-js';
 import CryptoSM from 'sm-crypto';
 
 function object2string(data) {
-  if (typeof data === 'Object') {
+  if (typeof data === 'object') {
     return JSON.stringify(data);
   }
 
@@ -16,8 +16,29 @@ function object2string(data) {
   return str;
 }
 
-// -----------------------  AES 加密、解密 -----------------------
-const AES_KEY = '1024abcd1024abcd1024abcd1024abcd';
+/**
+ * 字符串转为数字
+ */
+function stringToHex(str) {
+  let hex = '';
+  for(let i = 0; i < str.length; i++) {
+    hex += str.charCodeAt(i).toString(16).padStart(2, '0');
+  }
+  return hex;
+}
+
+
+/*
+ * -------------------- ※ AES 加密、解密 begin ※ --------------------
+ *
+ * 1、AES加密算法支持三种密钥长度：128位、192位和256位，这里选择128位
+ * 2、AES 要求秘钥为 128bit，转化字节为 16个字节；
+ * 3、js前端使用 UCS-2 或者 UTF-16 编码，字母、数字、特殊符号等 占用1个字节；
+ * 4、所以：秘钥Key 组成为：字母、数字、特殊符号 一共16个即可
+ *
+ * -------------------- ※ AES 加密、解密 end ※ --------------------
+ */
+const AES_KEY = '1024lab__1024lab';
 
 const AES = {
   encryptData: function (data) {
@@ -28,8 +49,7 @@ const AES = {
       mode: CryptoJS.mode.ECB,
       padding: CryptoJS.pad.Pkcs7,
     });
-
-    return encrypted.toString();
+    return CryptoJS.enc.Base64.stringify(encrypted.ciphertext);
   },
 
   decryptData: function (data) {
@@ -45,13 +65,24 @@ const AES = {
   },
 };
 
-// -----------------------  国密SM4算法 加密、解密 -----------------------
-const SM4_KEY = '1024abcd1024abcd1024abcd1024abcd';
+/*
+ * -------------------- ※ 国密SM4算法 加密、解密 begin ※ --------------------
+ *
+ * 1、国密SM4 要求秘钥为 128bit，转化字节为 16个字节；
+ * 2、js前端使用 UCS-2 或者 UTF-16 编码，字母、数字、特殊符号等 占用1个字节；
+ * 3、java中 每个 字母数字 也是占用1个字节；
+ * 4、所以：前端和后端的 秘钥Key 组成为：字母、数字、特殊符号 一共16个即可
+ *
+ * -------------------- ※ 国密SM4算法 加密、解密 end ※ --------------------
+ */
+
+// 秘钥Key 组成为：字母、数字、特殊符号 一共16个即可
+const SM4_KEY = '1024lab__1024lab';
 
 const SM4 = {
   encryptData: function (data) {
     // 第一步：SM4 加密
-    let encryptData = CryptoSM.sm4.encrypt(object2string(data), SM4_KEY);
+    let encryptData = CryptoSM.sm4.encrypt(object2string(data), stringToHex(SM4_KEY));
     // 第二步： Base64 编码
     return CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(encryptData));
   },
@@ -62,10 +93,12 @@ const SM4 = {
     let decode64Str = CryptoJS.enc.Utf8.stringify(words);
 
     // 第二步：SM4 解密
-    return CryptoSM.sm4.decrypt(decode64Str, SM4_KEY);
+    return CryptoSM.sm4.decrypt(decode64Str, stringToHex(SM4_KEY));
   },
 };
 
+
+
 // -----------------------  对外暴露： 加密、解密 -----------------------
 
 // 默认使用SM4算法
diff --git a/smart-app/src/pages/message/message.vue b/smart-app/src/pages/message/message.vue
index b32a4dd..a48c9eb 100644
--- a/smart-app/src/pages/message/message.vue
+++ b/smart-app/src/pages/message/message.vue
@@ -1,31 +1,105 @@
 <template>
   <view class="container">
-    <view class="message" v-for="(item, index) in 10">
-      <view class="message-header">
-        <view class="header-left">
-          <image src="/src/static/images/message/message.png" mode=""></image>
-          <view> 系统通知 </view>
+    <mescroll-body @init="mescrollInit" :down="{ auto: false }" @down="onDown" @up="onUp">
+      <mescroll-empty v-if="messageListData.length === 0"></mescroll-empty>
+      <view class="message" v-for="(item, index) in messageListData">
+        <view class="message-header">
+          <view class="header-left">
+            <image src="/src/static/images/message/message.png" mode=""></image>
+            <view>
+              {{ $smartEnumPlugin.getDescByValue('MESSAGE_TYPE_ENUM', item.messageType) }}
+            </view>
+          </view>
+          <view class="header-time"> {{item.createTime}} </view>
         </view>
-        <view class="header-time"> 2023-08-20 20:48:21 </view>
-      </view>
-      <view class="content">
-        <view class="message-title">
-          报销-付款已完成
-          <uni-icons v-if="index % 2 === 1" color="red" class="smart-margin-left10" type="info-filled" :size="14"></uni-icons>
+        <view class="content">
+          <view class="message-title">
+            <uni-icons v-if="!item.readFlag" color="red" class="smart-margin-right10" type="info-filled" :size="14"></uni-icons>
+            {{ item.title }}
+          </view>
+          <view class="message-body"> {{item.content}} </view>
         </view>
-        <view class="message-body"> 您的费用保修单已完成，付款金额300.00元，请注意查收。 </view>
       </view>
-    </view>
+    </mescroll-body>
   </view>
 </template>
 
-<script>
-  export default {
-    data() {
-      return {};
-    },
-    methods: {},
+<script setup>
+  import { reactive, ref } from 'vue';
+  import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+  import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
+  import { smartSentry } from '@/lib/smart-sentry';
+  import { messageApi } from '@/api/support/message-api';
+
+  // --------------------------- 查询 ---------------------------------
+
+  const defaultForm = {
+    searchWord: '',
+    messageType: null,
+    dataId: null,
+    readFlag: null,
+    endDate: null,
+    startDate: null,
+    pageNum: 1,
+    pageSize: 10,
+    searchCount: true,
+    receiverType: null,
+    receiverId: null,
   };
+
+  // 查询表单
+  const queryForm = reactive({ ...defaultForm });
+  // 通知列表数据
+  const messageListData = ref([]);
+
+  function buildQueryParam(pageNum) {
+    queryForm.pageNum = pageNum;
+    return Object.assign({}, queryForm, { pageNum });
+  }
+
+  async function query(mescroll, isDownFlag, param) {
+    try {
+      let res = await messageApi.queryMessage(param);
+      res.data.list.map(e => e.content = e.content.substr(0,50));
+      if (!isDownFlag) {
+        messageListData.value = messageListData.value.concat(res.data.list);
+      } else {
+        messageListData.value = res.data.list;
+      }
+      mescroll.endSuccess(res.data.list.length, res.data.pages > res.data.pageNum);
+    } catch (e) {
+      smartSentry.captureError(e);
+      //联网失败, 结束加载
+      mescroll.endErr();
+    }
+  }
+
+  const { mescrollInit, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+
+  /**
+   * 搜索
+   */
+  function search() {
+    query(getMescroll(), true, buildQueryParam(1));
+    uni.pageScrollTo({
+      scrollTop: 0,
+    });
+  }
+
+  /**
+   * 下拉刷新
+   */
+  function onDown(mescroll) {
+    queryForm.pageNum = 1;
+    query(mescroll, true, buildQueryParam(1));
+  }
+
+  /**
+   * 上拉加载更多
+   */
+  function onUp(mescroll) {
+    query(mescroll, false, buildQueryParam(mescroll.num));
+  }
 </script>
 
 <style lang="scss" scoped>
@@ -74,9 +148,13 @@
         flex-direction: row;
         justify-content: flex-start;
         align-items: center;
+        white-space: nowrap; /* 确保文本不会换行 */
+        overflow: hidden; /* 隐藏溢出的内容 */
+        text-overflow: ellipsis; /* 在文本溢出处显示省略号 */
       }
       .message-body {
         font-size: 28rpx;
+        max-height: 3.2rem;
         color: #777777;
       }
     }
diff --git a/smart-app/src/pages/mine/components/mine-menu.vue b/smart-app/src/pages/mine/components/mine-menu.vue
index ee9d061..4e40819 100644
--- a/smart-app/src/pages/mine/components/mine-menu.vue
+++ b/smart-app/src/pages/mine/components/mine-menu.vue
@@ -7,7 +7,7 @@
             <image class="icon" src="/static/images/mine/mine-account.png" mode=""></image>
           </template>
         </uni-list-item>
-        <uni-list-item title="消息通知" link="switchTab" showBadge badgeText="6" badgeType="error" to="/pages/message/message">
+        <uni-list-item title="消息通知" link="switchTab" showBadge :badgeText="messageCount" badgeType="error" to="/pages/message/message">
           <template #header>
             <image class="icon" src="/static/images/mine/mine-message.png" mode=""></image>
           </template>
@@ -67,8 +67,12 @@
 </template>
 <script setup>
   import { SmartToast } from '@/lib/smart-support';
+  import { useUserStore } from '@/store/modules/system/user';
+  import { computed } from 'vue';
 
   const emits = defineEmits(['changeStyle']);
+  const userStore = useUserStore();
+  const messageCount = computed(() => userStore.$state.unreadMessageCount);
 
   function changeStyle() {
     emits('changeStyle');
diff --git a/smart-app/src/store/modules/system/user.js b/smart-app/src/store/modules/system/user.js
index 43b3132..c8c8f27 100644
--- a/smart-app/src/store/modules/system/user.js
+++ b/smart-app/src/store/modules/system/user.js
@@ -11,10 +11,15 @@ import _ from 'lodash';
 import { defineStore } from 'pinia';
 import { USER_TOKEN } from '@/constants/local-storage-key-const';
 import { loginApi } from '@/api/system/login-api';
+import { smartSentry } from '@/lib/smart-sentry';
+import {messageApi} from "@/api/support/message-api";
 
 const defaultUserInfo = {
+  token: '',
   //员工id
   employeeId: '',
+  // 头像
+  avatar: '',
   //登录名
   loginName: '',
   //姓名
@@ -25,6 +30,8 @@ const defaultUserInfo = {
   departmentId: '',
   //部门名词
   departmentName: '',
+  //是否需要修改密码
+  needUpdatePwdFlag: false,
   //是否为超级管理员
   administratorFlag: true,
   //上次登录ip
@@ -35,6 +42,8 @@ const defaultUserInfo = {
   lastLoginUserAgent: '',
   //上次登录时间
   lastLoginTime: '',
+  // 未读消息数量
+  unreadMessageCount: 0,
 };
 
 export const useUserStore = defineStore({
@@ -62,6 +71,15 @@ export const useUserStore = defineStore({
       let res = await loginApi.getLoginInfo();
       this.setUserLoginInfo(res.data);
     },
+    // 查询未读消息数量
+    async queryUnreadMessageCount() {
+      try {
+        let result = await messageApi.queryUnreadCount();
+        this.unreadMessageCount = result.data;
+      } catch (e) {
+        smartSentry.captureError(e);
+      }
+    },
     //设置登录信息
     setUserLoginInfo(data) {
       // 用户基本信息
@@ -79,6 +97,9 @@ export const useUserStore = defineStore({
       this.lastLoginTime = data.lastLoginTime;
 
       uni.setStorageSync(USER_TOKEN, data.token);
+
+      // 获取用户未读消息
+      this.queryUnreadMessageCount();
     },
   },
 });