[ISSUE#10217][ISSUE#10525] V1.x develop fix bug. (alibaba#10526)

* Fix issue#10525. set empty role name problem. * Fix issue#10217, not read application problem.
KomachiSion · May 22, 2023 · 984735a · 984735a
1 parent 59ba327
commit 984735a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java b/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
@@ -134,6 +134,7 @@ public NamingProxy(String namespaceId, String endpoint, String serverList, Prope
             }
         }
         this.initRefreshTask();
+        injectRoleName();
     }
 
     private void initRefreshTask() {
@@ -644,7 +645,6 @@ private void injectSecurityInfo(Map<String, String> params, Header header) {
         }
         try {
             // Inject ak/sk if exist:
-            injectRoleName();
             String ak = getAccessKey();
             String sk = getSecretKey();
             params.put("app", AppNameUtils.getAppName());
@@ -740,8 +740,10 @@ private void injectRoleName() {
         if (null != StsConfig.getInstance().getRamRoleName()) {
             return;
         }
-        String roleName = properties.getProperty(PropertyKeyConst.RAM_ROLE_NAME, "");
-        StsConfig.getInstance().setRamRoleName(roleName);
+        String roleName = properties.getProperty(PropertyKeyConst.RAM_ROLE_NAME);
+        if (StringUtils.isNotEmpty(roleName)) {
+            StsConfig.getInstance().setRamRoleName(roleName);
+        }
     }
 
     public String getAccessKey() {

diff --git a/distribution/bin/startup.sh b/distribution/bin/startup.sh
@@ -116,7 +116,7 @@ JAVA_OPT="${JAVA_OPT} -Dloader.path=${BASE_DIR}/plugins/health,${BASE_DIR}/plugi
 JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}"
 JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
 JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}"
-JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=optional:${CUSTOM_SEARCH_LOCATIONS}"
+JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CUSTOM_SEARCH_LOCATIONS}"
 JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/nacos-logback.xml"
 JAVA_OPT="${JAVA_OPT} --server.max-http-header-size=524288"