修正格式

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

@@ -21,14 +21,20 @@ TARGET=PSSYSAPP
         <#if appPlatform.getUserParam("nacos","172.16.102.211:8848")??>
             <#assign nacosUrl = appPlatform.getUserParam("nacos","172.16.102.211:8848")>
         </#if>
-        <#if appPlatform.getUserParam("spring.redis.host","172.16.100.243")??>
-            <#assign redisHost = appPlatform.getUserParam("spring.redis.host","172.16.100.243")>
+        <#if depApp.getUserParam("spring.redis.host","")?? && depApp.getUserParam("spring.redis.host","")!="">
+            <#assign redisHost = depApp.getUserParam("spring.redis.host","")>
+        <#elseif appPlatform.getUserParam("spring.redis.host","")?? && appPlatform.getUserParam("spring.redis.host","")!="">
+            <#assign redisHost = appPlatform.getUserParam("spring.redis.host","")>
         </#if>
-        <#if appPlatform.getUserParam("spring.redis.port","6379")??>
-            <#assign redisPort = appPlatform.getUserParam("spring.redis.port","6379")>
+        <#if depApp.getUserParam("spring.redis.port","")?? && depApp.getUserParam("spring.redis.port","")!="">
+            <#assign redisPort = depApp.getUserParam("spring.redis.port","")>
+        <#elseif appPlatform.getUserParam("spring.redis.port","")?? && appPlatform.getUserParam("spring.redis.port","")!="">
+            <#assign redisPort = appPlatform.getUserParam("spring.redis.port","")>
         </#if>
-        <#if appPlatform.getUserParam("spring.redis.database","0")??>
-            <#assign redisDataBase = appPlatform.getUserParam("spring.redis.database","0")>
+        <#if depApp.getUserParam("spring.redis.database","")?? && depApp.getUserParam("spring.redis.database","")!="">
+            <#assign redisDataBase = depApp.getUserParam("spring.redis.database","")>
+        <#elseif appPlatform.getUserParam("spring.redis.database","")?? && appPlatform.getUserParam("spring.redis.database","")!="">
+            <#assign redisDataBase = appPlatform.getUserParam("spring.redis.database","")>
         </#if>
     </#if>
 </#if>
@@ -66,18 +72,19 @@ services:
     <#assign appPlatform=sysrun.getPSDevSlnMSDepApp().getPSDCMSPlatform()>
     environment:
       <#if appPlatformNode.getSSHIPAddr()??>
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: ${appPlatformNode.getSSHIPAddr()}
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=${appPlatformNode.getSSHIPAddr()}
       </#if>
       <#comment>系统运行参数设置，从SysRun中获取到当前部署相关信息</#comment>
-      SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: ${nacosUrl}
-      SPRING_REDIS_HOST: ${redisHost}
-      SPRING_REDIS_PORT: ${redisPort}
-      SPRING_REDIS_DATABASE: ${redisDataBase}
-      SPRING_DATASOURCE_USERNAME: ${dbUserName}
-      SPRING_DATASOURCE_PASSWORD: ${dbPassWord}
-      SPRING_DATASOURCE_URL: ${dbUrl}
-      SPRING_DATASOURCE_DRIVER-CLASS-NAME: ${dbDriver}
-      SPRING_DATASOURCE_DEFAULTSCHEMA: ${dbUserName}
+      - SERVER_PORT=${httpPort}
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=${nacosUrl}
+      - SPRING_REDIS_HOST: ${redisHost}
+      - SPRING_REDIS_PORT: ${redisPort}
+      - SPRING_REDIS_DATABASE: ${redisDataBase}
+      - SPRING_DATASOURCE_USERNAME: ${dbUserName}
+      - SPRING_DATASOURCE_PASSWORD: ${dbPassWord}
+      - SPRING_DATASOURCE_URL: ${dbUrl}
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME: ${dbDriver}
+      - SPRING_DATASOURCE_DEFAULTSCHEMA: ${dbUserName}
       <#comment>输出前端应用自定义参数替换标准参数</#comment>
       <#if depApp.getUserParamNames()??>
           <@outputUserParam depApp depApp.getUserParamNames()/>
