docker yml补充sysrun参数

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

@@ -46,6 +46,8 @@ networks:
 <#comment>输出用户自定义参数</#comment>
 <#macro outputUserParam paramObj paramList>
   <#list paramList as param>
+      <#if !P.exists('AppDeployUserParam',param)>
       ${param?upper_case?replace("[.]","_")?replace("-","")}: ${paramObj.getUserParam(param,"")}
+      </#if>
   </#list>
 </#macro>
\ No newline at end of file

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

@@ -17,9 +17,22 @@ services:
       - "${httpPort}:${httpPort}"
     networks:
       - agent_network
-      <#if  sysrun?? && sysrun.getPSDevSlnMSDepAPI()?? && sysrun.getPSDevSlnMSDepAPI().getPSDCMSPlatformNode()?? && sysrun.getPSDevSlnMSDepAPI().getPSDCMSPlatformNode().getSSHIPAddr()??>
+  <#if  sysrun?? && sysrun.getPSDevSlnMSDepAPI()?? && sysrun.getPSDevSlnMSDepAPI().getPSDCMSPlatformNode()??>
+      <#assign depSysApi=sysrun.getPSDevSlnMSDepAPI()>
+      <#assign depSysApiPlatformNode=sysrun.getPSDevSlnMSDepAPI().getPSDCMSPlatformNode()>
+      <#assign depSysApiPlatform=sysrun.getPSDevSlnMSDepAPI().getPSDCMSPlatform()>
     environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: ${sysrun.getPSDevSlnMSDepAPI().getPSDCMSPlatformNode().getSSHIPAddr()}
+      <#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>
   </#if>
     deploy:
       mode: replicated
@@ -29,3 +42,12 @@ networks:
   agent_network:
     driver: overlay
     attachable: true
+
+<#comment>输出用户自定义参数</#comment>
+<#macro outputUserParam paramObj paramList>
+    <#list paramList as param>
+        <#if !P.exists('SysApiDeployUserParam',param)>
+        ${param?upper_case?replace("[.]","_")?replace("-","")}: ${paramObj.getUserParam(param,"")}
+        </#if>
+    </#list>
+</#macro>
\ No newline at end of file