init

SLN/config.xml.ftl

@@ -99,7 +99,6 @@ TARGET=PSSYSTEM
       if [[ $para3 = all ]];then
           sed -i "s#BaseUrl#//BaseUrl#g" public/environments/environment.js
           sed -i "3a BaseUrl: '/<#if sys.getDeploySysId()??><#if (sys.getDeploySysId()?length gt 16)>${sys.getName()?lower_case}<#else>${sys.getDeploySysId()?lower_case}</#if><#else>${sys.getName()?lower_case}</#if>__${pub.getPSApplication().getPKGCodeName()?lower_case}'," public/environments/environment.js
-          cat public/environments/environment.js
           sed -i "s#outputDir#//outputDir#g" vue.config.js
           yarn
           ln -s /var/lib/jenkins/appcache/${depapp.getId()} node_modules/.cache
@@ -130,7 +129,7 @@ TARGET=PSSYSTEM
               mv <#if pub?? && pub.getModelFolder?? && pub.getModelFolder()??> ../../${pub.getModelFolder()}/PSSYSAPPS/${pub.getPSApplication().getCodeName()}</#if> model
           else
               mv <#if pub?? && pub.getModelFolder?? && pub.getModelFolder()??> ../${pub.getModelFolder()}/PSSYSAPPS/${pub.getPSApplication().getCodeName()}</#if> model
-          fi  
+          fi
           sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
           mv Dockerfile-MODEL Dockerfile
       fi
@@ -146,17 +145,19 @@ TARGET=PSSYSTEM
 </#if>
 </#if>
 </#if>
-<#if sysrun.getRunMode() == "STARTMSAPI">   
-<#if depapi.getUserParam("dockerimage","")?? && depapi.getUserParam("dockerimage","")!="">    
-      cd ${pub.getCodeName()?lower_case}-boot 
-      docker -H $para1 stack deploy --compose-file=src/main/docker/${pub.getCodeName()?lower_case}-boot-${pub.getPSSysServiceAPI().getCodeName()?lower_case}.yaml ${depplatform.getName()} --with-registry-auth      
+<#if sysrun.getRunMode() == "STARTMSAPI">
+<#if depapi.getUserParam("dockerimage","")?? && depapi.getUserParam("dockerimage","")!="">
+      cd ${pub.getCodeName()?lower_case}-boot
+      docker -H $para1 stack deploy --compose-file=src/main/docker/${pub.getCodeName()?lower_case}-boot-${pub.getPSSysServiceAPI().getCodeName()?lower_case}.yaml ${depplatform.getName()} --with-registry-auth
 <#else>
       cd ${pub.getCodeName()?lower_case}-boot
       mvn ibizlabcli:code
       cd ..
+      set +e
       git add .
       git commit -m "generator before deploy $para5"
       git push origin master
+      set -e
       mvn package -Pboot
 <#if pub.getPSDeployCenter().getCDType()?? && (pub.getPSDeployCenter().getCDType()=="SWARM") >           
       cd ${pub.getCodeName()?lower_case}-boot