@@ -99,15 +106,15 @@ networks:
 <#comment>输出用户自定义参数</#comment>
 <#macro outputUserParam paramObj paramList>
   <#list paramList as param>
-    <#assign userParamkey=param?upper_case?replace(".","_")?replace("-","")>
+    <#assign userParamkey=param?upper_case?replace(".","_")>
     <#comment>nacos、数据库连接等信息从sysRun中获取</#comment>
      <#if userParamkey!="SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR" && userParamkey!="SPRING_REDIS_HOST" &&
-     userParamkey!="SPRING_REDIS_PORT" &&userParamkey!="SPRING_REDIS_DATABASE"
+     userParamkey!="SERVER_PORT" &&userParamkey!="SPRING_REDIS_PORT" &&userParamkey!="SPRING_REDIS_DATABASE"
      &&userParamkey!="SPRING_DATASOURCE_USERNAME" &&userParamkey!="SPRING_DATASOURCE_PASSWORD"
      &&userParamkey!="SPRING_DATASOURCE_URL" &&userParamkey!="SPRING_DATASOURCE_DRIVER-CLASS-NAME" &&userParamkey!="SPRING_DATASOURCE_DEFAULTSCHEMA">
       <#comment>扩展标准配置:用户配置参数替换标准配置(application-sys.yml)</#comment>
       <#if !P.exists('AppDeployUserParam',param)>
-      ${userParamkey}: ${paramObj.getUserParam(param,"")}
+      - ${userParamkey}=${paramObj.getUserParam(param,"")}
       </#if>
      </#if>
   </#list>

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

@@ -21,14 +21,20 @@ TARGET=PSSYSSERVICEAPI
         <#if depSysApiPlatform.getUserParam("nacos","172.16.102.211:8848")??>
             <#assign nacosUrl = depSysApiPlatform.getUserParam("nacos","172.16.102.211:8848")>
         </#if>
-        <#if depSysApiPlatform.getUserParam("spring.redis.host","172.16.100.243")??>
-            <#assign redisHost = depSysApiPlatform.getUserParam("spring.redis.host","172.16.100.243")>
+        <#if depSysApi.getUserParam("spring.redis.host","")?? && depSysApi.getUserParam("spring.redis.host","")!="">
+            <#assign redisHost = depSysApi.getUserParam("spring.redis.host","")>
+        <#elseif depSysApiPlatform.getUserParam("spring.redis.host","")?? && depSysApiPlatform.getUserParam("spring.redis.host","")!="">
+            <#assign redisHost = depSysApiPlatform.getUserParam("spring.redis.host","")>
         </#if>
-        <#if depSysApiPlatform.getUserParam("spring.redis.port","6379")??>
-            <#assign redisPort = depSysApiPlatform.getUserParam("spring.redis.port","6379")>
+        <#if depSysApi.getUserParam("spring.redis.port","")?? && depSysApi.getUserParam("spring.redis.port","")!="">
+            <#assign redisPort = depSysApi.getUserParam("")>
+        <#elseif depSysApiPlatform.getUserParam("spring.redis.port","")?? && depSysApiPlatform.getUserParam("spring.redis.port","")!="">
+            <#assign redisPort = depSysApiPlatform.getUserParam("")>
         </#if>
-        <#if depSysApiPlatform.getUserParam("spring.redis.database","0")??>
-            <#assign redisDataBase = depSysApiPlatform.getUserParam("spring.redis.database","0")>
+        <#if depSysApi.getUserParam("spring.redis.database","")?? && depSysApi.getUserParam("spring.redis.database","")!="">
+            <#assign redisDataBase = depSysApi.getUserParam("spring.redis.database","")>
+        <#elseif depSysApiPlatform.getUserParam("spring.redis.database","")?? && depSysApiPlatform.getUserParam("spring.redis.database","")!="">
+            <#assign redisDataBase = depSysApiPlatform.getUserParam("spring.redis.database","")>
         </#if>
     </#if>
 </#if>
