2 years ago · 5b41cd3d9f
--- a/eladmin-master/.github/FUNDING.yml
+++ b/eladmin-master/.github/FUNDING.yml
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,11 @@
 
				+### IDEA ###
			
 
				+.idea/*
			
 
				+*.iml
			
 
				+*/target/*
			
 
				+*/*.iml
			
 
				+/.gradle/
			
 
				+/application.pid
			
 
				+
			
 
				 # Compiled class file
			
 
				 *.class
			
 
				 
			
--- a/eladmin-master/LICENSE
+++ b/eladmin-master/LICENSE
--- a/eladmin-master/README.md
+++ b/eladmin-master/README.md
--- a/eladmin-master/eladmin-common/pom.xml
+++ b/eladmin-master/eladmin-common/pom.xml
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/AnonymousAccess.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/AnonymousAccess.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/Limit.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/Limit.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousDeleteMapping.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousDeleteMapping.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousGetMapping.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousGetMapping.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPatchMapping.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPatchMapping.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPostMapping.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPostMapping.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPutMapping.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPutMapping.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/DateUtil.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/DateUtil.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java
--- a/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java
+++ b/eladmin-master/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java
--- a/eladmin-master/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java
+++ b/eladmin-master/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java
--- a/eladmin-master/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java
+++ b/eladmin-master/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java
--- a/eladmin-master/eladmin-common/src/test/java/me/zhengjie/utils/FileUtilTest.java
+++ b/eladmin-master/eladmin-common/src/test/java/me/zhengjie/utils/FileUtilTest.java
--- a/eladmin-master/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java
+++ b/eladmin-master/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java
--- a/eladmin-master/eladmin-generator/pom.xml
+++ b/eladmin-master/eladmin-generator/pom.xml
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java
--- a/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
+++ b/eladmin-master/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
--- a/eladmin-master/eladmin-logging/pom.xml
+++ b/eladmin-master/eladmin-logging/pom.xml
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/annotation/Log.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/annotation/Log.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java
--- a/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java
+++ b/eladmin-master/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java
--- a/eladmin-master/.gitignore
+++ b/eladmin-master/.gitignore
@@ -1,49 +0,0 @@
 
				-### IDEA ###
			
 
				-.idea/*
			
 
				-*.iml
			
 
				-*/target/*
			
 
				-*/*.iml
			
 
				-/.gradle/
			
 
				-/application.pid
			
 
				-
			
 
				-# Compiled class file
			
 
				-*.class
			
 
				-
			
 
				-.DS_Store
			
 
				-.idea/
			
 
				-*.iml
			
 
				-target/
			
 
				- 
			
 
				-# Log file
			
 
				-*.log
			
 
				-logs
			
 
				-*.jar
			
 
				-*.war
			
 
				-*.nar
			
 
				-*.ear
			
 
				-*.zip
			
 
				-*.tar.gz
			
 
				-*.rar
			
 
				-*.settings
			
 
				-*.project
			
 
				-.settings/
			
 
				-*.settings 
			
 
				-.project 
			
 
				-*.idea 
			
 
				-logs 
			
 
				-log
			
 
				-.factorypath 
			
 
				-*.mvn 
			
 
				-.mvn 
			
 
				-*.iml 
			
 
				-*.factorypath 
			
 
				-*.node_modules 
			
 
				-node_modules 
			
 
				-.sts4-cache
			
 
				-*.factorypath
			
 
				-*.classpath
			
 
				-/eladmin-system/log.filePath_IS_UNDEFINED
			
 
				-/eladmin-security/*.classpath
			
 
				-/eladmin-security/*.factorypath
			
 
				-/eladmin-system/*.classpath
			
 
				-/eladmin-system/*.factorypath
			
--- a/eladmin-master/eladmin-system/application.pid
+++ b/eladmin-master/eladmin-system/application.pid
--- a/eladmin-master/eladmin-system/pom.xml
+++ b/eladmin-master/eladmin-system/pom.xml
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/AppRun.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/AppRun.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/RelaxedQueryCharsConnectorCustomizer
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/RelaxedQueryCharsConnectorCustomizer
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/App.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/App.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java
--- a/eladmin-master/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java
+++ b/eladmin-master/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java