docker yml补充sysrun参数

SLN/%PUBPRJ%-app/%PUBPRJ%-app-%APP_PKGPATH%/src/main/docker/%PUBPRJ%-app-%APP_PKGPATH%.yaml.ftl

@@ -25,14 +25,14 @@ services:
       <#if appPlatformNode.getSSHIPAddr()??>
       SPRING_CLOUD_NACOS_DISCOVERY_IP: ${appPlatformNode.getSSHIPAddr()}
       </#if>
-      <#comment>输出微服务平台自定义参数</#comment>
-      <#if appPlatform.getUserParamNames()??>
-        <@outputUserParam appPlatform appPlatform.getUserParamNames()/>
-      </#if>
       <#comment>输出前端应用自定义参数</#comment>
       <#if depApp.getUserParamNames()??>
           <@outputUserParam depApp depApp.getUserParamNames()/>
       </#if>
+      <#comment>输出微服务平台自定义参数</#comment>
+      <#if appPlatform.getUserParamNames()??>
+        <@outputUserParam appPlatform appPlatform.getUserParamNames()/>
+      </#if>
   </#if>
     deploy:
       mode: replicated

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/docker/%PUBPRJ%-provider-%SYSAPI_PKGPATH%.yaml.ftl

@@ -25,14 +25,14 @@ services:
       <#if depSysApiPlatformNode.getSSHIPAddr()??>
       SPRING_CLOUD_NACOS_DISCOVERY_IP: ${depSysApiPlatformNode.getSSHIPAddr()}
       </#if>
-      <#comment>输出微服务平台自定义参数</#comment>
-      <#if depSysApiPlatform.getUserParamNames()??>
-          <@outputUserParam depSysApiPlatform depSysApiPlatform.getUserParamNames()/>
-      </#if>
       <#comment>输出服务接口自定义参数</#comment>
       <#if depSysApi.getUserParamNames()??>
           <@outputUserParam depSysApi depSysApi.getUserParamNames()/>
       </#if>
+      <#comment>输出微服务平台自定义参数</#comment>
+      <#if depSysApiPlatform.getUserParamNames()??>
+          <@outputUserParam depSysApiPlatform depSysApiPlatform.getUserParamNames()/>
+      </#if>
   </#if>
     deploy:
       mode: replicated
@@ -47,7 +47,7 @@ networks:
 <#macro outputUserParam paramObj paramList>
     <#list paramList as param>
         <#if !P.exists('SysApiDeployUserParam',param)>
-        ${param?upper_case?replace(".","_")?replace("-","")}: ${paramObj.getUserParam(param,"")}
+        ${param?upper_case?replace(".","_")}: ${paramObj.getUserParam(param,"")}
         </#if>
     </#list>
 </#macro>
\ No newline at end of file

SLN/%PUBPRJ%-util/src/main/resources/application-sys.yml.ftl

@@ -18,13 +18,13 @@ TARGET=PSSYSTEM
         <#if appPlatform.getUserParam("nacos","172.16.102.211:8848")??>
           <#assign nacosUrl = appPlatform.getUserParam("nacos","172.16.102.211:8848")>
         </#if>
-        <#if appPlatform.getUserParam("redisHost","172.16.100.243")??>
+        <#if appPlatform.getUserParam("spring.redis.host","172.16.100.243")??>
           <#assign redisHost = appPlatform.getUserParam("redisHost","172.16.100.243")>
         </#if>
-        <#if appPlatform.getUserParam("redisPort","6379")??>
+        <#if appPlatform.getUserParam("spring.redis.port","6379")??>
           <#assign redisPort = appPlatform.getUserParam("redisPort","6379")>
         </#if>
-        <#if appPlatform.getUserParam("redisDataBase","0")??>
+        <#if appPlatform.getUserParam("spring.redis.database","0")??>
           <#assign redisDataBase = appPlatform.getUserParam("redisDataBase","0")>
         </#if>
         <#break>
@@ -39,13 +39,13 @@ TARGET=PSSYSTEM
       <#if sysApiPlatform.getUserParam("nacos","172.16.102.211:8848")??>
         <#assign nacosUrl = sysApiPlatform.getUserParam("nacos","172.16.102.211:8848")>
       </#if>
-      <#if sysApiPlatform.getUserParam("redisHost","172.16.100.243")??>
+      <#if sysApiPlatform.getUserParam("spring.redis.host","172.16.100.243")??>
         <#assign redisHost = sysApiPlatform.getUserParam("redisHost","172.16.100.243")>
       </#if>
-      <#if sysApiPlatform.getUserParam("redisPort","6379")??>
+      <#if sysApiPlatform.getUserParam("spring.redis.port","6379")??>
         <#assign redisPort = sysApiPlatform.getUserParam("redisPort","6379")>
       </#if>
-      <#if sysApiPlatform.getUserParam("redisDataBase","0")??>
+      <#if sysApiPlatform.getUserParam("spring.redis.database","0")??>
         <#assign redisDataBase = sysApiPlatform.getUserParam("redisDataBase","0")>
       </#if>
       <#break>