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/PSMODULES/Test/PSDATAENTITIES/TEST.json

@@ -966,6 +966,9 @@
   }, {
     "modelref" : true,
     "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr05202892IndexView_DR.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr05221370EditView2_DR.json"
   } ],
   "getAllPSDEDataSets" : [ {
     "codeName" : "CodeListSet",
@@ -7026,6 +7029,12 @@
     "name" : "布局闪烁确认-分页导航1",
     "realModelSubType" : "DETABEXPVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr05221370EditView2",
+    "logicName" : " 计数器实体编辑视图（左右关系）",
+    "name" : " 计数器实体编辑视图（左右关系）",
+    "realModelSubType" : "DEEDITVIEW2",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "backUIActionTest",
     "logicName" : "后台调用测试",
@@ -7595,6 +7604,13 @@
     "name" : "代码表选择类编辑器测试_表单",
     "realModelSubType" : "EDITFORM",
     "realModelType" : "PSDEFORM"
+  }, {
+    "codeName" : "Usr05221370EditView2_Form",
+    "logicName" : " 计数器实体编辑视图（左右关系）_表单",
+    "modelTag2" : "0",
+    "name" : " 计数器实体编辑视图（左右关系）_表单",
+    "realModelSubType" : "EDITFORM",
+    "realModelType" : "PSDEFORM"
   }, {
     "codeName" : "IndexMain",
     "logicName" : "实体首页主表单",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr03276928EditView2_DR.json

@@ -5,7 +5,9 @@
   "name" : "edit2测试锚点_关系界面组",
   "getPSDEDRDetails" : [ {
     "caption" : "表格测试修改1",
+    "counterId" : "num1",
     "detailType" : "DRITEM",
+    "enableMode" : "COUNT_GT_ZERO",
     "name" : "test4",
     "orderValue" : 100,
     "getPSDEDRItem" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr05221370EditView2_DR.json

+{
+  "codeName" : "Usr05221370EditView2_DR",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATARELATIONS/Usr05221370EditView2_DR.json",
+  "formCaption" : "测试实体",
+  "name" : " 计数器实体编辑视图（左右关系）_关系界面组",
+  "getPSDEDRDetails" : [ {
+    "caption" : "cc",
+    "counterId" : "num1",
+    "detailType" : "DRITEM",
+    "enableMode" : "COUNT_GT_ZERO",
+    "name" : "cc",
+    "orderValue" : 100,
+    "originCaption" : "cc",
+    "getPSDEDRItem" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem0402822494.json"
+    }
+  } ]
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem0402822494.json

 {
   "codeName" : "UsrDRItem0402822494",
+  "counterId" : "num1",
+  "counterMode" : 1,
   "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDRITEMS/UsrDRItem0402822494.json",
+  "enableMode" : "COUNT_GT_ZERO",
   "itemType" : "CUSTOM",
   "name" : "表格测试修改1",
   "parentDataJO" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json

@@ -9380,6 +9380,10 @@
     "ungroup" : true
   } ],
   "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr05221370EditView2.json",
+    "viewType" : "DEEDITVIEW2"
+  }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
     "viewType" : "DEEDITVIEW2"

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

@@ -542,6 +542,8 @@
       } ],
       "getPSDEDRCtrlItems" : [ {
         "caption" : "表格测试修改1",
+        "counterId" : "num1",
+        "enableMode" : "COUNT_GT_ZERO",
         "name" : "test4",
         "getPSAppView" : {
           "modelref" : true,

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

@@ -25015,6 +25015,12 @@
     "enableRemove" : true
   } ],
   "getAllPSAppViews" : [ {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr05221370EditView2.json",
+    "viewType" : "DEEDITVIEW2",
+    "resource" : "TEST",
+    "view" : "Usr05221370EditView2"
+  }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookGridView_Test.json",
     "viewType" : "DEGRIDVIEW",
@@ -108671,6 +108677,10 @@
         "ungroup" : true
       } ],
       "getAllPSAppViews" : [ {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr05221370EditView2.json",
+        "viewType" : "DEEDITVIEW2"
+      }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView2.json",
         "viewType" : "DEEDITVIEW2"

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: