格克

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-archiver/pom.properties

@@ -1,3 +1,3 @@
-artifactId=jeecg-system-cloud-api
-groupId=org.jeecgframework.boot
 version=2.4.2
+groupId=org.jeecgframework.boot
+artifactId=jeecg-system-cloud-api

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,4 +0,0 @@
-org\jeecg\common\system\api\fallback\SysBaseAPIFallback.class
-org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.class
-org\jeecg\common\system\api\ISysBaseAPI.class
-org\jeecg\config\FeignConfig.class

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,4 +1,4 @@
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\fallback\SysBaseAPIFallback.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\config\FeignConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\config\FeignConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\fallback\SysBaseAPIFallback.java

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-archiver/pom.properties

@@ -1,3 +1,3 @@
-artifactId=jeecg-system-local-api
-groupId=org.jeecgframework.boot
 version=2.4.2
+groupId=org.jeecgframework.boot
+artifactId=jeecg-system-local-api

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1 +0,0 @@
-org\jeecg\common\system\api\ISysBaseAPI.class

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +1 @@
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java

jeecg-boot-base/jeecg-boot-base-core/pom.xml

@@ -150,11 +150,13 @@
 			<artifactId>shiro-spring-boot-starter</artifactId>
 			<version>${shiro.version}</version>
 		</dependency>
+<!--
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-re</artifactId>
 			<version>2.4.2</version>
 		</dependency>
+-->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
@@ -248,6 +250,11 @@
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.jeecgframework.boot</groupId>
+			<artifactId>codegenerate</artifactId>
+			<version>1.3.3</version>
+		</dependency>
 	</dependencies>
 
 </project>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java

@@ -9,6 +9,8 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author scott

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -73,6 +73,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
         filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
         filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除
+        filterChainDefinitionMap.put("/sys/test/notify_url", "anon"); //支付成功回调接口
         filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
         filterChainDefinitionMap.put("/sys/mLogin", "anon"); //登录接口排除
         filterChainDefinitionMap.put("/sys/logout", "anon"); //登出接口排除

jeecg-boot-base/jeecg-boot-base-core/target/maven-archiver/pom.properties

@@ -1,3 +1,3 @@
-artifactId=jeecg-boot-base-core
-groupId=org.jeecgframework.boot
 version=2.4.2
+groupId=org.jeecgframework.boot
+artifactId=jeecg-boot-base-core

jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,150 +0,0 @@
-org\jeecg\common\util\jsonschema\JsonschemaUtil.class
-org\jeecg\common\util\jsonschema\validate\TreeSelectProperty.class
-org\jeecg\config\mybatis\TenantContext.class
-org\jeecg\config\shiro\filters\ResourceCheckFilter.class
-org\jeecg\common\util\PmsUtil.class
-org\jeecg\common\util\RestDesformUtil.class
-org\jeecg\common\es\QueryStringBuilder.class
-org\jeecg\config\shiro\ShiroConfig.class
-org\jeecg\common\exception\JeecgBootExceptionHandler.class
-org\jeecg\config\shiro\ShiroRealm.class
-org\jeecg\common\api\dto\OnlineAuthDTO.class
-org\jeecg\common\constant\ProvinceCityArea.class
-org\jeecg\common\util\FillRuleUtil.class
-org\jeecg\common\util\superSearch\ObjectParseUtil$1.class
-org\jeecg\common\system\vo\ComboModel.class
-org\jeecg\common\api\vo\Result.class
-org\jeecg\common\constant\CacheConstant.class
-org\jeecg\common\util\MyClassLoader.class
-org\jeecg\common\api\dto\message\TemplateMessageDTO.class
-org\jeecg\common\system\vo\SysPermissionDataRuleModel.class
-org\jeecg\common\exception\JeecgBootException.class
-org\jeecg\common\util\encryption\EncryptedString.class
-org\jeecg\common\util\dynamic\db\SqlUtils.class
-org\jeecg\config\RestTemplateConfig.class
-org\jeecg\common\constant\ServiceNameConstants.class
-org\jeecg\config\mybatis\JeecgTenantParser.class
-org\jeecg\common\util\jsonschema\validate\HiddenProperty.class
-org\jeecg\config\shiro\JwtToken.class
-org\jeecg\config\JeecgCloudCondition.class
-org\jeecg\common\util\CommonUtils.class
-org\jeecg\common\util\SysAnnmentTypeEnum.class
-org\jeecg\common\util\security\entity\SecurityResp.class
-org\jeecg\common\util\DateUtils$4.class
-org\jeecg\common\system\vo\SysCategoryModel.class
-org\jeecg\common\api\dto\message\TemplateDTO.class
-org\jeecg\common\util\jsonschema\validate\PopupProperty.class
-org\jeecg\common\util\security\entity\SecurityReq.class
-org\jeecg\modules\base\service\impl\BaseCommonServiceImpl.class
-org\jeecg\common\api\dto\FileDownDTO.class
-org\jeecg\common\util\DateUtils$1.class
-org\jeecg\common\util\YouBianCodeUtil.class
-org\jeecg\common\util\DySmsEnum.class
-org\jeecg\config\mybatis\MybatisPlusConfig$1.class
-org\jeecg\common\util\RestUtil.class
-org\jeecg\common\api\IWpsBaseAPI.class
-org\jeecg\config\WebMvcConfiguration.class
-org\jeecg\common\aspect\annotation\PermissionData.class
-org\jeecg\common\aspect\PermissionDataAspect.class
-org\jeecg\common\aspect\AutoLogAspect$1.class
-org\jeecg\common\util\BrowserUtils.class
-org\jeecg\common\api\dto\message\MessageDTO.class
-org\jeecg\config\redis\RedisConfig.class
-org\jeecg\common\util\jsonschema\validate\DictProperty.class
-org\jeecg\common\util\UUIDGenerator.class
-org\jeecg\common\system\base\entity\JeecgEntity.class
-org\jeecg\common\util\security\entity\SecuritySignResp.class
-org\jeecg\common\constant\enums\CgformEnum.class
-org\jeecg\common\util\jsonschema\CommonProperty.class
-org\jeecg\common\constant\enums\ModuleType.class
-org\jeecg\common\util\DateUtils.class
-org\jeecg\config\shiro\filters\JwtFilter.class
-org\jeecg\config\oss\OssConfiguration.class
-org\jeecg\common\util\encryption\AesEncryptUtil.class
-org\jeecg\common\util\ReflectHelper.class
-org\jeecg\common\constant\ProvinceCityArea$Area.class
-org\jeecg\common\util\RedisUtil.class
-org\jeecg\common\util\superSearch\QueryRuleEnum.class
-org\jeecg\common\system\base\service\JeecgService.class
-org\jeecg\common\api\dto\message\BusTemplateMessageDTO.class
-org\jeecg\common\api\vo\OaWpsModel.class
-org\jeecg\common\util\DateUtils$3.class
-org\jeecg\common\util\superSearch\QueryRuleVo.class
-org\jeecg\common\util\filter\StrAttackFilter.class
-org\jeecg\common\util\IPUtils.class
-org\jeecg\common\system\vo\DynamicDataSourceModel.class
-org\jeecg\config\AutoPoiConfig.class
-org\jeecg\common\util\HTMLUtils.class
-org\jeecg\config\StaticConfig.class
-org\jeecg\config\AutoPoiDictConfig.class
-org\jeecg\common\aspect\UrlMatchEnum.class
-org\jeecg\common\util\MinioUtil.class
-org\jeecg\common\util\jsonschema\validate\NumberProperty.class
-org\jeecg\common\handler\IFillRuleHandler.class
-org\jeecg\common\system\query\QueryCondition.class
-org\jeecg\common\api\CommonAPI.class
-org\jeecg\modules\base\service\BaseCommonService.class
-org\jeecg\common\system\vo\SysDepartModel.class
-org\jeecg\common\util\DateUtils$5.class
-org\jeecg\config\shiro\filters\CustomShiroFilterFactoryBean$MySpringShiroFilter.class
-org\jeecg\common\constant\CommonSendStatus.class
-org\jeecg\common\util\jsonschema\BaseColumn.class
-org\jeecg\common\api\dto\LogDTO.class
-org\jeecg\common\system\util\JeecgDataAutorUtils.class
-org\jeecg\common\system\query\QueryGenerator$1.class
-org\jeecg\common\system\query\QueryGenerator.class
-org\jeecg\common\system\query\QueryRuleEnum.class
-org\jeecg\common\constant\WebsocketConst.class
-org\jeecg\common\util\superSearch\ObjectParseUtil.class
-org\jeecg\common\system\util\JwtUtil.class
-org\jeecg\config\mybatis\MybatisPlusConfig$2.class
-org\jeecg\common\system\vo\DictModel.class
-org\jeecg\common\util\security\SecurityTools.class
-org\jeecg\common\util\DateUtils$2.class
-org\jeecg\common\system\base\service\impl\JeecgServiceImpl.class
-org\jeecg\common\util\jsonschema\validate\SwitchProperty.class
-org\jeecg\common\util\dynamic\db\DataSourceCachePool.class
-org\jeecg\common\system\base\controller\JeecgController.class
-org\jeecg\common\util\security\entity\MyKeyPair.class
-org\jeecg\config\mybatis\MybatisPlusConfig.class
-org\jeecg\common\es\JeecgElasticsearchTemplate.class
-org\jeecg\common\constant\DataBaseConstant.class
-org\jeecg\common\aspect\DictAspect.class
-org\jeecg\common\constant\FillRuleConstant.class
-org\jeecg\common\util\jsonschema\JsonSchemaDescrip.class
-org\jeecg\common\system\vo\SysUserCacheInfo.class
-org\jeecg\common\util\ImportExcelUtil.class
-org\jeecg\common\util\BrowserType.class
-org\jeecg\common\aspect\annotation\Dict.class
-org\jeecg\common\aspect\AutoLogAspect.class
-org\jeecg\config\Swagger2Config.class
-org\jeecg\common\api\dto\FileUploadDTO.class
-org\jeecg\common\util\TokenUtils.class
-org\jeecg\common\system\vo\DictQuery.class
-org\jeecg\common\util\DateUtils$7.class
-org\jeecg\config\shiro\filters\CustomShiroFilterFactoryBean.class
-org\jeecg\common\system\query\MatchTypeEnum.class
-org\jeecg\common\util\oss\OssBootUtil.class
-org\jeecg\common\util\jsonschema\validate\LinkDownProperty.class
-org\jeecg\common\aspect\annotation\OnlineAuth.class
-org\jeecg\common\util\dynamic\db\FreemarkerParseFactory.class
-org\jeecg\common\constant\CommonConstant.class
-org\jeecg\common\util\dynamic\db\DynamicDBUtil.class
-org\jeecg\common\util\oConvertUtils.class
-org\jeecg\common\util\SqlInjectionUtil.class
-org\jeecg\common\util\PasswordUtil.class
-org\jeecg\modules\base\mapper\BaseCommonMapper.class
-org\jeecg\common\util\SpringContextUtils.class
-org\jeecg\common\util\MD5Util.class
-org\jeecg\common\system\vo\LoginUser.class
-org\jeecg\common\constant\VXESocketConst.class
-org\jeecg\config\mybatis\MybatisInterceptor.class
-org\jeecg\common\util\jsonschema\validate\StringProperty.class
-org\jeecg\common\util\security\entity\SecuritySignReq.class
-org\jeecg\common\api\dto\message\BusMessageDTO.class
-org\jeecg\common\aspect\annotation\AutoLog.class
-org\jeecg\common\util\DySmsHelper.class
-org\jeecg\config\WebSocketConfig.class
-org\jeecg\config\CorsFilterCondition.class
-org\jeecg\config\oss\MinioConfig.class
-org\jeecg\common\util\DateUtils$6.class

jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,136 +1,136 @@
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\SysAnnmentTypeEnum.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\redis\RedisConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\filters\ResourceCheckFilter.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\LogDTO.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\PermissionData.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\modules\base\service\BaseCommonService.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\CacheConstant.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\AutoLogAspect.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecuritySignReq.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\ImportExcelUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\handler\IFillRuleHandler.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\SwitchProperty.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\ReflectHelper.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\HiddenProperty.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\OnlineAuth.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\MyClassLoader.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\superSearch\QueryRuleVo.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\JeecgCloudCondition.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\PmsUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\RedisUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\FreemarkerParseFactory.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\DataSourceCachePool.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\JsonSchemaDescrip.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\oss\MinioConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecurityReq.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\DySmsEnum.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\BaseColumn.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\SqlInjectionUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\TenantContext.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DynamicDataSourceModel.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\MyKeyPair.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\TemplateDTO.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\superSearch\QueryRuleEnum.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\vo\Result.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\QueryRuleEnum.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\DateUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\ShiroRealm.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\MybatisPlusConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\oss\OssConfiguration.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\TemplateMessageDTO.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\LinkDownProperty.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\AutoPoiConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\CommonAPI.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\UUIDGenerator.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\DictProperty.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\IPUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\MD5Util.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\DynamicDBUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\TreeSelectProperty.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\QueryCondition.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\MessageDTO.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\FillRuleUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\OnlineAuthDTO.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\WebsocketConst.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\IWpsBaseAPI.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\exception\JeecgBootExceptionHandler.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\service\impl\JeecgServiceImpl.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\TokenUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\util\JeecgDataAutorUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\CommonSendStatus.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\StringProperty.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\YouBianCodeUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\oConvertUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\FileUploadDTO.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\SpringContextUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\BusTemplateMessageDTO.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\MinioUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\filter\StrAttackFilter.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\PopupProperty.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\DataBaseConstant.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DictModel.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\enums\CgformEnum.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\modules\base\mapper\BaseCommonMapper.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\UrlMatchEnum.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\ProvinceCityArea.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\es\JeecgElasticsearchTemplate.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\AutoLog.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\JwtToken.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\WebMvcConfiguration.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\MatchTypeEnum.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\MybatisInterceptor.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\filters\JwtFilter.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\PermissionDataAspect.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\BusMessageDTO.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\AutoPoiDictConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\enums\ModuleType.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysUserCacheInfo.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\HTMLUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\VXESocketConst.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\LoginUser.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\ShiroConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\BrowserType.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\SqlUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\superSearch\ObjectParseUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\StaticConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\es\QueryStringBuilder.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\ServiceNameConstants.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\entity\JeecgEntity.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\encryption\AesEncryptUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\ComboModel.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\encryption\EncryptedString.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\JsonschemaUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DictQuery.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\modules\base\service\impl\BaseCommonServiceImpl.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\BrowserUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\JeecgTenantParser.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\DySmsHelper.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\RestTemplateConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysDepartModel.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\FileDownDTO.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\service\JeecgService.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\filters\CustomShiroFilterFactoryBean.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\exception\JeecgBootException.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysPermissionDataRuleModel.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\controller\JeecgController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysCategoryModel.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecuritySignResp.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\CommonProperty.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecurityResp.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\Dict.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\DictAspect.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\Swagger2Config.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\PasswordUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\QueryGenerator.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\CorsFilterCondition.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\oss\OssBootUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\RestUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\vo\OaWpsModel.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\NumberProperty.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\RestDesformUtil.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\FillRuleConstant.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\CommonUtils.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\WebSocketConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\CommonConstant.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\SecurityTools.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\util\JwtUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\StaticConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\MyClassLoader.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\QueryRuleEnum.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\JwtToken.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysCategoryModel.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\PopupProperty.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\superSearch\ObjectParseUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\AutoPoiDictConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\FillRuleUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\MybatisPlusConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\vo\OaWpsModel.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DynamicDataSourceModel.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\MessageDTO.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecuritySignResp.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\IPUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\WebsocketConst.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\YouBianCodeUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\modules\base\service\BaseCommonService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\CommonAPI.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\superSearch\QueryRuleVo.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\service\impl\JeecgServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\MatchTypeEnum.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\ReflectHelper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\SwitchProperty.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\filter\StrAttackFilter.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysUserCacheInfo.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\oss\OssConfiguration.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\DataSourceCachePool.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\BrowserType.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\util\JeecgDataAutorUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\MinioUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\CommonConstant.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\superSearch\QueryRuleEnum.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\BaseColumn.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\HiddenProperty.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\FileUploadDTO.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\JeecgCloudCondition.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\service\JeecgService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\CommonProperty.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\SqlUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\ShiroConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\PermissionData.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\controller\JeecgController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\BusTemplateMessageDTO.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\TemplateMessageDTO.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\JsonSchemaDescrip.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\DataBaseConstant.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\filters\ResourceCheckFilter.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\JsonschemaUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\exception\JeecgBootExceptionHandler.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\NumberProperty.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\base\entity\JeecgEntity.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysDepartModel.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\JeecgTenantParser.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\RedisUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\ServiceNameConstants.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\ComboModel.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\encryption\EncryptedString.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\exception\JeecgBootException.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\CommonUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\enums\ModuleType.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\DySmsHelper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\WebSocketConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\UrlMatchEnum.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\QueryGenerator.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\OnlineAuth.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\SecurityTools.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\HTMLUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\modules\base\mapper\BaseCommonMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\CommonSendStatus.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecuritySignReq.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\RestUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\WebMvcConfiguration.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\RestDesformUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\ShiroRealm.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\CorsFilterCondition.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\DynamicDBUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\ImportExcelUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\oss\OssBootUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\BusMessageDTO.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\AutoLogAspect.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\message\TemplateDTO.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\es\JeecgElasticsearchTemplate.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\VXESocketConst.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\FillRuleConstant.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\PmsUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\DictProperty.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\ProvinceCityArea.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\BrowserUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\redis\RedisConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\SysPermissionDataRuleModel.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DictModel.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\SpringContextUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\OnlineAuthDTO.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\TreeSelectProperty.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\filters\JwtFilter.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\RestTemplateConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\Dict.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\enums\CgformEnum.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\Swagger2Config.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\oss\MinioConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\oConvertUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\handler\IFillRuleHandler.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\annotation\AutoLog.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\DictAspect.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\LoginUser.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecurityReq.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\LinkDownProperty.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\PasswordUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\DateUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\jsonschema\validate\StringProperty.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\SecurityResp.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\MybatisInterceptor.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\aspect\PermissionDataAspect.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\util\JwtUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\IWpsBaseAPI.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\UUIDGenerator.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\security\entity\MyKeyPair.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\constant\CacheConstant.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\modules\base\service\impl\BaseCommonServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\vo\DictQuery.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\encryption\AesEncryptUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\DySmsEnum.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\FileDownDTO.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\dynamic\db\FreemarkerParseFactory.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\MD5Util.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\AutoPoiConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\SysAnnmentTypeEnum.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\vo\Result.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\api\dto\LogDTO.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\es\QueryStringBuilder.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\mybatis\TenantContext.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\SqlInjectionUtil.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\config\shiro\filters\CustomShiroFilterFactoryBean.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\util\TokenUtils.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-core\src\main\java\org\jeecg\common\system\query\QueryCondition.java

