zhanghengfeng 发布系统代码 [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/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/Book/PSFORMS/TestEditorMobEditView_Form.json

@@ -1252,7 +1252,9 @@
               "colMD" : 24,
               "layout" : "TABLE_24COL"
             },
+            "unitName" : "元",
             "allowEmpty" : true,
+            "enableUnitName" : true,
             "showCaption" : true
           }, {
             "caption" : "图片（多项）",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/bookTestEditorMobEditView.json

@@ -1355,7 +1355,9 @@
                 "colMD" : 24,
                 "layout" : "TABLE_24COL"
               },
+              "unitName" : "元",
               "allowEmpty" : true,
+              "enableUnitName" : true,
               "showCaption" : true
             }, {
               "caption" : "图片（多项）",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json

@@ -128,7 +128,7 @@
   "getPSDEFormItemVRs" : [ {
     "checkMode" : 3,
     "name" : "表单项值规则",
-    "getPSDEFormItemName" : "field",
+    "getPSDEFormItemName" : "field8",
     "getPSSysValueRule" : {
       "codeName" : "ValueRule14",
       "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
@@ -211,6 +211,7 @@
   }, {
     "id" : "field",
     "dataType" : 25,
+    "createDV" : "2234",
     "updateDVT" : "CURTIME",
     "getPSAppDEField" : {
       "name" : "FIELD",
@@ -732,6 +733,7 @@
       }, {
         "caption" : "文本框",
         "codeName" : "field",
+        "createDV" : "2234",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -776,6 +778,7 @@
           "layout" : "TABLE_24COL"
         },
         "updateDVT" : "CURTIME",
+        "valueFormat" : "￥#,##0",
         "allowEmpty" : false,
         "showCaption" : true
       }, {
@@ -838,19 +841,17 @@
           "notMode" : false
         } ],
         "getPSEditor" : {
-          "editorParams" : {
-            "readOnly" : "true"
-          },
           "editorType" : "NUMBER",
-          "name" : "field23",
-          "readOnly" : true
+          "name" : "field23"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
+        "unitName" : "元",
         "valueFormat" : "￥#,##0",
         "allowEmpty" : true,
+        "enableUnitName" : true,
         "showCaption" : true
       }, {
         "caption" : "选项框",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main_4.json

@@ -859,7 +859,9 @@
         "colMD" : 24,
         "layout" : "TABLE_24COL"
       },
+      "unitName" : "元",
       "allowEmpty" : true,
+      "enableUnitName" : true,
       "showCaption" : true
     }, {
       "caption" : "文本",

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

@@ -246,7 +246,7 @@
     "getPSDEFormItemVRs" : [ {
       "checkMode" : 3,
       "name" : "表单项值规则",
-      "getPSDEFormItemName" : "field",
+      "getPSDEFormItemName" : "field8",
       "getPSSysValueRule" : {
         "codeName" : "ValueRule14",
         "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
@@ -329,6 +329,7 @@
     }, {
       "id" : "field",
       "dataType" : 25,
+      "createDV" : "2234",
       "updateDVT" : "CURTIME",
       "getPSAppDEField" : {
         "name" : "FIELD",
@@ -850,6 +851,7 @@
         }, {
           "caption" : "文本框",
           "codeName" : "field",
+          "createDV" : "2234",
           "dataType" : 25,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
@@ -894,6 +896,7 @@
             "layout" : "TABLE_24COL"
           },
           "updateDVT" : "CURTIME",
+          "valueFormat" : "￥#,##0",
           "allowEmpty" : false,
           "showCaption" : true
         }, {
@@ -956,19 +959,17 @@
             "notMode" : false
           } ],
           "getPSEditor" : {
-            "editorParams" : {
-              "readOnly" : "true"
-            },
             "editorType" : "NUMBER",
-            "name" : "field23",
-            "readOnly" : true
+            "name" : "field23"
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
+          "unitName" : "元",
           "valueFormat" : "￥#,##0",
           "allowEmpty" : true,
+          "enableUnitName" : true,
           "showCaption" : true
         }, {
           "caption" : "选项框",

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

@@ -768,7 +768,7 @@
     "getPSDEFormItemVRs" : [ {
       "checkMode" : 3,
       "name" : "表单项值规则",
-      "getPSDEFormItemName" : "field",
+      "getPSDEFormItemName" : "field8",
       "getPSSysValueRule" : {
         "codeName" : "ValueRule14",
         "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
@@ -851,6 +851,7 @@
     }, {
       "id" : "field",
       "dataType" : 25,
+      "createDV" : "2234",
       "updateDVT" : "CURTIME",
       "getPSAppDEField" : {
         "name" : "FIELD",
@@ -1372,6 +1373,7 @@
         }, {
           "caption" : "文本框",
           "codeName" : "field",
+          "createDV" : "2234",
           "dataType" : 25,
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
@@ -1416,6 +1418,7 @@
             "layout" : "TABLE_24COL"
           },
           "updateDVT" : "CURTIME",
+          "valueFormat" : "￥#,##0",
           "allowEmpty" : false,
           "showCaption" : true
         }, {
@@ -1478,19 +1481,17 @@
             "notMode" : false
           } ],
           "getPSEditor" : {
-            "editorParams" : {
-              "readOnly" : "true"
-            },
             "editorType" : "NUMBER",
-            "name" : "field23",
-            "readOnly" : true
+            "name" : "field23"
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
+          "unitName" : "元",
           "valueFormat" : "￥#,##0",
           "allowEmpty" : true,
+          "enableUnitName" : true,
           "showCaption" : true
         }, {
           "caption" : "选项框",

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

@@ -962,7 +962,9 @@
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
+        "unitName" : "元",
         "allowEmpty" : true,
+        "enableUnitName" : true,
         "showCaption" : true
       }, {
         "caption" : "文本",

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: