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

e37e6469 · ibizdev · 8d7d219a · e37e6469 · e37e6469 · e37e6469
--- a/config.xml
+++ b/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>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json
 {
+  "getAllPSAppDEACModes" : [ {
+    "codeName" : "Default",
+    "logicName" : "DEFAULT",
+    "name" : "DEFAULT",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+    },
+    "getPSDEACModeDataItems" : [ {
+      "dataType" : 25,
+      "name" : "value",
+      "getPSAppDEField" : {
+        "name" : "PHONEID",
+        "codeName" : "PhoneId"
+      },
+      "getPSDEField" : {
+        "name" : "PHONEID",
+        "codeName" : "PhoneId"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "text",
+      "getPSAppDEField" : {
+        "name" : "PHONENAME",
+        "codeName" : "PhoneName"
+      },
+      "getPSDEField" : {
+        "name" : "PHONENAME",
+        "codeName" : "PhoneName"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "userdata",
+      "getPSAppDEField" : {
+        "name" : "PHONEID",
+        "codeName" : "PhoneId"
+      },
+      "getPSDEField" : {
+        "name" : "PHONEID",
+        "codeName" : "PhoneId"
+      }
+    } ],
+    "pagingSize" : 50,
+    "getTextPSAppDEField" : {
+      "name" : "PHONENAME",
+      "codeName" : "PhoneName"
+    },
+    "getValuePSAppDEField" : {
+      "name" : "PHONEID",
+      "codeName" : "PhoneId"
+    },
+    "defaultMode" : true,
+    "enablePagingBar" : false
+  } ],
  "getAllPSAppDEActions" : [ {
    "actionMode" : "CUSTOM",
    "actionName" : "aa",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSFORMS/StudentMain.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSFORMS/StudentMain.json
@@ -416,9 +416,31 @@
          "codeName" : "Address"
        },
        "getPSEditor" : {
-          "editorType" : "TEXTBOX",
+          "editorParams" : {
-          "maxLength" : 100,
+            "AC" : "TRUE",
-          "name" : "address"
+            "TRIGGER" : "TRUE",
+            "PICKUPVIEW" : "FALSE"
+          },
+          "editorType" : "PICKEREX_TRIGGER",
+          "handlerType" : "PickupText",
+          "name" : "address",
+          "getPSAppDEACMode" : {
+            "modelref" : true,
+            "id" : "Default"
+          },
+          "getPSAppDEDataSet" : {
+            "modelref" : true,
+            "id" : "FetchDefault"
+          },
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+          },
+          "enableAC" : true,
+          "enablePickupView" : false,
+          "forceSelection" : true,
+          "showTrigger" : true,
+          "singleSelect" : true
        },
        "getPSLayoutPos" : {
          "colLG" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr01245132EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentUsr01245132EditView.json
@@ -624,9 +624,31 @@
            "codeName" : "Address"
          },
          "getPSEditor" : {
-            "editorType" : "TEXTBOX",
+            "editorParams" : {
-            "maxLength" : 100,
+              "AC" : "TRUE",
-            "name" : "address"
+              "TRIGGER" : "TRUE",
+              "PICKUPVIEW" : "FALSE"
+            },
+            "editorType" : "PICKEREX_TRIGGER",
+            "handlerType" : "PickupText",
+            "name" : "address",
+            "getPSAppDEACMode" : {
+              "modelref" : true,
+              "id" : "Default"
+            },
+            "getPSAppDEDataSet" : {
+              "modelref" : true,
+              "id" : "FetchDefault"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+            },
+            "enableAC" : true,
+            "enablePickupView" : false,
+            "forceSelection" : true,
+            "showTrigger" : true,
+            "singleSelect" : true
          },
          "getPSLayoutPos" : {
            "colLG" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -40473,6 +40473,21 @@
        "id" : "Search"
      }
    } ]