jeecg-boot-base/jeecg-boot-base-tools/target/maven-archiver/pom.properties

@@ -1,3 +1,3 @@
-artifactId=jeecg-boot-base-tools
-groupId=org.jeecgframework.boot
 version=2.4.2
+groupId=org.jeecgframework.boot
+artifactId=jeecg-boot-base-tools

jeecg-boot-base/jeecg-boot-base-tools/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,5 +1,5 @@
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\base\BaseMap.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\GlobalConstants.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\annotation\RabbitComponent.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\CommonConfig.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\SpringContextHolder.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\CommonConfig.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\GlobalConstants.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\annotation\RabbitComponent.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\SpringContextHolder.java
+D:\porject\GEKE_SERVICE\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\base\BaseMap.java

jeecg-boot-module-demo/src/main/resources/application.yml

@@ -2,4 +2,10 @@ server:
   port: 7002
 spring:
   application:
-    name: jeecg-demo
+    name: jeecg-demo
+
+#Mybatis输出sql日志
+logging:
+  level:
+    org.jeecg.modules.geke: info
+

jeecg-boot-module-demo/target/classes/application.yml

@@ -2,4 +2,10 @@ server:
   port: 7002
 spring:
   application:
-    name: jeecg-demo
+    name: jeecg-demo
+
+#Mybatis输出sql日志
+logging:
+  level:
+    org.jeecg.modules.geke: info
+

jeecg-boot-module-demo/target/maven-archiver/pom.properties

@@ -1,3 +1,3 @@
-artifactId=jeecg-boot-module-demo
-groupId=org.jeecgframework.boot
 version=2.4.2
+groupId=org.jeecgframework.boot
+artifactId=jeecg-boot-module-demo

jeecg-boot-module-demo/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,35 +0,0 @@
-org\jeecg\modules\demo\test\service\impl\JeecgOrderCustomerServiceImpl.class
-org\jeecg\modules\demo\test\entity\JeecgOrderCustomer.class
-org\jeecg\modules\demo\test\service\impl\JeecgDemoServiceImpl.class
-org\jeecg\modules\demo\test\mapper\JoaDemoMapper.class
-org\jeecg\modules\demo\mock\MockController.class
-org\jeecg\modules\demo\test\controller\JeecgOrderTabMainController.class
-org\jeecg\modules\demo\test\service\IJeecgOrderMainService.class
-org\jeecg\modules\demo\test\mapper\JeecgDemoMapper.class
-org\jeecg\modules\demo\test\service\impl\JeecgOrderMainServiceImpl.class
-org\jeecg\modules\demo\test\service\impl\JoaDemoServiceImpl.class
-org\jeecg\modules\demo\test\mapper\JeecgOrderMainMapper.class
-org\jeecg\modules\demo\test\service\IJeecgOrderCustomerService.class
-org\jeecg\modules\demo\test\service\impl\JeecgOrderTicketServiceImpl.class
-org\jeecg\modules\demo\test\controller\JeecgOrderMainController.class
-org\jeecg\modules\demo\mock\vxe\entity\MockEntity.class
-org\jeecg\modules\demo\test\entity\JeecgDemo.class
-org\jeecg\modules\demo\test\controller\JeecgDemoController.class
-org\jeecg\modules\demo\mock\vxe\websocket\VXESocket.class
-org\jeecg\modules\demo\test\vo\JeecgOrderMainPage.class
-org\jeecg\modules\dlglong\controller\DlMockController.class
-org\jeecg\modules\demo\cloud\service\impl\JcloudDemoServiceImpl.class
-org\jeecg\modules\demo\test\entity\JeecgOrderMain.class
-org\jeecg\modules\demo\test\controller\BigScreenTemplatController.class
-org\jeecg\modules\demo\test\service\IJeecgDemoService.class
-org\jeecg\modules\demo\test\entity\JeecgOrderTicket.class
-org\jeecg\modules\demo\test\service\IJoaDemoService.class
-org\jeecg\modules\demo\test\controller\JoaDemoController.class
-org\jeecg\modules\demo\test\mapper\JeecgOrderTicketMapper.class
-org\jeecg\modules\demo\cloud\provider\JcloudDemoProvider.class
-org\jeecg\modules\demo\cloud\service\JcloudDemoService.class
-org\jeecg\modules\demo\test\mapper\JeecgOrderCustomerMapper.class
-org\jeecg\modules\demo\test\service\IJeecgOrderTicketService.class
-org\jeecg\modules\demo\mock\vxe\controller\VxeMockController.class
-org\jeecg\modules\demo\test\entity\JoaDemo.class
-org\jeecg\modules\dlglong\entity\MockEntity.class

jeecg-boot-module-demo/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,37 +1,62 @@
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJoaDemoService.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JeecgOrderMainServiceImpl.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JeecgOrderCustomer.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JeecgOrderMain.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\cloud\service\impl\JcloudDemoServiceImpl.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JoaDemoMapper.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JoaDemo.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\dlglong\entity\MockEntity.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\cloud\service\JcloudDemoService.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\JoaDemoController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JoaDemoServiceImpl.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\dlglong\controller\DlMockController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JeecgDemoMapper.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\mock\vxe\controller\VxeMockController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JeecgDemo.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJeecgDemoService.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\mock\vxe\websocket\VXESocket.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JeecgOrderTicketMapper.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\BigScreenTemplatController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\JeecgOrderTabMainController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\JeecgDemoController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJeecgOrderMainService.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\vo\JeecgOrderMainPage.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\JeecgDemoCloudApplication.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJeecgOrderTicketService.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\mock\MockController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJeecgOrderCustomerService.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JeecgOrderTicket.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\cloud\controller\JcloudDemoController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JeecgOrderCustomerServiceImpl.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\cloud\provider\JcloudDemoProvider.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\JeecgOrderMainController.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JeecgOrderCustomerMapper.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JeecgOrderTicketServiceImpl.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JeecgOrderMainMapper.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\mock\vxe\entity\MockEntity.java
-D:\ideaWorkSpace\jeecg-boot\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JeecgDemoServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\mock\MockController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\JeecgOrderTabMainController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\teams\entity\Teams.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\attendance\controller\AttendanceController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\vacation\entity\Vacation.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\teams\mapper\TeamsMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\mapper\SalaryMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JeecgOrderCustomer.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\attendance\service\IAttendanceService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JeecgDemoServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\mock\vxe\controller\VxeMockController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\service\ISalaryCardService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JeecgOrderCustomerMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\entity\SalaryCard.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJoaDemoService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JeecgOrderMainMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\mapper\SalaryCardMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\cloud\service\JcloudDemoService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\cloud\provider\JcloudDemoProvider.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\attendance\entity\Attendance.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\attendance\service\impl\AttendanceServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\JeecgDemoCloudApplication.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JoaDemoMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JoaDemoServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\mock\vxe\websocket\VXESocket.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\controller\SalaryCardController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\cloud\controller\JcloudDemoController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JoaDemo.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\vacation\service\IVacationService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\JeecgDemoController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\mock\vxe\entity\MockEntity.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\service\ISalaryService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJeecgOrderCustomerService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\vacation\service\impl\VacationServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JeecgOrderMain.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JeecgOrderTicket.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JeecgOrderCustomerServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJeecgOrderMainService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\entity\Salary.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\service\impl\SalaryServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\JeecgOrderMainController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\vacation\mapper\VacationMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\teams\service\impl\TeamsServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\entity\JeecgDemo.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\cloud\service\impl\JcloudDemoServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\teams\controller\TeamsController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\vacation\controller\VacationController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJeecgDemoService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\IJeecgOrderTicketService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\BigScreenTemplatController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\vo\JeecgOrderMainPage.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JeecgOrderTicketMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\dlglong\controller\DlMockController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\controller\JoaDemoController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\controller\SalaryController.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\teams\service\ITeamsService.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\dlglong\entity\MockEntity.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JeecgOrderMainServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\attendance\mapper\AttendanceMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\mapper\JeecgDemoMapper.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\demo\test\service\impl\JeecgOrderTicketServiceImpl.java
+D:\porject\GEKE_SERVICE\jeecg-boot-module-demo\src\main\java\org\jeecg\modules\geke\salary\service\impl\SalaryCardServiceImpl.java

jeecg-boot-module-system/pom.xml

@@ -30,6 +30,53 @@
 	</repositories>
 
 	<dependencies>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4.7</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-email</artifactId>
