Merge branch 'fix_bugs_2024-01-31' into dev

# Conflicts:
#	blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml

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.username","nacos");
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
+		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.username","nacos");
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
+		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");

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

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