修复东方通Jenkins配置文件错误

SLN/config.xml.ftl

@@ -62,6 +62,13 @@ TARGET=PSSYSTEM
       cd ${sys.codeName?lower_case}/
 <#if sysrun.getRunMode() == "STARTMSAPP" && depapp.getUserParam("ibiz.deploy.packagetype","")?? && depapp.getUserParam("ibiz.deploy.packagetype","")=="war">   
       mvn clean package -P${pub.getPSApplication().getPKGCodeName()?lower_case}-war
+<#if pub.getPSDeployCenter().getCDType()?? && (pub.getPSDeployCenter().getCDType()=="SWARM") >      
+      cd ${pub.getCodeName()?lower_case}-app/${pub.getCodeName()?lower_case}-app-${pub.getPSApplication().getPKGCodeName()?lower_case}
+</#if>
+<#if depapp.getUserParam("ibiz.deploy.packagetype","")?? && depapp.getUserParam("ibiz.deploy.packagetype","")=="war">
+      mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case}-war exec:exec@prepare
+      mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case}-war exec:exec@buildpush
+</#if>      
 <#elseif sysrun.getRunMode() == "STARTMSAPP">  
       mvn clean package -P${pub.getPSApplication().getPKGCodeName()?lower_case}
       mvn install -P${pub.getPSApplication().getPKGCodeName()?lower_case}
@@ -69,10 +76,7 @@ TARGET=PSSYSTEM
       cd ${pub.getCodeName()?lower_case}-app/${pub.getCodeName()?lower_case}-app-${pub.getPSApplication().getPKGCodeName()?lower_case}
 <#if depapp.getUserParam("multiplatform","")?? && depapp.getUserParam("multiplatform","")=="true">
       mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case} exec:exec@prepare
-      mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case} exec:exec@buildpush
-<#elseif depapp.getUserParam("ibiz.deploy.packagetype","")?? && depapp.getUserParam("ibiz.deploy.packagetype","")=="war">
-      mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case}-war exec:exec@prepare
-      mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case}-war exec:exec@buildpush      
+      mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case} exec:exec@buildpush   
 <#else>           
       mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case} docker:build
       mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case} docker:push
@@ -83,9 +87,6 @@ TARGET=PSSYSTEM
 <#if depapp.getUserParam("multiplatform","")?? && depapp.getUserParam("multiplatform","")=="true">
       mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case} exec:exec@prepare
       mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case} exec:exec@buildpush
-<#elseif depapp.getUserParam("ibiz.deploy.packagetype","")?? && depapp.getUserParam("ibiz.deploy.packagetype","")=="war">
-      mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case}-war exec:exec@prepare
-      mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case}-war exec:exec@buildpush
 <#else>
       mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case} docker:build
       mvn -P${pub.getPSApplication().getPKGCodeName()?lower_case} docker:push
@@ -105,6 +106,13 @@ TARGET=PSSYSTEM
 </#if>
 <#if sysrun.getRunMode() == "STARTMSAPI" && depapi.getUserParam("ibiz.deploy.packagetype","")?? && depapi.getUserParam("ibiz.deploy.packagetype","")=="war">
       mvn clean package -P${pub.getPSSysServiceAPI().getCodeName()?lower_case}-war
+<#if pub.getPSDeployCenter().getCDType()?? && (pub.getPSDeployCenter().getCDType()=="SWARM") >           
+      cd ${pub.getCodeName()?lower_case}-provider/${pub.getCodeName()?lower_case}-provider-${pub.getPSSysServiceAPI().getCodeName()?lower_case}
+</#if>
+<#if depapi.getUserParam("ibiz.deploy.packagetype","")?? && depapi.getUserParam("ibiz.deploy.packagetype","")=="war"> 
+      mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case}-war exec:exec@prepare
+      mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case}-war exec:exec@buildpush  
+</#if>
 <#elseif sysrun.getRunMode() == "STARTMSAPI">      
       mvn clean package -P${pub.getPSSysServiceAPI().getCodeName()?lower_case}
       mvn install -P${pub.getPSSysServiceAPI().getCodeName()?lower_case}
@@ -113,9 +121,6 @@ TARGET=PSSYSTEM
 <#if depapi.getUserParam("multiplatform","")?? && depapi.getUserParam("multiplatform","")=="true">   
       mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case} exec:exec@prepare
       mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case} exec:exec@buildpush      
-<#elseif depapi.getUserParam("ibiz.deploy.packagetype","")?? && depapi.getUserParam("ibiz.deploy.packagetype","")=="war">   
-      mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case}-war exec:exec@prepare
-      mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case}-war exec:exec@buildpush   
 <#else>   
       mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case} docker:build
       mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case} docker:push
@@ -125,10 +130,7 @@ TARGET=PSSYSTEM
       cd ${pub.getCodeName()?lower_case}-provider/${pub.getCodeName()?lower_case}-provider-${pub.getPSSysServiceAPI().getCodeName()?lower_case}
 <#if depapi.getUserParam("multiplatform","")?? && depapi.getUserParam("multiplatform","")=="true">   
       mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case} exec:exec@prepare
-      mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case} exec:exec@buildpush      
-<#elseif depapi.getUserParam("ibiz.deploy.packagetype","")?? && depapi.getUserParam("ibiz.deploy.packagetype","")=="war"> 
-      mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case}-war exec:exec@prepare
-      mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case}-war exec:exec@buildpush      
+      mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case} exec:exec@buildpush            
 <#else>   
       mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case} docker:build
       mvn -P${pub.getPSSysServiceAPI().getCodeName()?lower_case} docker:push