From 00e0628c8eef156023da7cb3193bd1c91e8f93dd Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 31 May 2023 21:26:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=83=A8=E7=BD=B2=E6=AD=A3=E5=BC=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/LauncherConstant.java | 4 ++-- .../org/springblade/common/launch/LauncherServiceImpl.java | 4 ++++ .../com/logpm/factory/snm/service/impl/OrderServiceImpl.java | 1 - .../logpm-factory/src/main/resources/application.yml | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) 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 a971414df..aaf7de697 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 @@ -51,7 +51,7 @@ public interface LauncherConstant { /** * nacos prod 地址 */ - String NACOS_PROD_ADDR = "172.30.0.48:8848"; + String NACOS_PROD_ADDR = "172.16.128.145:8848"; /** * nacos test 地址 @@ -83,7 +83,7 @@ public interface LauncherConstant { /** * seata prod 地址 */ - String SEATA_PROD_ADDR = "172.30.0.68:8091"; + String SEATA_PROD_ADDR = "172.16.128.145:8091"; /** * seata test 地址 diff --git a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index adaf9c0d1..9a792a4ad 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -40,6 +40,10 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); // dubbo注册 PropsUtil.setProperty(props, "dubbo.application.name", appName); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java index a5f7a6ebd..46b3b9ba8 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/snm/service/impl/OrderServiceImpl.java @@ -126,7 +126,6 @@ public class OrderServiceImpl implements IOrderService { String resBody = orderLogEntity.getResBody(); ResponseStationOrderVo responseStationOrderVo = JSONUtil.toBean(resBody, ResponseStationOrderVo.class); - List rs = new ArrayList<>(); List PACKAGE_LIST = new ArrayList<>(); diff --git a/blade-service/logpm-factory/src/main/resources/application.yml b/blade-service/logpm-factory/src/main/resources/application.yml index 6c0998ed4..d6ef31875 100644 --- a/blade-service/logpm-factory/src/main/resources/application.yml +++ b/blade-service/logpm-factory/src/main/resources/application.yml @@ -41,10 +41,10 @@ xxl: job: accessToken: '' admin: - addresses: http://192.168.2.110:7009/xxl-job-admin + addresses: http://47.108.51.143:7009/xxl-job-admin executor: appname: logpm-factory-xxljob - ip: 192.168.2.110 + ip: 127.0.0.1 logpath: ../data/applogs/logpm-factory-xxljob/jobhandler logretentiondays: -1 port: 7018