move config of wedpr-adm to other sub-project

Author: cyjseagull

wedpr-adm/src/main/java/com/webank/wedpr/adm/config/AuthSyncConfig.java renamed to wedpr-components/authorization/src/main/java/com/webank/wedpr/components/authorization/config/AuthSyncConfig.java

@@ -14,11 +14,12 @@
 *
 */
 
-package com.webank.wedpr.adm.config;
+package com.webank.wedpr.components.authorization.config;
 
 import com.webank.wedpr.components.authorization.dao.AuthMapperWrapper;
 import com.webank.wedpr.components.authorization.service.impl.AuthSyncer;
 import com.webank.wedpr.components.sync.ResourceSyncer;
+import com.webank.wedpr.components.sync.config.ResourceSyncerConfig;
 import com.webank.wedpr.core.config.WeDPRCommonConfig;
 import com.webank.wedpr.core.utils.ThreadPoolService;
 import org.springframework.beans.factory.annotation.Autowired;

wedpr-components/leader-election/build.gradle

@@ -5,4 +5,5 @@ plugins {
 
 dependencies {
     compile project(":wedpr-components-sys-config")
+    compile project(":wedpr-components-uuid")
 }

wedpr-adm/src/main/java/com/webank/wedpr/adm/config/LeaderElectionConfig.java renamed to wedpr-components/leader-election/src/main/java/com/webank/wedpr/components/leader/election/config/LeaderElectionConfig.java

@@ -14,12 +14,13 @@
 *
 */
 
-package com.webank.wedpr.adm.config;
+package com.webank.wedpr.components.leader.election.config;
 
 import com.webank.wedpr.components.leader.election.LeaderElection;
 import com.webank.wedpr.components.leader.election.impl.ElectionConfig;
 import com.webank.wedpr.components.leader.election.impl.LeaderElectionImpl;
 import com.webank.wedpr.components.meta.sys.config.WeDPRSysConfig;
+import com.webank.wedpr.components.meta.sys.config.loader.SysConfigLoader;
 import com.webank.wedpr.components.uuid.generator.WeDPRUuidGenerator;
 import com.webank.wedpr.core.config.WeDPRConfig;
 import org.slf4j.Logger;

wedpr-components/meta/setting-template/src/main/resources/mapper/SettingTemplateMapper.xml

@@ -90,7 +90,7 @@
                     and `name` like concat(#{condition.name}, '%')
                 </if>
                 <if test="condition.type != null and condition.type !=''">
-                    and `type` = condition.type
+                    and `type` = #{condition.type}
                 </if>
                  <if test="condition.owner != null and condition.owner !=''">
                     and `owner` = #{condition.owner}

wedpr-adm/src/main/java/com/webank/wedpr/adm/config/SysConfigLoader.java renamed to wedpr-components/meta/sys-config/src/main/java/com/webank/wedpr/components/meta/sys/config/loader/SysConfigLoader.java

@@ -12,7 +12,7 @@
  * the License.
  *
  */
-package com.webank.wedpr.adm.config;
+package com.webank.wedpr.components.meta.sys.config.loader;
 
 import com.webank.wedpr.components.meta.sys.config.WeDPRSysConfig;
 import com.webank.wedpr.components.meta.sys.config.dao.SysConfigMapper;

wedpr-adm/src/main/java/com/webank/wedpr/adm/config/FileMetaBuilderConfig.java renamed to wedpr-components/scheduler/src/main/java/com/webank/wedpr/components/scheduler/config/FileMetaBuilderConfig.java

@@ -13,12 +13,13 @@
  *
  */
 
-package com.webank.wedpr.adm.config;
+package com.webank.wedpr.components.scheduler.config;
 
 import com.webank.wedpr.components.scheduler.executor.impl.model.FileMetaBuilder;
 import com.webank.wedpr.components.storage.builder.StoragePathBuilder;
 import com.webank.wedpr.components.storage.config.HdfsStorageConfig;
 import com.webank.wedpr.components.storage.config.LocalStorageConfig;
+import com.webank.wedpr.components.sync.config.ResourceSyncerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

wedpr-adm/src/main/java/com/webank/wedpr/adm/config/JobCheckerConfig.java renamed to wedpr-components/scheduler/src/main/java/com/webank/wedpr/components/scheduler/config/JobCheckerConfig.java

@@ -13,7 +13,7 @@
  *
  */
 
-package com.webank.wedpr.adm.config;
+package com.webank.wedpr.components.scheduler.config;
 
 import com.webank.wedpr.components.project.JobChecker;
 import com.webank.wedpr.components.project.dao.JobDO;

wedpr-adm/src/main/java/com/webank/wedpr/adm/config/JobSyncerConfig.java renamed to wedpr-components/scheduler/src/main/java/com/webank/wedpr/components/scheduler/config/JobSyncerConfig.java

@@ -14,12 +14,13 @@
 *
 */
 
-package com.webank.wedpr.adm.config;
+package com.webank.wedpr.components.scheduler.config;
 
 import com.webank.wedpr.components.project.dao.ProjectMapperWrapper;
 import com.webank.wedpr.components.scheduler.core.JobSyncer;
 import com.webank.wedpr.components.scheduler.core.SchedulerTaskImpl;
 import com.webank.wedpr.components.sync.ResourceSyncer;
+import com.webank.wedpr.components.sync.config.ResourceSyncerConfig;
 import com.webank.wedpr.core.config.WeDPRCommonConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;

wedpr-adm/src/main/java/com/webank/wedpr/adm/config/SchedulerLoader.java renamed to wedpr-components/scheduler/src/main/java/com/webank/wedpr/components/scheduler/config/SchedulerLoader.java

@@ -13,7 +13,7 @@
  *
  */
 
-package com.webank.wedpr.adm.config;
+package com.webank.wedpr.components.scheduler.config;
 
 import com.webank.wedpr.components.project.JobChecker;
 import com.webank.wedpr.components.project.dao.ProjectMapperWrapper;
@@ -25,6 +25,7 @@
 import com.webank.wedpr.components.storage.config.HdfsStorageConfig;
 import com.webank.wedpr.components.storage.config.LocalStorageConfig;
 import com.webank.wedpr.components.sync.ResourceSyncer;
+import com.webank.wedpr.components.sync.config.ResourceSyncerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

wedpr-adm/src/main/java/com/webank/wedpr/adm/config/ResourceSyncerConfig.java renamed to wedpr-components/sync/src/main/java/com/webank/wedpr/components/sync/config/ResourceSyncerConfig.java

@@ -12,9 +12,10 @@
  * the License.
  *
  */
-package com.webank.wedpr.adm.config;
+package com.webank.wedpr.components.sync.config;
 
 import com.webank.wedpr.components.leader.election.LeaderElection;
+import com.webank.wedpr.components.leader.election.config.LeaderElectionConfig;
 import com.webank.wedpr.components.meta.sys.config.WeDPRSysConfig;
 import com.webank.wedpr.components.sync.ResourceSyncer;
 import com.webank.wedpr.components.sync.dao.SyncStatusMapper;
@@ -34,7 +35,7 @@
 import org.springframework.context.annotation.Scope;
 
 @Configuration
-@AutoConfigureAfter(LeaderElection.class)
+@AutoConfigureAfter(LeaderElectionConfig.class)
 public class ResourceSyncerConfig {
     private static final Logger logger = LoggerFactory.getLogger(ResourceSyncerConfig.class);