+			<version>1.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.5</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.belerweb</groupId>
+			<artifactId>pinyin4j</artifactId>
+			<version>2.5.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-asl</artifactId>
+			<version>1.9.9</version>
+		</dependency>
+
+		<!--<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-sdk-java</artifactId>
+			<version>3.7.4.ALL</version>
+		</dependency>-->
+
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>jeecg-system-local-api</artifactId>
@@ -44,7 +91,7 @@
 			<version>${jeecgboot.version}</version>
 		</dependency>
 		<!-- 积木报表 -->
-		<dependency>
+	<!--	<dependency>
 			<groupId>com.jimureport</groupId>
 			<artifactId>spring-boot-starter-jimureport</artifactId>
 			<version>1.1.09-beta</version>
@@ -54,8 +101,40 @@
 					<groupId>org.jeecgframework</groupId>
 				</exclusion>
 			</exclusions>
+		</dependency>-->
+
+		<!-- 支付接口配置 -->
+
+		<!--<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-easysdk</artifactId>
+			<version>2.0.2</version>
+		</dependency>-->
+		<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-easysdk</artifactId>
+			<version>2.1.2</version>
 		</dependency>
-	</dependencies>
+		        <!-- 支付接口需要依赖commons-logging:jar:1.1.1 -->
+		         <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+		         <dependency>
+		             <groupId>commons-logging</groupId>
+		             <artifactId>commons-logging</artifactId>
+		             <version>1.1.1</version>
+		         </dependency>
+		         <!-- 生成支付二维码需要jar -->
+		         <!-- https://mvnrepository.com/artifact/com.google.zxing/core -->
+		         <dependency>
+		             <groupId>com.google.zxing</groupId>
+		             <artifactId>core</artifactId>
+		             <version>3.3.3</version>
+		         </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>spring-boot-starter-jimureport</artifactId>
+            <version>1.3.4-beta</version>
+        </dependency>
+    </dependencies>
 
 	<build>
 		<plugins>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java

@@ -1,7 +1,9 @@
 package org.jeecg.modules.message.websocket;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -17,7 +19,14 @@ import cn.hutool.core.util.ObjectUtil;
 import org.jeecg.boot.starter.redis.client.JeecgRedisClient;
 import org.jeecg.boot.starter.redis.listener.JeecgRedisListerer;
 import org.jeecg.common.base.BaseMap;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.WebsocketConst;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.modules.system.util.TokenInfo;
+import org.jeecg.modules.system.vo.SpringContextUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.alibaba.fastjson.JSONObject;
@@ -31,27 +40,39 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Component
 @Slf4j
