for alibaba#3675

syapollo · Aug 25, 2020 · f2682e1 · f2682e1
1 parent 136b456
commit f2682e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java b/config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java
@@ -38,19 +38,18 @@ public String parseName(Object request) {
         String namespaceId = req.getParameter("tenant");
         String groupName = req.getParameter("group");
         String dataId = req.getParameter("dataId");
-
         StringBuilder sb = new StringBuilder();
 
         if (StringUtils.isNotBlank(namespaceId)) {
             sb.append(namespaceId);
         }
-
         sb.append(Resource.SPLITTER);
-
-        if (StringUtils.isBlank(dataId)) {
-            sb.append("*").append(Resource.SPLITTER).append(AUTH_CONFIG_PREFIX).append("*");
-        } else {
-            sb.append(groupName).append(Resource.SPLITTER).append(AUTH_CONFIG_PREFIX).append(dataId);
+        if (StringUtils.isNotBlank(groupName)) {
+            sb.append(groupName);
+        }
+        sb.append(Resource.SPLITTER).append(AUTH_CONFIG_PREFIX);
+        if (StringUtils.isNotBlank(dataId)) {
+            sb.append(dataId);
         }
 
         return sb.toString();

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java b/naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java
@@ -55,10 +55,12 @@ public String parseName(Object request) {
 
         sb.append(Resource.SPLITTER);
 
-        if (StringUtils.isBlank(serviceName)) {
-            sb.append("*").append(Resource.SPLITTER).append(AUTH_NAMING_PREFIX).append("*");
-        } else {
-            sb.append(groupName).append(Resource.SPLITTER).append(AUTH_NAMING_PREFIX).append(serviceName);
+        if (StringUtils.isNotBlank(groupName)) {
+            sb.append(groupName);
+        }
+        sb.append(Resource.SPLITTER).append(AUTH_NAMING_PREFIX);
+        if (StringUtils.isNotBlank(serviceName)) {
+            sb.append(serviceName);
         }
 
         return sb.toString();