1.修改配送配置文件

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java

@@ -30,7 +30,7 @@ import org.springblade.core.launch.BladeApplication;
 public class DistributionApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_TRUNKLINE_NAME, DistributionApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME, DistributionApplication.class, args);
 	}
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/DistributionProperties.java

@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration;
 @ComponentScan({"org.springblade", "com.logpm"})
 @EnableFeignClients({"org.springblade", "com.logpm"})
 @MapperScan({"org.springblade.**.mapper.**", "com.logpm.**.mapper.**"})
-@EnableConfigurationProperties(BasicDataProperties.class)
-public class BasicDataProperties {
+@EnableConfigurationProperties(DistributionProperties.class)
+public class DistributionProperties {
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/launcher/DistributionLauncherServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.Properties;
  * @author Chill
  */
 @AutoService(LauncherService.class)
-public class BasicDataLauncherServiceImpl implements LauncherService {
+public class DistributionLauncherServiceImpl implements LauncherService {
 
 	@Override
 	public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/pros/DistributionProperties.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 @Data
 @ConfigurationProperties(prefix = "logpm")
 @Component
-public class BasicDataProperties {
+public class DistributionProperties {
 	/**
 	 * 名称
 	 */

blade-service/logpm-distribution/src/main/resources/application-dev.yml

@@ -30,15 +30,15 @@ spring:
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.factory.master.url}
-          username: ${blade.datasource.factory.master.username}
-          password: ${blade.datasource.factory.master.password}
+          url: ${blade.datasource.distribution.master.url}
+          username: ${blade.datasource.distribution.master.username}
+          password: ${blade.datasource.distribution.master.password}
         slave:
           druid:
             #独立校验配置
             validation-query: select 1
             #oracle校验
             #validation-query: select 1 from dual
-          url: ${blade.datasource.factory.slave.url}
-          username: ${blade.datasource.factory.slave.username}
-          password: ${blade.datasource.factory.slave.password}
+          url: ${blade.datasource.distribution.slave.url}
+          username: ${blade.datasource.distribution.slave.username}
+          password: ${blade.datasource.distribution.slave.password}

blade-service/logpm-distribution/src/main/resources/application-prod.yml

@@ -22,10 +22,10 @@ spring:
       primary: master
       datasource:
         master:
-          url: ${blade.datasource.factory.master.url}
-          username: ${blade.datasource.factory.master.username}
-          password: ${blade.datasource.factory.master.password}
+          url: ${blade.datasource.distribution.master.url}
+          username: ${blade.datasource.distribution.master.username}
+          password: ${blade.datasource.distribution.master.password}
         slave:
-          url: ${blade.datasource.factory.slave.url}
-          username: ${blade.datasource.factory.slave.username}
-          password: ${blade.datasource.factory.slave.password}
+          url: ${blade.datasource.distribution.slave.url}
+          username: ${blade.datasource.distribution.slave.username}
+          password: ${blade.datasource.distribution.slave.password}

blade-service/logpm-distribution/src/main/resources/application-test.yml

@@ -22,10 +22,10 @@ spring:
       primary: master
       datasource:
         master:
-          url: ${blade.datasource.factory.master.url}
-          username: ${blade.datasource.factory.master.username}
-          password: ${blade.datasource.factory.master.password}
+          url: ${blade.datasource.distribution.master.url}
+          username: ${blade.datasource.distribution.master.username}
+          password: ${blade.datasource.distribution.master.password}
         slave:
-          url: ${blade.datasource.factory.slave.url}
-          username: ${blade.datasource.factory.slave.username}
-          password: ${blade.datasource.factory.slave.password}
+          url: ${blade.datasource.distribution.slave.url}
+          username: ${blade.datasource.distribution.slave.username}
+          password: ${blade.datasource.distribution.slave.password}

blade-service/logpm-distribution/src/main/resources/application.yml

@@ -15,10 +15,10 @@ oss:
   enabled: true
   name: minio
   tenant-mode: false
-  endpoint: http://127.0.0.1:9000
-  access-key: D99KGE6ZTQXSATTJWU24
-  secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
-  bucket-name: bladex
+  endpoint: http://192.168.2.100:9000
+  access-key: minio
+  secret-key: 123123123
+  bucket-name: logpm
 
 #blade配置
 blade:
@@ -37,14 +37,4 @@ spring:
     allow-circular-references: true
 
 
-xxl:
-  job:
-    accessToken: ''
-    admin:
-      addresses: http://127.0.0.1:7009/xxl-job-admin
-    executor:
-      appname: logpm-factory-xxljob
-      ip: 127.0.0.1
-      logpath: ../data/applogs/logpm-factory-xxljob/jobhandler
-      logretentiondays: -1
-      port: 7018
+