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/Web/PSAPPDEVIEWS/TESTUsr05062284EditView.json

@@ -172,6 +172,7 @@
     } ],
     "getPSControls" : [ {
       "codeName" : "Usr05062284EditViewtoolbar",
+      "controlStyle" : "testtoolbarplugin",
       "controlType" : "TOOLBAR",
       "logicName" : "测试实体编辑视图_工具栏",
       "name" : "toolbar",
@@ -182,6 +183,51 @@
       "getPSControlParam" : {
         "id" : "TOOLBAR"
       },
+      "getPSDEToolbarItems" : [ {
+        "caption" : "向导新建",
+        "groupExtractMode" : "ITEM",
+        "itemType" : "DEUIACTION",
+        "name" : "deuiaction1",
+        "noPrivDisplayMode" : 2,
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_deuiaction1"
+        },
+        "getPSSysPFPlugin" : {
+          "pluginType" : "TOOLBAR_ITEM",
+          "pluginCode" : "testtoolbarplugin"
+        },
+        "getPSUIAction" : {
+          "actionTarget" : "NONE",
+          "caption" : "向导新建",
+          "codeName" : "newWizard",
+          "getFrontPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTWizardView.json",
+            "viewType" : "DEWIZARDVIEW"
+          },
+          "frontProcessType" : "TOP",
+          "fullCodeName" : "TEST_newWizard",
+          "name" : "向导新建",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+          },
+          "timeout" : 60000,
+          "uIActionMode" : "FRONT",
+          "uIActionTag" : "newWizard",
+          "uIActionType" : "DEUIACTION",
+          "id" : "newWizard@TEST"
+        },
+        "tooltip" : "向导新建",
+        "uIActionTarget" : "NONE",
+        "showCaption" : true,
+        "showIcon" : true
+      } ],
+      "getPSSysPFPlugin" : {
+        "pluginType" : "TOOLBAR_RENDER",
+        "pluginCode" : "testtoolbarplugin"
+      },
       "xDataControlName" : "form",
       "modelid" : "7984EA1F-9175-4FE3-A2C8-984D6A7E57D2",
       "modeltype" : "PSDETOOLBAR"

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

@@ -6755,6 +6755,27 @@
     "pluginType" : "CHART_RENDER",
     "refMode" : "CONTROL",
     "refTag" : "CHART"
+  }, {
+    "name" : "测试工具栏绘制插件",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "TOOLBAR_RENDER",
+      "pluginCode" : "testtoolbarplugin"
+    },
+    "pluginCode" : "testtoolbarplugin",
+    "pluginType" : "TOOLBAR_RENDER",
+    "refMode" : "CONTROL",
+    "refTag" : "TOOLBAR"
+  }, {
+    "name" : "测试工具栏项绘制插件",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "TOOLBAR_ITEM",
+      "pluginCode" : "testtoolbarplugin"
+    },
+    "pluginCode" : "testtoolbarplugin",
+    "pluginType" : "TOOLBAR_ITEM",
+    "refMode" : "CONTROLITEM",
+    "refTag" : "TOOLBAR",
+    "refTag2" : "DEUIACTION"
   }, {
     "name" : "测试搜索表单绘制插件",
     "getPSSysPFPlugin" : {

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

@@ -489,6 +489,27 @@
     "pluginType" : "CHART_RENDER",
     "refMode" : "CONTROL",
     "refTag" : "CHART"
+  }, {
+    "name" : "测试工具栏绘制插件",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "TOOLBAR_RENDER",
+      "pluginCode" : "testtoolbarplugin"
+    },
+    "pluginCode" : "testtoolbarplugin",
+    "pluginType" : "TOOLBAR_RENDER",
+    "refMode" : "CONTROL",
+    "refTag" : "TOOLBAR"
+  }, {
+    "name" : "测试工具栏项绘制插件",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "TOOLBAR_ITEM",
+      "pluginCode" : "testtoolbarplugin"
+    },
+    "pluginCode" : "testtoolbarplugin",
+    "pluginType" : "TOOLBAR_ITEM",
+    "refMode" : "CONTROLITEM",
+    "refTag" : "TOOLBAR",
+    "refTag2" : "DEUIACTION"
   }, {
     "name" : "测试搜索表单绘制插件",
     "getPSSysPFPlugin" : {

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: