后台目录结构大调整，让结构更清晰

xlj44400 · Aug 12, 2022 · 4b19f25 · 4b19f25
1 parent 5f88b0e
commit 4b19f25
Show file tree

Hide file tree

Showing 1,486 changed files with 94 additions and 213 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 ## ide
 **/.idea
 *.iml
+rebel.xml
 
 ## backend
 **/target

diff --git a/db/其他类型库/jeecgboot-oracle11g.dmp → db/其他数据库/jeecgboot-oracle11g.dmp b/db/其他类型库/jeecgboot-oracle11g.dmp → db/其他数据库/jeecgboot-oracle11g.dmp
diff --git a/db/其他类型库/jeecgboot-oracle11g.sql → db/其他数据库/jeecgboot-oracle11g.sql b/db/其他类型库/jeecgboot-oracle11g.sql → db/其他数据库/jeecgboot-oracle11g.sql
diff --git a/db/其他类型库/jeecgboot-sqlserver2019.sql → db/其他数据库/jeecgboot-sqlserver2019.sql b/db/其他类型库/jeecgboot-sqlserver2019.sql → db/其他数据库/jeecgboot-sqlserver2019.sql
diff --git a/db/增量SQL/3.2升级到3.3增量脚本sql → db/增量SQL/3.2升级到3.4增量脚本sql b/db/增量SQL/3.2升级到3.3增量脚本sql → db/增量SQL/3.2升级到3.4增量脚本sql
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
 
   jeecg-boot-system:
     build:
-      context: ./jeecg-boot-module-system
+      context: ./jeecg-module-system/jeecg-system-biz
     restart: on-failure
     depends_on:
       - jeecg-boot-mysql

diff --git a/jeecg-boot-base/jeecg-boot-base-core/pom.xml → jeecg-boot-base-core/pom.xml b/jeecg-boot-base/jeecg-boot-base-core/pom.xml → jeecg-boot-base-core/pom.xml
@@ -2,8 +2,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
+		<artifactId>jeecg-boot-parent</artifactId>
 		<groupId>org.jeecgframework.boot</groupId>
-		<artifactId>jeecg-boot-base</artifactId>
 		<version>3.4.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/.../java/org/jeecg/common/api/CommonAPI.java → .../java/org/jeecg/common/api/CommonAPI.java b/.../java/org/jeecg/common/api/CommonAPI.java → .../java/org/jeecg/common/api/CommonAPI.java
