From 04fbccf9824f2d15ab9d64ae48a97e810eef9e89 Mon Sep 17 00:00:00 2001 From: lbw Date: Thu, 12 Jan 2023 20:08:44 +0800 Subject: [PATCH 1/6] :bookmark: v4.6.0 --- .../pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java index e812f0e90..8d4c3fc18 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java @@ -189,7 +189,7 @@ public class SysTenantServiceImpl extends ServiceImpl roleMenuMapper.insert(ele)); + roleMenuList.forEach(roleMenuMapper::insert); // 插入系统字典 dictService.saveBatch(dictList.stream().peek(d -> d.setId(null)).collect(Collectors.toList())); // 处理字典项最新关联的字典ID From 39a7a4ebf84fc7520e36ee37d2111b74c2497675 Mon Sep 17 00:00:00 2001 From: lbw Date: Sat, 14 Jan 2023 09:44:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?:sparkles:=20pigx-register=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=BC=80=E5=90=AF=E8=AE=A4=E8=AF=81=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 ++ pigx-auth/src/main/resources/application.yml | 8 ++------ pigx-gateway/src/main/resources/application.yml | 2 ++ .../com/alibaba/nacos/PigxNacosApplication.java | 2 +- .../com/alibaba/nacos/config/ConsoleConfig.java | 9 ++++++++- pigx-register/src/main/resources/application.yml | 15 ++++++++++----- .../admin/config/ClientDetailsInitRunner.java | 9 ++++----- .../pigx/admin/config/DynamicRouteInitRunner.java | 7 ++----- .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application.yml | 4 +++- .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application.yml | 4 +++- .../src/main/resources/application.yml | 2 ++ pom.xml | 4 +++- 21 files changed, 60 insertions(+), 26 deletions(-) diff --git a/pigx-app-server/pigx-app-server-biz/src/main/resources/application.yml b/pigx-app-server/pigx-app-server-biz/src/main/resources/application.yml index f7abeb654..ffa924dd5 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/resources/application.yml +++ b/pigx-app-server/pigx-app-server-biz/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-auth/src/main/resources/application.yml b/pigx-auth/src/main/resources/application.yml index eeaf5b5fd..d0a0e4929 100644 --- a/pigx-auth/src/main/resources/application.yml +++ b/pigx-auth/src/main/resources/application.yml @@ -1,17 +1,13 @@ server: port: 3000 - -security: - api: - encrypt: - aesKey: 'pigxpigxpigxpigx' - spring: application: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-gateway/src/main/resources/application.yml b/pigx-gateway/src/main/resources/application.yml index f918e7dd6..f9667b146 100644 --- a/pigx-gateway/src/main/resources/application.yml +++ b/pigx-gateway/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java index 1ae2597c3..5d301bd93 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/PigxNacosApplication.java @@ -43,7 +43,7 @@ public class PigxNacosApplication { */ private static boolean initEnv() { System.setProperty(ConfigConstants.STANDALONE_MODE, "true"); - System.setProperty(ConfigConstants.AUTH_ENABLED, "false"); + System.setProperty(ConfigConstants.AUTH_ENABLED, "true"); System.setProperty(ConfigConstants.LOG_BASEDIR, "logs"); System.setProperty(ConfigConstants.LOG_ENABLED, "true"); return true; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java index 7a3ec617d..b5dbe6e89 100644 --- a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java @@ -16,6 +16,7 @@ package com.alibaba.nacos.config; +import com.alibaba.nacos.console.filter.XssFilter; import com.alibaba.nacos.core.code.ControllerMethodsCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; @@ -39,7 +40,7 @@ import java.time.ZoneId; */ @Component @EnableScheduling -@PropertySource("/application.properties") +@PropertySource("/application.yml") public class ConsoleConfig { @Autowired @@ -64,11 +65,17 @@ public class ConsoleConfig { config.addAllowedHeader("*"); config.setMaxAge(18000L); config.addAllowedMethod("*"); + config.addAllowedOriginPattern("*"); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", config); return new CorsFilter(source); } + @Bean + public XssFilter xssFilter() { + return new XssFilter(); + } + @Bean public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() { return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(ZoneId.systemDefault().toString()); diff --git a/pigx-register/src/main/resources/application.yml b/pigx-register/src/main/resources/application.yml index 4ea15de2f..d62e442d6 100644 --- a/pigx-register/src/main/resources/application.yml +++ b/pigx-register/src/main/resources/application.yml @@ -1,8 +1,9 @@ server: - port: 8848 + port: 18848 tomcat: basedir: logs - + error: + include-message: always db: num: 1 user: ${MYSQL_USER:root} @@ -13,25 +14,29 @@ db: nacos: core: auth: + server: + identity: + key: serverIdentity + value: security system.type: nacos plugin.nacos.token.secret.key: SecretKey012345678901234567890123456789012345678901234567890123456789 security: ignore: - urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** + urls: /actuator/**,/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** spring: datasource: platform: mysql #这个过期属性不能修改，nacos 代码对此有硬编码 security: enabled: true - boot: # 接入 spring boot admin + boot: # 接入 spring boot admin admin: client: url: http://pigx-monitor:5001 username: pig password: pig instance: - prefer-ip: true + service-host-type: ip application: name: @project.artifactId@ diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ClientDetailsInitRunner.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ClientDetailsInitRunner.java index f38e3c7f7..8cc468257 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ClientDetailsInitRunner.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ClientDetailsInitRunner.java @@ -39,20 +39,19 @@ public class ClientDetailsInitRunner implements InitializingBean { private final RedisTemplate redisTemplate; - /** - * WebServerInitializedEvent - * 使用 TransactionalEventListener 时启动时无法获取到事件 + * WebServerInitializedEvent 使用 TransactionalEventListener 时启动时无法获取到事件 */ @Async @Order @EventListener({ WebServerInitializedEvent.class }) - public void WebServerInit(){ + public void WebServerInit() { this.initClientDetails(); } + @Async @Order - @TransactionalEventListener({ ClientDetailsInitEvent.class}) + @TransactionalEventListener({ ClientDetailsInitEvent.class }) public void initClientDetails() { log.debug("初始化客户端信息开始 "); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java index a8d4c0f6a..309ab4d61 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java @@ -60,18 +60,15 @@ public class DynamicRouteInitRunner implements InitializingBean { private final RedisMessageListenerContainer listenerContainer; /** - * WebServerInitializedEvent - * 使用 TransactionalEventListener 时启动时无法获取到事件 + * WebServerInitializedEvent 使用 TransactionalEventListener 时启动时无法获取到事件 */ @Async @Order @EventListener({ WebServerInitializedEvent.class }) - public void WebServerInit(){ + public void WebServerInit() { this.initRoute(); } - - @Async @Order @TransactionalEventListener({ DynamicRouteInitEvent.class }) diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/application.yml b/pigx-upms/pigx-upms-biz/src/main/resources/application.yml index 959c5409f..ab5f384f5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/application.yml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-visual/pigx-codegen/src/main/resources/application.yml b/pigx-visual/pigx-codegen/src/main/resources/application.yml index 67d2202f2..ce79a8f62 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/application.yml +++ b/pigx-visual/pigx-codegen/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml index 513b466f0..ee17eda36 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: @@ -13,4 +15,4 @@ spring: config: import: - optional:nacos:application-@profiles.active@.yml - - optional:nacos:${spring.application.name}-@profiles.active@.yml \ No newline at end of file + - optional:nacos:${spring.application.name}-@profiles.active@.yml diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml b/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml index 14ab80f36..b9a5fa5cb 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml +++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/application.yml @@ -9,6 +9,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml b/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml index 10a58c711..51965388e 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} service: @artifactId@ diff --git a/pigx-visual/pigx-monitor/src/main/resources/application.yml b/pigx-visual/pigx-monitor/src/main/resources/application.yml index 1f678a709..f188b6370 100644 --- a/pigx-visual/pigx-monitor/src/main/resources/application.yml +++ b/pigx-visual/pigx-monitor/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-visual/pigx-mp-platform/src/main/resources/application.yml b/pigx-visual/pigx-mp-platform/src/main/resources/application.yml index b60c628fc..15e7a9d50 100644 --- a/pigx-visual/pigx-mp-platform/src/main/resources/application.yml +++ b/pigx-visual/pigx-mp-platform/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-visual/pigx-oa-platform/src/main/resources/application.yml b/pigx-visual/pigx-oa-platform/src/main/resources/application.yml index b78e4df42..ef069930c 100644 --- a/pigx-visual/pigx-oa-platform/src/main/resources/application.yml +++ b/pigx-visual/pigx-oa-platform/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-visual/pigx-pay-platform/src/main/resources/application.yml b/pigx-visual/pigx-pay-platform/src/main/resources/application.yml index 868829ec6..407e01ac1 100644 --- a/pigx-visual/pigx-pay-platform/src/main/resources/application.yml +++ b/pigx-visual/pigx-pay-platform/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-visual/pigx-report-platform/src/main/resources/application.yml b/pigx-visual/pigx-report-platform/src/main/resources/application.yml index 092ca6bfc..d1406ac40 100644 --- a/pigx-visual/pigx-report-platform/src/main/resources/application.yml +++ b/pigx-visual/pigx-report-platform/src/main/resources/application.yml @@ -6,6 +6,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: diff --git a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml index 1e6e6edf2..30d0a8c8d 100755 --- a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml +++ b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml @@ -8,6 +8,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} @@ -38,4 +40,4 @@ auth: sentinel: dashboard: - version: @project.version@ \ No newline at end of file + version: @project.version@ diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml index e60dd1eb1..6819422d0 100644 --- a/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml +++ b/pigx-visual/pigx-xxl-job-admin/src/main/resources/application.yml @@ -9,6 +9,8 @@ spring: name: @artifactId@ cloud: nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} metadata: diff --git a/pom.xml b/pom.xml index fe2a52960..2f04797a4 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ pigx-common pigx-visual pigx-app-server - + @@ -292,6 +292,8 @@ dev + nacos + nacos From 4053476ff6181b57570ad1695d28691c70186a58 Mon Sep 17 00:00:00 2001 From: lbw Date: Sat, 28 Jan 2023 09:55:31 +0800 Subject: [PATCH 3/6] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=E8=BF=87=E7=A8=8B=E7=9A=84=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OAuth2ResourceOwnerBaseAuthenticationProvider.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java index efdca4e91..c71fb65ef 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/support/base/OAuth2ResourceOwnerBaseAuthenticationProvider.java @@ -6,6 +6,7 @@ import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.security.service.PigRedisOAuth2AuthorizationService; import com.pig4cloud.pigx.common.security.util.OAuth2ErrorCodesExpand; import com.pig4cloud.pigx.common.security.util.ScopeException; +import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; @@ -39,6 +40,7 @@ import java.util.function.Supplier; * * 处理自定义授权 */ +@Slf4j public abstract class OAuth2ResourceOwnerBaseAuthenticationProvider implements AuthenticationProvider { @@ -296,7 +298,10 @@ public abstract class OAuth2ResourceOwnerBaseAuthenticationProvider Date: Sat, 28 Jan 2023 11:20:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=90=8C=E6=AD=A5=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/SysOauthClientDetailsServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java index 704935925..07d76fb99 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -77,6 +77,7 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl Date: Sun, 29 Jan 2023 14:44:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?:bug:=20monitor=20druid=20=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/service/impl/MonitorStatService.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java index 6b975ef9c..fbcba00b2 100755 --- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java +++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/service/impl/MonitorStatService.java @@ -71,12 +71,8 @@ public class MonitorStatService implements DruidStatServiceMBean { List instances = discoveryClient.getInstances(service); for (ServiceInstance instance : instances) { String host = instance.getHost(); - String instanceId = instance.getInstanceId(); - if (instanceId == null) { - instanceId = instance.getMetadata().get("nacos.instanceId").replaceAll("#", "-").replaceAll("@@", - "-"); - } int port = instance.getPort(); + String instanceId = String.format("%s_%s", host, port); String serviceId = instance.getServiceId(); // 根据前端参数采集指定的服务 if (monitorProperties.getApplications().contains(serviceId)) { @@ -109,13 +105,9 @@ public class MonitorStatService implements DruidStatServiceMBean { List instances = discoveryClient.getInstances(service); for (ServiceInstance instance : instances) { String host = instance.getHost(); - String instanceId = instance.getInstanceId(); - if (instanceId == null) { - instanceId = instance.getMetadata().get("nacos.instanceId").replaceAll("#", "-").replaceAll("@@", - "-"); - } int port = instance.getPort(); String serviceId = instance.getServiceId(); + String instanceId = String.format("%s_%s", host, port); // 根据前端参数采集指定的服务 if (serviceId.equals(requestServiceName)) { ServiceNode serviceNode = new ServiceNode(); @@ -492,4 +484,4 @@ public class MonitorStatService implements DruidStatServiceMBean { return array.subList(fromIndex, toIndex); } -} \ No newline at end of file +} From 77e5c4bfb298758598bdbff6ba9ba6ac67858821 Mon Sep 17 00:00:00 2001 From: 31849868 <31849868@qq.com> Date: Tue, 31 Jan 2023 13:03:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?oa=5Fleave=5Fbill=20=E4=B8=AD=E7=9A=84=20te?= =?UTF-8?q?nantId=20=E5=BA=94=E8=AF=A5=E6=98=AF=20Long?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java index 2c87d6373..74db815fa 100755 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java @@ -91,7 +91,7 @@ public class LeaveBill extends Model { /** * 租户ID */ - private Integer tenantId; + private Long tenantId; /** * 主键值