@@ -66,18 +72,19 @@ services:
       <#assign depSysApiPlatform=sysrun.getPSDevSlnMSDepAPI().getPSDCMSPlatform()>
     environment:
       <#if depSysApiPlatformNode.getSSHIPAddr()??>
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: ${depSysApiPlatformNode.getSSHIPAddr()}
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=${depSysApiPlatformNode.getSSHIPAddr()}
       </#if>
       <#comment>系统运行参数设置，从SysRun中获取到当前部署相关信息</#comment>
-      SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR: ${nacosUrl}
-      SPRING_REDIS_HOST: ${redisHost}
-      SPRING_REDIS_PORT: ${redisPort}
-      SPRING_REDIS_DATABASE: ${redisDataBase}
-      SPRING_DATASOURCE_USERNAME: ${dbUserName}
-      SPRING_DATASOURCE_PASSWORD: ${dbPassWord}
-      SPRING_DATASOURCE_URL: ${dbUrl}
-      SPRING_DATASOURCE_DRIVER-CLASS-NAME: ${dbDriver}
-      SPRING_DATASOURCE_DEFAULTSCHEMA: ${dbUserName}
+      - SERVER_PORT=${httpPort}
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=${nacosUrl}
+      - SPRING_REDIS_HOST=${redisHost}
+      - SPRING_REDIS_PORT=${redisPort}
+      - SPRING_REDIS_DATABASE=${redisDataBase}
+      - SPRING_DATASOURCE_USERNAME=${dbUserName}
+      - SPRING_DATASOURCE_PASSWORD=${dbPassWord}
+      - SPRING_DATASOURCE_URL=${dbUrl}
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=${dbDriver}
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=${dbUserName}
       <#comment>输出服务接口自定义参数替换标准参数</#comment>
       <#if depSysApi.getUserParamNames()??>
           <@outputUserParam depSysApi depSysApi.getUserParamNames()/>
@@ -99,15 +106,15 @@ networks:
 <#comment>输出用户自定义参数</#comment>
 <#macro outputUserParam paramObj paramList>
     <#list paramList as param>
-        <#assign userParamkey=param?upper_case?replace(".","_")?replace("-","")>
+        <#assign userParamkey=param?upper_case?replace(".","_")>
         <#comment>nacos、数据库连接等信息从sysRun中获取</#comment>
         <#if userParamkey!="SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR" && userParamkey!="SPRING_REDIS_HOST" &&
-        userParamkey!="SPRING_REDIS_PORT" &&userParamkey!="SPRING_REDIS_DATABASE"
+        userParamkey!="SERVER_PORT" &&userParamkey!="SPRING_REDIS_PORT" &&userParamkey!="SPRING_REDIS_DATABASE"
         &&userParamkey!="SPRING_DATASOURCE_USERNAME" &&userParamkey!="SPRING_DATASOURCE_PASSWORD"
         &&userParamkey!="SPRING_DATASOURCE_URL" &&userParamkey!="SPRING_DATASOURCE_DRIVER-CLASS-NAME" &&userParamkey!="SPRING_DATASOURCE_DEFAULTSCHEMA">
             <#comment>扩展标准配置:用户配置参数替换标准配置(application-sys.yml)</#comment>
             <#if !P.exists('SysApiDeployUserParam',param)>
-      ${userParamkey}: ${paramObj.getUserParam(param,"")}
+      - ${userParamkey}=${paramObj.getUserParam(param,"")}
             </#if>
         </#if>
     </#list>

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

@@ -209,6 +209,5 @@ ibiz:
     <#assign enableDataAcc="true">
   </#if>
   enablePermissionValid: ${enableDataAcc}
-  cacheLevel: L1 #一级缓存，本地caffeine缓存
-  #cacheLevel: L2 #二级缓存，本地caffeine缓存+Redis缓存
+  cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存