Explorar o código

升级nacos到最新版2.0.3

RuoYi %!s(int64=4) %!d(string=hai) anos
pai
achega
e57d2ea17c

+ 1 - 1
pom.xml

@@ -20,7 +20,7 @@
20
         <spring-boot.version>2.5.3</spring-boot.version>
20
         <spring-boot.version>2.5.3</spring-boot.version>
21
         <spring-cloud.version>2020.0.3</spring-cloud.version>
21
         <spring-cloud.version>2020.0.3</spring-cloud.version>
22
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
22
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
23
-        <alibaba.nacos.version>2.0.2</alibaba.nacos.version>
23
+        <alibaba.nacos.version>2.0.3</alibaba.nacos.version>
24
         <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
24
         <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
25
         <spring-boot.mybatis>2.2.0</spring-boot.mybatis>
25
         <spring-boot.mybatis>2.2.0</spring-boot.mybatis>
26
         <swagger.fox.version>3.0.0</swagger.fox.version>
26
         <swagger.fox.version>3.0.0</swagger.fox.version>

+ 2 - 1
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java

@@ -280,7 +280,8 @@ public class VelocityUtils
280
      */
280
      */
281
     public static String getParentMenuId(JSONObject paramsObj)
281
     public static String getParentMenuId(JSONObject paramsObj)
282
     {
282
     {
283
-        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
283
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
284
+                && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))
284
         {
285
         {
285
             return paramsObj.getString(GenConstants.PARENT_MENU_ID);
286
             return paramsObj.getString(GenConstants.PARENT_MENU_ID);
286
         }
287
         }