+  }, {
+    "codeName" : "Usr0205450998",
+    "name" : "r气泡portlet-layout",
+    "getPSUIActionGroupDetails" : [ {
+      "caption" : "登录",
+      "detailType" : "DEUIACTION",
+      "name" : "ud847fde",
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true,
+      "getPSUIAction" : {
+        "modelref" : true,
+        "id" : "Login"
+      }
+    } ]
  }, {
    "codeName" : "Usr0205898661",
    "name" : "bc气泡portlet-layout",
@@ -88884,7 +88899,7 @@
          } ],
          "predefinedType" : "VIEWHEADER"
        }, {
-          "caption" : "分组标题",
+          "caption" : "工具栏按钮样式",
          "itemStyle" : "DEFAULT",
          "itemType" : "CONTAINER",
          "name" : "container_group6",
@@ -97721,6 +97736,99 @@
            "tooltip" : "危险",
            "showCaption" : true,
            "showIcon" : true
+          }, {
+            "caption" : "两个行为项测试",
+            "groupExtractMode" : "ITEMX",
+            "itemType" : "ITEMS",
+            "name" : "items23",
+            "getPSUIActionGroup" : {
+              "codeName" : "Usr0205898661",
+              "name" : "bc气泡portlet-layout",
+              "getPSUIActionGroupDetails" : [ {
+                "caption" : "登录",
+                "detailType" : "DEUIACTION",
+                "name" : "u42444c6",
+                "getPSUIAction" : {
+                  "caption" : "登录",
+                  "codeName" : "Login",
+                  "fullCodeName" : "Login",
+                  "name" : "应用登录",
+                  "predefinedType" : "APP_LOGIN",
+                  "timeout" : 60000,
+                  "uIActionMode" : "SYS",
+                  "uIActionTag" : "Login",
+                  "uIActionType" : "DEUIACTION"
+                },
+                "addSeparator" : false,
+                "showCaption" : true,
+                "showIcon" : true
+              }, {
+                "actionLevel" : 50,
+                "caption" : "气泡打开视图",
+                "detailType" : "DEUIACTION",
+                "name" : "u2586346",
+                "getPSUIAction" : {
+                  "actionLevel" : 50,
+                  "actionTarget" : "NONE",
+                  "caption" : "气泡打开视图",
+                  "codeName" : "openPopoverViewDays",
+                  "getFrontPSAppView" : {
+                    "modelref" : true,
+                    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BOOKCHILD5EditView.json",
+                    "viewType" : "DEEDITVIEW"
+                  },
+                  "frontProcessType" : "WIZARD",
+                  "fullCodeName" : "BOOKCHILD5_openPopoverViewDays",
+                  "name" : "气泡打开视图bc",
+                  "getPSAppDataEntity" : {
+                    "modelref" : true,
+                    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD5.json"
+                  },
+                  "uIActionMode" : "FRONT",
+                  "uIActionTag" : "openPopoverViewDays",
+                  "uIActionType" : "DEUIACTION",
+                  "globalUIAction" : true,
+                  "id" : "openPopoverViewDays@BOOKCHILD5"
+                },
+                "addSeparator" : false,
+                "showCaption" : true,
+                "showIcon" : true
+              } ]
+            },
+            "tooltip" : "两个行为项测试",
+            "showCaption" : true,
+            "showIcon" : true
+          }, {
+            "caption" : "一个行为项测试",
+            "groupExtractMode" : "ITEMX",
+            "itemType" : "ITEMS",
+            "name" : "items24",
+            "getPSUIActionGroup" : {
+              "codeName" : "Usr0205450998",
+              "name" : "r气泡portlet-layout",
+              "getPSUIActionGroupDetails" : [ {
+                "caption" : "登录",
+                "detailType" : "DEUIACTION",
+                "name" : "ud847fde",
+                "getPSUIAction" : {
+                  "caption" : "登录",
+                  "codeName" : "Login",
+                  "fullCodeName" : "Login",
+                  "name" : "应用登录",
+                  "predefinedType" : "APP_LOGIN",
+                  "timeout" : 60000,
+                  "uIActionMode" : "SYS",
+                  "uIActionTag" : "Login",
+                  "uIActionType" : "DEUIACTION"
+                },
+                "addSeparator" : false,
+                "showCaption" : true,
+                "showIcon" : true
+              } ]
+            },
+            "tooltip" : "一个行为项测试",
+            "showCaption" : true,
+            "showIcon" : true
          } ],
          "xDataControlName" : "form",
          "modelid" : "788A9D92-4028-4CB5-859F-E87A6C3E7B7C",
@@ -166137,6 +166245,60 @@
        } ]
      } ]
    }, {
+      "getAllPSAppDEACModes" : [ {
+        "codeName" : "Default",
+        "logicName" : "DEFAULT",
+        "name" : "DEFAULT",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
+        },
+        "getPSDEACModeDataItems" : [ {
+          "dataType" : 25,
+          "name" : "value",
+          "getPSAppDEField" : {
+            "name" : "PHONEID",
+            "codeName" : "PhoneId"
+          },
+          "getPSDEField" : {
+            "name" : "PHONEID",
+            "codeName" : "PhoneId"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "text",
+          "getPSAppDEField" : {
+            "name" : "PHONENAME",
+            "codeName" : "PhoneName"
+          },
+          "getPSDEField" : {
+            "name" : "PHONENAME",
+            "codeName" : "PhoneName"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "userdata",
+          "getPSAppDEField" : {
+            "name" : "PHONEID",
+            "codeName" : "PhoneId"
+          },
+          "getPSDEField" : {
+            "name" : "PHONEID",
+            "codeName" : "PhoneId"
+          }
+        } ],
+        "pagingSize" : 50,
+        "getTextPSAppDEField" : {
+          "name" : "PHONENAME",
+          "codeName" : "PhoneName"
+        },
+        "getValuePSAppDEField" : {
+          "name" : "PHONEID",
+          "codeName" : "PhoneId"
+        },
+        "defaultMode" : true,
+        "enablePagingBar" : false
+      } ],
      "getAllPSAppDEActions" : [ {
        "actionMode" : "CUSTOM",
        "actionName" : "aa",
--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -33,7 +33,7 @@
    <profiles>
        <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
            <build>
                <resources>
                    <resource>

--- a/trainsys-provider/src/main/docker/Dockerfile
+++ b/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
--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+++ b/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
+        - containerPort: 8081
-        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"      
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 50000
+    port: 8081
-    targetPort: 50000
+    targetPort: 8081
-    nodePort: 50000
+    nodePort: 8081
    protocol: TCP
  selector:
    app: trainsys-provider

--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
+++ b/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: