diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index f1388ed71..30976e390 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -45,7 +45,7 @@ public interface LauncherConstant { /** * nacos dev 地址 */ - String NACOS_DEV_ADDR = "192.168.10.210:8848"; + String NACOS_DEV_ADDR = "192.168.1.100:8848"; /** * nacos prod 地址 @@ -55,7 +55,7 @@ public interface LauncherConstant { /** * nacos test 地址 */ - String NACOS_TEST_ADDR = "192.168.10.210:8848"; + String NACOS_TEST_ADDR = "192.168.1.100:8848"; /** * sentinel dev 地址 @@ -75,7 +75,7 @@ public interface LauncherConstant { /** * seata dev 地址 */ - String SEATA_DEV_ADDR = "192.168.10.210:8091"; + String SEATA_DEV_ADDR = "192.168.1.100:8091"; /** * seata prod 地址 @@ -85,7 +85,7 @@ public interface LauncherConstant { /** * seata test 地址 */ - String SEATA_TEST_ADDR = "192.168.10.210:8091"; + String SEATA_TEST_ADDR = "192.168.1.100:8091"; /** * dbuuo提供者 diff --git a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java index de1c9485c..acbd246cf 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java @@ -33,7 +33,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; public class GateWayApplication { public static void main(String[] args) { - BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME, GateWayApplication.class, args); + + BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME.concat("-pref"), GateWayApplication.class, args); } } diff --git a/blade-gateway/src/main/resources/application-dev.yml b/blade-gateway/src/main/resources/application-dev.yml index b8eaf546c..ad8e58950 100644 --- a/blade-gateway/src/main/resources/application-dev.yml +++ b/blade-gateway/src/main/resources/application-dev.yml @@ -7,5 +7,5 @@ blade: #version: 3.0.0 #负载均衡优先调用的ip段 prior-ip-pattern: - - 192.168.0.* + - 192.168.10.* - 127.0.0.1 diff --git a/blade-gateway/src/main/resources/bootstrap.yml b/blade-gateway/src/main/resources/bootstrap.yml index 5c9f4fd54..7518ca9d9 100644 --- a/blade-gateway/src/main/resources/bootstrap.yml +++ b/blade-gateway/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 80 + port: 8888 spring: cloud: diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java index 8d557d26d..df622ed81 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java @@ -29,7 +29,7 @@ import org.springblade.core.launch.BladeApplication; public class FactoryApplication { public static void main(String[] args) { - BladeApplication.run(LauncherConstant.APPLICATION_FACTORY_NAME, FactoryApplication.class, args); + BladeApplication.run(LauncherConstant.APPLICATION_FACTORY_NAME.concat("-pref"), FactoryApplication.class, args); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java index 171b1dd5b..ba3d32367 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java @@ -115,6 +115,11 @@ public class FactoryXxlJob { Map map = orderService.dataRelative(orderLogEntity); List dataList = map.get(StationOrderEntity.class.getName()); + if(dataList.size()==0){ + XxlJobLogger.log("本次解析操作没有数据"); + return; + } + dataList = checkDataExit(dataList, newList); if (dataList != null && dataList.size() != 0) { XxlJobLogger.log("保存对象StationOrderEntity {}", dataList); diff --git a/pom.xml b/pom.xml index 809d39a26..08a0c99dd 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,6 @@ blade-biz-common - blade-example - blade-example-api blade-gateway blade-ops blade-service