diff --git a/...org/jeecg/common/api/dto/FileDownDTO.java → ...org/jeecg/common/api/dto/FileDownDTO.java b/...org/jeecg/common/api/dto/FileDownDTO.java → ...org/jeecg/common/api/dto/FileDownDTO.java
diff --git a/...g/jeecg/common/api/dto/FileUploadDTO.java → ...g/jeecg/common/api/dto/FileUploadDTO.java b/...g/jeecg/common/api/dto/FileUploadDTO.java → ...g/jeecg/common/api/dto/FileUploadDTO.java
diff --git a/...java/org/jeecg/common/api/dto/LogDTO.java → ...java/org/jeecg/common/api/dto/LogDTO.java b/...java/org/jeecg/common/api/dto/LogDTO.java → ...java/org/jeecg/common/api/dto/LogDTO.java
diff --git a/...g/jeecg/common/api/dto/OnlineAuthDTO.java → ...g/jeecg/common/api/dto/OnlineAuthDTO.java b/...g/jeecg/common/api/dto/OnlineAuthDTO.java → ...g/jeecg/common/api/dto/OnlineAuthDTO.java
diff --git a/...common/api/dto/message/BusMessageDTO.java → ...common/api/dto/message/BusMessageDTO.java b/...common/api/dto/message/BusMessageDTO.java → ...common/api/dto/message/BusMessageDTO.java
diff --git a/...pi/dto/message/BusTemplateMessageDTO.java → ...pi/dto/message/BusTemplateMessageDTO.java b/...pi/dto/message/BusTemplateMessageDTO.java → ...pi/dto/message/BusTemplateMessageDTO.java
diff --git a/...cg/common/api/dto/message/MessageDTO.java → ...cg/common/api/dto/message/MessageDTO.java b/...cg/common/api/dto/message/MessageDTO.java → ...cg/common/api/dto/message/MessageDTO.java
diff --git a/...g/common/api/dto/message/TemplateDTO.java → ...g/common/api/dto/message/TemplateDTO.java b/...g/common/api/dto/message/TemplateDTO.java → ...g/common/api/dto/message/TemplateDTO.java
diff --git a/...n/api/dto/message/TemplateMessageDTO.java → ...n/api/dto/message/TemplateMessageDTO.java b/...n/api/dto/message/TemplateMessageDTO.java → ...n/api/dto/message/TemplateMessageDTO.java
diff --git a/.../java/org/jeecg/common/api/vo/Result.java → .../java/org/jeecg/common/api/vo/Result.java b/.../java/org/jeecg/common/api/vo/Result.java → .../java/org/jeecg/common/api/vo/Result.java
diff --git a/...rg/jeecg/common/aspect/AutoLogAspect.java → ...rg/jeecg/common/aspect/AutoLogAspect.java b/...rg/jeecg/common/aspect/AutoLogAspect.java → ...rg/jeecg/common/aspect/AutoLogAspect.java
diff --git a/...a/org/jeecg/common/aspect/DictAspect.java → ...a/org/jeecg/common/aspect/DictAspect.java b/...a/org/jeecg/common/aspect/DictAspect.java → ...a/org/jeecg/common/aspect/DictAspect.java
diff --git a/...g/common/aspect/PermissionDataAspect.java → ...g/common/aspect/PermissionDataAspect.java b/...g/common/aspect/PermissionDataAspect.java → ...g/common/aspect/PermissionDataAspect.java
diff --git a/...org/jeecg/common/aspect/UrlMatchEnum.java → ...org/jeecg/common/aspect/UrlMatchEnum.java b/...org/jeecg/common/aspect/UrlMatchEnum.java → ...org/jeecg/common/aspect/UrlMatchEnum.java
diff --git a/...cg/common/aspect/annotation/AutoDict.java → ...cg/common/aspect/annotation/AutoDict.java b/...cg/common/aspect/annotation/AutoDict.java → ...cg/common/aspect/annotation/AutoDict.java
diff --git a/...ecg/common/aspect/annotation/AutoLog.java → ...ecg/common/aspect/annotation/AutoLog.java b/...ecg/common/aspect/annotation/AutoLog.java → ...ecg/common/aspect/annotation/AutoLog.java
diff --git a/.../common/aspect/annotation/AutoLowApp.java → .../common/aspect/annotation/AutoLowApp.java b/.../common/aspect/annotation/AutoLowApp.java → .../common/aspect/annotation/AutoLowApp.java
diff --git a/.../jeecg/common/aspect/annotation/Dict.java → .../jeecg/common/aspect/annotation/Dict.java b/.../jeecg/common/aspect/annotation/Dict.java → .../jeecg/common/aspect/annotation/Dict.java
diff --git a/...ommon/aspect/annotation/DynamicTable.java → ...ommon/aspect/annotation/DynamicTable.java b/...ommon/aspect/annotation/DynamicTable.java → ...ommon/aspect/annotation/DynamicTable.java
diff --git a/.../common/aspect/annotation/OnlineAuth.java → .../common/aspect/annotation/OnlineAuth.java b/.../common/aspect/annotation/OnlineAuth.java → .../common/aspect/annotation/OnlineAuth.java
diff --git a/...mon/aspect/annotation/PermissionData.java → ...mon/aspect/annotation/PermissionData.java b/...mon/aspect/annotation/PermissionData.java → ...mon/aspect/annotation/PermissionData.java
diff --git a/...jeecg/common/constant/CommonConstant.java → ...jeecg/common/constant/CommonConstant.java b/...jeecg/common/constant/CommonConstant.java → ...jeecg/common/constant/CommonConstant.java
diff --git a/...ecg/common/constant/CommonSendStatus.java → ...ecg/common/constant/CommonSendStatus.java b/...ecg/common/constant/CommonSendStatus.java → ...ecg/common/constant/CommonSendStatus.java
diff --git a/...ecg/common/constant/DataBaseConstant.java → ...ecg/common/constant/DataBaseConstant.java b/...ecg/common/constant/DataBaseConstant.java → ...ecg/common/constant/DataBaseConstant.java
diff --git a/...common/constant/DynamicTableConstant.java → ...common/constant/DynamicTableConstant.java b/...common/constant/DynamicTableConstant.java → ...common/constant/DynamicTableConstant.java
diff --git a/...ecg/common/constant/FillRuleConstant.java → ...ecg/common/constant/FillRuleConstant.java b/...ecg/common/constant/FillRuleConstant.java → ...ecg/common/constant/FillRuleConstant.java
diff --git a/...ecg/common/constant/ProvinceCityArea.java → ...ecg/common/constant/ProvinceCityArea.java b/...ecg/common/constant/ProvinceCityArea.java → ...ecg/common/constant/ProvinceCityArea.java
diff --git a/...common/constant/ServiceNameConstants.java → ...common/constant/ServiceNameConstants.java b/...common/constant/ServiceNameConstants.java → ...common/constant/ServiceNameConstants.java
diff --git a/...jeecg/common/constant/SymbolConstant.java → ...jeecg/common/constant/SymbolConstant.java b/...jeecg/common/constant/SymbolConstant.java → ...jeecg/common/constant/SymbolConstant.java
diff --git a/...jeecg/common/constant/VxeSocketConst.java → ...jeecg/common/constant/VxeSocketConst.java b/...jeecg/common/constant/VxeSocketConst.java → ...jeecg/common/constant/VxeSocketConst.java
diff --git a/...jeecg/common/constant/WebsocketConst.java → ...jeecg/common/constant/WebsocketConst.java b/...jeecg/common/constant/WebsocketConst.java → ...jeecg/common/constant/WebsocketConst.java
diff --git a/...ecg/common/constant/enums/CgformEnum.java → ...ecg/common/constant/enums/CgformEnum.java b/...ecg/common/constant/enums/CgformEnum.java → ...ecg/common/constant/enums/CgformEnum.java
diff --git a/.../common/constant/enums/LowAppAopEnum.java → .../common/constant/enums/LowAppAopEnum.java b/.../common/constant/enums/LowAppAopEnum.java → .../common/constant/enums/LowAppAopEnum.java
diff --git a/...ommon/constant/enums/MessageTypeEnum.java → ...ommon/constant/enums/MessageTypeEnum.java b/...ommon/constant/enums/MessageTypeEnum.java → ...ommon/constant/enums/MessageTypeEnum.java
diff --git a/...ecg/common/constant/enums/ModuleType.java → ...ecg/common/constant/enums/ModuleType.java b/...ecg/common/constant/enums/ModuleType.java → ...ecg/common/constant/enums/ModuleType.java
diff --git a/...ommon/constant/enums/OperateTypeEnum.java → ...ommon/constant/enums/OperateTypeEnum.java b/...ommon/constant/enums/OperateTypeEnum.java → ...ommon/constant/enums/OperateTypeEnum.java
diff --git a/...n/constant/enums/RoleIndexConfigEnum.java → ...n/constant/enums/RoleIndexConfigEnum.java b/...n/constant/enums/RoleIndexConfigEnum.java → ...n/constant/enums/RoleIndexConfigEnum.java
diff --git a/...itization/annotation/SensitiveDecode.java → ...itization/annotation/SensitiveDecode.java b/...itization/annotation/SensitiveDecode.java → ...itization/annotation/SensitiveDecode.java
diff --git a/...itization/annotation/SensitiveEncode.java → ...itization/annotation/SensitiveEncode.java b/...itization/annotation/SensitiveEncode.java → ...itization/annotation/SensitiveEncode.java
diff --git a/...sitization/annotation/SensitiveField.java → ...sitization/annotation/SensitiveField.java b/...sitization/annotation/SensitiveField.java → ...sitization/annotation/SensitiveField.java
diff --git a/...itization/aspect/SensitiveDataAspect.java → ...itization/aspect/SensitiveDataAspect.java b/...itization/aspect/SensitiveDataAspect.java → ...itization/aspect/SensitiveDataAspect.java
diff --git a/.../desensitization/enums/SensitiveEnum.java → .../desensitization/enums/SensitiveEnum.java b/.../desensitization/enums/SensitiveEnum.java → .../desensitization/enums/SensitiveEnum.java
diff --git a/...sensitization/util/SensitiveInfoUtil.java → ...sensitization/util/SensitiveInfoUtil.java b/...sensitization/util/SensitiveInfoUtil.java → ...sensitization/util/SensitiveInfoUtil.java
diff --git a/...common/es/JeecgElasticsearchTemplate.java → ...common/es/JeecgElasticsearchTemplate.java b/...common/es/JeecgElasticsearchTemplate.java → ...common/es/JeecgElasticsearchTemplate.java
diff --git a/...g/jeecg/common/es/QueryStringBuilder.java → ...g/jeecg/common/es/QueryStringBuilder.java b/...g/jeecg/common/es/QueryStringBuilder.java → ...g/jeecg/common/es/QueryStringBuilder.java
diff --git a/...mmon/exception/JeecgBoot401Exception.java → ...mmon/exception/JeecgBoot401Exception.java b/...mmon/exception/JeecgBoot401Exception.java → ...mmon/exception/JeecgBoot401Exception.java
diff --git a/.../common/exception/JeecgBootException.java → .../common/exception/JeecgBootException.java b/.../common/exception/JeecgBootException.java → .../common/exception/JeecgBootException.java
diff --git a/.../exception/JeecgBootExceptionHandler.java → .../exception/JeecgBootExceptionHandler.java b/.../exception/JeecgBootExceptionHandler.java → .../exception/JeecgBootExceptionHandler.java
diff --git a/...eecg/common/handler/IFillRuleHandler.java → ...eecg/common/handler/IFillRuleHandler.java b/...eecg/common/handler/IFillRuleHandler.java → ...eecg/common/handler/IFillRuleHandler.java
diff --git a/...cg/common/system/annotation/EnumDict.java → ...cg/common/system/annotation/EnumDict.java b/...cg/common/system/annotation/EnumDict.java → ...cg/common/system/annotation/EnumDict.java
diff --git a/...stem/base/controller/JeecgController.java → ...stem/base/controller/JeecgController.java b/...stem/base/controller/JeecgController.java → ...stem/base/controller/JeecgController.java
diff --git a/...ommon/system/base/entity/JeecgEntity.java → ...ommon/system/base/entity/JeecgEntity.java b/...ommon/system/base/entity/JeecgEntity.java → ...ommon/system/base/entity/JeecgEntity.java
diff --git a/...mon/system/base/service/JeecgService.java → ...mon/system/base/service/JeecgService.java b/...mon/system/base/service/JeecgService.java → ...mon/system/base/service/JeecgService.java
diff --git a/...m/base/service/impl/JeecgServiceImpl.java → ...m/base/service/impl/JeecgServiceImpl.java b/...m/base/service/impl/JeecgServiceImpl.java → ...m/base/service/impl/JeecgServiceImpl.java
diff --git a/...cg/common/system/query/MatchTypeEnum.java → ...cg/common/system/query/MatchTypeEnum.java b/...cg/common/system/query/MatchTypeEnum.java → ...cg/common/system/query/MatchTypeEnum.java
diff --git a/...g/common/system/query/QueryCondition.java → ...g/common/system/query/QueryCondition.java b/...g/common/system/query/QueryCondition.java → ...g/common/system/query/QueryCondition.java
diff --git a/...g/common/system/query/QueryGenerator.java → ...g/common/system/query/QueryGenerator.java b/...g/common/system/query/QueryGenerator.java → ...g/common/system/query/QueryGenerator.java
diff --git a/...cg/common/system/query/QueryRuleEnum.java → ...cg/common/system/query/QueryRuleEnum.java b/...cg/common/system/query/QueryRuleEnum.java → ...cg/common/system/query/QueryRuleEnum.java
diff --git a/...mmon/system/util/JeecgDataAutorUtils.java → ...mmon/system/util/JeecgDataAutorUtils.java b/...mmon/system/util/JeecgDataAutorUtils.java → ...mmon/system/util/JeecgDataAutorUtils.java
diff --git a/...org/jeecg/common/system/util/JwtUtil.java → ...org/jeecg/common/system/util/JwtUtil.java b/...org/jeecg/common/system/util/JwtUtil.java → ...org/jeecg/common/system/util/JwtUtil.java
diff --git a/...eecg/common/system/util/ResourceUtil.java → ...eecg/common/system/util/ResourceUtil.java b/...eecg/common/system/util/ResourceUtil.java → ...eecg/common/system/util/ResourceUtil.java
diff --git a/...rg/jeecg/common/system/vo/ComboModel.java → ...rg/jeecg/common/system/vo/ComboModel.java b/...rg/jeecg/common/system/vo/ComboModel.java → ...rg/jeecg/common/system/vo/ComboModel.java
diff --git a/...org/jeecg/common/system/vo/DictModel.java → ...org/jeecg/common/system/vo/DictModel.java b/...org/jeecg/common/system/vo/DictModel.java → ...org/jeecg/common/system/vo/DictModel.java
diff --git a/...jeecg/common/system/vo/DictModelMany.java → ...jeecg/common/system/vo/DictModelMany.java b/...jeecg/common/system/vo/DictModelMany.java → ...jeecg/common/system/vo/DictModelMany.java
diff --git a/...org/jeecg/common/system/vo/DictQuery.java → ...org/jeecg/common/system/vo/DictQuery.java b/...org/jeecg/common/system/vo/DictQuery.java → ...org/jeecg/common/system/vo/DictQuery.java
diff --git a/...mon/system/vo/DynamicDataSourceModel.java → ...mon/system/vo/DynamicDataSourceModel.java b/...mon/system/vo/DynamicDataSourceModel.java → ...mon/system/vo/DynamicDataSourceModel.java
diff --git a/...org/jeecg/common/system/vo/LoginUser.java → ...org/jeecg/common/system/vo/LoginUser.java b/...org/jeecg/common/system/vo/LoginUser.java → ...org/jeecg/common/system/vo/LoginUser.java
diff --git a/...ecg/common/system/vo/SelectTreeModel.java → ...ecg/common/system/vo/SelectTreeModel.java b/...ecg/common/system/vo/SelectTreeModel.java → ...ecg/common/system/vo/SelectTreeModel.java
diff --git a/...cg/common/system/vo/SysCategoryModel.java → ...cg/common/system/vo/SysCategoryModel.java b/...cg/common/system/vo/SysCategoryModel.java → ...cg/common/system/vo/SysCategoryModel.java
diff --git a/...eecg/common/system/vo/SysDepartModel.java → ...eecg/common/system/vo/SysDepartModel.java b/...eecg/common/system/vo/SysDepartModel.java → ...eecg/common/system/vo/SysDepartModel.java
diff --git a/...system/vo/SysPermissionDataRuleModel.java → ...system/vo/SysPermissionDataRuleModel.java b/...system/vo/SysPermissionDataRuleModel.java → ...system/vo/SysPermissionDataRuleModel.java
diff --git a/...cg/common/system/vo/SysUserCacheInfo.java → ...cg/common/system/vo/SysUserCacheInfo.java b/...cg/common/system/vo/SysUserCacheInfo.java → ...cg/common/system/vo/SysUserCacheInfo.java
diff --git a/...va/org/jeecg/common/util/BrowserType.java → ...va/org/jeecg/common/util/BrowserType.java b/...va/org/jeecg/common/util/BrowserType.java → ...va/org/jeecg/common/util/BrowserType.java
diff --git a/...a/org/jeecg/common/util/BrowserUtils.java → ...a/org/jeecg/common/util/BrowserUtils.java b/...a/org/jeecg/common/util/BrowserUtils.java → ...a/org/jeecg/common/util/BrowserUtils.java
diff --git a/...va/org/jeecg/common/util/CommonUtils.java → ...va/org/jeecg/common/util/CommonUtils.java b/...va/org/jeecg/common/util/CommonUtils.java → ...va/org/jeecg/common/util/CommonUtils.java
diff --git a/...java/org/jeecg/common/util/DateUtils.java → ...java/org/jeecg/common/util/DateUtils.java b/...java/org/jeecg/common/util/DateUtils.java → ...java/org/jeecg/common/util/DateUtils.java
diff --git a/...java/org/jeecg/common/util/DySmsEnum.java → ...java/org/jeecg/common/util/DySmsEnum.java b/...java/org/jeecg/common/util/DySmsEnum.java → ...java/org/jeecg/common/util/DySmsEnum.java
diff --git a/...va/org/jeecg/common/util/DySmsHelper.java → ...va/org/jeecg/common/util/DySmsHelper.java b/...va/org/jeecg/common/util/DySmsHelper.java → ...va/org/jeecg/common/util/DySmsHelper.java
diff --git a/...a/org/jeecg/common/util/FillRuleUtil.java → ...a/org/jeecg/common/util/FillRuleUtil.java b/...a/org/jeecg/common/util/FillRuleUtil.java → ...a/org/jeecg/common/util/FillRuleUtil.java
diff --git a/...java/org/jeecg/common/util/HTMLUtils.java → ...java/org/jeecg/common/util/HTMLUtils.java b/...java/org/jeecg/common/util/HTMLUtils.java → ...java/org/jeecg/common/util/HTMLUtils.java
diff --git a/...rg/jeecg/common/util/ImportExcelUtil.java → ...rg/jeecg/common/util/ImportExcelUtil.java b/...rg/jeecg/common/util/ImportExcelUtil.java → ...rg/jeecg/common/util/ImportExcelUtil.java
diff --git a/...n/java/org/jeecg/common/util/IpUtils.java → ...n/java/org/jeecg/common/util/IpUtils.java b/...n/java/org/jeecg/common/util/IpUtils.java → ...n/java/org/jeecg/common/util/IpUtils.java
diff --git a/...n/java/org/jeecg/common/util/Md5Util.java → ...n/java/org/jeecg/common/util/Md5Util.java b/...n/java/org/jeecg/common/util/Md5Util.java → ...n/java/org/jeecg/common/util/Md5Util.java
diff --git a/...java/org/jeecg/common/util/MinioUtil.java → ...java/org/jeecg/common/util/MinioUtil.java b/...java/org/jeecg/common/util/MinioUtil.java → ...java/org/jeecg/common/util/MinioUtil.java
diff --git a/.../org/jeecg/common/util/MyClassLoader.java → .../org/jeecg/common/util/MyClassLoader.java b/.../org/jeecg/common/util/MyClassLoader.java → .../org/jeecg/common/util/MyClassLoader.java
diff --git a/...a/org/jeecg/common/util/PasswordUtil.java → ...a/org/jeecg/common/util/PasswordUtil.java b/...a/org/jeecg/common/util/PasswordUtil.java → ...a/org/jeecg/common/util/PasswordUtil.java
diff --git a/...n/java/org/jeecg/common/util/PmsUtil.java → ...n/java/org/jeecg/common/util/PmsUtil.java b/...n/java/org/jeecg/common/util/PmsUtil.java → ...n/java/org/jeecg/common/util/PmsUtil.java
diff --git a/.../org/jeecg/common/util/ReflectHelper.java → .../org/jeecg/common/util/ReflectHelper.java b/.../org/jeecg/common/util/ReflectHelper.java → .../org/jeecg/common/util/ReflectHelper.java
diff --git a/...rg/jeecg/common/util/RestDesformUtil.java → ...rg/jeecg/common/util/RestDesformUtil.java b/...rg/jeecg/common/util/RestDesformUtil.java → ...rg/jeecg/common/util/RestDesformUtil.java
diff --git a/.../java/org/jeecg/common/util/RestUtil.java → .../java/org/jeecg/common/util/RestUtil.java b/.../java/org/jeecg/common/util/RestUtil.java → .../java/org/jeecg/common/util/RestUtil.java
diff --git a/...jeecg/common/util/SpringContextUtils.java → ...jeecg/common/util/SpringContextUtils.java b/...jeecg/common/util/SpringContextUtils.java → ...jeecg/common/util/SpringContextUtils.java
diff --git a/...g/jeecg/common/util/SqlInjectionUtil.java → ...g/jeecg/common/util/SqlInjectionUtil.java b/...g/jeecg/common/util/SqlInjectionUtil.java → ...g/jeecg/common/util/SqlInjectionUtil.java
diff --git a/...jeecg/common/util/SysAnnmentTypeEnum.java → ...jeecg/common/util/SysAnnmentTypeEnum.java b/...jeecg/common/util/SysAnnmentTypeEnum.java → ...jeecg/common/util/SysAnnmentTypeEnum.java
diff --git a/...ava/org/jeecg/common/util/TokenUtils.java → ...ava/org/jeecg/common/util/TokenUtils.java b/...ava/org/jeecg/common/util/TokenUtils.java → ...ava/org/jeecg/common/util/TokenUtils.java
diff --git a/.../org/jeecg/common/util/UUIDGenerator.java → .../org/jeecg/common/util/UUIDGenerator.java b/.../org/jeecg/common/util/UUIDGenerator.java → .../org/jeecg/common/util/UUIDGenerator.java
diff --git a/...rg/jeecg/common/util/YouBianCodeUtil.java → ...rg/jeecg/common/util/YouBianCodeUtil.java b/...rg/jeecg/common/util/YouBianCodeUtil.java → ...rg/jeecg/common/util/YouBianCodeUtil.java
diff --git a/.../util/dynamic/db/DataSourceCachePool.java → .../util/dynamic/db/DataSourceCachePool.java b/.../util/dynamic/db/DataSourceCachePool.java → .../util/dynamic/db/DataSourceCachePool.java
diff --git a/...g/common/util/dynamic/db/DbTypeUtils.java → ...g/common/util/dynamic/db/DbTypeUtils.java b/...g/common/util/dynamic/db/DbTypeUtils.java → ...g/common/util/dynamic/db/DbTypeUtils.java
diff --git a/...common/util/dynamic/db/DynamicDBUtil.java → ...common/util/dynamic/db/DynamicDBUtil.java b/...common/util/dynamic/db/DynamicDBUtil.java → ...common/util/dynamic/db/DynamicDBUtil.java
diff --git a/...il/dynamic/db/FreemarkerParseFactory.java → ...il/dynamic/db/FreemarkerParseFactory.java b/...il/dynamic/db/FreemarkerParseFactory.java → ...il/dynamic/db/FreemarkerParseFactory.java
diff --git a/...ommon/util/encryption/AesEncryptUtil.java → ...ommon/util/encryption/AesEncryptUtil.java b/...ommon/util/encryption/AesEncryptUtil.java → ...ommon/util/encryption/AesEncryptUtil.java
diff --git a/...mmon/util/encryption/EncryptedString.java → ...mmon/util/encryption/EncryptedString.java b/...mmon/util/encryption/EncryptedString.java → ...mmon/util/encryption/EncryptedString.java
diff --git a/...cg/common/util/filter/FileTypeFilter.java → ...cg/common/util/filter/FileTypeFilter.java b/...cg/common/util/filter/FileTypeFilter.java → ...cg/common/util/filter/FileTypeFilter.java
diff --git a/...g/common/util/filter/StrAttackFilter.java → ...g/common/util/filter/StrAttackFilter.java b/...g/common/util/filter/StrAttackFilter.java → ...g/common/util/filter/StrAttackFilter.java
diff --git a/.../org/jeecg/common/util/oConvertUtils.java → .../org/jeecg/common/util/oConvertUtils.java b/.../org/jeecg/common/util/oConvertUtils.java → .../org/jeecg/common/util/oConvertUtils.java
diff --git a/...rg/jeecg/common/util/oss/OssBootUtil.java → ...rg/jeecg/common/util/oss/OssBootUtil.java b/...rg/jeecg/common/util/oss/OssBootUtil.java → ...rg/jeecg/common/util/oss/OssBootUtil.java
diff --git a/...curity/AbstractQueryBlackListHandler.java → ...curity/AbstractQueryBlackListHandler.java b/...curity/AbstractQueryBlackListHandler.java → ...curity/AbstractQueryBlackListHandler.java
diff --git a/...g/common/util/security/SecurityTools.java → ...g/common/util/security/SecurityTools.java b/...g/common/util/security/SecurityTools.java → ...g/common/util/security/SecurityTools.java
diff --git a/...ommon/util/security/entity/MyKeyPair.java → ...ommon/util/security/entity/MyKeyPair.java b/...ommon/util/security/entity/MyKeyPair.java → ...ommon/util/security/entity/MyKeyPair.java
diff --git a/...mon/util/security/entity/SecurityReq.java → ...mon/util/security/entity/SecurityReq.java b/...mon/util/security/entity/SecurityReq.java → ...mon/util/security/entity/SecurityReq.java
diff --git a/...on/util/security/entity/SecurityResp.java → ...on/util/security/entity/SecurityResp.java b/...on/util/security/entity/SecurityResp.java → ...on/util/security/entity/SecurityResp.java
diff --git a/...util/security/entity/SecuritySignReq.java → ...util/security/entity/SecuritySignReq.java b/...util/security/entity/SecuritySignReq.java → ...util/security/entity/SecuritySignReq.java
diff --git a/...til/security/entity/SecuritySignResp.java → ...til/security/entity/SecuritySignResp.java b/...til/security/entity/SecuritySignResp.java → ...til/security/entity/SecuritySignResp.java
diff --git a/...mon/util/superSearch/ObjectParseUtil.java → ...mon/util/superSearch/ObjectParseUtil.java b/...mon/util/superSearch/ObjectParseUtil.java → ...mon/util/superSearch/ObjectParseUtil.java
diff --git a/...ommon/util/superSearch/QueryRuleEnum.java → ...ommon/util/superSearch/QueryRuleEnum.java b/...ommon/util/superSearch/QueryRuleEnum.java → ...ommon/util/superSearch/QueryRuleEnum.java
diff --git a/.../common/util/superSearch/QueryRuleVo.java → .../common/util/superSearch/QueryRuleVo.java b/.../common/util/superSearch/QueryRuleVo.java → .../common/util/superSearch/QueryRuleVo.java
diff --git a/.../java/org/jeecg/config/AutoPoiConfig.java → .../java/org/jeecg/config/AutoPoiConfig.java b/.../java/org/jeecg/config/AutoPoiConfig.java → .../java/org/jeecg/config/AutoPoiConfig.java
diff --git a/...a/org/jeecg/config/AutoPoiDictConfig.java → ...a/org/jeecg/config/AutoPoiDictConfig.java b/...a/org/jeecg/config/AutoPoiDictConfig.java → ...a/org/jeecg/config/AutoPoiDictConfig.java
diff --git a/...org/jeecg/config/CorsFilterCondition.java → ...org/jeecg/config/CorsFilterCondition.java b/...org/jeecg/config/CorsFilterCondition.java → ...org/jeecg/config/CorsFilterCondition.java
diff --git a/...in/java/org/jeecg/config/DruidConfig.java → ...in/java/org/jeecg/config/DruidConfig.java b/...in/java/org/jeecg/config/DruidConfig.java → ...in/java/org/jeecg/config/DruidConfig.java
diff --git a/...ava/org/jeecg/config/JeecgBaseConfig.java → ...ava/org/jeecg/config/JeecgBaseConfig.java b/...ava/org/jeecg/config/JeecgBaseConfig.java → ...ava/org/jeecg/config/JeecgBaseConfig.java
diff --git a/...org/jeecg/config/JeecgCloudCondition.java → ...org/jeecg/config/JeecgCloudCondition.java b/...org/jeecg/config/JeecgCloudCondition.java → ...org/jeecg/config/JeecgCloudCondition.java
diff --git a/.../org/jeecg/config/RestTemplateConfig.java → .../org/jeecg/config/RestTemplateConfig.java b/.../org/jeecg/config/RestTemplateConfig.java → .../org/jeecg/config/RestTemplateConfig.java
diff --git a/...n/java/org/jeecg/config/StaticConfig.java → ...n/java/org/jeecg/config/StaticConfig.java b/...n/java/org/jeecg/config/StaticConfig.java → ...n/java/org/jeecg/config/StaticConfig.java
diff --git a/...java/org/jeecg/config/Swagger2Config.java → ...java/org/jeecg/config/Swagger2Config.java b/...java/org/jeecg/config/Swagger2Config.java → ...java/org/jeecg/config/Swagger2Config.java
diff --git a/...org/jeecg/config/WebMvcConfiguration.java → ...org/jeecg/config/WebMvcConfiguration.java b/...org/jeecg/config/WebMvcConfiguration.java → ...org/jeecg/config/WebMvcConfiguration.java
diff --git a/...ava/org/jeecg/config/WebSocketConfig.java → ...ava/org/jeecg/config/WebSocketConfig.java b/...ava/org/jeecg/config/WebSocketConfig.java → ...ava/org/jeecg/config/WebSocketConfig.java
diff --git a/...nfig/filter/RequestBodyReserveFilter.java → ...nfig/filter/RequestBodyReserveFilter.java b/...nfig/filter/RequestBodyReserveFilter.java → ...nfig/filter/RequestBodyReserveFilter.java
diff --git a/.../jeecg/config/filter/WebsocketFilter.java → .../jeecg/config/filter/WebsocketFilter.java b/.../jeecg/config/filter/WebsocketFilter.java → .../jeecg/config/filter/WebsocketFilter.java
diff --git a/...ecg/config/mybatis/JeecgTenantParser.java → ...ecg/config/mybatis/JeecgTenantParser.java b/...ecg/config/mybatis/JeecgTenantParser.java → ...ecg/config/mybatis/JeecgTenantParser.java
diff --git a/...cg/config/mybatis/MybatisInterceptor.java → ...cg/config/mybatis/MybatisInterceptor.java b/...cg/config/mybatis/MybatisInterceptor.java → ...cg/config/mybatis/MybatisInterceptor.java
diff --git a/...config/mybatis/MybatisPlusSaasConfig.java → ...config/mybatis/MybatisPlusSaasConfig.java b/...config/mybatis/MybatisPlusSaasConfig.java → ...config/mybatis/MybatisPlusSaasConfig.java
diff --git a/...g/jeecg/config/mybatis/TenantContext.java → ...g/jeecg/config/mybatis/TenantContext.java b/...g/jeecg/config/mybatis/TenantContext.java → ...g/jeecg/config/mybatis/TenantContext.java
diff --git a/...config/mybatis/ThreadLocalDataHelper.java → ...config/mybatis/ThreadLocalDataHelper.java b/...config/mybatis/ThreadLocalDataHelper.java → ...config/mybatis/ThreadLocalDataHelper.java
diff --git a/...ig/mybatis/aspect/DynamicTableAspect.java → ...ig/mybatis/aspect/DynamicTableAspect.java b/...ig/mybatis/aspect/DynamicTableAspect.java → ...ig/mybatis/aspect/DynamicTableAspect.java
diff --git a/...rceptor/DynamicDatasourceInterceptor.java → ...rceptor/DynamicDatasourceInterceptor.java b/...rceptor/DynamicDatasourceInterceptor.java → ...rceptor/DynamicDatasourceInterceptor.java
diff --git a/...ava/org/jeecg/config/oss/MinioConfig.java → ...ava/org/jeecg/config/oss/MinioConfig.java b/...ava/org/jeecg/config/oss/MinioConfig.java → ...ava/org/jeecg/config/oss/MinioConfig.java
diff --git a/...rg/jeecg/config/oss/OssConfiguration.java → ...rg/jeecg/config/oss/OssConfiguration.java b/...rg/jeecg/config/oss/OssConfiguration.java → ...rg/jeecg/config/oss/OssConfiguration.java
diff --git a/...java/org/jeecg/config/shiro/JwtToken.java → ...java/org/jeecg/config/shiro/JwtToken.java b/...java/org/jeecg/config/shiro/JwtToken.java → ...java/org/jeecg/config/shiro/JwtToken.java
diff --git a/...a/org/jeecg/config/shiro/ShiroConfig.java → ...a/org/jeecg/config/shiro/ShiroConfig.java b/...a/org/jeecg/config/shiro/ShiroConfig.java → ...a/org/jeecg/config/shiro/ShiroConfig.java
diff --git a/...va/org/jeecg/config/shiro/ShiroRealm.java → ...va/org/jeecg/config/shiro/ShiroRealm.java b/...va/org/jeecg/config/shiro/ShiroRealm.java → ...va/org/jeecg/config/shiro/ShiroRealm.java
diff --git a/...filters/CustomShiroFilterFactoryBean.java → ...filters/CustomShiroFilterFactoryBean.java b/...filters/CustomShiroFilterFactoryBean.java → ...filters/CustomShiroFilterFactoryBean.java
diff --git a/...jeecg/config/shiro/filters/JwtFilter.java → ...jeecg/config/shiro/filters/JwtFilter.java b/...jeecg/config/shiro/filters/JwtFilter.java → ...jeecg/config/shiro/filters/JwtFilter.java
diff --git a/...ig/shiro/filters/ResourceCheckFilter.java → ...ig/shiro/filters/ResourceCheckFilter.java b/...ig/shiro/filters/ResourceCheckFilter.java → ...ig/shiro/filters/ResourceCheckFilter.java
diff --git a/...gn/interceptor/SignAuthConfiguration.java → ...gn/interceptor/SignAuthConfiguration.java b/...gn/interceptor/SignAuthConfiguration.java → ...gn/interceptor/SignAuthConfiguration.java
diff --git a/...sign/interceptor/SignAuthInterceptor.java → ...sign/interceptor/SignAuthInterceptor.java b/...sign/interceptor/SignAuthInterceptor.java → ...sign/interceptor/SignAuthInterceptor.java
diff --git a/.../BodyReaderHttpServletRequestWrapper.java → .../BodyReaderHttpServletRequestWrapper.java b/.../BodyReaderHttpServletRequestWrapper.java → .../BodyReaderHttpServletRequestWrapper.java
diff --git a/...org/jeecg/config/sign/util/HttpUtils.java → ...org/jeecg/config/sign/util/HttpUtils.java b/...org/jeecg/config/sign/util/HttpUtils.java → ...org/jeecg/config/sign/util/HttpUtils.java
diff --git a/.../org/jeecg/config/sign/util/SignUtil.java → .../org/jeecg/config/sign/util/SignUtil.java b/.../org/jeecg/config/sign/util/SignUtil.java → .../org/jeecg/config/sign/util/SignUtil.java
diff --git a/...jeecg/config/thirdapp/ThirdAppConfig.java → ...jeecg/config/thirdapp/ThirdAppConfig.java b/...jeecg/config/thirdapp/ThirdAppConfig.java → ...jeecg/config/thirdapp/ThirdAppConfig.java
diff --git a/...g/config/thirdapp/ThirdAppTypeConfig.java → ...g/config/thirdapp/ThirdAppTypeConfig.java b/...g/config/thirdapp/ThirdAppTypeConfig.java → ...g/config/thirdapp/ThirdAppTypeConfig.java
diff --git a/...g/config/thirdapp/ThirdAppTypeItemVo.java → ...g/config/thirdapp/ThirdAppTypeItemVo.java b/...g/config/thirdapp/ThirdAppTypeItemVo.java → ...g/config/thirdapp/ThirdAppTypeItemVo.java
diff --git a/...n/java/org/jeecg/config/vo/DomainUrl.java → ...n/java/org/jeecg/config/vo/DomainUrl.java b/...n/java/org/jeecg/config/vo/DomainUrl.java → ...n/java/org/jeecg/config/vo/DomainUrl.java
diff --git a/...c/main/java/org/jeecg/config/vo/Path.java → ...c/main/java/org/jeecg/config/vo/Path.java b/...c/main/java/org/jeecg/config/vo/Path.java → ...c/main/java/org/jeecg/config/vo/Path.java
diff --git a/.../main/java/org/jeecg/config/vo/Shiro.java → .../main/java/org/jeecg/config/vo/Shiro.java b/.../main/java/org/jeecg/config/vo/Shiro.java → .../main/java/org/jeecg/config/vo/Shiro.java
diff --git a/...modules/base/mapper/BaseCommonMapper.java → ...modules/base/mapper/BaseCommonMapper.java b/...modules/base/mapper/BaseCommonMapper.java → ...modules/base/mapper/BaseCommonMapper.java
diff --git a/...ules/base/mapper/xml/BaseCommonMapper.xml → ...ules/base/mapper/xml/BaseCommonMapper.xml b/...ules/base/mapper/xml/BaseCommonMapper.xml → ...ules/base/mapper/xml/BaseCommonMapper.xml
diff --git a/...dules/base/service/BaseCommonService.java → ...dules/base/service/BaseCommonService.java b/...dules/base/service/BaseCommonService.java → ...dules/base/service/BaseCommonService.java
diff --git a/...e/service/impl/BaseCommonServiceImpl.java → ...e/service/impl/BaseCommonServiceImpl.java b/...e/service/impl/BaseCommonServiceImpl.java → ...e/service/impl/BaseCommonServiceImpl.java
diff --git a/...e-core/src/main/resources/static/pca.json → ...e-core/src/main/resources/static/pca.json b/...e-core/src/main/resources/static/pca.json → ...e-core/src/main/resources/static/pca.json
diff --git a/jeecg-boot-module-demo/pom.xml → jeecg-module-demo/pom.xml b/jeecg-boot-module-demo/pom.xml → jeecg-module-demo/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>jeecg-boot-module-demo</artifactId>
+    <artifactId>jeecg-module-demo</artifactId>
 
     <dependencies>
         <dependency>

