diff --git a/pom.xml b/pom.xml index 89317cb..1e7546c 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,8 @@ 4.1.2 2.3 0.9.1 + 1.6.2 + 1.18.22 @@ -196,6 +198,13 @@ ${sync.version} + + org.mapstruct + mapstruct + ${mapstruct.version} + + + @@ -222,6 +231,19 @@ ${java.version} ${project.build.sourceEncoding} true + + + org.projectlombok + lombok + ${lombok.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + diff --git a/sync-admin/pom.xml b/sync-admin/pom.xml index 1bc6ce7..8510323 100644 --- a/sync-admin/pom.xml +++ b/sync-admin/pom.xml @@ -43,6 +43,11 @@ mysql-connector-java + + com.microsoft.sqlserver + mssql-jdbc + + com.lyr @@ -67,6 +72,7 @@ sync-gather + diff --git a/sync-admin/src/main/resources/application-local.yml b/sync-admin/src/main/resources/application-local.yml index 5a03869..74eb6d7 100644 --- a/sync-admin/src/main/resources/application-local.yml +++ b/sync-admin/src/main/resources/application-local.yml @@ -5,13 +5,12 @@ spring: port: 6379 database: 1 password: eGDiN3RRhRNzrzjd - datasource: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 master: + driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${spring.redis.host}:3306/sync-data?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: K2bfP8rzG62ZSJGN @@ -19,6 +18,7 @@ spring: slave: # 从数据源开关/默认关闭 enabled: false + driverClassName: url: username: password: diff --git a/sync-admin/target/classes/application-local.yml b/sync-admin/target/classes/application-local.yml index 5a03869..74eb6d7 100644 --- a/sync-admin/target/classes/application-local.yml +++ b/sync-admin/target/classes/application-local.yml @@ -5,13 +5,12 @@ spring: port: 6379 database: 1 password: eGDiN3RRhRNzrzjd - datasource: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 master: + driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${spring.redis.host}:3306/sync-data?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: K2bfP8rzG62ZSJGN @@ -19,6 +18,7 @@ spring: slave: # 从数据源开关/默认关闭 enabled: false + driverClassName: url: username: password: diff --git a/sync-admin/target/classes/com/lyr/RuoYiApplication.class b/sync-admin/target/classes/com/lyr/RuoYiApplication.class index 813fda3..f58cad1 100644 Binary files a/sync-admin/target/classes/com/lyr/RuoYiApplication.class and b/sync-admin/target/classes/com/lyr/RuoYiApplication.class differ diff --git a/sync-admin/target/classes/com/lyr/RuoYiServletInitializer.class b/sync-admin/target/classes/com/lyr/RuoYiServletInitializer.class index d6cdb13..040a1c4 100644 Binary files a/sync-admin/target/classes/com/lyr/RuoYiServletInitializer.class and b/sync-admin/target/classes/com/lyr/RuoYiServletInitializer.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/common/CaptchaController.class b/sync-admin/target/classes/com/lyr/web/controller/common/CaptchaController.class index 40b0e43..830c66b 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/common/CaptchaController.class and b/sync-admin/target/classes/com/lyr/web/controller/common/CaptchaController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/common/CommonController.class b/sync-admin/target/classes/com/lyr/web/controller/common/CommonController.class index 68d2027..1f4d850 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/common/CommonController.class and b/sync-admin/target/classes/com/lyr/web/controller/common/CommonController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/monitor/CacheController.class b/sync-admin/target/classes/com/lyr/web/controller/monitor/CacheController.class index 96a98c5..e391f75 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/monitor/CacheController.class and b/sync-admin/target/classes/com/lyr/web/controller/monitor/CacheController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/monitor/SysLogininforController.class b/sync-admin/target/classes/com/lyr/web/controller/monitor/SysLogininforController.class index 53a2e17..6815240 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/monitor/SysLogininforController.class and b/sync-admin/target/classes/com/lyr/web/controller/monitor/SysLogininforController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/monitor/SysOperlogController.class b/sync-admin/target/classes/com/lyr/web/controller/monitor/SysOperlogController.class index cb06921..c3ba79b 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/monitor/SysOperlogController.class and b/sync-admin/target/classes/com/lyr/web/controller/monitor/SysOperlogController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/monitor/SysUserOnlineController.class b/sync-admin/target/classes/com/lyr/web/controller/monitor/SysUserOnlineController.class index 7b2b839..ad495bb 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/monitor/SysUserOnlineController.class and b/sync-admin/target/classes/com/lyr/web/controller/monitor/SysUserOnlineController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysConfigController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysConfigController.class index cc05cf1..946c8bc 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysConfigController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysConfigController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysDeptController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysDeptController.class index e003d83..e877cbb 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysDeptController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysDeptController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysDictDataController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysDictDataController.class index 2dfba68..0126320 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysDictDataController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysDictDataController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysDictTypeController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysDictTypeController.class index 08b29ab..a148984 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysDictTypeController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysDictTypeController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysLoginController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysLoginController.class index b9f0923..f4c8a1f 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysLoginController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysLoginController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysMenuController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysMenuController.class index 2b33997..54312a8 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysMenuController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysMenuController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysNoticeController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysNoticeController.class index ac7fd47..a4af0aa 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysNoticeController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysNoticeController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysPostController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysPostController.class index 2ae8a2f..0ea0368 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysPostController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysPostController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysProfileController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysProfileController.class index 61f3ed2..b8748c7 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysProfileController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysProfileController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysRegisterController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysRegisterController.class index 539501a..3b0a477 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysRegisterController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysRegisterController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysRoleController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysRoleController.class index 73a77be..ab5589a 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysRoleController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysRoleController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/system/SysUserController.class b/sync-admin/target/classes/com/lyr/web/controller/system/SysUserController.class index 9c546cd..f95bdd2 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/system/SysUserController.class and b/sync-admin/target/classes/com/lyr/web/controller/system/SysUserController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/tool/TestController.class b/sync-admin/target/classes/com/lyr/web/controller/tool/TestController.class index ca4690c..e7fe5a9 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/tool/TestController.class and b/sync-admin/target/classes/com/lyr/web/controller/tool/TestController.class differ diff --git a/sync-admin/target/classes/com/lyr/web/controller/tool/UserEntity.class b/sync-admin/target/classes/com/lyr/web/controller/tool/UserEntity.class index 3f53632..4876d77 100644 Binary files a/sync-admin/target/classes/com/lyr/web/controller/tool/UserEntity.class and b/sync-admin/target/classes/com/lyr/web/controller/tool/UserEntity.class differ diff --git a/sync-admin/target/classes/com/lyr/web/core/config/SwaggerConfig.class b/sync-admin/target/classes/com/lyr/web/core/config/SwaggerConfig.class index 383e5ed..a8e1bf7 100644 Binary files a/sync-admin/target/classes/com/lyr/web/core/config/SwaggerConfig.class and b/sync-admin/target/classes/com/lyr/web/core/config/SwaggerConfig.class differ diff --git a/sync-common/pom.xml b/sync-common/pom.xml index a084544..4fc76fc 100644 --- a/sync-common/pom.xml +++ b/sync-common/pom.xml @@ -114,6 +114,24 @@ javax.servlet-api + + org.mapstruct + mapstruct + + + + org.projectlombok + lombok + provided + + + + com.google.guava + guava + 33.2.1-jre + + + \ No newline at end of file diff --git a/sync-common/src/main/java/com/lyr/common/core/domain/ServiceResult.java b/sync-common/src/main/java/com/lyr/common/core/domain/ServiceResult.java new file mode 100644 index 0000000..c681970 --- /dev/null +++ b/sync-common/src/main/java/com/lyr/common/core/domain/ServiceResult.java @@ -0,0 +1,31 @@ +package com.lyr.common.core.domain; + +import com.google.common.collect.ImmutableMap; +import com.lyr.common.constant.HttpStatus; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.HashMap; +import java.util.Map; + +/** + * 操作消息提醒 + * + * @author liyc + */ +@NoArgsConstructor +@AllArgsConstructor +@Data +public class ServiceResult extends HashMap { + + + private Integer code; + private String message; + private Map data; + + public static ServiceResult success(String name) { + ImmutableMap data1 = ImmutableMap.of(); + return new ServiceResult(HttpStatus.SUCCESS, name, data1); + } +} diff --git a/sync-common/src/main/java/com/lyr/common/utils/spring/SpringUtils.java b/sync-common/src/main/java/com/lyr/common/utils/spring/SpringUtils.java index 58650bd..6f77a3d 100644 --- a/sync-common/src/main/java/com/lyr/common/utils/spring/SpringUtils.java +++ b/sync-common/src/main/java/com/lyr/common/utils/spring/SpringUtils.java @@ -36,6 +36,15 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC return (T) beanFactory.getBean(name); } + + public static T getBeanOfNull(String name) throws BeansException { + try { + return (T) beanFactory.getBean(name); + } catch (BeansException e) { + } + return null; + } + /** * 获取类型为requiredType的对象 * diff --git a/sync-common/target/classes/com/lyr/common/annotation/Excel$ColumnType.class b/sync-common/target/classes/com/lyr/common/annotation/Excel$ColumnType.class index cbfd8bf..032f124 100644 Binary files a/sync-common/target/classes/com/lyr/common/annotation/Excel$ColumnType.class and b/sync-common/target/classes/com/lyr/common/annotation/Excel$ColumnType.class differ diff --git a/sync-common/target/classes/com/lyr/common/annotation/Excel$Type.class b/sync-common/target/classes/com/lyr/common/annotation/Excel$Type.class index 807a0b2..499c52b 100644 Binary files a/sync-common/target/classes/com/lyr/common/annotation/Excel$Type.class and b/sync-common/target/classes/com/lyr/common/annotation/Excel$Type.class differ diff --git a/sync-common/target/classes/com/lyr/common/config/RuoYiConfig.class b/sync-common/target/classes/com/lyr/common/config/RuoYiConfig.class index 5a2bfb5..9e10bcc 100644 Binary files a/sync-common/target/classes/com/lyr/common/config/RuoYiConfig.class and b/sync-common/target/classes/com/lyr/common/config/RuoYiConfig.class differ diff --git a/sync-common/target/classes/com/lyr/common/config/serializer/SensitiveJsonSerializer.class b/sync-common/target/classes/com/lyr/common/config/serializer/SensitiveJsonSerializer.class index 7aa1a72..b06e41c 100644 Binary files a/sync-common/target/classes/com/lyr/common/config/serializer/SensitiveJsonSerializer.class and b/sync-common/target/classes/com/lyr/common/config/serializer/SensitiveJsonSerializer.class differ diff --git a/sync-common/target/classes/com/lyr/common/constant/ScheduleConstants$Status.class b/sync-common/target/classes/com/lyr/common/constant/ScheduleConstants$Status.class index b8d8753..091c3ce 100644 Binary files a/sync-common/target/classes/com/lyr/common/constant/ScheduleConstants$Status.class and b/sync-common/target/classes/com/lyr/common/constant/ScheduleConstants$Status.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/controller/BaseController$1.class b/sync-common/target/classes/com/lyr/common/core/controller/BaseController$1.class index 264a2dc..908deca 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/controller/BaseController$1.class and b/sync-common/target/classes/com/lyr/common/core/controller/BaseController$1.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/controller/BaseController.class b/sync-common/target/classes/com/lyr/common/core/controller/BaseController.class index 839b1e7..8f6675d 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/controller/BaseController.class and b/sync-common/target/classes/com/lyr/common/core/controller/BaseController.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/AjaxResult.class b/sync-common/target/classes/com/lyr/common/core/domain/AjaxResult.class index 2aee082..2f7aad3 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/AjaxResult.class and b/sync-common/target/classes/com/lyr/common/core/domain/AjaxResult.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/BaseEntity.class b/sync-common/target/classes/com/lyr/common/core/domain/BaseEntity.class index c3ea6ab..ec8c035 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/BaseEntity.class and b/sync-common/target/classes/com/lyr/common/core/domain/BaseEntity.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/R.class b/sync-common/target/classes/com/lyr/common/core/domain/R.class index b8b4f02..2b33de4 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/R.class and b/sync-common/target/classes/com/lyr/common/core/domain/R.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/TreeEntity.class b/sync-common/target/classes/com/lyr/common/core/domain/TreeEntity.class index f4ccad3..b3da5a3 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/TreeEntity.class and b/sync-common/target/classes/com/lyr/common/core/domain/TreeEntity.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/TreeSelect.class b/sync-common/target/classes/com/lyr/common/core/domain/TreeSelect.class index 7b98c20..02cb7f5 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/TreeSelect.class and b/sync-common/target/classes/com/lyr/common/core/domain/TreeSelect.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDept.class b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDept.class index 4b96452..a1e8740 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDept.class and b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDept.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDictData.class b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDictData.class index 5fd53ab..3b73b81 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDictData.class and b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDictData.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDictType.class b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDictType.class index c58de6a..e4f246a 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDictType.class and b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysDictType.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysMenu.class b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysMenu.class index 5b07e6e..9d95262 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysMenu.class and b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysMenu.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysRole.class b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysRole.class index d92cfef..5f8ca47 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysRole.class and b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysRole.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysUser.class b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysUser.class index 0b184bc..9b6326b 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/entity/SysUser.class and b/sync-common/target/classes/com/lyr/common/core/domain/entity/SysUser.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/model/LoginBody.class b/sync-common/target/classes/com/lyr/common/core/domain/model/LoginBody.class index 9741dfb..a415f11 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/model/LoginBody.class and b/sync-common/target/classes/com/lyr/common/core/domain/model/LoginBody.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/domain/model/LoginUser.class b/sync-common/target/classes/com/lyr/common/core/domain/model/LoginUser.class index e2a8aea..88df0fb 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/domain/model/LoginUser.class and b/sync-common/target/classes/com/lyr/common/core/domain/model/LoginUser.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/page/PageDomain.class b/sync-common/target/classes/com/lyr/common/core/page/PageDomain.class index f070579..3acc88d 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/page/PageDomain.class and b/sync-common/target/classes/com/lyr/common/core/page/PageDomain.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/page/TableDataInfo.class b/sync-common/target/classes/com/lyr/common/core/page/TableDataInfo.class index ea9ea65..c1636cb 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/page/TableDataInfo.class and b/sync-common/target/classes/com/lyr/common/core/page/TableDataInfo.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/redis/RedisCache.class b/sync-common/target/classes/com/lyr/common/core/redis/RedisCache.class index 0192864..c780cca 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/redis/RedisCache.class and b/sync-common/target/classes/com/lyr/common/core/redis/RedisCache.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/text/CharsetKit.class b/sync-common/target/classes/com/lyr/common/core/text/CharsetKit.class index bb113d4..284a90c 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/text/CharsetKit.class and b/sync-common/target/classes/com/lyr/common/core/text/CharsetKit.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/text/Convert.class b/sync-common/target/classes/com/lyr/common/core/text/Convert.class index 4aeb34a..869d6d1 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/text/Convert.class and b/sync-common/target/classes/com/lyr/common/core/text/Convert.class differ diff --git a/sync-common/target/classes/com/lyr/common/core/text/StrFormatter.class b/sync-common/target/classes/com/lyr/common/core/text/StrFormatter.class index 7e714dd..fcbcf3a 100644 Binary files a/sync-common/target/classes/com/lyr/common/core/text/StrFormatter.class and b/sync-common/target/classes/com/lyr/common/core/text/StrFormatter.class differ diff --git a/sync-common/target/classes/com/lyr/common/enums/BusinessStatus.class b/sync-common/target/classes/com/lyr/common/enums/BusinessStatus.class index 531c529..d0a1d0b 100644 Binary files a/sync-common/target/classes/com/lyr/common/enums/BusinessStatus.class and b/sync-common/target/classes/com/lyr/common/enums/BusinessStatus.class differ diff --git a/sync-common/target/classes/com/lyr/common/enums/BusinessType.class b/sync-common/target/classes/com/lyr/common/enums/BusinessType.class index d77e172..7e64ede 100644 Binary files a/sync-common/target/classes/com/lyr/common/enums/BusinessType.class and b/sync-common/target/classes/com/lyr/common/enums/BusinessType.class differ diff --git a/sync-common/target/classes/com/lyr/common/enums/DataSourceType.class b/sync-common/target/classes/com/lyr/common/enums/DataSourceType.class index 2c2f0a1..4f69c35 100644 Binary files a/sync-common/target/classes/com/lyr/common/enums/DataSourceType.class and b/sync-common/target/classes/com/lyr/common/enums/DataSourceType.class differ diff --git a/sync-common/target/classes/com/lyr/common/enums/DesensitizedType.class b/sync-common/target/classes/com/lyr/common/enums/DesensitizedType.class index 63acb2e..b0031f8 100644 Binary files a/sync-common/target/classes/com/lyr/common/enums/DesensitizedType.class and b/sync-common/target/classes/com/lyr/common/enums/DesensitizedType.class differ diff --git a/sync-common/target/classes/com/lyr/common/enums/HttpMethod.class b/sync-common/target/classes/com/lyr/common/enums/HttpMethod.class index 24f2227..8d55e27 100644 Binary files a/sync-common/target/classes/com/lyr/common/enums/HttpMethod.class and b/sync-common/target/classes/com/lyr/common/enums/HttpMethod.class differ diff --git a/sync-common/target/classes/com/lyr/common/enums/LimitType.class b/sync-common/target/classes/com/lyr/common/enums/LimitType.class index c46c5ac..0654b13 100644 Binary files a/sync-common/target/classes/com/lyr/common/enums/LimitType.class and b/sync-common/target/classes/com/lyr/common/enums/LimitType.class differ diff --git a/sync-common/target/classes/com/lyr/common/enums/OperatorType.class b/sync-common/target/classes/com/lyr/common/enums/OperatorType.class index ddf93bf..9553eee 100644 Binary files a/sync-common/target/classes/com/lyr/common/enums/OperatorType.class and b/sync-common/target/classes/com/lyr/common/enums/OperatorType.class differ diff --git a/sync-common/target/classes/com/lyr/common/enums/UserStatus.class b/sync-common/target/classes/com/lyr/common/enums/UserStatus.class index 9819f1c..afd6970 100644 Binary files a/sync-common/target/classes/com/lyr/common/enums/UserStatus.class and b/sync-common/target/classes/com/lyr/common/enums/UserStatus.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/GlobalException.class b/sync-common/target/classes/com/lyr/common/exception/GlobalException.class index 8377e80..bda9fcf 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/GlobalException.class and b/sync-common/target/classes/com/lyr/common/exception/GlobalException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/ServiceException.class b/sync-common/target/classes/com/lyr/common/exception/ServiceException.class index f7553ca..3e8e4ac 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/ServiceException.class and b/sync-common/target/classes/com/lyr/common/exception/ServiceException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/UtilException.class b/sync-common/target/classes/com/lyr/common/exception/UtilException.class index c000889..8707762 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/UtilException.class and b/sync-common/target/classes/com/lyr/common/exception/UtilException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/base/BaseException.class b/sync-common/target/classes/com/lyr/common/exception/base/BaseException.class index a750eca..c05558c 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/base/BaseException.class and b/sync-common/target/classes/com/lyr/common/exception/base/BaseException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/file/FileException.class b/sync-common/target/classes/com/lyr/common/exception/file/FileException.class index f376755..15d3a59 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/file/FileException.class and b/sync-common/target/classes/com/lyr/common/exception/file/FileException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/file/FileNameLengthLimitExceededException.class b/sync-common/target/classes/com/lyr/common/exception/file/FileNameLengthLimitExceededException.class index ed93744..082de6f 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/file/FileNameLengthLimitExceededException.class and b/sync-common/target/classes/com/lyr/common/exception/file/FileNameLengthLimitExceededException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/file/FileSizeLimitExceededException.class b/sync-common/target/classes/com/lyr/common/exception/file/FileSizeLimitExceededException.class index 5ec8bef..c4d51b3 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/file/FileSizeLimitExceededException.class and b/sync-common/target/classes/com/lyr/common/exception/file/FileSizeLimitExceededException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/file/FileUploadException.class b/sync-common/target/classes/com/lyr/common/exception/file/FileUploadException.class index 949d44b..4a02cec 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/file/FileUploadException.class and b/sync-common/target/classes/com/lyr/common/exception/file/FileUploadException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class index ad580e0..9c8b20e 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class and b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class index 6d46434..0390937 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class and b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class index fcaf901..dc1526a 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class and b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class index e0f8b7d..a78a18c 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class and b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException.class b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException.class index c70c6f6..43a5cec 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException.class and b/sync-common/target/classes/com/lyr/common/exception/file/InvalidExtensionException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/job/TaskException$Code.class b/sync-common/target/classes/com/lyr/common/exception/job/TaskException$Code.class index f6424d6..4c98086 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/job/TaskException$Code.class and b/sync-common/target/classes/com/lyr/common/exception/job/TaskException$Code.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/job/TaskException.class b/sync-common/target/classes/com/lyr/common/exception/job/TaskException.class index 70f33eb..8a74783 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/job/TaskException.class and b/sync-common/target/classes/com/lyr/common/exception/job/TaskException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/user/UserException.class b/sync-common/target/classes/com/lyr/common/exception/user/UserException.class index b18de61..86c6192 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/user/UserException.class and b/sync-common/target/classes/com/lyr/common/exception/user/UserException.class differ diff --git a/sync-common/target/classes/com/lyr/common/exception/user/UserPasswordRetryLimitExceedException.class b/sync-common/target/classes/com/lyr/common/exception/user/UserPasswordRetryLimitExceedException.class index 138d916..4ada936 100644 Binary files a/sync-common/target/classes/com/lyr/common/exception/user/UserPasswordRetryLimitExceedException.class and b/sync-common/target/classes/com/lyr/common/exception/user/UserPasswordRetryLimitExceedException.class differ diff --git a/sync-common/target/classes/com/lyr/common/filter/PropertyPreExcludeFilter.class b/sync-common/target/classes/com/lyr/common/filter/PropertyPreExcludeFilter.class index e2f9f38..73bfc88 100644 Binary files a/sync-common/target/classes/com/lyr/common/filter/PropertyPreExcludeFilter.class and b/sync-common/target/classes/com/lyr/common/filter/PropertyPreExcludeFilter.class differ diff --git a/sync-common/target/classes/com/lyr/common/filter/RepeatableFilter.class b/sync-common/target/classes/com/lyr/common/filter/RepeatableFilter.class index 0a1bbda..f2bd2b2 100644 Binary files a/sync-common/target/classes/com/lyr/common/filter/RepeatableFilter.class and b/sync-common/target/classes/com/lyr/common/filter/RepeatableFilter.class differ diff --git a/sync-common/target/classes/com/lyr/common/filter/RepeatedlyRequestWrapper$1.class b/sync-common/target/classes/com/lyr/common/filter/RepeatedlyRequestWrapper$1.class index a0d072c..798b56d 100644 Binary files a/sync-common/target/classes/com/lyr/common/filter/RepeatedlyRequestWrapper$1.class and b/sync-common/target/classes/com/lyr/common/filter/RepeatedlyRequestWrapper$1.class differ diff --git a/sync-common/target/classes/com/lyr/common/filter/RepeatedlyRequestWrapper.class b/sync-common/target/classes/com/lyr/common/filter/RepeatedlyRequestWrapper.class index c0a3b80..42d2751 100644 Binary files a/sync-common/target/classes/com/lyr/common/filter/RepeatedlyRequestWrapper.class and b/sync-common/target/classes/com/lyr/common/filter/RepeatedlyRequestWrapper.class differ diff --git a/sync-common/target/classes/com/lyr/common/filter/XssFilter.class b/sync-common/target/classes/com/lyr/common/filter/XssFilter.class index f8f2907..9177a1f 100644 Binary files a/sync-common/target/classes/com/lyr/common/filter/XssFilter.class and b/sync-common/target/classes/com/lyr/common/filter/XssFilter.class differ diff --git a/sync-common/target/classes/com/lyr/common/filter/XssHttpServletRequestWrapper$1.class b/sync-common/target/classes/com/lyr/common/filter/XssHttpServletRequestWrapper$1.class index c22f9da..daf51f7 100644 Binary files a/sync-common/target/classes/com/lyr/common/filter/XssHttpServletRequestWrapper$1.class and b/sync-common/target/classes/com/lyr/common/filter/XssHttpServletRequestWrapper$1.class differ diff --git a/sync-common/target/classes/com/lyr/common/filter/XssHttpServletRequestWrapper.class b/sync-common/target/classes/com/lyr/common/filter/XssHttpServletRequestWrapper.class index be6573f..1c55687 100644 Binary files a/sync-common/target/classes/com/lyr/common/filter/XssHttpServletRequestWrapper.class and b/sync-common/target/classes/com/lyr/common/filter/XssHttpServletRequestWrapper.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/Arith.class b/sync-common/target/classes/com/lyr/common/utils/Arith.class index 98ddf44..7e59b16 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/Arith.class and b/sync-common/target/classes/com/lyr/common/utils/Arith.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/DateUtils.class b/sync-common/target/classes/com/lyr/common/utils/DateUtils.class index 0c0c6f0..4e35bb5 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/DateUtils.class and b/sync-common/target/classes/com/lyr/common/utils/DateUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/DesensitizedUtil.class b/sync-common/target/classes/com/lyr/common/utils/DesensitizedUtil.class index a22ea94..a067321 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/DesensitizedUtil.class and b/sync-common/target/classes/com/lyr/common/utils/DesensitizedUtil.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/DictUtils.class b/sync-common/target/classes/com/lyr/common/utils/DictUtils.class index e724add..a171cba 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/DictUtils.class and b/sync-common/target/classes/com/lyr/common/utils/DictUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/ExceptionUtil.class b/sync-common/target/classes/com/lyr/common/utils/ExceptionUtil.class index 54231c1..60b7f26 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/ExceptionUtil.class and b/sync-common/target/classes/com/lyr/common/utils/ExceptionUtil.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/LogUtils.class b/sync-common/target/classes/com/lyr/common/utils/LogUtils.class index 64d57e8..915de56 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/LogUtils.class and b/sync-common/target/classes/com/lyr/common/utils/LogUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/MessageUtils.class b/sync-common/target/classes/com/lyr/common/utils/MessageUtils.class index 79b3fab..c3b6797 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/MessageUtils.class and b/sync-common/target/classes/com/lyr/common/utils/MessageUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/SecurityUtils.class b/sync-common/target/classes/com/lyr/common/utils/SecurityUtils.class index 0b52fff..4b7d448 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/SecurityUtils.class and b/sync-common/target/classes/com/lyr/common/utils/SecurityUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/ServletUtils.class b/sync-common/target/classes/com/lyr/common/utils/ServletUtils.class index 32a8b00..10520d4 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/ServletUtils.class and b/sync-common/target/classes/com/lyr/common/utils/ServletUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/StringUtils.class b/sync-common/target/classes/com/lyr/common/utils/StringUtils.class index 2657c8c..a8ffc9e 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/StringUtils.class and b/sync-common/target/classes/com/lyr/common/utils/StringUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/Threads.class b/sync-common/target/classes/com/lyr/common/utils/Threads.class index aa96ea6..a13e6b9 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/Threads.class and b/sync-common/target/classes/com/lyr/common/utils/Threads.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/bean/BeanUtils.class b/sync-common/target/classes/com/lyr/common/utils/bean/BeanUtils.class index 0a62ffd..67439d1 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/bean/BeanUtils.class and b/sync-common/target/classes/com/lyr/common/utils/bean/BeanUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/bean/BeanValidators.class b/sync-common/target/classes/com/lyr/common/utils/bean/BeanValidators.class index c325f35..9e04fbf 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/bean/BeanValidators.class and b/sync-common/target/classes/com/lyr/common/utils/bean/BeanValidators.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/file/FileTypeUtils.class b/sync-common/target/classes/com/lyr/common/utils/file/FileTypeUtils.class index 88d8d69..670c8db 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/file/FileTypeUtils.class and b/sync-common/target/classes/com/lyr/common/utils/file/FileTypeUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/file/FileUploadUtils.class b/sync-common/target/classes/com/lyr/common/utils/file/FileUploadUtils.class index 6c3fb0d..5367b93 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/file/FileUploadUtils.class and b/sync-common/target/classes/com/lyr/common/utils/file/FileUploadUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/file/FileUtils.class b/sync-common/target/classes/com/lyr/common/utils/file/FileUtils.class index da56d8d..0718dcd 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/file/FileUtils.class and b/sync-common/target/classes/com/lyr/common/utils/file/FileUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/file/ImageUtils.class b/sync-common/target/classes/com/lyr/common/utils/file/ImageUtils.class index 1b09a48..47f8ba1 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/file/ImageUtils.class and b/sync-common/target/classes/com/lyr/common/utils/file/ImageUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/file/MimeTypeUtils.class b/sync-common/target/classes/com/lyr/common/utils/file/MimeTypeUtils.class index 26302ed..e948cf8 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/file/MimeTypeUtils.class and b/sync-common/target/classes/com/lyr/common/utils/file/MimeTypeUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/html/EscapeUtil.class b/sync-common/target/classes/com/lyr/common/utils/html/EscapeUtil.class index 8c711ff..1080b9e 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/html/EscapeUtil.class and b/sync-common/target/classes/com/lyr/common/utils/html/EscapeUtil.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/html/HTMLFilter.class b/sync-common/target/classes/com/lyr/common/utils/html/HTMLFilter.class index 8f5971b..2049d8a 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/html/HTMLFilter.class and b/sync-common/target/classes/com/lyr/common/utils/html/HTMLFilter.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/http/HttpHelper.class b/sync-common/target/classes/com/lyr/common/utils/http/HttpHelper.class index dbc2a2c..f5da776 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/http/HttpHelper.class and b/sync-common/target/classes/com/lyr/common/utils/http/HttpHelper.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class b/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class index e949943..81feacb 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class and b/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils$TrustAnyTrustManager.class b/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils$TrustAnyTrustManager.class index 4357473..52ce67e 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils$TrustAnyTrustManager.class and b/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils$TrustAnyTrustManager.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils.class b/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils.class index 060aa49..002139c 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils.class and b/sync-common/target/classes/com/lyr/common/utils/http/HttpUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/ip/AddressUtils.class b/sync-common/target/classes/com/lyr/common/utils/ip/AddressUtils.class index f2742c5..d5d39b4 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/ip/AddressUtils.class and b/sync-common/target/classes/com/lyr/common/utils/ip/AddressUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/ip/IpUtils.class b/sync-common/target/classes/com/lyr/common/utils/ip/IpUtils.class index c66eed1..43a02c7 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/ip/IpUtils.class and b/sync-common/target/classes/com/lyr/common/utils/ip/IpUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/poi/ExcelHandlerAdapter.class b/sync-common/target/classes/com/lyr/common/utils/poi/ExcelHandlerAdapter.class index 46d78a3..871ae0b 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/poi/ExcelHandlerAdapter.class and b/sync-common/target/classes/com/lyr/common/utils/poi/ExcelHandlerAdapter.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/poi/ExcelUtil.class b/sync-common/target/classes/com/lyr/common/utils/poi/ExcelUtil.class index b23f7ff..4d99afc 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/poi/ExcelUtil.class and b/sync-common/target/classes/com/lyr/common/utils/poi/ExcelUtil.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/reflect/ReflectUtils.class b/sync-common/target/classes/com/lyr/common/utils/reflect/ReflectUtils.class index fb9b4c4..cf978c3 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/reflect/ReflectUtils.class and b/sync-common/target/classes/com/lyr/common/utils/reflect/ReflectUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/sign/Base64.class b/sync-common/target/classes/com/lyr/common/utils/sign/Base64.class index 049d772..216117d 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/sign/Base64.class and b/sync-common/target/classes/com/lyr/common/utils/sign/Base64.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/sign/Md5Utils.class b/sync-common/target/classes/com/lyr/common/utils/sign/Md5Utils.class index 296ee47..8f5c61e 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/sign/Md5Utils.class and b/sync-common/target/classes/com/lyr/common/utils/sign/Md5Utils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/spring/SpringUtils.class b/sync-common/target/classes/com/lyr/common/utils/spring/SpringUtils.class index 083e7de..711443e 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/spring/SpringUtils.class and b/sync-common/target/classes/com/lyr/common/utils/spring/SpringUtils.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/sql/SqlUtil.class b/sync-common/target/classes/com/lyr/common/utils/sql/SqlUtil.class index 6ec1dff..aa0600b 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/sql/SqlUtil.class and b/sync-common/target/classes/com/lyr/common/utils/sql/SqlUtil.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/uuid/Seq.class b/sync-common/target/classes/com/lyr/common/utils/uuid/Seq.class index dd9d9a5..8a3e95b 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/uuid/Seq.class and b/sync-common/target/classes/com/lyr/common/utils/uuid/Seq.class differ diff --git a/sync-common/target/classes/com/lyr/common/utils/uuid/UUID.class b/sync-common/target/classes/com/lyr/common/utils/uuid/UUID.class index e45f651..87cf023 100644 Binary files a/sync-common/target/classes/com/lyr/common/utils/uuid/UUID.class and b/sync-common/target/classes/com/lyr/common/utils/uuid/UUID.class differ diff --git a/sync-common/target/classes/com/lyr/common/xss/XssValidator.class b/sync-common/target/classes/com/lyr/common/xss/XssValidator.class index 9225a0d..0194681 100644 Binary files a/sync-common/target/classes/com/lyr/common/xss/XssValidator.class and b/sync-common/target/classes/com/lyr/common/xss/XssValidator.class differ diff --git a/sync-framework/pom.xml b/sync-framework/pom.xml index 4fe857d..f0ba40a 100644 --- a/sync-framework/pom.xml +++ b/sync-framework/pom.xml @@ -45,11 +45,6 @@ mybatis-plus-extension - - com.microsoft.sqlserver - mssql-jdbc - 12.8.1.jre8 - @@ -74,6 +69,7 @@ com.lyr sync-system + org.projectlombok lombok diff --git a/sync-framework/src/main/java/com/lyr/framework/config/DruidConfig.java b/sync-framework/src/main/java/com/lyr/framework/config/DruidConfig.java index 46b4ca5..431c89b 100644 --- a/sync-framework/src/main/java/com/lyr/framework/config/DruidConfig.java +++ b/sync-framework/src/main/java/com/lyr/framework/config/DruidConfig.java @@ -31,6 +31,9 @@ public class DruidConfig { @ConfigurationProperties("spring.datasource.druid.master") public DataSource masterDataSource(DruidProperties druidProperties) { DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); + String url = dataSource.getUrl(); + String name = dataSource.getName(); + String password = dataSource.getPassword(); return druidProperties.dataSource(dataSource); } @@ -39,6 +42,9 @@ public class DruidConfig { @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true") public DataSource slaveDataSource(DruidProperties druidProperties) { DruidDataSource dataSource = DruidDataSourceBuilder.create().build(); + String url = dataSource.getUrl(); + String name = dataSource.getName(); + String password = dataSource.getPassword(); return druidProperties.dataSource(dataSource); } @@ -47,13 +53,10 @@ public class DruidConfig { public DynamicDataSource dataSource(DataSource masterDataSource) { DynamicDataSource dynamicDataSource = new DynamicDataSource(); dynamicDataSource.setDefaultTargetDataSource(masterDataSource); + Object slaveDataSource = SpringUtils.getBeanOfNull("slaveDataSource"); dynamicDataSource.addTargetDataSource(DataSourceType.MASTER.name(), masterDataSource); - dynamicDataSource.addTargetDataSource(DataSourceType.SLAVE.name(), "slaveDataSource"); + dynamicDataSource.addTargetDataSource(DataSourceType.SLAVE.name(), slaveDataSource); return dynamicDataSource; - /* Map targetDataSources = new HashMap<>(); - targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource); - setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource"); - return new DynamicDataSource(masterDataSource, targetDataSources);*/ } /** diff --git a/sync-framework/src/main/java/com/lyr/framework/datasource/DynamicDataSource.java b/sync-framework/src/main/java/com/lyr/framework/datasource/DynamicDataSource.java index 1a2f980..cb51a54 100644 --- a/sync-framework/src/main/java/com/lyr/framework/datasource/DynamicDataSource.java +++ b/sync-framework/src/main/java/com/lyr/framework/datasource/DynamicDataSource.java @@ -1,6 +1,5 @@ package com.lyr.framework.datasource; -import com.lyr.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; @@ -35,16 +34,11 @@ public class DynamicDataSource extends AbstractRoutingDataSource { * @param dataSource */ public void addTargetDataSource(Object key, Object dataSource) { + if (null == dataSource) { + return; + } try { - if (dataSource instanceof String) { - try { - SpringUtils.getBean(dataSource.toString()); - this.targetDataSources.put(key, dataSource); - } catch (Exception e) { - } - } else { - this.targetDataSources.put(key, dataSource); - } + this.targetDataSources.put(key, dataSource); super.afterPropertiesSet(); // 重新初始化数据源 } catch (Exception e) { log.error("添加数据源失败", e); diff --git a/sync-framework/src/main/java/com/lyr/framework/manager/DataSourceManager.java b/sync-framework/src/main/java/com/lyr/framework/manager/DataSourceManager.java index 24f3960..9724e1f 100644 --- a/sync-framework/src/main/java/com/lyr/framework/manager/DataSourceManager.java +++ b/sync-framework/src/main/java/com/lyr/framework/manager/DataSourceManager.java @@ -85,13 +85,12 @@ public class DataSourceManager { private void testDataSourceConnection(DruidDataSource dataSource, RegisterType registerType) { String dataSourceName = dataSource.getName(); int compareTo = RegisterType.LOAD.compareTo(registerType); - String message = String.format("数据源连接测试未通过 %s", - (compareTo == 0 ? "排查表参数: data_source_config" : "请手动测试数据源是否正确")); + String message = String.format("数据源连接测试未通过 %s", (compareTo == 0 ? "排查表参数: data_source_config" : "请手动测试数据源是否正确")); try (Connection connection = dataSource.getConnection()) { JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); Integer result = jdbcTemplate.queryForObject("SELECT 1", Integer.class); if (result != null && result == 1) { - log.info(String.format("数据源连接测试通过", dataSourceName)); + log.info(String.format("数据源连接测试通过 %s", dataSourceName)); } else { log.error(message); throw new ServiceException(message); @@ -125,6 +124,4 @@ public class DataSourceManager { } - - } diff --git a/sync-framework/target/classes/com/lyr/framework/config/DruidConfig$1.class b/sync-framework/target/classes/com/lyr/framework/config/DruidConfig$1.class index 9bd3b40..85c723d 100644 Binary files a/sync-framework/target/classes/com/lyr/framework/config/DruidConfig$1.class and b/sync-framework/target/classes/com/lyr/framework/config/DruidConfig$1.class differ diff --git a/sync-framework/target/classes/com/lyr/framework/config/DruidConfig.class b/sync-framework/target/classes/com/lyr/framework/config/DruidConfig.class index 9829d09..b4a7a5c 100644 Binary files a/sync-framework/target/classes/com/lyr/framework/config/DruidConfig.class and b/sync-framework/target/classes/com/lyr/framework/config/DruidConfig.class differ diff --git a/sync-framework/target/classes/com/lyr/framework/datasource/DynamicDataSource.class b/sync-framework/target/classes/com/lyr/framework/datasource/DynamicDataSource.class index d0e3f5d..2584dfb 100644 Binary files a/sync-framework/target/classes/com/lyr/framework/datasource/DynamicDataSource.class and b/sync-framework/target/classes/com/lyr/framework/datasource/DynamicDataSource.class differ diff --git a/sync-gather/src/main/java/com/lyr/gather/controller/DataSourceConfigController.java b/sync-gather/src/main/java/com/lyr/gather/controller/DataSourceConfigController.java index 4f7fd98..0993251 100644 --- a/sync-gather/src/main/java/com/lyr/gather/controller/DataSourceConfigController.java +++ b/sync-gather/src/main/java/com/lyr/gather/controller/DataSourceConfigController.java @@ -1,11 +1,11 @@ package com.lyr.gather.controller; +import com.lyr.common.core.domain.AjaxResult; +import com.lyr.common.core.domain.ServiceResult; +import com.lyr.gather.domain.DataSourceConfigDTO; import com.lyr.gather.service.DataSourceConfigService; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotNull; @@ -32,8 +32,9 @@ public class DataSourceConfigController { @GetMapping("/add") - public void add() { - dataSourceConfigService.add(); + public AjaxResult add(@RequestBody DataSourceConfigDTO dto) { + ServiceResult serviceResult = dataSourceConfigService.add(dto); + return AjaxResult.success(serviceResult); } diff --git a/sync-gather/src/main/java/com/lyr/gather/convert/DataSourceConfigConvert.java b/sync-gather/src/main/java/com/lyr/gather/convert/DataSourceConfigConvert.java new file mode 100644 index 0000000..06ad9fd --- /dev/null +++ b/sync-gather/src/main/java/com/lyr/gather/convert/DataSourceConfigConvert.java @@ -0,0 +1,15 @@ +package com.lyr.gather.convert; + + +import com.alibaba.druid.pool.DruidDataSource; +import com.lyr.gather.domain.DataSourceConfigDTO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +@Mapper +public interface DataSourceConfigConvert { + + DataSourceConfigConvert INSTANCE = Mappers.getMapper(DataSourceConfigConvert.class); + + DruidDataSource convert(DataSourceConfigDTO bean); +} diff --git a/sync-gather/src/main/java/com/lyr/gather/domain/DataSourceConfigDTO.java b/sync-gather/src/main/java/com/lyr/gather/domain/DataSourceConfigDTO.java new file mode 100644 index 0000000..3ad3267 --- /dev/null +++ b/sync-gather/src/main/java/com/lyr/gather/domain/DataSourceConfigDTO.java @@ -0,0 +1,27 @@ +package com.lyr.gather.domain; + +import lombok.Data; +import org.apache.ibatis.annotations.Insert; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @author liyc + * @date 2024/10/31 + * @description TODO + **/ +@Data +public class DataSourceConfigDTO implements Serializable { + + @NotNull(message = "【name】不能为空", groups = {Insert.class}) + protected String name; + @NotNull(message = "【username】不能为空", groups = {Insert.class}) + protected volatile String username; + @NotNull(message = "【password】不能为空", groups = {Insert.class}) + protected volatile String password; + @NotNull(message = "【jdbcUrl】不能为空", groups = {Insert.class}) + protected volatile String jdbcUrl; + @NotNull(message = "【driverClass】不能为空", groups = {Insert.class}) + protected volatile String driverClass; +} diff --git a/sync-gather/src/main/java/com/lyr/gather/domain/model/DataSourceConfig.java b/sync-gather/src/main/java/com/lyr/gather/domain/model/DataSourceConfig.java index a6fa5cc..8c2934f 100644 --- a/sync-gather/src/main/java/com/lyr/gather/domain/model/DataSourceConfig.java +++ b/sync-gather/src/main/java/com/lyr/gather/domain/model/DataSourceConfig.java @@ -19,6 +19,9 @@ public class DataSourceConfig { */ private Long id; + @Excel(name = "名称") + private String alias; + /** * 数据源的唯一名称，用于标识不同的数据源 */ @@ -55,9 +58,6 @@ public class DataSourceConfig { @Excel(name = "数据库驱动类名") private String driverClassName; - @Excel(name = "bean名称") - private String beanName; - /** * 是否启用该数据源，1 表示启用，0 表示禁用 */ diff --git a/sync-gather/src/main/java/com/lyr/gather/service/DataSourceConfigService.java b/sync-gather/src/main/java/com/lyr/gather/service/DataSourceConfigService.java index 3509b4a..f2cb494 100644 --- a/sync-gather/src/main/java/com/lyr/gather/service/DataSourceConfigService.java +++ b/sync-gather/src/main/java/com/lyr/gather/service/DataSourceConfigService.java @@ -1,13 +1,17 @@ package com.lyr.gather.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.lyr.common.core.domain.ServiceResult; +import com.lyr.gather.domain.DataSourceConfigDTO; import com.lyr.gather.domain.model.DataSourceConfig; public interface DataSourceConfigService extends IService { void print(); - void add(); + ServiceResult add(DataSourceConfigDTO dto); + + void remove(String[] ids); void list(String s, Object o); } diff --git a/sync-gather/src/main/java/com/lyr/gather/service/impl/DataSourceConfigServiceImpl.java b/sync-gather/src/main/java/com/lyr/gather/service/impl/DataSourceConfigServiceImpl.java index 5dab190..ca54e7a 100644 --- a/sync-gather/src/main/java/com/lyr/gather/service/impl/DataSourceConfigServiceImpl.java +++ b/sync-gather/src/main/java/com/lyr/gather/service/impl/DataSourceConfigServiceImpl.java @@ -2,15 +2,21 @@ package com.lyr.gather.service.impl; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lyr.common.core.domain.ServiceResult; +import com.lyr.common.utils.bean.BeanValidators; import com.lyr.framework.manager.DataSourceManager; +import com.lyr.gather.convert.DataSourceConfigConvert; +import com.lyr.gather.domain.DataSourceConfigDTO; import com.lyr.gather.domain.model.DataSourceConfig; import com.lyr.gather.mapper.DataSourceConfigMapper; import com.lyr.gather.mapper.TSupplierMapper; import com.lyr.gather.service.DataSourceConfigService; +import org.apache.ibatis.annotations.Insert; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import javax.annotation.Resource; +import javax.validation.Validator; import java.util.List; @Service @@ -20,6 +26,8 @@ public class DataSourceConfigServiceImpl extends ServiceImpl