init

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

 <#ibiztemplate>
 TARGET=PSSYSAPP
 </#ibiztemplate>
+<#if sysrun?? && sysrun.getPSDevSlnMSDepApp()?? && sysrun.getPSDevSlnMSDepApp().getPSDCMSPlatformNode()??>
 <#assign httpPort = "8080">
 <#assign nacosUrl = "127.0.0.1:8848" >
 <#assign redisHost = "127.0.0.1" >
@@ -98,22 +99,6 @@ spec:
           value: "${httpPort}"
         - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
           value: "${nacosUrl}"
-        - name: SPRING_REDIS_HOST
-          value: "${redisHost}"
-        - name: SPRING_REDIS_PORT
-          value: "${redisPort}"
-        - name: SPRING_REDIS_DATABASE
-          value: "${redisDataBase}"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "${dbUserName}"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "${dbPassWord}"
-        - name: SPRING_DATASOURCE_URL
-          value: "${dbUrl}"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "${dbDriver}"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "${dbUserName}"
       <#comment>输出前端应用自定义参数替换标准参数</#comment>
       <#if depApp.getUserParamNames()??>
           <@outputUserParam depApp depApp.getUserParamNames()/>
@@ -148,7 +133,7 @@ spec:
     protocol: TCP
   selector:
     app: ${pub.getCodeName()?lower_case}-app-${app.getPKGCodeName()?lower_case}
-
+</#if>
 <#comment>输出用户自定义参数</#comment>
 <#macro outputUserParam paramObj paramList>
   <#list paramList as param>

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

 <#ibiztemplate>
 TARGET=PSSYSAPP
 </#ibiztemplate>
+<#if sysrun?? && sysrun.getPSDevSlnMSDepApp()?? && sysrun.getPSDevSlnMSDepApp().getPSDCMSPlatformNode()??>
 <#assign httpPort = "8080">
 <#assign nacosUrl = "127.0.0.1:8848" >
 <#assign redisHost = "127.0.0.1" >
@@ -68,7 +69,7 @@ TARGET=PSSYSAPP
 version: "3.2"
 services:
   ${pub.getCodeName()?lower_case}-app-${app.getPKGCodeName()?lower_case}:
-    image: registry.cn-shanghai.aliyuncs.com/ibizsys/${pub.getCodeName()?lower_case}-app-${app.getPKGCodeName()?lower_case}:latest
+    image: ${dockerimage}
     ports:
       - "${httpPort}:${httpPort}"
 <#if dockerPortMap!=''>
@@ -93,14 +94,7 @@ services:
       <#comment>系统运行参数设置，从SysRun中获取到当前部署相关信息</#comment>
       - 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}
+      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=${nacosUrl}
       <#comment>输出前端应用自定义参数替换标准参数</#comment>
       <#if depApp.getUserParamNames()??>
           <@outputUserParam depApp depApp.getUserParamNames()/>
@@ -130,14 +124,14 @@ volumes:
     driver: local
     driver_opts:
       type: "nfs"
-      o: "addr=172.16.240.109,rw"
-      device: ":/nfs"
+      o: "addr=172.16.240.140,rw"
+      device: ":/data/nfs"
 
 networks:
   agent_network:
     driver: overlay
     attachable: true
-
+</#if>
 <#comment>输出用户自定义参数</#comment>
 <#macro outputUserParam paramObj paramList>
   <#list paramList as param>

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

 <#ibiztemplate>
 TARGET=PSSYSSERVICEAPI
 </#ibiztemplate>
+<#if  sysrun?? && sysrun.getPSDevSlnMSDepAPI()?? && sysrun.getPSDevSlnMSDepAPI().getPSDCMSPlatformNode()??>
 <#assign httpPort = "8081">
 <#assign nacosUrl = "127.0.0.1:8848" >
 <#assign redisHost = "127.0.0.1" >
@@ -152,7 +153,7 @@ spec:
 </#if>      
   selector:
     app: ${pub.getCodeName()?lower_case}-boot
-
+</#if>
 <#comment>输出用户自定义参数</#comment>
 <#macro outputUserParam paramObj paramList>
     <#list paramList as param>

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

 <#ibiztemplate>
 TARGET=PSSYSSERVICEAPI
 </#ibiztemplate>
+<#if  sysrun?? && sysrun.getPSDevSlnMSDepAPI()?? && sysrun.getPSDevSlnMSDepAPI().getPSDCMSPlatformNode()??>
 <#assign httpPort = "8081">
 <#assign nacosUrl = "127.0.0.1:8848" >
 <#assign redisHost = "127.0.0.1" >
@@ -143,7 +144,7 @@ networks:
   agent_network:
     driver: overlay
     attachable: true
-
+</#if>
 <#comment>输出用户自定义参数</#comment>
 <#macro outputUserParam paramObj paramList>
     <#list paramList as param>

SLN/%PUBPRJ%-boot/src/main/docker/Dockerfile-APP.ftl

+<#ibiztemplate>
+TARGET=PSSYSAPP
+</#ibiztemplate>
+<#if sysrun?? && sysrun.getPSDevSlnMSDepApp()?? && sysrun.getPSDevSlnMSDepApp().getPSDCMSPlatformNode()??>
+<#assign httpPort = "8080">
+<#assign timezone = "Asia/Shanghai">
+<#if sysrun?? >
+  <#if sysrun.getPSDevSlnMSDepApp()??>
+    <#if sysrun.getPSDevSlnMSDepApp().getHttpPort()??>
+      <#assign httpPort = sysrun.getPSDevSlnMSDepApp().getHttpPort()?c>
+    </#if>
+    <#if sysrun.getPSDevSlnMSDepApp().getUserParam("timezone","")?? && sysrun.getPSDevSlnMSDepApp().getUserParam("timezone","")!="">
+        <#assign timezone = sysrun.getPSDevSlnMSDepApp().getUserParam("timezone","")>
+    <#elseif sysrun.getPSDevSlnMSDepApp().getPSDCMSPlatform().getUserParam("timezone","")?? && sysrun.getPSDevSlnMSDepApp().getPSDCMSPlatform().getUserParam("timezone","")!="">
+        <#assign timezone = sysrun.getPSDevSlnMSDepApp().getPSDCMSPlatform().getUserParam("timezone","")>
+    </#if>
+  </#if>
+</#if>
+FROM ibiz4j/ibizlab-gateway:latest
+ENV TZ=${timezone}
+EXPOSE ${httpPort}
+WORKDIR /
+COPY dist /dist
+</#if>
\ No newline at end of file

SLN/config.xml.ftl

@@ -82,8 +82,12 @@ TARGET=PSSYSTEM
       mkdir -p /var/lib/jenkins/appcache/${depapp.getId()}
       if [ -e app_${pub.getPSApplication().getPKGCodeName()}/app/vue.config.js ]
       then
+          mv -f ${pub.getCodeName()?lower_case}-boot/src/main/docker/${pub.getCodeName()?lower_case}-app-${pub.getPSApplication().getPKGCodeName()}.yaml app_${pub.getPSApplication().getPKGCodeName()}/app/swarm.yaml
+          mv -f ${pub.getCodeName()?lower_case}-boot/src/main/docker/Dockerfile-APP app_${pub.getPSApplication().getPKGCodeName()}/app/Dockerfile
           cd app_${pub.getPSApplication().getPKGCodeName()}/app
       else
+          mv -f ${pub.getCodeName()?lower_case}-boot/src/main/docker/${pub.getCodeName()?lower_case}-app-${pub.getPSApplication().getPKGCodeName()}.yaml app_${pub.getPSApplication().getPKGCodeName()}/swarm.yaml
+          mv -f ${pub.getCodeName()?lower_case}-boot/src/main/docker/Dockerfile-APP app_${pub.getPSApplication().getPKGCodeName()}/Dockerfile
           cd app_${pub.getPSApplication().getPKGCodeName()}
       fi
 <#if depapp.getUserParam("dockerimage","")?? && depapp.getUserParam("dockerimage","")!="">
@@ -93,8 +97,9 @@ TARGET=PSSYSTEM
 <#if pub.getPSDeployCenter().getCDType()?? && (pub.getPSDeployCenter().getCDType()=="SWARM") >
       sed -i "s#dstimage#$para5#g" swarm.yaml
       if [[ $para3 = all ]];then
-          mv Dockerfile-ALL Dockerfile
           sed -i "s#/api#/<#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}#g" src/environments/environment.ts
+          sed -i "s#BaseUrl: ''#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}'#g" src/environments/environment.ts
+          sed -i "s#BaseUrl: process.env.VUE_APP_BASEURL#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}'#g" src/environments/environment.ts
           sed -i "s#outputDir#//outputDir#g" vue.config.js
           yarn
           ln -s /var/lib/jenkins/appcache/${depapp.getId()} node_modules/.cache
@@ -114,7 +119,6 @@ TARGET=PSSYSTEM
       docker -H $para1 stack deploy --compose-file=swarm.yaml ${depplatform.getName()} --with-registry-auth
 <#elseif  pub.getPSDeployCenter().getCDType()?? && (pub.getPSDeployCenter().getCDType()=="K8S") >
       if [[ $para3 = all ]];then
-          mv Dockerfile-ALL Dockerfile
           sed -i "s#/api#/<#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}#g" src/environments/environment.ts
           sed -i "s#outputDir#//outputDir#g" vue.config.js
           yarn
@@ -151,6 +155,9 @@ TARGET=PSSYSTEM
       cd ${pub.getCodeName()?lower_case}-boot
       mvn ibizlabcli:code
       cd ..
+      git add .
+      git cmmit -m "generator before deploy $para5"
+      git push origin master
       mvn package -Pboot
       mvn install -Pboot
 <#if pub.getPSDeployCenter().getCDType()?? && (pub.getPSDeployCenter().getCDType()=="SWARM") >