-@ServerEndpoint("/websocket/{userId}") //此注解相当于设置访问URL
+@ServerEndpoint("/websocket/{userId}/{sessionId}") //此注解相当于设置访问URL
 public class WebSocket {
 
     private Session session;
 
     private String userId;
 
+    private String sessionId;
+
+
     private static final String REDIS_TOPIC_NAME = "socketHandler";
 
+    @Autowired
+    public void setRestTemplateImpl(RedisUtil redisUtil){
+        WebSocket.redisUtil=redisUtil;
+    }
+
     @Resource
     private JeecgRedisClient jeecgRedisClient;
 
+    private  static RedisUtil redisUtil;
+
+
     private static CopyOnWriteArraySet<WebSocket> webSockets = new CopyOnWriteArraySet<>();
     private static Map<String, Session> sessionPool = new HashMap<String, Session>();
 
 
     @OnOpen
-    public void onOpen(Session session, @PathParam(value = "userId") String userId) {
+    public void onOpen(Session session, @PathParam(value = "userId") String userId, @PathParam(value = "sessionId") String sessionId) {
         try {
             this.session = session;
             this.userId = userId;
+            this.sessionId=sessionId;
             webSockets.add(this);
             sessionPool.put(userId, session);
             log.info("【websocket消息】有新的连接，总数为:" + webSockets.size());
@@ -62,6 +83,7 @@ public class WebSocket {
     @OnClose
     public void onClose() {
         try {
+
             webSockets.remove(this);
             sessionPool.remove(this.userId);
             log.info("【websocket消息】连接断开，总数为:" + webSockets.size());
@@ -99,16 +121,47 @@ public class WebSocket {
         }
     }
 
+    public void sendToUser(String message) {
+        String sendUserno = message.split("[|]")[1];
+        String sendMessage = message.split("[|]")[0];
+        String userid=message.split("[|]")[2];
+        List<Chat>list=new ArrayList<>();
+        Chat chat=new Chat();
+        if (redisUtil.hasKey(sendUserno+userid)){
+            chat.setUserid(userid);
+            chat.setCenter(sendMessage);
+            list.add(chat);
+            redisUtil.set(sendUserno+userid,list);
+        }
+
+        try {
+            if (sessionPool.get(sendUserno) != null) {
+                sessionPool.get(sendUserno).getAsyncRemote().sendText(sendMessage);
+            } else {
+                System.out.println("当前用户不在线");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 
     @OnMessage
     public void onMessage(String message) {
         //todo 现在有个定时任务刷，应该去掉
         log.debug("【websocket消息】收到客户端消息:" + message);
-        JSONObject obj = new JSONObject();
+       /* JSONObject obj = new JSONObject();
         obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_CHECK);//业务类型
         obj.put(WebsocketConst.MSG_TXT, "心跳响应");//消息内容
         for (WebSocket webSocket : webSockets) {
             webSocket.pushMessage(message);
+        }*/
+        if (webSockets.size()>=2){
+            sendToUser(message);
+        }else {
+            for (WebSocket webSocket : webSockets) {
+                webSocket.pushMessage(message);
+            }
         }
     }
 
@@ -150,4 +203,6 @@ public class WebSocket {
         }
     }
 
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -9,10 +9,15 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.session.mgt.eis.SessionDAO;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.crazycake.shiro.RedisSessionDAO;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.api.ISysBaseAPI;
+
 import org.jeecg.modules.base.service.BaseCommonService;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
@@ -26,6 +31,7 @@ import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysLogService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.system.util.RandImageUtil;
+import org.jeecg.modules.system.util.TokenInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -33,6 +39,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.util.*;
 
 /**
@@ -59,6 +66,12 @@ public class LoginController {
 	@Resource
 	private BaseCommonService baseCommonService;
 
+	@Autowired
+	private  SessionDAO sessionDAO;
+
+
+
+
 	private static final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890";
 
 	@ApiOperation("登录接口")
@@ -140,11 +153,29 @@ public class LoginController {
 	    	//清空用户登录Token缓存
 	    	redisUtil.del(CommonConstant.PREFIX_USER_TOKEN + token);
 	    	//清空用户登录Shiro权限缓存
-			redisUtil.del(CommonConstant.PREFIX_USER_SHIRO_CACHE + sysUser.getId());
+			//redisUtil.del(CommonConstant.PREFIX_USER_SHIRO_CACHE + sysUser.getId());
 			//清空用户的缓存信息（包括部门信息），例如sys:cache:user::<username>
-			redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername()));
+			//redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername()));
+			//清空session缓存
+			List<TokenInfo> taskList = (ArrayList<TokenInfo>) redisUtil.get(sysUser.getId());
+			if (taskList.size()>1){
+				for (TokenInfo t:taskList){
+					if (t.getTokenKey().equals(CommonConstant.PREFIX_USER_TOKEN +token)){
+						taskList.remove(t);
+						System.out.println("销毁session"+t.getSessionId());
+					}
+				}
+				redisUtil.set(sysUser.getId(),taskList);
+			}else{
+				redisUtil.del(sysUser.getId());
+				redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername()));
+				redisUtil.del(CommonConstant.PREFIX_USER_SHIRO_CACHE + sysUser.getId());
+
+			}
+
 			//调用shiro的logout
 			SecurityUtils.getSubject().logout();
+
 	    	return Result.ok("退出登录成功！");
 	    }else {
 	    	return Result.error("Token无效!");
@@ -433,7 +464,7 @@ public class LoginController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value = "/mLogin", method = RequestMethod.POST)
-	public Result<JSONObject> mLogin(@RequestBody SysLoginModel sysLoginModel) throws Exception {
+	public Result<JSONObject> mLogin(@RequestBody SysLoginModel sysLoginModel, HttpSession session) throws Exception {
 		Result<JSONObject> result = new Result<JSONObject>();
 		String username = sysLoginModel.getUsername();
 		String password = sysLoginModel.getPassword();
@@ -477,10 +508,40 @@ public class LoginController {
 
 		//token 信息
 		obj.put("token", token);
+		obj.put("sessionId",session.getId());
 		result.setResult(obj);
 		result.setSuccess(true);
 		result.setCode(200);
+		Map<String,Object>map=new HashMap<>();
+		List<TokenInfo>list=new ArrayList<>();
+		TokenInfo tokenInfo=new TokenInfo();
 		baseCommonService.addLog("用户名: " + username + ",登录成功[移动端]！", CommonConstant.LOG_TYPE_1, null);
+		Collection<Session> activeSessions = sessionDAO.getActiveSessions();
+		if (!redisUtil.hasKey(sysUser.getId())){
+			tokenInfo.setTokenKey(CommonConstant.PREFIX_USER_TOKEN + token);
+			tokenInfo.setSessionId(session.getId());
+
+			list.add(tokenInfo);
+			redisUtil.set(sysUser.getId(),list);
+
+
+		}else {
+			List<TokenInfo> taskList = (ArrayList<TokenInfo>) redisUtil.get(sysUser.getId());
+			if (taskList.size() ==2) {
+				TokenInfo tokenInfo1 = taskList.get(0);
+				taskList.remove(0);
+				redisUtil.del(tokenInfo1.getTokenKey());
+				tokenInfo.setTokenKey(CommonConstant.PREFIX_USER_TOKEN + token);
+				tokenInfo.setSessionId(session.getId());
+				taskList.add(tokenInfo);
+				redisUtil.set(sysUser.getId(), taskList);
+			} else {
+				tokenInfo.setTokenKey(CommonConstant.PREFIX_USER_TOKEN + token);
+				tokenInfo.setSessionId(session.getId());
+				taskList.add(tokenInfo);
+				redisUtil.set(sysUser.getId(), taskList);
+			}
+		}
 		return result;
 	}
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -12,6 +12,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.mail.EmailException;
+import org.apache.commons.mail.HtmlEmail;
+import org.apache.poi.sl.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;
@@ -24,10 +30,17 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.*;
+import org.jeecg.modules.geke.attendance.service.IAttendanceService;
+import org.jeecg.modules.geke.vacation.entity.Vacation;
+import org.jeecg.modules.geke.vacation.mapper.VacationMapper;
+import org.jeecg.modules.geke.vacation.service.IVacationService;
 import org.jeecg.modules.system.entity.*;
+import org.jeecg.modules.system.mapper.SysDepartMapper;
+import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.service.*;
+import org.jeecg.modules.system.util.emailUtils;
 import org.jeecg.modules.system.vo.SysDepartUsersVO;
 import org.jeecg.modules.system.vo.SysUserRoleVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -46,6 +59,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.ParseException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -61,8 +77,15 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/sys/user")
 public class SysUserController {
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
 	@Autowired
 	private ISysBaseAPI sysBaseAPI;
+
+	@Autowired
+    private VacationMapper vacationMapper;
 	
 	@Autowired
 	private ISysUserService sysUserService;
@@ -73,6 +96,9 @@ public class SysUserController {
 	@Autowired
 	private ISysUserRoleService sysUserRoleService;
 
+	@Autowired
+    private IAttendanceService attendanceService;
+
 	@Autowired
 	private ISysUserDepartService sysUserDepartService;
 
@@ -82,9 +108,16 @@ public class SysUserController {
     @Autowired
     private ISysDepartRoleUserService departRoleUserService;
 
+    @Autowired
+    private IVacationService vacationService;
+
     @Autowired
     private ISysDepartRoleService departRoleService;
 
+    @Autowired
+    private SysDepartMapper departMapper;
+
+
 	@Autowired
 	private RedisUtil redisUtil;
 
@@ -94,6 +127,98 @@ public class SysUserController {
     @Resource
     private BaseCommonService baseCommonService;
 
+
+
+
+
+
+    /**
+     * 获取部门数据
+     * @param user
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+
+    @RequestMapping(value = "/departList", method = RequestMethod.GET)
+    public  Map<String, Object> departList(String departName) {
+        return sysUserService.departCount(departName);
+    }
+
+
+
+    /**
+     * 获取用户列表数据
+     * @param user
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @PermissionData(pageComponent = "system/UserLists")
+    @RequestMapping(value = "/lists", method = RequestMethod.GET)
+    public  List<SysUser> queryPageList(String username,String date) throws ParseException {
+        Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+
+
+        List<SysUser> sysUsers = sysUserService.queryUsers(username);
+        List<String>userids=new ArrayList<>();
+        if (sysUsers.size()!=0){
+            for (SysUser u:sysUsers){
+                userids.add(u.getId());
+                String querymoth = attendanceService.querymoth(u.getId(), date);
+                u.setDel(querymoth);
+            }
+        }
+        //批量查询用户的所属部门
+        //step.1 先拿到全部的 useids
+        //step.2 通过 useids，一次性查询用户的所属部门名字
+        if(userids!=null && userids.size()>0){
+            Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userids);
+            sysUsers.forEach(item->{
+                item.setOrgCodeTxt(useDepNames.get(item.getId()));
+            });
+        }
+
+        return sysUsers;
+    }
+
+
+
+
+    /**
+     * 获取工资方法情况人事部门
+     * @param user
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+
+    @RequestMapping(value = "/querywagesList", method = RequestMethod.GET)
+    public  List<SysUser> querywagesList(String username){
+        Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
+        List<SysUser> sysUsers = sysUserService.queryUsers(username);
+        List<String>userids=new ArrayList<>();
+        if (sysUsers.size()!=0){
+            for (SysUser u:sysUsers){
+                userids.add(u.getId());
+            }
+        }
+        //批量查询用户的所属部门
+        //step.1 先拿到全部的 useids
+        //step.2 通过 useids，一次性查询用户的所属部门名字
+        if(userids.size()>0){
+            Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userids);
+            sysUsers.forEach(item->{
+                item.setOrgCodeTxt(useDepNames.get(item.getId()));
+            });
+        }
+
+        return sysUsers;
+    }
+
     /**
      * 获取用户列表数据
      * @param user
@@ -121,6 +246,7 @@ public class SysUserController {
             Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userIds);
             pageList.getRecords().forEach(item->{
                 item.setOrgCodeTxt(useDepNames.get(item.getId()));
+                item.setOrgText(sysUserService.getOrgName(item.getId()).get(0));
             });
         }
 		result.setSuccess(true);
@@ -235,16 +361,31 @@ public class SysUserController {
     }
 
     @RequestMapping(value = "/queryById", method = RequestMethod.GET)
-    public Result<SysUser> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<SysUser> result = new Result<SysUser>();
-        SysUser sysUser = sysUserService.getById(id);
-        if (sysUser == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(sysUser);
-            result.setSuccess(true);
+    public Map<String,Object> queryById(@RequestParam(name = "id", required = true) String id) throws ParseException {
+        Map<String,Object>map=new HashMap<>();
+        List<String>ids=new ArrayList<>();
+        ids.add(id);
+        SysUser sysUser = sysUserMapper.sysusers(id);
+        if (!"".equals(sysUser.getPost())&&sysUser.getPost()!=null){
+            String postName = sysUserService.getPostName(sysUser.getPost());
+            sysUser.setPost(postName);
         }
-        return result;
+        Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(ids);
+        sysUser.setOrgCodeTxt(useDepNames.get(sysUser.getId()));
+        /*SysUser sysUser = sysUserService.getById(id);*/
+        LocalDateTime dateTime = LocalDateTime.now();
+        String  str = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss"));
+        Vacation vacations = vacationMapper.queryList(id, "1");
+        Vacation vacationst = vacationMapper.queryList(id, "4");
+        if(vacationst!=null){
+            vacations.setLeaveDate(vacationst.getAvailableDay());
+        }
+       
+        String querymoth = attendanceService.querymoth(id, str);
+        map.put("data",sysUser);
+       map.put("sign",vacations);
+       map.put("sum",querymoth);
+        return map;
     }
 
     @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
@@ -258,6 +399,7 @@ public class SysUserController {
             for (SysUserRole sysUserRole : userRole) {
                 list.add(sysUserRole.getRoleId());
             }
+
             result.setSuccess(true);
             result.setResult(list);
         }
@@ -408,15 +550,29 @@ public class SysUserController {
        }
         //update-end--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
         List<SysUser> pageList = sysUserService.list(queryWrapper);
+        List<String>userids=new ArrayList<>();
+       if (pageList.size()>0){
+           for (SysUser ls:pageList){
+               userids.add(ls.getId());
+           }
+           if(userids.size()>0){
+               Map<String,String>  useDepNames = sysUserService.getDepNamesByUserIds(userids);
+               pageList.forEach(item->{
+                   item.setOrgCodeTxt(useDepNames.get(item.getId()));
+               });
+           }
 
+       }
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "用户列表");
         mv.addObject(NormalExcelConstants.CLASS, SysUser.class);
 		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
         ExportParams exportParams = new ExportParams("用户列表数据", "导出人:"+user.getRealname(), "导出信息");
         exportParams.setImageBasePath(upLoadPath);
         mv.addObject(NormalExcelConstants.PARAMS, exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+
         return mv;
     }
 
@@ -449,15 +605,26 @@ public class SysUserController {
                     if (StringUtils.isBlank(sysUserExcel.getPassword())) {
                         // 密码默认为 “123456”
                         sysUserExcel.setPassword("123456");
-                    }
+                }
                     // 密码加密加盐
                     String salt = oConvertUtils.randomGen(8);
                     sysUserExcel.setSalt(salt);
                     String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
                     sysUserExcel.setPassword(passwordEncode);
+                    sysUserExcel.setDelFlag(Integer.parseInt(CommonConstant.DEL_FLAG_0.toString()));
+                    sysUserExcel.setStatus(1);
                     try {
-                        sysUserService.save(sysUserExcel);
-                        successLines++;
+                        if (!"".equals(sysUserExcel.getRealname())&&sysUserExcel.getRealname()!=null){
+                            if (!"".equals(sysUserExcel.getEmail())&&sysUserExcel.getEmail()!=null){
+                                if (!"".equals(sysUserExcel.getOrgCodeTxt())&&sysUserExcel.getOrgCodeTxt()!=null){
+                                    sysUserService.save(sysUserExcel);
+                                    successLines++;
+                                }
+                            }
+
+                        }
+
+
                     } catch (Exception e) {
                         errorLines++;
                         String message = e.getMessage().toLowerCase();
@@ -477,13 +644,16 @@ public class SysUserController {
                         }
                     }
                     // 批量将部门和用户信息建立关联关系
-                    String departIds = sysUserExcel.getDepartIds();
+                    String departIds = sysUserExcel.getOrgCodeTxt();
                     if (StringUtils.isNotBlank(departIds)) {
                         String userId = sysUserExcel.getId();
                         String[] departIdArray = departIds.split(",");
                         List<SysUserDepart> userDepartList = new ArrayList<>(departIdArray.length);
                         for (String departId : departIdArray) {
-                            userDepartList.add(new SysUserDepart(userId, departId));
+                            String departLis = departMapper.getDepartLis(departId);
+                            if (!"".equals(departId)&&departId!=null){
+                                userDepartList.add(new SysUserDepart(userId, departLis));
+                            }
                         }
                         sysUserDepartService.saveBatch(userDepartList);
                     }
@@ -1339,4 +1509,79 @@ public class SysUserController {
         sysUserService.updateById(user);
         return Result.ok("手机号设置成功!");
     }
+
+
+
+    @RequestMapping(value = "/departUser", method = RequestMethod.GET)
+    public List<SysUser>queryDepartUser(String departId,String name){
+      return   sysUserService.departUser(departId,name);
+    }
+
+    //根据用户id查询对应团队信息
+    @RequestMapping(value = "/queryTeamUser", method = RequestMethod.GET)
+    public List<SysUser>queryTeamUser(String userId,String name){
+        List<SysUser> sysUsers = sysUserService.queryTeamUser(userId, name);
+        if (sysUsers.size()>0){
+            for (SysUser ls:sysUsers){
+                List<SysUser> sysUsers1 = sysUserService.queryTeamUser(ls.getId(), name);
+                if (sysUsers1.size()>0){//判断当前用户是否拥有团队
+                    ls.setCount("1");
+                }else{
+                    ls.setCount("2");
+                }
+
+            }
+        }
+
+
+        return  sysUsers ;
+    }
+
+
+
+
+    //发邮件
+    @RequestMapping(value = "/sendEamilCode", method = RequestMethod.GET)
+    public String sendEamilCode(String email) {
+        String emailCode = emailUtils.emailTo(email);
+        redisUtil.set(email,emailCode,60);
+        return emailCode;//返回验证码
+    }
+
+
+    //发邮件
+    @RequestMapping(value = "/editUser", method = RequestMethod.GET)
+    public  Result<SysUser> editUser(String id,String avatar) {
+        Result<SysUser> result = new Result<SysUser>();
+        try {
+                int i = sysUserMapper.editUser(id, avatar);
+                if (i>0){
+                    result.success("修改成功!");
+                }else {
+                    result.error500("操作失败");
+                }
+
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+
+    @RequestMapping(value = "/userpwd", method = RequestMethod.GET)
+    public Result<?> changePassword(String password, String username,String email,String emailCode) {
+        SysUser sysUser=new SysUser();
+        System.out.println(redisUtil.hasKey(email)+""+redisUtil.get(email));
+        if (redisUtil.hasKey(email)==false||!redisUtil.get(email).equals(emailCode)) {
+            return Result.error("验证码错误");
+        }
+        SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
+        if (u == null) {
+            return Result.error("用户不存在！");
+        }
+        sysUser.setUsername(username);
+        sysUser.setPassword(password);
+        return sysUserService.changePassword(sysUser);
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -67,7 +67,6 @@ public class SysUser implements Serializable {
     /**
      * 头像
      */
-    @Excel(name = "头像", width = 15,type = 2)
     private String avatar;
 
     /**
@@ -103,19 +102,20 @@ public class SysUser implements Serializable {
     private String orgCode;
 
     /**部门名称*/
+    @Excel(name = "部门", width = 15)
     private transient String orgCodeTxt;
 
     /**
      * 状态(1：正常  2：冻结 ）
      */
-    @Excel(name = "状态", width = 15,dicCode="user_status")
+    /*@Excel(name = "状态(1：正常  2：冻结 ）", width = 15,dicCode="user_status")*/
     @Dict(dicCode = "user_status")
     private Integer status;
 
     /**
      * 删除状态（0，正常，1已删除）
      */
-    @Excel(name = "删除状态", width = 15,dicCode="del_flag")
+   /* @Excel(name = "删除状态（0，正常，1已删除）", width = 15,dicCode="del_flag")*/
     @TableLogic
     private Integer delFlag;
 
@@ -128,7 +128,6 @@ public class SysUser implements Serializable {
     /**
      * 职务，关联职务表
      */
-    @Excel(name = "职务", width = 15)
     @Dict(dictTable ="sys_position",dicText = "name",dicCode = "code")
     private String post;
 
@@ -165,13 +164,11 @@ public class SysUser implements Serializable {
     /**
      * 身份（0 普通成员 1 上级）
      */
-    @Excel(name="（1普通成员 2上级）",width = 15)
     private Integer userIdentity;
 
     /**
      * 负责部门
      */
-    @Excel(name="负责部门",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     private String departIds;
 
@@ -182,4 +179,34 @@ public class SysUser implements Serializable {
 
     /**设备id uniapp推送用*/
     private String clientId;
+
+    /**英文名**/
+    @Excel(name="英文名",width = 15)
+    private  String egName;
+    /**出生日期**/
+    @Excel(name="出生日期",width = 15,format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private  Date birthDate;
+    /**入职日期**/
+    @Excel(name="入职日期",width = 15,format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private  Date entryDate;
+    /**紧急联系人**/
+    @Excel(name="紧急联系人",width = 15)
+    private  String urgentName;
+    /**紧急联系人电话**/
+    @Excel(name="紧急联系人电话",width = 15)
+    private  String urgentPhone;
+
+    /**备用字段**/
+    private transient  String del;
+    /**部门id**/
+    private  transient String departId;
+    /**部门人数**/
+    private  transient String count;
+
+    /**用户所属组织**/
+    private  transient  String orgText;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java

@@ -19,6 +19,13 @@ public class SysUserDepart implements Serializable {
 	private String userId;
 	/**部门id*/
 	private String depId;
+
+
+
+	public SysUserDepart(){
+
+	}
+
 	public SysUserDepart(String id, String userId, String depId) {
 		super();
 		this.id = id;
@@ -30,4 +37,28 @@ public class SysUserDepart implements Serializable {
 		this.userId = id;
 		this.depId = departId;
 	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getDepId() {
+		return depId;
+	}
+
+	public void setDepId(String depId) {
+		this.depId = depId;
+	}
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java

@@ -52,4 +52,9 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 	 */
 	List<String> getSubDepIdsByOrgCodes(@org.apache.ibatis.annotations.Param("orgCodes") String[] orgCodes);
 
+	SysDepart getOneDepart(@Param("id") String id);
+
+	//导入根据部门名称查询部门id
+	String getDepartLis(@Param("name") String name);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysPositionMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysPosition;
 
 /**
@@ -11,4 +12,7 @@ import org.jeecg.modules.system.entity.SysPosition;
  */
 public interface SysPositionMapper extends BaseMapper<SysPosition> {
 
+    //根据获取企业微信的职位名称查询对应code值
+    String getOne(@Param("name")String name);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java

@@ -8,4 +8,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
 	
 	List<SysUserDepart> getUserDepartByUid(@Param("userId") String userId);
+
+	//判断部门是否有重复的
+	SysUserDepart getOne(@Param("userId")String userId,@Param("depId")String depId);
+
+	//根据用户id查询部门id
+	List<String>getUserDepart(@Param("userId")String userId);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -5,12 +5,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.poi.ss.formula.functions.T;
+import org.jeecg.modules.system.entity.Student;
+import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.vo.SysUserDepVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -139,4 +143,40 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 * @return
 	 */
 	List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username);
+
+	//根据真实姓名查询
+	List<SysUser>queryUsers(@Param("username") String username);
+
+
+	public  SysUser sysusers(@Param("id") String id);
+
+
+	//查询部门
+	List<SysUser> departCount(@Param("departName")String departName,@Param("partId")String partId);
+
+	//查询公司
+	SysDepart departN();
+
+	//查询对应部门下的人员信息
+	List<SysUser> departUser(@Param("departId")String departId,@Param("name")String name);
+
+	//查询用户对应的团队人员
+	List<SysUser>queryTeamUser(@Param("userId")String userId,@Param("name")String name);
+
+	//查询单个用户
+	SysUser getOne(@Param("username")String username);
+
+	//查询用户组织
+
+	List<String> getOrgName(@Param("userid")String userid);
+
+	//查询职位
+	 String getPostName(@Param("code") String code);
+
+	//查询用户部门id
+	List<String> departIds(@Param("userid")String userid);
+
+	int editUser(@Param("id")String id,@Param("avat")String avat);
+
+	 int  student(@Param("list") List<Student> list);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml

@@ -33,5 +33,18 @@
             org_code LIKE CONCAT(#{item},'%')
         </foreach>
 	</select>
+    <select id="getOneDepart" resultType="org.jeecg.modules.system.entity.SysDepart">
+        select *from sys_depart where 1=1
+        <if test="id!=null and ''!=id">
+            and id=#{id}
+        </if>
+
+    </select>
+    <select id="getDepartLis" resultType="java.lang.String">
+        select id from sys_depart where 1=1
+        <if test="name!=null and ''!=name">
+            and depart_name=#{name}
+        </if>
+    </select>
 
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPositionMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.system.mapper.SysPositionMapper">
 
+    <select id="getOne" resultType="java.lang.String">
+ select code from sys_position where 1=1
+ <if test="name!=null and ''!=name">
+     and name=#{name}
+ </if>
+
+    </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml

@@ -6,4 +6,13 @@
 		FROM sys_user_depart
 		WHERE user_id = #{userId, jdbcType=VARCHAR}
     </select>
+	<select id="getOne" resultType="org.jeecg.modules.system.entity.SysUserDepart">
+		SELECT *
+		FROM sys_user_depart
+		WHERE user_id =#{userId} and dep_id=#{depId}
+	</select>
+    <select id="getUserDepart" resultType="java.lang.String">
+		select dep_id from sys_user_depart
+		where user_id=#{userId}
+	</select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.system.mapper.SysUserMapper">
+    <insert id="student">
+		insert into student (id,name,sex)
+		values
+		<foreach collection="list" item="item" index="index" separator=",">
+			(#{item.id},#{item.name},#{item.sex})
+		</foreach>
+
+	</insert>
 
-	<!-- 根据用户名查询 -->
+    <!-- 根据用户名查询 -->
 	<select id="getUserByName" resultType="org.jeecg.modules.system.entity.SysUser">
 		select * from  sys_user  where username = #{username} and del_flag = 0
 	</select>
@@ -147,8 +155,11 @@
     <update id="updateNullByEmptyString">
         UPDATE sys_user SET ${fieldName} = NULL WHERE ${fieldName} = ''
     </update>
+    <update id="editUser">
+		update sys_user set avatar=#{avat} where id=#{id}
+	</update>
 
-	<!-- 通过多个部门IDS，查询部门下的用户信息 -->
+    <!-- 通过多个部门IDS，查询部门下的用户信息 -->
 	<select id="queryByDepIds" resultType="org.jeecg.modules.system.entity.SysUser">
 		select * from sys_user where del_flag = 0
 		<if test="departIds!=null  and departIds.size()>0">
@@ -162,4 +173,98 @@
 			and username != #{username}
 		</if>
 	</select>
+    <select id="queryUsers" resultType="org.jeecg.modules.system.entity.SysUser">
+		select *from sys_user where 1=1
+		<if test="username!=null and ''!=username">
+		 and 	realname like concat(concat('%',#{username}),'%')
+		</if>
+	</select>
+
+	<select id="sysusers" resultType="org.jeecg.modules.system.entity.SysUser">
+		select *from sys_user
+
+		where 1=1
+		<if test="id!=null and ''!=id">
+			and id=#{id}
+		</if>
+	</select>
+	<select id="departCount" resultType="org.jeecg.modules.system.entity.SysUser">
+			select a.id as 'departId',b.orgCodeTxt as 'orgCodeTxt',b.count as 'count' from sys_depart a
+		right join (
+		select d.depart_name as 'orgCodeTxt' ,count(ud.user_id) as 'count' from sys_depart d
+		left join sys_user_depart ud
+		on d.id=ud.dep_id
+		left join sys_user s
+		on ud.user_id=s.id where 1=1
+		<if test="departName!=null and ''!=departName">
+			and d.depart_name like concat(concat('%',#{departName}),'%')
+		</if>
+		<if test="partId!=null and ''!=partId">
+			and parent_id=#{partId}
+		</if>
+		GROUP BY d.depart_name
+		) b
+on a.depart_name=b.orgCodeTxt
+	</select>
+	<select id="departN" resultType="org.jeecg.modules.system.entity.SysDepart">
+		select id as 'id',depart_name as 'departName' from sys_depart where parent_id=''
+	</select>
+	<select id="departUser" resultType="org.jeecg.modules.system.entity.SysUser">
+		select d.depart_name as'orgCodeTxt',
+		s.id as'id',s.username as'username',s.realname as'realname',
+		p.name as'post',s.avatar as 'avatar'
+		from sys_user_depart ud
+		left join sys_depart d
+		on d.id = ud.dep_id
+		left join sys_user s
+		on ud.user_id=s.id
+		left join sys_position p
+		on s.post=p.code
+		where 1=1
+		<if test="departId!=null and ''!=departId">
+		 and 	d.id=#{departId}
+		</if>
+		<if test="name!=null and ''!=name">
+		 and	s.realname like concat(concat('%',#{name}),'%')
+		</if>
+	</select>
+	<select id="queryTeamUser" resultType="org.jeecg.modules.system.entity.SysUser">
+		select s.id as 'id',s.realname as 'realname',s.post as 'post',
+		s.avatar as 'avatar'
+		from geke_user_teams a left join sys_user s on a.user_teams_id=s.id where 1=1
+		<if test="userId!=null and ''!=userId">
+			and a.user_id=#{userId}
+		</if>
+		<if test="name!=null and ''!=name">
+			and s.realname like concat(concat('%',#{name}),'%')
+		</if>
+	</select>
+    <select id="getOne" resultType="org.jeecg.modules.system.entity.SysUser">
+			select *from sys_user where 1=1
+			<if test="username!=null and ''!=username">
+			and 	username=#{username}
+			</if>
+	</select>
+	<select id="getOrgName" resultType="java.lang.String">
+		select c.depart_name as 'orgName' from sys_user_depart a
+		left join sys_depart b on a.dep_id=b.id
+		left join sys_depart c on b.parent_id=c.id
+		where 1=1
+		<if test="userid!=null and ''!=userid">
+			and user_id=#{userid}
+		</if>
+	</select>
+	<select id="getPostName" resultType="java.lang.String">
+		select name from sys_position
+		where 1=1
+		<if test="code!=null and ''!=code">
+			and code=#{code}
+		</if>
+	</select>
+	<select id="departIds" resultType="java.lang.String">
+		select dep_id from sys_user_depart where 1=1
+		 <if test="userid!=null and ''!=userid">
+			 and  user_id=#{userid}
+		 </if>
+	</select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysDepartTreeModel;
+import org.springframework.data.repository.query.Param;
+
 import java.util.List;
 
 /**
@@ -107,4 +109,8 @@ public interface ISysDepartService extends IService<SysDepart>{
      * @return
      */
     List<SysDepartTreeModel> queryTreeByKeyWord(String keyWord);
+
+    SysDepart getOneDepart( String id);
+
+    Boolean saveDepart(SysDepart sysDepart);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.system.service;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.entity.SysUserDepart;
 import org.jeecg.modules.system.model.DepartIdModel;
@@ -38,4 +39,9 @@ public interface ISysUserDepartService extends IService<SysUserDepart> {
 	 * 根据部门code，查询当前部门和下级部门的用户信息
 	 */
 	public List<SysUser> queryUserByDepCode(String depCode,String realname);
+
+	Boolean saveUserDepart(SysUserDepart sysUserDepart);
+
+	List<String>getUserDepart(String userId);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import org.apache.ibatis.annotations.Param;
+import org.apache.poi.ss.formula.functions.T;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.modules.system.entity.SysUser;
@@ -27,6 +29,10 @@ import org.springframework.transaction.annotation.Transactional;
  */
 public interface ISysUserService extends IService<SysUser> {
 
+
+
+	List<SysUser>queryUsers( String username);
+
 	/**
 	 * 重置密码
 	 *
@@ -233,4 +239,49 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	List<SysUser> queryByDepIds(List<String> departIds, String username);
+
+
+	/**
+	 * 查询部门及人数
+	 * @param departName
+	 * @param partId
+	 * @return
+	 */
+	Map<String,Object> departCount(String departName);
+
+	/**
+	 * 查询对应部门的人员信息
+	 * @param departId
+	 * @return
+	 */
+
+	List<SysUser> departUser(String departId,String name);
+
+
+	/**
+	 * 查询用户对应的团队人员信息
+	 * @param userId
+	 * @param name
+	 * @return
+	 */
+	List<SysUser>queryTeamUser(String userId,String name);
+
+
+	List<String> getOrgName(String userid);
+
+
+
+	//查询职位
+	String getPostName(String code);
+
+
+	//获取企业微信的数据同步到本地数据库
+	Boolean add(SysUser sysUser);
+
+	SysUser getUserByid(String id);
+//查询部门id
+List<String>  departIds(String userid);
+
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -50,6 +50,9 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 	@Autowired
 	private SysUserMapper sysUserMapper;
 
+	@Autowired
+	private  SysDepartMapper sysDepartMapper;
+
 	@Override
 	public List<SysDepartTreeModel> queryMyDeptTreeList(String departIds) {
 		//根据部门id获取所负责部门
@@ -111,8 +114,8 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 			if (sysDepart.getParentId() == null) {
 				sysDepart.setParentId("");
 			}
-			String s = UUID.randomUUID().toString().replace("-", "");
-			sysDepart.setId(s);
+			/*String s = UUID.randomUUID().toString().replace("-", "");
+			sysDepart.setId(s);*/
 			// 先判断该对象有无父级ID,有则意味着不是最高级,否则意味着是最高级
 			// 获取父级ID
 			String parentId = sysDepart.getParentId();
@@ -454,7 +457,24 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
         }
         return treelist;
     }
-    /**
+
+	@Override
+	public SysDepart getOneDepart(String id) {
+		return sysDepartMapper.getOneDepart(id);
+	}
+
+	@Override
+	public Boolean saveDepart(SysDepart sysDepart) {
+		SysDepart byId = super.getById(sysDepart.getId());
+		if (byId!=null){
+			return	super.updateById(sysDepart);
+		}else {
+			return	super.save(sysDepart);
+		}
+
+	}
+
+	/**
      * 根据关键字筛选部门信息
      * @param keyWord
      * @return

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java

@@ -34,8 +34,9 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 	private ISysDepartService sysDepartService;
 	@Autowired
 	private ISysUserService sysUserService;
-	
 
+	@Autowired
+	private  SysUserDepartMapper sysUserDepartMapper;
 	/**
 	 * 根据用户id查询部门信息
 	 */
@@ -129,5 +130,24 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 		}
 		return new ArrayList<SysUser>();
 	}
-	
+
+	@Override
+	public Boolean saveUserDepart(SysUserDepart sysUserDepart) {
+		SysUserDepart one = sysUserDepartMapper.getOne(sysUserDepart.getUserId(), sysUserDepart.getDepId());
+		if (one!=null){
+			sysUserDepart.setId(one.getId());
+			return	super.updateById(sysUserDepart);
+		}else {
+			return	super.save(sysUserDepart);
+		}
+
+
+	}
+
+	@Override
+	public List<String> getUserDepart(String userId) {
+		return sysUserDepartMapper.getUserDepart(userId);
+	}
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
@@ -16,10 +18,13 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.geke.teams.entity.Teams;
+import org.jeecg.modules.geke.teams.service.ITeamsService;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.util.UrlData;
 import org.jeecg.modules.system.vo.SysUserDepVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
@@ -63,7 +68,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	@Resource
 	private BaseCommonService baseCommonService;
 
-    @Override
+	@Autowired
+	private ITeamsService teamsService;
+
+	@Override
+	public List<SysUser> queryUsers(String username) {
+		return userMapper.queryUsers(username);
+	}
+
+	@Override
     @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
     public Result<?> resetPassword(String username, String oldpassword, String newpassword, String confirmpassword) {
         SysUser user = userMapper.getUserByName(username);
@@ -439,4 +452,86 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return userMapper.queryByDepIds(departIds,username);
 	}
 
+	@Override
+	public Map<String,Object> departCount(String departName) {
+		Map<String,Object>map=new HashMap<>();
+		SysDepart s = userMapper.departN();
+		List<SysUser> sysUsers = userMapper.departCount(departName, s.getId());
+		map.put("orgName",s);
+		map.put("departName",sysUsers);
+		return map;
+	}
+
+	@Override
+	public List<SysUser> departUser(String departId,String name) {
+		List<SysUser> sysUsers = userMapper.departUser(departId, name);
+		if (sysUsers.size()>0){
+			for (SysUser ls:sysUsers){
+				List<Teams> teams = teamsService.queryTeamsById(ls.getId(),"");
+				if (teams.size()>0){
+					ls.setCount("1");//用统计部门人数的字段暂时来当作是否有团队字段（仅限当前方法）
+				}else {
+					ls.setCount("0");
+
+				}
+			}
+		}
+		return sysUsers;
+	}
+
+	@Override
+	public List<SysUser> queryTeamUser(String userId, String name) {
+		return userMapper.queryTeamUser(userId,name);
+	}
+
+	@Override
+	public List<String> getOrgName(String userid) {
+		return userMapper.getOrgName(userid);
+	}
+
+
+
+	@Override
+	public String getPostName(String code) {
+		return userMapper.getPostName(code);
+	}
+
+	//企业微信接口拉取数据增加用户方法
+	@Override
+	public Boolean add(SysUser sysUser) {
+		SysUser byId = super.getById(sysUser.getId());
+		if (byId!=null &&!byId.equals("")){
+			return super.updateById(sysUser);
+		}else {
+			sysUser.setStatus(1);
+			sysUser.setDelFlag(0);
+			if (StringUtils.isBlank(sysUser.getPassword())) {
+				// 密码默认为 “123456”
+				sysUser.setPassword("123456");
+			}
+			// 密码加密加盐
+			String salt = oConvertUtils.randomGen(8);
+			sysUser.setSalt(salt);
+			sysUser.setUsername(UrlData.getPinYinFirst(sysUser.getRealname()));
+			String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), sysUser.getPassword(), salt);
+			sysUser.setPassword(passwordEncode);
+			return this.save(sysUser);
+		}
+
+
+	}
+
+	@Override
+	public SysUser getUserByid(String id) {
+		return super.getById(id);
+	}
+
+	@Override
+	public List<String>  departIds(String userid) {
+		return userMapper.departIds(userid);
+	}
+
+
+
+
 }

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -24,17 +24,17 @@ spring:
      multipart:
         max-file-size: 10MB
         max-request-size: 10MB
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+#  mail:
+#    host: smtp.163.com
+#    username: liguang3306@163.com
+#    password: LALECFNNDENKFEGF
+#    properties:
+#      mail:
+#        smtp:
+#          auth: true
+#          starttls:
+#            enable: true
+#            required: true
   ## quartz定时任务,采用数据库方式
   quartz:
     job-store-type: jdbc
@@ -133,7 +133,7 @@ spring:
         master:
           url: jdbc:mysql://127.0.0.1:3306/geke?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: root
+          password: 123
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -167,7 +167,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -24,17 +24,17 @@ spring:
      multipart:
         max-file-size: 10MB
         max-request-size: 10MB
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+#  mail:
+#    host: smtp.163.com
+#    username: jeecgos@163.com
+#    password: ??
+#    properties:
+#      mail:
+#        smtp:
+#          auth: true
+#          starttls:
+#            enable: true
+#            required: true
   ## quartz定时任务,采用数据库方式
   quartz:
     job-store-type: jdbc

jeecg-boot-module-system/src/main/resources/application.yml

@@ -2,4 +2,6 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: @profile.name@
+    active: dev
+
+

jeecg-boot-module-system/src/main/resources/jeecg/jeecg_config.properties

@@ -1,7 +1,7 @@
 #code_generate_project_path
-project_path=E:\\eclipse2018-workspace\\jeecg-boot
+project_path=E:\\GEKE_SERVICE\\jeecg-boot-module-demo
 #bussi_package[User defined]
-bussi_package=org.jeecg.modules.demo
+bussi_package=org.jeecg.modules.geke
 
 
 #default code path

jeecg-boot-module-system/src/main/resources/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql
 diver_name=com.mysql.cj.jdbc.Driver
-url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+url=jdbc:mysql://localhost:3306/geke?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 username=root
-password=root
-database_name=jeecg-boot
+password=123
+database_name=geke
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver

jeecg-boot-module-system/target/classes/application-dev.yml

@@ -24,17 +24,17 @@ spring:
      multipart:
         max-file-size: 10MB
         max-request-size: 10MB
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+#  mail:
+#    host: smtp.163.com
+#    username: liguang3306@163.com
+#    password: LALECFNNDENKFEGF
+#    properties:
+#      mail:
+#        smtp:
+#          auth: true
+#          starttls:
+#            enable: true
+#            required: true
   ## quartz定时任务,采用数据库方式
   quartz:
     job-store-type: jdbc
@@ -133,7 +133,7 @@ spring:
         master:
           url: jdbc:mysql://127.0.0.1:3306/geke?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: root
+          password: 123
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -167,7 +167,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置

jeecg-boot-module-system/target/classes/application-prod.yml

@@ -24,17 +24,17 @@ spring:
      multipart:
         max-file-size: 10MB
         max-request-size: 10MB
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+#  mail:
+#    host: smtp.163.com
+#    username: jeecgos@163.com
+#    password: ??
+#    properties:
+#      mail:
+#        smtp:
+#          auth: true
+#          starttls:
+#            enable: true
+#            required: true
   ## quartz定时任务,采用数据库方式
   quartz:
     job-store-type: jdbc

jeecg-boot-module-system/target/classes/application.yml

@@ -2,4 +2,6 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: dev
+    active: dev
+
+

jeecg-boot-module-system/target/classes/jeecg/jeecg_config.properties

@@ -1,7 +1,7 @@
 #code_generate_project_path
-project_path=E:\\eclipse2018-workspace\\jeecg-boot
+project_path=E:\\GEKE_SERVICE\\jeecg-boot-module-demo
 #bussi_package[User defined]
-bussi_package=org.jeecg.modules.demo
+bussi_package=org.jeecg.modules.geke
 
 
 #default code path

jeecg-boot-module-system/target/classes/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql
 diver_name=com.mysql.cj.jdbc.Driver
-url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+url=jdbc:mysql://localhost:3306/geke?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 username=root
-password=root
-database_name=jeecg-boot
+password=123
+database_name=geke
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver