From a75ba43d8b31d4ce317e4de538e5b573f4bb6fc8 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 26 Jan 2024 17:09:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=E6=AD=A3=E5=BC=8F=E5=8C=85=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/launch/LauncherServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 2749bc113..7d5c44bb6 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 @@ -41,10 +41,10 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(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"); + 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"); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); From 43ce5c1aae35aa4b226ae8fef22aab856fdc164a Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 26 Jan 2024 17:21:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1.=E6=AD=A3=E5=BC=8F=E5=8C=85=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-patch/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-patch/src/main/resources/application.yml b/blade-service/logpm-patch/src/main/resources/application.yml index 2a2c16f5d..ddad5233f 100644 --- a/blade-service/logpm-patch/src/main/resources/application.yml +++ b/blade-service/logpm-patch/src/main/resources/application.yml @@ -31,10 +31,10 @@ xxl: job: accessToken: '' admin: - addresses: http://192.168.2.106:7009/xxl-job-admin + addresses: http://127.0.0.1:7009/xxl-job-admin executor: appname: logpm-patch-xxljob - ip: 192.168.2.106 + ip: 127.0.0.1 logpath: ../data/applogs/logpm-patch-xxljob/jobhandler logretentiondays: -1 port: 7118 From e7050f0b619d2614ec355f6b4ac9e70378f88a9c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 31 Jan 2024 18:28:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9nacos=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/launch/LauncherServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 23a0734e0..eb7a75c87 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 @@ -44,10 +44,10 @@ public class LauncherServiceImpl implements LauncherService { 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"); + 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); PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false"); From 3e0b71be9fb8bb07ad2b10c4d28273b1a45ca1ce Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 31 Jan 2024 19:00:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml index cb523b60a..97007a98e 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml @@ -8,7 +8,7 @@ From e620104145ff920cf09d6187987e4381d392978d Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 31 Jan 2024 22:53:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/resources/application.yml b/blade-service/logpm-distribution/src/main/resources/application.yml index dfd285af5..a84f9a5a7 100644 --- a/blade-service/logpm-distribution/src/main/resources/application.yml +++ b/blade-service/logpm-distribution/src/main/resources/application.yml @@ -10,23 +10,7 @@ swagger: - org.springblade - com.logpm -#oss配置 -oss: - enabled: true - name: minio - tenant-mode: false - endpoint: http://8.137.14.82:9000 - access-key: minio - secret-key: 123123123 - bucket-name: bladex - -#blade配置 -blade: - #本地文件上传 - file: - remote-mode: true - upload-domain: http://localhost:8999 - remote-path: /usr/share/nginx/html + logging: config: classpath:logback.xml