diff --git a/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java b/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java index 9a62552ea39..b94aa4df9f1 100644 --- a/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java +++ b/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java @@ -62,6 +62,7 @@ public class NacosRegistryServiceImpl implements RegistryService private static final String REGISTRY_TYPE = "nacos"; private static final String REGISTRY_CLUSTER = "cluster"; private static final String PRO_APPLICATION_KEY = "application"; + private static final String PRO_CLIENT_APPLICATION = "clientApplication"; private static final String PRO_GROUP_KEY = "group"; private static final String USER_NAME = "username"; private static final String PASSWORD = "password"; @@ -326,6 +327,10 @@ public static String getNacosSecretKey() { return String.join(ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR, ConfigurationKeys.FILE_ROOT_REGISTRY, REGISTRY_TYPE, SECRET_KEY); } + public static String getClientApplication() { + return String.join(ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR, ConfigurationKeys.FILE_ROOT_REGISTRY, REGISTRY_TYPE, PRO_CLIENT_APPLICATION); + } + private static String getNacosUrlPatternOfSLB() { return String.join(ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR, ConfigurationKeys.FILE_ROOT_REGISTRY, REGISTRY_TYPE, SLB_PATTERN); } diff --git a/script/client/spring/application.properties b/script/client/spring/application.properties index 1160f0d8c9f..bd2618f8325 100755 --- a/script/client/spring/application.properties +++ b/script/client/spring/application.properties @@ -129,6 +129,7 @@ seata.registry.nacos.namespace= seata.registry.nacos.username= seata.registry.nacos.password= seata.registry.nacos.contextPath= +seata.registry.nacos.clientApplication=${spring.application.name} ##if use MSE Nacos with auth, mutex with username/password attribute #seata.registry.nacos.access-key= #seata.registry.nacos.secret-key= diff --git a/script/client/spring/application.yml b/script/client/spring/application.yml index d56c8eaebde..20f257d17c7 100755 --- a/script/client/spring/application.yml +++ b/script/client/spring/application.yml @@ -126,6 +126,7 @@ seata: username: password: context-path: + client-application: ${spring.application.name} ##if use MSE Nacos with auth, mutex with username/password attribute #access-key: #secret-key: diff --git a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryNacosProperties.java b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryNacosProperties.java index 1d881b7fb5e..279b2e5e878 100644 --- a/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryNacosProperties.java +++ b/seata-spring-autoconfigure/seata-spring-autoconfigure-core/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryNacosProperties.java @@ -37,7 +37,7 @@ public class RegistryNacosProperties { private String application = "seata-server"; private String slbPattern; private String contextPath; - + private String clientApplication; public String getServerAddr() { return serverAddr; } @@ -135,4 +135,12 @@ public RegistryNacosProperties setContextPath(String contextPath) { this.contextPath = contextPath; return this; } + + public String getClientApplication() { + return clientApplication; + } + + public void setClientApplication(String clientApplication) { + this.clientApplication = clientApplication; + } }