diff --git a/...controller/JcloudDemoFeignController.java → ...controller/JcloudDemoFeignController.java b/...controller/JcloudDemoFeignController.java → ...controller/JcloudDemoFeignController.java
diff --git a/...troller/JcloudDemoProviderController.java → ...troller/JcloudDemoProviderController.java b/...troller/JcloudDemoProviderController.java → ...troller/JcloudDemoProviderController.java
diff --git a/...demo/cloud/service/JcloudDemoService.java → ...demo/cloud/service/JcloudDemoService.java b/...demo/cloud/service/JcloudDemoService.java → ...demo/cloud/service/JcloudDemoService.java
diff --git a/...d/service/impl/JcloudDemoServiceImpl.java → ...d/service/impl/JcloudDemoServiceImpl.java b/...d/service/impl/JcloudDemoServiceImpl.java → ...d/service/impl/JcloudDemoServiceImpl.java
diff --git a/...les/demo/cloud/xxljob/TestJobHandler.java → ...les/demo/cloud/xxljob/TestJobHandler.java b/...les/demo/cloud/xxljob/TestJobHandler.java → ...les/demo/cloud/xxljob/TestJobHandler.java
diff --git a/...ecg/modules/demo/mock/MockController.java → ...ecg/modules/demo/mock/MockController.java b/...ecg/modules/demo/mock/MockController.java → ...ecg/modules/demo/mock/MockController.java
diff --git a/...rg/jeecg/modules/demo/mock/json/area.json → ...rg/jeecg/modules/demo/mock/json/area.json b/...rg/jeecg/modules/demo/mock/json/area.json → ...rg/jeecg/modules/demo/mock/json/area.json
diff --git a/...ecg/modules/demo/mock/json/area_mini.json → ...ecg/modules/demo/mock/json/area_mini.json b/...ecg/modules/demo/mock/json/area_mini.json → ...ecg/modules/demo/mock/json/area_mini.json
diff --git a/.../modules/demo/mock/json/area_options.json → .../modules/demo/mock/json/area_options.json b/.../modules/demo/mock/json/area_options.json → .../modules/demo/mock/json/area_options.json
diff --git a/...ules/demo/mock/json/asyn_tree_list_0.json → ...ules/demo/mock/json/asyn_tree_list_0.json b/...ules/demo/mock/json/asyn_tree_list_0.json → ...ules/demo/mock/json/asyn_tree_list_0.json
diff --git a/...ules/demo/mock/json/asyn_tree_list_1.json → ...ules/demo/mock/json/asyn_tree_list_1.json b/...ules/demo/mock/json/asyn_tree_list_1.json → ...ules/demo/mock/json/asyn_tree_list_1.json
diff --git a/...ules/demo/mock/json/asyn_tree_list_2.json → ...ules/demo/mock/json/asyn_tree_list_2.json b/...ules/demo/mock/json/asyn_tree_list_2.json → ...ules/demo/mock/json/asyn_tree_list_2.json
diff --git a/...ules/demo/mock/json/asyn_tree_list_3.json → ...ules/demo/mock/json/asyn_tree_list_3.json b/...ules/demo/mock/json/asyn_tree_list_3.json → ...ules/demo/mock/json/asyn_tree_list_3.json
diff --git a/...les/demo/mock/json/asyn_tree_list_31.json → ...les/demo/mock/json/asyn_tree_list_31.json b/...les/demo/mock/json/asyn_tree_list_31.json → ...les/demo/mock/json/asyn_tree_list_31.json
diff --git a/...es/demo/mock/json/getCntrNoCountInfo.json → ...es/demo/mock/json/getCntrNoCountInfo.json b/...es/demo/mock/json/getCntrNoCountInfo.json → ...es/demo/mock/json/getCntrNoCountInfo.json
diff --git a/...ecg/modules/demo/mock/json/getTubiao.json → ...ecg/modules/demo/mock/json/getTubiao.json b/...ecg/modules/demo/mock/json/getTubiao.json → ...ecg/modules/demo/mock/json/getTubiao.json
diff --git a/...les/demo/mock/json/graphreport_chart.json → ...les/demo/mock/json/graphreport_chart.json b/...les/demo/mock/json/graphreport_chart.json → ...les/demo/mock/json/graphreport_chart.json
diff --git a/...cg/modules/demo/mock/json/permission.json → ...cg/modules/demo/mock/json/permission.json b/...cg/modules/demo/mock/json/permission.json → ...cg/modules/demo/mock/json/permission.json
diff --git a/...es/demo/mock/json/permission_no_page.json → ...es/demo/mock/json/permission_no_page.json b/...es/demo/mock/json/permission_no_page.json → ...es/demo/mock/json/permission_no_page.json
diff --git a/...rg/jeecg/modules/demo/mock/json/role.json → ...rg/jeecg/modules/demo/mock/json/role.json b/...rg/jeecg/modules/demo/mock/json/role.json → ...rg/jeecg/modules/demo/mock/json/role.json
diff --git a/...jeecg/modules/demo/mock/json/service.json → ...jeecg/modules/demo/mock/json/service.json b/...jeecg/modules/demo/mock/json/service.json → ...jeecg/modules/demo/mock/json/service.json
diff --git a/...cg/modules/demo/mock/json/sysdatalog.json → ...cg/modules/demo/mock/json/sysdatalog.json b/...cg/modules/demo/mock/json/sysdatalog.json → ...cg/modules/demo/mock/json/sysdatalog.json
diff --git a/.../modules/demo/mock/json/task_process.json → .../modules/demo/mock/json/task_process.json b/.../modules/demo/mock/json/task_process.json → .../modules/demo/mock/json/task_process.json
diff --git a/...rg/jeecg/modules/demo/mock/json/user.json → ...rg/jeecg/modules/demo/mock/json/user.json b/...rg/jeecg/modules/demo/mock/json/user.json → ...rg/jeecg/modules/demo/mock/json/user.json
diff --git a/...ecg/modules/demo/mock/json/user_info.json → ...ecg/modules/demo/mock/json/user_info.json b/...ecg/modules/demo/mock/json/user_info.json → ...ecg/modules/demo/mock/json/user_info.json
diff --git a/...eecg/modules/demo/mock/json/userinfo.json → ...eecg/modules/demo/mock/json/userinfo.json b/...eecg/modules/demo/mock/json/userinfo.json → ...eecg/modules/demo/mock/json/userinfo.json
diff --git a/...es/demo/mock/json/workplace_activity.json → ...es/demo/mock/json/workplace_activity.json b/...es/demo/mock/json/workplace_activity.json → ...es/demo/mock/json/workplace_activity.json
diff --git a/...es/demo/mock/json/workplace_projects.json → ...es/demo/mock/json/workplace_projects.json b/...es/demo/mock/json/workplace_projects.json → ...es/demo/mock/json/workplace_projects.json
diff --git a/...dules/demo/mock/json/workplace_radar.json → ...dules/demo/mock/json/workplace_radar.json b/...dules/demo/mock/json/workplace_radar.json → ...dules/demo/mock/json/workplace_radar.json
diff --git a/...dules/demo/mock/json/workplace_teams.json → ...dules/demo/mock/json/workplace_teams.json b/...dules/demo/mock/json/workplace_teams.json → ...dules/demo/mock/json/workplace_teams.json
diff --git a/...ock/vxe/controller/VxeMockController.java → ...ock/vxe/controller/VxeMockController.java b/...ock/vxe/controller/VxeMockController.java → ...ock/vxe/controller/VxeMockController.java
diff --git a/...ules/demo/mock/vxe/entity/MockEntity.java → ...ules/demo/mock/vxe/entity/MockEntity.java b/...ules/demo/mock/vxe/entity/MockEntity.java → ...ules/demo/mock/vxe/entity/MockEntity.java
diff --git a/...eecg/modules/demo/mock/vxe/json/ddjh.json → ...eecg/modules/demo/mock/vxe/json/ddjh.json b/...eecg/modules/demo/mock/vxe/json/ddjh.json → ...eecg/modules/demo/mock/vxe/json/ddjh.json
diff --git a/...g/modules/demo/mock/vxe/json/ddjh_s8.json → ...g/modules/demo/mock/vxe/json/ddjh_s8.json b/...g/modules/demo/mock/vxe/json/ddjh_s8.json → ...g/modules/demo/mock/vxe/json/ddjh_s8.json
diff --git a/...g/modules/demo/mock/vxe/json/dlglong.json → ...g/modules/demo/mock/vxe/json/dlglong.json b/...g/modules/demo/mock/vxe/json/dlglong.json → ...g/modules/demo/mock/vxe/json/dlglong.json
diff --git a/...es/demo/mock/vxe/websocket/VxeSocket.java → ...es/demo/mock/vxe/websocket/VxeSocket.java b/...es/demo/mock/vxe/websocket/VxeSocket.java → ...es/demo/mock/vxe/websocket/VxeSocket.java
diff --git a/.../demo/online/OnlCgformDemoController.java → .../demo/online/OnlCgformDemoController.java b/.../demo/online/OnlCgformDemoController.java → .../demo/online/OnlCgformDemoController.java
diff --git a/...ontroller/BigScreenTemplatController.java → ...ontroller/BigScreenTemplatController.java b/...ontroller/BigScreenTemplatController.java → ...ontroller/BigScreenTemplatController.java
diff --git a/.../test/controller/JeecgDemoController.java → .../test/controller/JeecgDemoController.java b/.../test/controller/JeecgDemoController.java → .../test/controller/JeecgDemoController.java
diff --git a/...ontroller/JeecgDynamicDataController.java → ...ontroller/JeecgDynamicDataController.java b/...ontroller/JeecgDynamicDataController.java → ...ontroller/JeecgDynamicDataController.java
diff --git a/...ntroller/JeecgOrderErpMainController.java → ...ntroller/JeecgOrderErpMainController.java b/...ntroller/JeecgOrderErpMainController.java → ...ntroller/JeecgOrderErpMainController.java
diff --git a/.../controller/JeecgOrderMainController.java → .../controller/JeecgOrderMainController.java b/.../controller/JeecgOrderMainController.java → .../controller/JeecgOrderMainController.java
diff --git a/...mo/test/controller/JoaDemoController.java → ...mo/test/controller/JoaDemoController.java b/...mo/test/controller/JoaDemoController.java → ...mo/test/controller/JoaDemoController.java
diff --git a/...g/modules/demo/test/entity/JeecgDemo.java → ...g/modules/demo/test/entity/JeecgDemo.java b/...g/modules/demo/test/entity/JeecgDemo.java → ...g/modules/demo/test/entity/JeecgDemo.java
diff --git a/.../demo/test/entity/JeecgOrderCustomer.java → .../demo/test/entity/JeecgOrderCustomer.java b/.../demo/test/entity/JeecgOrderCustomer.java → .../demo/test/entity/JeecgOrderCustomer.java
diff --git a/...ules/demo/test/entity/JeecgOrderMain.java → ...ules/demo/test/entity/JeecgOrderMain.java b/...ules/demo/test/entity/JeecgOrderMain.java → ...ules/demo/test/entity/JeecgOrderMain.java
diff --git a/...es/demo/test/entity/JeecgOrderTicket.java → ...es/demo/test/entity/JeecgOrderTicket.java b/...es/demo/test/entity/JeecgOrderTicket.java → ...es/demo/test/entity/JeecgOrderTicket.java
diff --git a/...ecg/modules/demo/test/entity/JoaDemo.java → ...ecg/modules/demo/test/entity/JoaDemo.java b/...ecg/modules/demo/test/entity/JoaDemo.java → ...ecg/modules/demo/test/entity/JoaDemo.java
diff --git a/...les/demo/test/mapper/JeecgDemoMapper.java → ...les/demo/test/mapper/JeecgDemoMapper.java b/...les/demo/test/mapper/JeecgDemoMapper.java → ...les/demo/test/mapper/JeecgDemoMapper.java
diff --git a/...test/mapper/JeecgOrderCustomerMapper.java → ...test/mapper/JeecgOrderCustomerMapper.java b/...test/mapper/JeecgOrderCustomerMapper.java → ...test/mapper/JeecgOrderCustomerMapper.java
diff --git a/...emo/test/mapper/JeecgOrderMainMapper.java → ...emo/test/mapper/JeecgOrderMainMapper.java b/...emo/test/mapper/JeecgOrderMainMapper.java → ...emo/test/mapper/JeecgOrderMainMapper.java
diff --git a/...o/test/mapper/JeecgOrderTicketMapper.java → ...o/test/mapper/JeecgOrderTicketMapper.java b/...o/test/mapper/JeecgOrderTicketMapper.java → ...o/test/mapper/JeecgOrderTicketMapper.java
diff --git a/...dules/demo/test/mapper/JoaDemoMapper.java → ...dules/demo/test/mapper/JoaDemoMapper.java b/...dules/demo/test/mapper/JoaDemoMapper.java → ...dules/demo/test/mapper/JoaDemoMapper.java
diff --git a/.../demo/test/mapper/xml/JeecgDemoMapper.xml → .../demo/test/mapper/xml/JeecgDemoMapper.xml b/.../demo/test/mapper/xml/JeecgDemoMapper.xml → .../demo/test/mapper/xml/JeecgDemoMapper.xml
diff --git a/...t/mapper/xml/JeecgOrderCustomerMapper.xml → ...t/mapper/xml/JeecgOrderCustomerMapper.xml b/...t/mapper/xml/JeecgOrderCustomerMapper.xml → ...t/mapper/xml/JeecgOrderCustomerMapper.xml
diff --git a/.../test/mapper/xml/JeecgOrderMainMapper.xml → .../test/mapper/xml/JeecgOrderMainMapper.xml b/.../test/mapper/xml/JeecgOrderMainMapper.xml → .../test/mapper/xml/JeecgOrderMainMapper.xml
diff --git a/...est/mapper/xml/JeecgOrderTicketMapper.xml → ...est/mapper/xml/JeecgOrderTicketMapper.xml b/...est/mapper/xml/JeecgOrderTicketMapper.xml → ...est/mapper/xml/JeecgOrderTicketMapper.xml
diff --git a/...es/demo/test/mapper/xml/JoaDemoMapper.xml → ...es/demo/test/mapper/xml/JoaDemoMapper.xml b/...es/demo/test/mapper/xml/JoaDemoMapper.xml → ...es/demo/test/mapper/xml/JoaDemoMapper.xml
diff --git a/.../demo/test/service/IJeecgDemoService.java → .../demo/test/service/IJeecgDemoService.java b/.../demo/test/service/IJeecgDemoService.java → .../demo/test/service/IJeecgDemoService.java
diff --git a/...est/service/IJeecgDynamicDataService.java → ...est/service/IJeecgDynamicDataService.java b/...est/service/IJeecgDynamicDataService.java → ...est/service/IJeecgDynamicDataService.java
diff --git a/...t/service/IJeecgOrderCustomerService.java → ...t/service/IJeecgOrderCustomerService.java b/...t/service/IJeecgOrderCustomerService.java → ...t/service/IJeecgOrderCustomerService.java
diff --git a/.../test/service/IJeecgOrderMainService.java → .../test/service/IJeecgOrderMainService.java b/.../test/service/IJeecgOrderMainService.java → .../test/service/IJeecgOrderMainService.java
diff --git a/...est/service/IJeecgOrderTicketService.java → ...est/service/IJeecgOrderTicketService.java b/...est/service/IJeecgOrderTicketService.java → ...est/service/IJeecgOrderTicketService.java
diff --git a/...es/demo/test/service/IJoaDemoService.java → ...es/demo/test/service/IJoaDemoService.java b/...es/demo/test/service/IJoaDemoService.java → ...es/demo/test/service/IJoaDemoService.java
diff --git a/...st/service/impl/JeecgDemoServiceImpl.java → ...st/service/impl/JeecgDemoServiceImpl.java b/...st/service/impl/JeecgDemoServiceImpl.java → ...st/service/impl/JeecgDemoServiceImpl.java
diff --git a/...ice/impl/JeecgDynamicDataServiceImpl.java → ...ice/impl/JeecgDynamicDataServiceImpl.java b/...ice/impl/JeecgDynamicDataServiceImpl.java → ...ice/impl/JeecgDynamicDataServiceImpl.java
diff --git a/...e/impl/JeecgOrderCustomerServiceImpl.java → ...e/impl/JeecgOrderCustomerServiceImpl.java b/...e/impl/JeecgOrderCustomerServiceImpl.java → ...e/impl/JeecgOrderCustomerServiceImpl.java
diff --git a/...rvice/impl/JeecgOrderMainServiceImpl.java → ...rvice/impl/JeecgOrderMainServiceImpl.java b/...rvice/impl/JeecgOrderMainServiceImpl.java → ...rvice/impl/JeecgOrderMainServiceImpl.java
diff --git a/...ice/impl/JeecgOrderTicketServiceImpl.java → ...ice/impl/JeecgOrderTicketServiceImpl.java b/...ice/impl/JeecgOrderTicketServiceImpl.java → ...ice/impl/JeecgOrderTicketServiceImpl.java
diff --git a/...test/service/impl/JoaDemoServiceImpl.java → ...test/service/impl/JoaDemoServiceImpl.java b/...test/service/impl/JoaDemoServiceImpl.java → ...test/service/impl/JoaDemoServiceImpl.java
diff --git a/...ules/demo/test/vo/JeecgOrderMainPage.java → ...ules/demo/test/vo/JeecgOrderMainPage.java b/...ules/demo/test/vo/JeecgOrderMainPage.java → ...ules/demo/test/vo/JeecgOrderMainPage.java
diff --git a/...g/modules/demo/xxljob/TestJobHandler.java → ...g/modules/demo/xxljob/TestJobHandler.java b/...g/modules/demo/xxljob/TestJobHandler.java → ...g/modules/demo/xxljob/TestJobHandler.java
diff --git a/.../dlglong/controller/DlMockController.java → .../dlglong/controller/DlMockController.java b/.../dlglong/controller/DlMockController.java → .../dlglong/controller/DlMockController.java
diff --git a/...cg/modules/dlglong/entity/MockEntity.java → ...cg/modules/dlglong/entity/MockEntity.java b/...cg/modules/dlglong/entity/MockEntity.java → ...cg/modules/dlglong/entity/MockEntity.java
diff --git a/.../org/jeecg/modules/dlglong/json/ddjh.json → .../org/jeecg/modules/dlglong/json/ddjh.json b/.../org/jeecg/modules/dlglong/json/ddjh.json → .../org/jeecg/modules/dlglong/json/ddjh.json
diff --git a/...g/jeecg/modules/dlglong/json/ddjh_s8.json → ...g/jeecg/modules/dlglong/json/ddjh_s8.json b/...g/jeecg/modules/dlglong/json/ddjh_s8.json → ...g/jeecg/modules/dlglong/json/ddjh_s8.json
diff --git a/...g/jeecg/modules/dlglong/json/dlglong.json → ...g/jeecg/modules/dlglong/json/dlglong.json b/...g/jeecg/modules/dlglong/json/dlglong.json → ...g/jeecg/modules/dlglong/json/dlglong.json
diff --git a/...static/bigscreen/template1/css/easyui.css → ...static/bigscreen/template1/css/easyui.css b/...static/bigscreen/template1/css/easyui.css → ...static/bigscreen/template1/css/easyui.css
diff --git a/...tic/bigscreen/template1/css/jquery-ui.css → ...tic/bigscreen/template1/css/jquery-ui.css b/...tic/bigscreen/template1/css/jquery-ui.css → ...tic/bigscreen/template1/css/jquery-ui.css
diff --git a/.../bigscreen/template1/css/main_design1.css → .../bigscreen/template1/css/main_design1.css b/.../bigscreen/template1/css/main_design1.css → .../bigscreen/template1/css/main_design1.css
diff --git a/...s/static/bigscreen/template1/css/room.css → ...s/static/bigscreen/template1/css/room.css b/...s/static/bigscreen/template1/css/room.css → ...s/static/bigscreen/template1/css/room.css
diff --git a/...gscreen/template1/images/content_comm.png → ...gscreen/template1/images/content_comm.png b/...gscreen/template1/images/content_comm.png → ...gscreen/template1/images/content_comm.png
diff --git a/...screen/template1/images/content_comm1.png → ...screen/template1/images/content_comm1.png b/...screen/template1/images/content_comm1.png → ...screen/template1/images/content_comm1.png
diff --git a/...gscreen/template1/images/content_down.png → ...gscreen/template1/images/content_down.png b/...gscreen/template1/images/content_down.png → ...gscreen/template1/images/content_down.png
diff --git a/...screen/template1/images/content_down1.png → ...screen/template1/images/content_down1.png b/...screen/template1/images/content_down1.png → ...screen/template1/images/content_down1.png
diff --git a/...atic/bigscreen/template1/images/index.gif → ...atic/bigscreen/template1/images/index.gif b/...atic/bigscreen/template1/images/index.gif → ...atic/bigscreen/template1/images/index.gif
diff --git a/...tic/bigscreen/template1/images/index1.gif → ...tic/bigscreen/template1/images/index1.gif b/...tic/bigscreen/template1/images/index1.gif → ...tic/bigscreen/template1/images/index1.gif
diff --git a/...een/template1/images/screenbg_design1.jpg → ...een/template1/images/screenbg_design1.jpg b/...een/template1/images/screenbg_design1.jpg → ...een/template1/images/screenbg_design1.jpg
diff --git a/...screen/template1/images/war_room_main.jpg → ...screen/template1/images/war_room_main.jpg b/...screen/template1/images/war_room_main.jpg → ...screen/template1/images/war_room_main.jpg
diff --git a/...tic/bigscreen/template1/js/big_design1.js → ...tic/bigscreen/template1/js/big_design1.js b/...tic/bigscreen/template1/js/big_design1.js → ...tic/bigscreen/template1/js/big_design1.js
diff --git a/...es/static/bigscreen/template1/js/china.js → ...es/static/bigscreen/template1/js/china.js b/...es/static/bigscreen/template1/js/china.js → ...es/static/bigscreen/template1/js/china.js
diff --git a/...gscreen/template1/js/echarts-wordcloud.js → ...gscreen/template1/js/echarts-wordcloud.js b/...gscreen/template1/js/echarts-wordcloud.js → ...gscreen/template1/js/echarts-wordcloud.js
diff --git a/...tic/bigscreen/template1/js/echarts.min.js → ...tic/bigscreen/template1/js/echarts.min.js b/...tic/bigscreen/template1/js/echarts.min.js → ...tic/bigscreen/template1/js/echarts.min.js
diff --git a/...static/bigscreen/template1/js/geoCoord.js → ...static/bigscreen/template1/js/geoCoord.js b/...static/bigscreen/template1/js/geoCoord.js → ...static/bigscreen/template1/js/geoCoord.js
diff --git a/...gscreen/template1/js/jquery.easyui.min.js → ...gscreen/template1/js/jquery.easyui.min.js b/...gscreen/template1/js/jquery.easyui.min.js → ...gscreen/template1/js/jquery.easyui.min.js
diff --git a/...atic/bigscreen/template1/js/jquery.min.js → ...atic/bigscreen/template1/js/jquery.min.js b/...atic/bigscreen/template1/js/jquery.min.js → ...atic/bigscreen/template1/js/jquery.min.js
diff --git a/...s/static/bigscreen/template1/js/resize.js → ...s/static/bigscreen/template1/js/resize.js b/...s/static/bigscreen/template1/js/resize.js → ...s/static/bigscreen/template1/js/resize.js
diff --git a/...ces/static/bigscreen/template1/js/room.js → ...ces/static/bigscreen/template1/js/room.js b/...ces/static/bigscreen/template1/js/room.js → ...ces/static/bigscreen/template1/js/room.js
diff --git a/.../static/bigscreen/template2/css/style.css → .../static/bigscreen/template2/css/style.css b/.../static/bigscreen/template2/css/style.css → .../static/bigscreen/template2/css/style.css
diff --git a/...atic/bigscreen/template2/images/arrow.png → ...atic/bigscreen/template2/images/arrow.png b/...atic/bigscreen/template2/images/arrow.png → ...atic/bigscreen/template2/images/arrow.png
diff --git a/...c/bigscreen/template2/images/bg_img03.png → ...c/bigscreen/template2/images/bg_img03.png b/...c/bigscreen/template2/images/bg_img03.png → ...c/bigscreen/template2/images/bg_img03.png
diff --git a/...c/bigscreen/template2/images/bg_img04.png → ...c/bigscreen/template2/images/bg_img04.png b/...c/bigscreen/template2/images/bg_img04.png → ...c/bigscreen/template2/images/bg_img04.png
diff --git a/...igscreen/template2/images/border_bg01.png → ...igscreen/template2/images/border_bg01.png b/...igscreen/template2/images/border_bg01.png → ...igscreen/template2/images/border_bg01.png
diff --git a/.../bigscreen/template2/images/box_title.png → .../bigscreen/template2/images/box_title.png b/.../bigscreen/template2/images/box_title.png → .../bigscreen/template2/images/box_title.png
diff --git a/...bigscreen/template2/images/chart_icon.png → ...bigscreen/template2/images/chart_icon.png b/...bigscreen/template2/images/chart_icon.png → ...bigscreen/template2/images/chart_icon.png
diff --git a/...screen/template2/images/chart_icon_on.png → ...screen/template2/images/chart_icon_on.png b/...screen/template2/images/chart_icon_on.png → ...screen/template2/images/chart_icon_on.png
diff --git a/...atic/bigscreen/template2/images/close.png → ...atic/bigscreen/template2/images/close.png b/...atic/bigscreen/template2/images/close.png → ...atic/bigscreen/template2/images/close.png
diff --git a/...bigscreen/template2/images/close_icon.png → ...bigscreen/template2/images/close_icon.png b/...bigscreen/template2/images/close_icon.png → ...bigscreen/template2/images/close_icon.png
diff --git a/.../bigscreen/template2/images/data_icon.png → .../bigscreen/template2/images/data_icon.png b/.../bigscreen/template2/images/data_icon.png → .../bigscreen/template2/images/data_icon.png
diff --git a/...gscreen/template2/images/data_icon_on.png → ...gscreen/template2/images/data_icon_on.png b/...gscreen/template2/images/data_icon_on.png → ...gscreen/template2/images/data_icon_on.png
diff --git a/...tic/bigscreen/template2/images/fangda.png → ...tic/bigscreen/template2/images/fangda.png b/...tic/bigscreen/template2/images/fangda.png → ...tic/bigscreen/template2/images/fangda.png
diff --git a/...c/bigscreen/template2/images/index_bg.png → ...c/bigscreen/template2/images/index_bg.png b/...c/bigscreen/template2/images/index_bg.png → ...c/bigscreen/template2/images/index_bg.png
diff --git a/...tatic/bigscreen/template2/images/jian.png → ...tatic/bigscreen/template2/images/jian.png b/...tatic/bigscreen/template2/images/jian.png → ...tatic/bigscreen/template2/images/jian.png
diff --git a/.../bigscreen/template2/images/line-blue.png → .../bigscreen/template2/images/line-blue.png b/.../bigscreen/template2/images/line-blue.png → .../bigscreen/template2/images/line-blue.png
diff --git a/...ic/bigscreen/template2/images/line_bg.png → ...ic/bigscreen/template2/images/line_bg.png b/...ic/bigscreen/template2/images/line_bg.png → ...ic/bigscreen/template2/images/line_bg.png
diff --git a/...c/bigscreen/template2/images/line_img.png → ...c/bigscreen/template2/images/line_img.png b/...c/bigscreen/template2/images/line_img.png → ...c/bigscreen/template2/images/line_img.png
diff --git a/...c/bigscreen/template2/images/menu_btn.png → ...c/bigscreen/template2/images/menu_btn.png b/...c/bigscreen/template2/images/menu_btn.png → ...c/bigscreen/template2/images/menu_btn.png
diff --git a/...ic/bigscreen/template2/images/menu_on.png → ...ic/bigscreen/template2/images/menu_on.png b/...ic/bigscreen/template2/images/menu_on.png → ...ic/bigscreen/template2/images/menu_on.png
diff --git a/...tatic/bigscreen/template2/images/next.png → ...tatic/bigscreen/template2/images/next.png b/...tatic/bigscreen/template2/images/next.png → ...tatic/bigscreen/template2/images/next.png
diff --git a/...igscreen/template2/images/people_iocn.png → ...igscreen/template2/images/people_iocn.png b/...igscreen/template2/images/people_iocn.png → ...igscreen/template2/images/people_iocn.png
diff --git a/...tatic/bigscreen/template2/images/plus.png → ...tatic/bigscreen/template2/images/plus.png b/...tatic/bigscreen/template2/images/plus.png → ...tatic/bigscreen/template2/images/plus.png
diff --git a/...c/bigscreen/template2/images/popUP_bg.png → ...c/bigscreen/template2/images/popUP_bg.png b/...c/bigscreen/template2/images/popUP_bg.png → ...c/bigscreen/template2/images/popUP_bg.png
diff --git a/...tatic/bigscreen/template2/images/prev.png → ...tatic/bigscreen/template2/images/prev.png b/...tatic/bigscreen/template2/images/prev.png → ...tatic/bigscreen/template2/images/prev.png
diff --git a/...igscreen/template2/images/select_icon.png → ...igscreen/template2/images/select_icon.png b/...igscreen/template2/images/select_icon.png → ...igscreen/template2/images/select_icon.png
diff --git a/...creen/template2/images/select_icon_on.png → ...creen/template2/images/select_icon_on.png b/...creen/template2/images/select_icon_on.png → ...creen/template2/images/select_icon_on.png
diff --git a/...igscreen/template2/images/selsct_time.png → ...igscreen/template2/images/selsct_time.png b/...igscreen/template2/images/selsct_time.png → ...igscreen/template2/images/selsct_time.png
diff --git a/...screen/template2/images/settings_icon.png → ...screen/template2/images/settings_icon.png b/...screen/template2/images/settings_icon.png → ...screen/template2/images/settings_icon.png
diff --git a/...een/template2/images/settings_icon_on.png → ...een/template2/images/settings_icon_on.png b/...een/template2/images/settings_icon_on.png → ...een/template2/images/settings_icon_on.png
diff --git a/...gscreen/template2/images/teacher_icon.png → ...gscreen/template2/images/teacher_icon.png b/...gscreen/template2/images/teacher_icon.png → ...gscreen/template2/images/teacher_icon.png
diff --git a/...bigscreen/template2/images/title_bg01.png → ...bigscreen/template2/images/title_bg01.png b/...bigscreen/template2/images/title_bg01.png → ...bigscreen/template2/images/title_bg01.png
diff --git a/...gscreen/template2/images/title_border.png → ...gscreen/template2/images/title_border.png b/...gscreen/template2/images/title_border.png → ...gscreen/template2/images/title_border.png