deploy

SLN/config.xml.ftl

@@ -80,11 +80,11 @@ TARGET=PSSYSTEM
       cd ${sys.codeName?lower_case}/
 <#if sysrun.getRunMode() == "STARTMSAPP">
       mkdir -p /var/lib/jenkins/appcache/${depapp.getId()}
-      if [ -e app_${pub.getPSApplication().getPKGCodeName()}/.dynamic ]
+      if [ -e app_${pub.getPSApplication().getPKGCodeName()}/app/vue.config.js ]
       then
-          cd app_${pub.getPSApplication().getPKGCodeName()}
-      else
           cd app_${pub.getPSApplication().getPKGCodeName()}/app
+      else
+          cd app_${pub.getPSApplication().getPKGCodeName()}
       fi
 <#if depapp.getUserParam("dockerimage","")?? && depapp.getUserParam("dockerimage","")!="">
       sed -i "s#dstimage#${depapp.getUserParam("dockerimage","")}#g" swarm.yaml
@@ -100,11 +100,11 @@ TARGET=PSSYSTEM
           ln -s /var/lib/jenkins/appcache/${depapp.getId()} node_modules/.cache
           yarn build
       else
-          if [ -e .dynamic ]
+          if [ -e app/vue.config.js ]
           then
-              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
+          else
+              mv <#if pub?? && pub.getModelFolder?? && pub.getModelFolder()??> ../${pub.getModelFolder()}/PSSYSAPPS/${pub.getPSApplication().getCodeName()}</#if> model
           fi
           sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
           mv Dockerfile-MODEL Dockerfile
@@ -121,11 +121,11 @@ TARGET=PSSYSTEM
           ln -s /var/lib/jenkins/appcache/${depapp.getId()} node_modules/.cache
           yarn build
       else
-          if [ -e .dynamic ]
+          if [ -e app/vue.config.js ]
           then
-              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
+          else
+              mv <#if pub?? && pub.getModelFolder?? && pub.getModelFolder()??> ../${pub.getModelFolder()}/PSSYSAPPS/${pub.getPSApplication().getCodeName()}</#if> model
           fi  
           sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
           mv Dockerfile-MODEL Dockerfile