optimize:remove redundant configuration (apache#2348)

zhujindi · Mar 4, 2020 · 0d35ee1 · 0d35ee1
1 parent 2f811be
commit 0d35ee1
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 24 deletions.
diff --git a/script/client/conf/registry.conf b/script/client/conf/registry.conf
@@ -5,42 +5,34 @@ registry {
   nacos {
     serverAddr = "localhost"
     namespace = ""
-    cluster = "default"
   }
   eureka {
     serviceUrl = "http://localhost:8761/eureka"
-    application = "default"
     weight = "1"
   }
   redis {
     serverAddr = "localhost:6379"
     db = "0"
     password = ""
-    cluster = "default"
     timeout = "0"
   }
   zk {
-    cluster = "default"
     serverAddr = "127.0.0.1:2181"
     sessionTimeout = 6000
     connectTimeout = 2000
     username = ""
     password = ""
   }
   consul {
-    cluster = "default"
     serverAddr = "127.0.0.1:8500"
   }
   etcd3 {
-    cluster = "default"
     serverAddr = "http://localhost:2379"
   }
   sofa {
     serverAddr = "127.0.0.1:9603"
-    application = "default"
     region = "DEFAULT_ZONE"
     datacenter = "DefaultDataCenter"
-    cluster = "default"
     group = "SEATA_GROUP"
     addressWaitTime = "3000"
   }

diff --git a/script/client/spring/application.properties b/script/client/spring/application.properties
@@ -75,36 +75,28 @@ seata.config.zk.password=
 
 seata.registry.type=file
 
-seata.registry.consul.cluster=default
 seata.registry.consul.server-addr=127.0.0.1:8500
 
-seata.registry.etcd3.cluster=default
 seata.registry.etcd3.serverAddr=http://localhost:2379
 
-seata.registry.eureka.application=default
 seata.registry.eureka.weight=1
 seata.registry.eureka.service-url=http://localhost:8761/eureka
 
-seata.registry.nacos.cluster=default
 seata.registry.nacos.server-addr=localhost
 seata.registry.nacos.namespace=
 
 seata.registry.redis.server-addr=localhost:6379
 seata.registry.redis.db=0
 seata.registry.redis.password=
-seata.registry.redis.cluster=default
 seata.registry.redis.timeout=0
 
 
 seata.registry.sofa.server-addr=127.0.0.1:9603
-seata.registry.sofa.application=default
 seata.registry.sofa.region=DEFAULT_ZONE
 seata.registry.sofa.datacenter=DefaultDataCenter
-seata.registry.sofa.cluster=default
 seata.registry.sofa.group=SEATA_GROUP
 seata.registry.sofa.addressWaitTime=3000
 
-seata.registry.zk.cluster=default
 seata.registry.zk.server-addr=127.0.0.1:2181
 seata.registry.zk.session-timeout=6000
 seata.registry.zk.connect-timeout=2000

diff --git a/script/client/spring/application.yml b/script/client/spring/application.yml
@@ -72,35 +72,27 @@ seata:
   registry:
     type: file
     consul:
-      cluster: default
       server-addr: 127.0.0.1:8500
     etcd3:
-      cluster: default
       serverAddr: http://localhost:2379
     eureka:
-      application: default
       weight: 1
       service-url: http://localhost:8761/eureka
     nacos:
-      cluster: default
       server-addr: localhost
       namespace:
     redis:
       server-addr: localhost:6379
       db: 0
       password:
-      cluster: default
       timeout: 0
     sofa:
       server-addr: 127.0.0.1:9603
-      application: default
       region: DEFAULT_ZONE
       datacenter: DefaultDataCenter
-      cluster: default
       group: SEATA_GROUP
       addressWaitTime: 3000
     zk:
-      cluster: default
       server-addr: 127.0.0.1:2181
       session-timeout: 6000
       connect-timeout: 2000