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

app_Web/package.json

@@ -14,13 +14,13 @@
     "@floating-ui/dom": "^1.0.11",
     "@ibiz-template/command": "^0.0.1-beta.50",
     "@ibiz-template/controller": "^0.0.1-beta.88",
-    "@ibiz-template/core": "^0.0.1-beta.88",
+    "@ibiz-template/core": "^0.0.4-beta.23",
     "@ibiz-template/model": "^0.0.1-beta.88",
-    "@ibiz-template/runtime": "^0.0.1-beta.88",
+    "@ibiz-template/runtime": "^0.0.4-beta.23",
     "@ibiz-template/service": "^0.0.1-beta.88",
-    "@ibiz-template/theme": "^0.0.1-beta.88",
+    "@ibiz-template/theme": "^0.0.4-beta.23",
     "@ibiz-template/vue-util": "^0.0.1-beta.88",
-    "@ibiz/dynamic-model-api": "^2.1.22",
+    "@ibiz/dynamic-model-api": "^2.1.24",
     "@riophae/vue-treeselect": "^0.4.0",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.2",

app_Web/src/components/common/app-col/app-col.tsx

@@ -67,6 +67,8 @@ export const AppCol = defineComponent({
           class={[this.ns.b(), this.ns.m('flex'), this.controller.extraClass]}
           style={{
             flexGrow: (this.layoutPos as IPSFlexLayoutPos).grow,
+            flexShrink: (this.layoutPos as IPSFlexLayoutPos).shrink,
+            flexBasis: (this.layoutPos as IPSFlexLayoutPos).basis,
             ...this.cssVars,
           }}
         >

app_Web/yarn.lock

@@ -659,15 +659,17 @@
     async-validator "^4.2.5"
     dayjs "^1.11.5"
 
-"@ibiz-template/core@^0.0.1-beta.88":
-  version "0.0.1-beta.88"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/core/-/core-0.0.1-beta.88.tgz#5f9fb8f0b192b6cb25ae63a82af4e1a7a5defe69"
-  integrity sha512-d3t95s0n2QGlCWpx2OzJxqS/uUxIb8aF7D4AALj0ahasL3RHKF6YLrG/F55ng5/ub06OjbvkIPZzQic39Gu2Xg==
-  dependencies:
-    axios "^1.2.1"
-    loglevel "^1.8.0"
-    pluralize "^8.0.0"
-    qs "^6.11.0"
+"@ibiz-template/core@^0.0.4-beta.23":
+  version "0.0.4-beta.23"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/core/-/core-0.0.4-beta.23.tgz#027b340aea85ef62e8d01d3b7ea552acae110833"
+  integrity sha512-Y5rUQ+YBLM2sUZZPjYQmLSTSb2u3NkhGBmJE0wvSF1PKCIsc/D3Fg1pzOi/AkbwRpT4sQw1v788Lt9vrYu06Ew==
+  dependencies:
+    axios "^1.4.0"
+    lodash-es "^4.17.21"
+    loglevel "^1.8.1"
+    qs "^6.11.2"
+    qx-util "^0.4.8"
+    ramda "^0.29.0"
 
 "@ibiz-template/model@^0.0.1-beta.88":
   version "0.0.1-beta.88"
@@ -677,23 +679,20 @@
     "@ibiz/dynamic-model-api" "^2.1.22"
     pluralize "^8.0.0"
 
-"@ibiz-template/runtime@^0.0.1-beta.88":
-  version "0.0.1-beta.88"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/runtime/-/runtime-0.0.1-beta.88.tgz#7043438b752bc68b4b69c56ca1975c3f6de0c6e6"
-  integrity sha512-um7iSypiImO1fcTXP04vKa5Qn8VEl93QAUSylqBcjyRa6eTs8obmu+Skz8ETAyKOmdEgOw+utV7FuqTYHCIMOg==
-  dependencies:
-    "@ibiz-template/command" "^0.0.1-beta.50"
-    qs "^6.11.0"
+"@ibiz-template/runtime@^0.0.4-beta.23":
+  version "0.0.4-beta.23"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/runtime/-/runtime-0.0.4-beta.23.tgz#ac98d6e21f56fbafe22f8e9afbb1b66ce3cf6f35"
+  integrity sha512-U7qB/J569Hrfp7SAx/8D5ELpUj+nD+eggBBSI2FSz4CwngBfqatSqjcqoWgzVMkx28iUtji08YqXNHDckvv0qg==
 
 "@ibiz-template/service@^0.0.1-beta.88":
   version "0.0.1-beta.88"
   resolved "http://npm.zhr.icu:4873/@ibiz-template/service/-/service-0.0.1-beta.88.tgz#8f0b74ddc176ef6b18a0108f5ef2e4f321c4d50a"
   integrity sha512-Kzr3zl81Vuo073gsSPhOMTFoLknBBjyUsW2kPp2sCFAklzcM72tqV/QI5wLahRQ5D3rCjwR/QISslyeeXPa+oQ==
 
-"@ibiz-template/theme@^0.0.1-beta.88":
-  version "0.0.1-beta.88"
-  resolved "http://npm.zhr.icu:4873/@ibiz-template/theme/-/theme-0.0.1-beta.88.tgz#29ae44fd020d9a32fc1962968ef22bfeb92592d2"
-  integrity sha512-Fo3R90FLrWmemWJAGetpem0CwevB1e4Z+QSssZPI2z3C1w47YByxDIBQMZJl2tGloUlKBxxh/fVz1v1r5UKHAQ==
+"@ibiz-template/theme@^0.0.4-beta.23":
+  version "0.0.4-beta.23"
+  resolved "http://npm.zhr.icu:4873/@ibiz-template/theme/-/theme-0.0.4-beta.23.tgz#e1762f33cc6ee172dd78b4a4febcb50b78679540"
+  integrity sha512-EHsJqTVpXFJHgww+ANTX24hj9UlQnXu6a7nWMfjE9k7ZcYEVtIExh0nKRjOSg8VozALQwHyX+P2E2WDIaY9vpw==
 
 "@ibiz-template/vue-util@^0.0.1-beta.88":
   version "0.0.1-beta.88"
@@ -705,6 +704,11 @@
   resolved "http://npm.zhr.icu:4873/@ibiz/dynamic-model-api/-/dynamic-model-api-2.1.22.tgz#5330ffaabc0c872d58a03933abd08ab609fdae6a"
   integrity sha512-ybNUGHxT+n9V729ap3hgAbDn3VKCUYwCyHxgJNjOM73M3sAglhD+xKr0C5IoZVILLoyE1MpKP7F+Hn4vhLE4fQ==
 
+"@ibiz/dynamic-model-api@^2.1.24":
+  version "2.1.24"
+  resolved "http://npm.zhr.icu:4873/@ibiz/dynamic-model-api/-/dynamic-model-api-2.1.24.tgz#38d5264749b8dcfb10fc5f6bb3131d4c9593300f"
+  integrity sha512-aUQ7Hpup2Whg6ur59apAiw7LhrdWKXNs6lYpRRUGgu071VsMrDt681/LcwT17y4MOLeHetVV2F2fHQIwCJECnw==
+
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
   resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"
@@ -1396,10 +1400,10 @@ asynckit@^0.4.0:
   resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-axios@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1"
-  integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==
+axios@^1.4.0:
+  version "1.4.0"
+  resolved "http://npm.zhr.icu:4873/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
+  integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"
@@ -3149,10 +3153,10 @@ log-update@^4.0.0:
     slice-ansi "^4.0.0"
     wrap-ansi "^6.2.0"
 
-loglevel@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz"
-  integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==
+loglevel@^1.8.1:
+  version "1.8.1"
+  resolved "http://npm.zhr.icu:4873/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4"
+  integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==
 
 lower-case@^2.0.2:
   version "2.0.2"
@@ -3767,6 +3771,13 @@ qs@^6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
+qs@^6.11.2:
+  version "6.11.2"
+  resolved "http://npm.zhr.icu:4873/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
+  integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
+  dependencies:
+    side-channel "^1.0.4"
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
@@ -3787,6 +3798,11 @@ ramda@^0.28.0:
   resolved "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz"
   integrity sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==
 
+ramda@^0.29.0:
+  version "0.29.0"
+  resolved "http://npm.zhr.icu:4873/ramda/-/ramda-0.29.0.tgz#fbbb67a740a754c8a4cbb41e2a6e0eb8507f55fb"
+  integrity sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==
+
 read-pkg-up@^7.0.1:
   version "7.0.1"
   resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"

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/TemplatePublish/PSSYSAPP.json

@@ -1240,16 +1240,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {

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

@@ -2552,16 +2552,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   } ],

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: