Compare commits

..

No commits in common. 'master' and 'pre-production' have entirely different histories.

  1. 8
      blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
  2. 3
      blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
  3. 1
      blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
  4. 2
      blade-service/logpm-aftersales/src/main/resources/application-prod.yml
  5. 4
      blade-service/logpm-basicdata/src/main/resources/application.yml
  6. 2
      blade-service/logpm-business/src/main/resources/application-prod.yml
  7. 2
      blade-service/logpm-distribution/src/main/resources/application-prod.yml
  8. 2
      blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
  9. 2
      blade-service/logpm-patch/src/main/resources/application-prod.yml
  10. 2
      blade-service/logpm-statisticsdata/src/main/resources/application-prod.yml
  11. 2
      blade-service/logpm-trunkline/src/main/resources/application-prod.yml
  12. 2
      blade-service/logpm-warehouse/src/main/resources/application-prod.yml

8
blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@ -51,7 +51,7 @@ public interface LauncherConstant {
/**
* nacos prod 地址
*/
String NACOS_PROD_ADDR = "172.26.199.145:8848";
String NACOS_PROD_ADDR = "172.16.128.145:8848";
/**
* nacos test 地址
@ -67,7 +67,7 @@ public interface LauncherConstant {
/**
* sentinel prod 地址
*/
String SENTINEL_PROD_ADDR = "172.26.199.145:8858";
String SENTINEL_PROD_ADDR = "172.16.128.145:8858";
/**
* sentinel test 地址
@ -83,7 +83,7 @@ public interface LauncherConstant {
/**
* seata prod 地址
*/
String SEATA_PROD_ADDR = "172.26.199.145:8091";
String SEATA_PROD_ADDR = "172.16.128.145:8091";
/**
* seata test 地址
@ -114,7 +114,7 @@ public interface LauncherConstant {
/**
* elk prod 地址
*/
String ELK_PROD_ADDR = "172.26.199.145:9002";
String ELK_PROD_ADDR = "172.30.0.72:9000";
/**
* elk test 地址

3
blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java

@ -100,9 +100,6 @@ public class OldSystemDataPushConfig {
//兴义仓
warehourseIds.add("155");
//自贡仓
warehourseIds.add("44");
//新都仓
warehourseIds.add("144");

1
blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@ -18,6 +18,7 @@ package org.springblade.common.launch;
import org.springblade.common.constant.LauncherConstant;
import org.springblade.core.auto.service.AutoService;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.launch.service.LauncherService;
import org.springblade.core.launch.utils.PropsUtil;
import org.springframework.boot.builder.SpringApplicationBuilder;

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

@ -12,7 +12,7 @@ server:
spring:
#rabbitmq配置
rabbitmq:
host: 172.26.199.145
host: 172.16.128.145
port: 5672
username: admin
password: Slwk@123654

4
blade-service/logpm-basicdata/src/main/resources/application.yml

@ -24,10 +24,10 @@ xxl:
job:
accessToken: ''
admin:
addresses: http://172.16.128.147:7009/xxl-job-admin
addresses: http://127.0.0.1:7009/xxl-job-admin
executor:
appname: logpm-basicdata-xxljob
ip: 172.16.128.147
ip: 127.0.0.1
logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler
logretentiondays: -1
port: 17019

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

@ -27,7 +27,7 @@ spring:
password: ${blade.datasource.business.master.password}
#rabbitmq配置
rabbitmq:
host: 172.26.199.145
host: 172.16.128.145
port: 5672
username: admin
password: Slwk@123654

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

@ -27,7 +27,7 @@ spring:
password: ${blade.datasource.distribution.master.password}
#rabbitmq配置
rabbitmq:
host: 172.26.199.145
host: 172.16.128.145
port: 5672
username: admin
password: Slwk@123654

2
blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@ -878,8 +878,6 @@ public class SyncOrderInfoToPlatform {
return ReturnT.SUCCESS;
}
@XxlJob("syncWaybillOrderInfo")
public ReturnT<String> syncWaybillOrderInfo(String param) {
log.info("############syncWaybillOrderInfo: 同步运单下订单信息 开始");

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

@ -12,7 +12,7 @@ server:
spring:
#rabbitmq配置
rabbitmq:
host: 172.26.199.145
host: 172.16.128.145
port: 5672
username: admin
password: Slwk@123654

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

@ -12,7 +12,7 @@ server:
spring:
#rabbitmq配置
rabbitmq:
host: 172.26.199.145
host: 172.16.128.145
port: 5672
username: admin
password: Slwk@123654

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

@ -27,7 +27,7 @@ spring:
password: ${blade.datasource.trunkline.master.password}
#rabbitmq配置
rabbitmq:
host: 172.26.199.145
host: 172.16.128.145
port: 5672
username: admin
password: Slwk@123654

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

@ -27,7 +27,7 @@ spring:
password: ${blade.datasource.warehouse.master.password}
#rabbitmq配置
rabbitmq:
host: 172.26.199.145
host: 172.16.128.145
port: 5672
username: admin
password: Slwk@123654

Loading…
Cancel
Save