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

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/i18n/cn/ibizlab/trainsys/messages_en.properties

 #英文
+OTHER.VIEW.FTR.TITLE.INFO=View title info
 COMMON.COMMON.TEST=test
 COMMON.TESTFORMLAG=\u6d4b\u8bd5\u591a\u8bed\u8a00-en
 CONTROL.SPEX.SEARCH.TEXT=Search

trainsys-core/src/main/resources/i18n/cn/ibizlab/trainsys/messages_zh_CN.properties

 #中文简体
 CONTROL.CONTROL.FORM.GETDRAFTERROR=\u52a0\u8f7d\u8349\u7a3f\u5931\u8d25\u4e86o(\u2565\ufe4f\u2565)o
 CONTROL.CONTROL.FORM.GETDRAFTSUCCESS=\u52a0\u8f7d\u8349\u7a3f\u6210\u529f\u5566\u2192_\u2192
+OTHER.VIEW.FTR.TITLE.INFO=\u89c6\u56fe\u6807\u9898\u4fe1\u606f
 COMMON.COMMON.TEST=\u6d4b\u8bd5
 COMMON.TESTFORMLAG=\u6d4b\u8bd5\u591a\u8bed\u8a00-zh
 PAGE.HEADER.WFEXPLORERVIEW=\u5de5\u4f5c\u6d41\u5bfc\u822a\u89c6\u56fe

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDGridTestArrangePView.json

@@ -64,7 +64,7 @@
     "realOpenMode" : "POPUPMODAL",
     "realTitle" : "测试编辑视图",
     "getRealTitlePSLanguageRes" : {
-      "lanResTag" : "PAGE.TITLE.CONTROLTEST.EDITVIEW2"
+      "lanResTag" : "COMMON.CONDITION.NOTIN"
     },
     "getRefPSAppView" : {
       "modelref" : true,
@@ -77,7 +77,7 @@
     "realOpenMode" : "POPUPMODAL",
     "realTitle" : "测试编辑视图",
     "getRealTitlePSLanguageRes" : {
-      "lanResTag" : "PAGE.TITLE.CONTROLTEST.EDITVIEW2"
+      "lanResTag" : "COMMON.CONDITION.NOTIN"
     },
     "getRefPSAppView" : {
       "modelref" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDTestEditView.json

@@ -974,7 +974,7 @@
   },
   "title" : "测试编辑视图",
   "getTitlePSLanguageRes" : {
-    "lanResTag" : "PAGE.TITLE.CONTROLTEST.EDITVIEW2"
+    "lanResTag" : "COMMON.CONDITION.NOTIN"
   },
   "viewStyle" : "DEFAULT",
   "viewType" : "DEEDITVIEW",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPLANS/EN.json

@@ -107,6 +107,10 @@
   }, {
     "content" : "Remove And Close",
     "lanResTag" : "TBB.TEXT.EDITVIEW.REMOVEANDCLOSE"
+  }, {
+    "content" : "View title info",
+    "dynaModelFilePath" : "PSMODULES/common/PSLANGUAGEITEMS/null.json",
+    "lanResTag" : "OTHER.VIEW.FTR.TITLE.INFO"
   } ],
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPLANS/EN.json",
   "language" : "EN",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPLANS/ZH_CN.json

@@ -5,6 +5,10 @@
   }, {
     "content" : "加载草稿成功啦→_→",
     "lanResTag" : "CONTROL.CONTROL.FORM.GETDRAFTSUCCESS"
+  }, {
+    "content" : "视图标题信息",
+    "dynaModelFilePath" : "PSMODULES/common/PSLANGUAGEITEMS/null.json",
+    "lanResTag" : "OTHER.VIEW.FTR.TITLE.INFO"
   }, {
     "content" : "测试多语言-zh",
     "lanResTag" : "COMMON.TESTFORMLAG"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSLANS/EN.json

@@ -812,6 +812,10 @@
   }, {
     "content" : "The [{0}] value is not a character type",
     "lanResTag" : "CTRL.SERVICE.CHECKFIELDSTRINGLENGTHRULE_INVALIDVALUE"
+  }, {
+    "content" : "View title info",
+    "dynaModelFilePath" : "PSMODULES/common/PSLANGUAGEITEMS/null.json",
+    "lanResTag" : "OTHER.VIEW.FTR.TITLE.INFO"
   }, {
     "content" : "Restart workflow",
     "lanResTag" : "CTRL.WFSERVICE.STEP.RESTART"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSLANS/ZH_CN.json

@@ -8,6 +8,10 @@
   }, {
     "content" : "加载草稿成功啦→_→",
     "lanResTag" : "CONTROL.CONTROL.FORM.GETDRAFTSUCCESS"
+  }, {
+    "content" : "视图标题信息",
+    "dynaModelFilePath" : "PSMODULES/common/PSLANGUAGEITEMS/null.json",
+    "lanResTag" : "OTHER.VIEW.FTR.TITLE.INFO"
   }, {
     "content" : "个人消息视图",
     "lanResTag" : "PAGE.HEADER.MESSAGEVIEW"

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: