chitanda 发布系统代码 [TrainSys，网页端]

app_Web/app/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-web:
     image: dstimage
     ports:
-      - "50100:80"
+      - "80:80"
     networks:
       - agent_network
     deploy:

app_Web/docker/Dockerfile

@@ -16,4 +16,4 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     yarn start:prod
 
-EXPOSE 50100
+EXPOSE 8080
\ No newline at end of file

app_Web/docker/swarm.yaml

@@ -3,16 +3,9 @@ services:
   trainsys-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-app-web:latest
     ports:
-      - "50100:50100"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - NACOS_DISCOVERY_IP=172.16.240.140
-      - APPLICATION_PORT=50100
-      - NACOS_SERVER_ADDR=127.0.0.1:8848
-      - REDIS_HOST=127.0.0.1
-      - REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
     deploy:
       resources:
            limits:

config.xml

@@ -55,34 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
-      if [ -e app_Web/.dynamic ]
-      then
-          cd app_Web
-      else
-          cd app_Web/app
-      fi
-      sed -i "s#dstimage#$para5#g" swarm.yaml      
-      if [[ $para3 = all ]];then
-          mv Dockerfile-ALL Dockerfile      
-          sed -i "s#/api#/trainsys__web#g" src/environments/environment.ts  
-          sed -i "s#outputDir#//outputDir#g" vue.config.js 
-          yarn
-          ln -s /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C node_modules/.cache
-          yarn build
-      else
-          if [ -e .dynamic ]
-          then
-              mv  ../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web model
-          else
-              mv  ../../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web model
-          fi
-          sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
-          mv Dockerfile-MODEL Dockerfile
-      fi          
-      docker build -t $para5 .
-      docker push $para5
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/liquibase/h2_table.xml

 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
 
+    <!--输出实体[RAWMATERIAL]数据结构 -->
+    <changeSet author="root" id="tab-rawmaterial-9-1">
+        <createTable tableName="T_RAWMATERIAL">
+                <column name="RAWMATERIALID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_RAWMATERIAL"/>
+                </column>
+                <column name="CREATEDATE" remarks="" type="DATETIME">
+                </column>
+                <column name="RAWMATERIALNAME" remarks="" type="VARCHAR(200)">
+                </column>
+                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="UPDATEDATE" remarks="" type="DATETIME">
+                </column>
+                <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
+                </column>
+        </createTable>
+    </changeSet>
+
 
 </databaseChangeLog>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/RawMaterial.json

@@ -174,6 +174,14 @@
     },
     "builtinAction" : true
   } ],
+  "getAllPSDEDBConfigs" : [ {
+    "dBType" : "MYSQL5",
+    "name" : "MYSQL5",
+    "objNameCase" : "DEFAULT",
+    "standardTableName" : "`T_RAWMATERIAL`",
+    "tableName" : "T_RAWMATERIAL",
+    "valid" : true
+  } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
       "name" : "RAWMATERIALID",