You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2021/08/11 04:35:09 UTC
[dubbo-samples] branch master updated: Nacos enable auth (#354)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new e67b8f6 Nacos enable auth (#354)
e67b8f6 is described below
commit e67b8f63cd89a73f03b50348f39939c96b6dfb16
Author: haoyann <10...@qq.com>
AuthorDate: Wed Aug 11 12:35:03 2021 +0800
Nacos enable auth (#354)
* nacos enable auth
* revert dubbo version
---
.../dubbo-samples-nacos-conditionrouter/case-configuration.yml | 1 +
.../java/org/apache/dubbo/samples/governance/util/NacosUtils.java | 2 ++
.../src/main/resources/spring/dubbo-demo-consumer.xml | 4 ++--
.../src/main/resources/spring/dubbo-demo-provider.xml | 4 ++--
.../dubbo-samples-nacos-configcenter/case-configuration.yml | 1 +
.../java/org/apache/dubbo/samples/configcenter/util/NacosUtils.java | 4 +++-
.../src/main/resources/config-center.properties | 2 +-
.../src/main/resources/spring/configcenter-consumer.xml | 2 +-
.../src/main/resources/spring/configcenter-provider.xml | 2 +-
.../dubbo-samples-nacos-override/case-configuration.yml | 1 +
.../java/org/apache/dubbo/samples/governance/util/NacosUtils.java | 2 ++
.../src/main/resources/spring/dubbo-demo-consumer.xml | 4 ++--
.../src/main/resources/spring/dubbo-demo-provider.xml | 4 ++--
.../dubbo-samples-nacos-registry/case-configuration.yml | 1 +
.../src/main/resources/spring/dubbo-consumer.properties | 2 +-
.../src/main/resources/spring/dubbo-provider.properties | 2 +-
.../dubbo-samples-nacos-tagrouter/case-configuration.yml | 1 +
.../java/org/apache/dubbo/samples/governance/util/NacosUtils.java | 2 ++
.../src/main/resources/spring/dubbo-demo-consumer.xml | 4 ++--
.../src/main/resources/spring/dubbo-demo-provider.xml | 4 ++--
20 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-configuration.yml b/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-configuration.yml
index c2d1f91..8ec566a 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-configuration.yml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-configuration.yml
@@ -22,6 +22,7 @@ services:
environment:
- PREFER_HOST_MODE=hostname
- MODE=standalone
+ - NACOS_AUTH_ENABLE=true
- JVM_XMS=350m
- JVM_XMX=350m
- JVM_XMN=150m
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java b/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java
index 807f006..06045f5 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java
@@ -36,6 +36,8 @@ public class NacosUtils {
String group = "dubbo";
Properties properties = new Properties();
properties.put(PropertyKeyConst.SERVER_ADDR, serverAddr);
+ properties.put("username", System.getProperty("username", "nacos"));
+ properties.put("password", System.getProperty("password", "nacos"));
ConfigService configService = NacosFactory.createConfigService(properties);
try (InputStream is = NacosUtils.class.getClassLoader().getResourceAsStream("dubbo-routers-condition.yml")) {
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/resources/spring/dubbo-demo-consumer.xml b/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/resources/spring/dubbo-demo-consumer.xml
index b787503..aa1c00d 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/resources/spring/dubbo-demo-consumer.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/resources/spring/dubbo-demo-consumer.xml
@@ -27,9 +27,9 @@
<dubbo:application name="governance-conditionrouter-consumer"/>
- <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
- <dubbo:config-center highest-priority="false" address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:config-center highest-priority="false" address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.samples.governance.api.DemoService"/>
<dubbo:reference id="demoService2" check="false" interface="org.apache.dubbo.samples.governance.api.DemoService2"/>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/resources/spring/dubbo-demo-provider.xml b/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/resources/spring/dubbo-demo-provider.xml
index 23528ba..2b7cdb5 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/resources/spring/dubbo-demo-provider.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/src/main/resources/spring/dubbo-demo-provider.xml
@@ -27,13 +27,13 @@
<dubbo:application name="governance-conditionrouter-provider"/>
- <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<dubbo:provider token="true"/>
<dubbo:protocol name="dubbo" port="${dubbo.port:20880}" heartbeat="10000"/>
- <dubbo:config-center highest-priority="false" address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:config-center highest-priority="false" address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<bean id="demoService" class="org.apache.dubbo.samples.governance.impl.DemoServiceImpl"/>
<dubbo:service interface="org.apache.dubbo.samples.governance.api.DemoService" ref="demoService"/>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-configuration.yml b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-configuration.yml
index 1384b21..8b04eef 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-configuration.yml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-configuration.yml
@@ -20,6 +20,7 @@ services:
environment:
- PREFER_HOST_MODE=hostname
- MODE=standalone
+ - NACOS_AUTH_ENABLE=true
- JVM_XMS=350m
- JVM_XMX=350m
- JVM_XMN=150m
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/java/org/apache/dubbo/samples/configcenter/util/NacosUtils.java b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/java/org/apache/dubbo/samples/configcenter/util/NacosUtils.java
index 4f858ca..fd5569b 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/java/org/apache/dubbo/samples/configcenter/util/NacosUtils.java
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/java/org/apache/dubbo/samples/configcenter/util/NacosUtils.java
@@ -36,6 +36,8 @@ public class NacosUtils {
String dataId = "dubbo.properties";
String group = "dubbo";
Properties properties = new Properties();
+ properties.put("username", System.getProperty("username", "nacos"));
+ properties.put("password", System.getProperty("password", "nacos"));
properties.put(PropertyKeyConst.SERVER_ADDR, serverAddr);
ConfigService configService = NacosFactory.createConfigService(properties);
@@ -46,7 +48,7 @@ public class NacosUtils {
String line;
while ((line = br.readLine()) != null) {
if (line.startsWith("dubbo.registry.address=")) {
- line = "dubbo.registry.address=nacos://" + serverAddr + ":8848";
+ line = "dubbo.registry.address=nacos://" + serverAddr + ":8848?username=nacos&password=nacos";
}
content.append(line).append("\n");
}
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/config-center.properties b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/config-center.properties
index e71a108..b1e3a57 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/config-center.properties
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/config-center.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Add the following global external properties to `/dubbo/config/dubbo/dubbo.properties`
-dubbo.registry.address=nacos://127.0.0.1:8848
+dubbo.registry.address=nacos://127.0.0.1:8848?username=nacos&password=nacos
dubbo.protocol.port=20880
# FIXME: https://github.com/apache/dubbo/issues/4780
dubbo.registry.simplified=false
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml
index 7a3350f..427f4f1 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-consumer.xml
@@ -28,7 +28,7 @@
<dubbo:application name="configcenter-nacos-consumer"/>
- <dubbo:config-center highest-priority="false" address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:config-center highest-priority="false" address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<dubbo:reference id="demoService" interface="org.apache.dubbo.samples.configcenter.api.DemoService"/>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-provider.xml b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-provider.xml
index 887da17..af73a48 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-provider.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/src/main/resources/spring/configcenter-provider.xml
@@ -24,7 +24,7 @@
<context:property-placeholder/>
<dubbo:application name="configcenter-nacos-provider"/>
- <dubbo:config-center address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:config-center address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<bean id="demoService" class="org.apache.dubbo.samples.configcenter.impl.DemoServiceImpl"/>
<dubbo:service interface="org.apache.dubbo.samples.configcenter.api.DemoService" ref="demoService"/>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-override/case-configuration.yml b/dubbo-samples-nacos/dubbo-samples-nacos-override/case-configuration.yml
index 9641c02..6c3d05a 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-override/case-configuration.yml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-override/case-configuration.yml
@@ -22,6 +22,7 @@ services:
environment:
- PREFER_HOST_MODE=hostname
- MODE=standalone
+ - NACOS_AUTH_ENABLE=true
- JVM_XMS=350m
- JVM_XMX=350m
- JVM_XMN=150m
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java
index d18a513..0edd420 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java
@@ -36,6 +36,8 @@ public class NacosUtils {
static {
Properties properties = new Properties();
properties.put(PropertyKeyConst.SERVER_ADDR, serverAddr);
+ properties.put("username", System.getProperty("username", "nacos"));
+ properties.put("password", System.getProperty("password", "nacos"));
try {
configService = NacosFactory.createConfigService(properties);
} catch (NacosException e) {
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/resources/spring/dubbo-demo-consumer.xml b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/resources/spring/dubbo-demo-consumer.xml
index 4f7d8d0..bd8522f 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/resources/spring/dubbo-demo-consumer.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/resources/spring/dubbo-demo-consumer.xml
@@ -27,9 +27,9 @@
<dubbo:application name="governance-serviceoverride-consumer"/>
- <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
- <dubbo:config-center address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:config-center address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<dubbo:reference timeout="1000" id="demoService" check="false"
interface="org.apache.dubbo.samples.governance.api.DemoService"/>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/resources/spring/dubbo-demo-provider.xml b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/resources/spring/dubbo-demo-provider.xml
index 647ed79..efb27c9 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/resources/spring/dubbo-demo-provider.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/main/resources/spring/dubbo-demo-provider.xml
@@ -27,11 +27,11 @@
<dubbo:application name="governance-serviceoverride-provider"/>
- <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<dubbo:provider token="true"/>
- <dubbo:config-center address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:config-center address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<dubbo:protocol name="dubbo" port="20880"/>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml b/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
index 7f2715b..d97b2d8 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
@@ -20,6 +20,7 @@ services:
environment:
- PREFER_HOST_MODE=hostname
- MODE=standalone
+ - NACOS_AUTH_ENABLE=true
- JVM_XMS=350m
- JVM_XMX=350m
- JVM_XMN=150m
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-consumer.properties b/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-consumer.properties
index 9d404e4..0a16623 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-consumer.properties
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-consumer.properties
@@ -18,5 +18,5 @@
#
dubbo.application.name=nacos-registry-demo-consumer
-dubbo.registry.address=nacos://${nacos.address:localhost}:8848
+dubbo.registry.address=nacos://${nacos.address:localhost}:8848?username=nacos&password=nacos
dubbo.consumer.timeout=3000
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-provider.properties b/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-provider.properties
index 38c16ed..6bf6c65 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-provider.properties
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-provider.properties
@@ -17,7 +17,7 @@
#
#
dubbo.application.name=nacos-registry-demo-provider
-dubbo.registry.address=nacos://${nacos.address:localhost}:8848
+dubbo.registry.address=nacos://${nacos.address:localhost}:8848?username=nacos&password=nacos
dubbo.protocol.name=dubbo
dubbo.protocol.port=20880
dubbo.provider.token=true
\ No newline at end of file
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/case-configuration.yml b/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/case-configuration.yml
index cc9b0d3..200f925 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/case-configuration.yml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/case-configuration.yml
@@ -20,6 +20,7 @@ services:
environment:
- PREFER_HOST_MODE=hostname
- MODE=standalone
+ - NACOS_AUTH_ENABLE=true
- JVM_XMS=350m
- JVM_XMX=350m
- JVM_XMN=150m
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java b/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java
index f80570e..5454b31 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/java/org/apache/dubbo/samples/governance/util/NacosUtils.java
@@ -37,6 +37,8 @@ public class NacosUtils {
static {
Properties properties = new Properties();
properties.put(PropertyKeyConst.SERVER_ADDR, serverAddr);
+ properties.put("username", System.getProperty("username", "nacos"));
+ properties.put("password", System.getProperty("password", "nacos"));
try {
configService = NacosFactory.createConfigService(properties);
} catch (NacosException e) {
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/resources/spring/dubbo-demo-consumer.xml b/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/resources/spring/dubbo-demo-consumer.xml
index e5f3293..c4c95c9 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/resources/spring/dubbo-demo-consumer.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/resources/spring/dubbo-demo-consumer.xml
@@ -27,9 +27,9 @@
<dubbo:application name="governance-tagrouter-consumer"/>
- <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
- <dubbo:config-center highest-priority="true" address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:config-center highest-priority="true" address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.samples.governance.api.DemoService"/>
<dubbo:reference id="demoService2" check="false" interface="org.apache.dubbo.samples.governance.api.DemoService2"/>
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/resources/spring/dubbo-demo-provider.xml b/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/resources/spring/dubbo-demo-provider.xml
index bf54236..01560e2 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/resources/spring/dubbo-demo-provider.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/src/main/resources/spring/dubbo-demo-provider.xml
@@ -29,11 +29,11 @@
<dubbo:protocol name="dubbo" port="${dubbo.port:20880}" heartbeat="10000"/>
- <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:registry address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<dubbo:provider token="true"/>
- <dubbo:config-center highest-priority="true" address="nacos://${nacos.address:127.0.0.1}:8848"/>
+ <dubbo:config-center highest-priority="true" address="nacos://${nacos.address:127.0.0.1}:8848?username=nacos&password=nacos"/>
<bean id="demoService" class="org.apache.dubbo.samples.governance.impl.DemoServiceImpl"/>
<dubbo:service interface="org.apache.dubbo.samples.governance.api.DemoService" ref="demoService"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org