tony001 发布系统代码 [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/PSAPPDATAENTITIES/BOOKCHILD5/PSDASHBOARDS/AppPortalDecorationView_Dashboard.json

@@ -155,7 +155,6 @@
         },
         "getPSControls" : [ {
           "codeName" : "Usr0301355514",
-          "controlStyle" : "PIE_3D",
           "controlType" : "CHART",
           "coordinateSystem" : "XY",
           "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -305,20 +304,20 @@
             "eChartsPos" : "yAxis",
             "eChartsType" : "value",
             "index" : 0,
-            "name" : "axis_yAxis_0",
+            "name" : "axis_yAxis_2",
             "position" : "left",
             "type" : "numeric",
+            "getUserParam" : {
+              "EC.axisLine" : "{\"show\":1}"
+            },
             "id" : "0"
           }, {
             "eChartsPos" : "yAxis",
             "eChartsType" : "value",
             "index" : 1,
-            "name" : "axis_yAxis_2",
+            "name" : "axis_yAxis_0",
             "position" : "left",
             "type" : "numeric",
-            "getUserParam" : {
-              "EC.axisLine" : "{\"show\":1}"
-            },
             "id" : "1"
           } ],
           "getPSControlHandler" : {
@@ -466,13 +465,8 @@
                 "modelref" : true,
                 "id" : "1"
               },
-              "getPSChartYAxis" : {
-                "modelref" : true,
-                "id" : "1"
-              },
               "type" : "XY",
               "x" : [ "NAME" ],
-              "y" : [ "SCORES" ],
               "id" : "0"
             },
             "getPSNavigateContexts" : [ {
@@ -526,8 +520,13 @@
                 "modelref" : true,
                 "id" : "1"
               },
+              "getPSChartYAxis" : {
+                "modelref" : true,
+                "id" : "1"
+              },
               "type" : "XY",
               "x" : [ "NAME" ],
+              "y" : [ "AGE" ],
               "id" : "0"
             },
             "getPSNavigateParams" : [ {
@@ -548,10 +547,6 @@
             "showTitle" : false,
             "id" : "0"
           },
-          "getPSSysPFPlugin" : {
-            "pluginType" : "CHART_RENDER",
-            "pluginCode" : "PIE_3D"
-          },
           "readOnly" : true,
           "name" : "dashboard_sysportlet2_chart",
           "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Dashboard.json

@@ -2030,7 +2030,6 @@
     },
     "getPSControls" : [ {
       "codeName" : "Usr0301355514",
-      "controlStyle" : "PIE_3D",
       "controlType" : "CHART",
       "coordinateSystem" : "XY",
       "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -2180,20 +2179,20 @@
         "eChartsPos" : "yAxis",
         "eChartsType" : "value",
         "index" : 0,
-        "name" : "axis_yAxis_0",
+        "name" : "axis_yAxis_2",
         "position" : "left",
         "type" : "numeric",
+        "getUserParam" : {
+          "EC.axisLine" : "{\"show\":1}"
+        },
         "id" : "0"
       }, {
         "eChartsPos" : "yAxis",
         "eChartsType" : "value",
         "index" : 1,
-        "name" : "axis_yAxis_2",
+        "name" : "axis_yAxis_0",
         "position" : "left",
         "type" : "numeric",
-        "getUserParam" : {
-          "EC.axisLine" : "{\"show\":1}"
-        },
         "id" : "1"
       } ],
       "getPSControlHandler" : {
@@ -2341,13 +2340,8 @@
             "modelref" : true,
             "id" : "1"
           },
-          "getPSChartYAxis" : {
-            "modelref" : true,
-            "id" : "1"
-          },
           "type" : "XY",
           "x" : [ "NAME" ],
-          "y" : [ "SCORES" ],
           "id" : "0"
         },
         "getPSNavigateContexts" : [ {
@@ -2401,8 +2395,13 @@
             "modelref" : true,
             "id" : "1"
           },
+          "getPSChartYAxis" : {
+            "modelref" : true,
+            "id" : "1"
+          },
           "type" : "XY",
           "x" : [ "NAME" ],
+          "y" : [ "AGE" ],
           "id" : "0"
         },
         "getPSNavigateParams" : [ {
@@ -2423,10 +2422,6 @@
         "showTitle" : false,
         "id" : "0"
       },
-      "getPSSysPFPlugin" : {
-        "pluginType" : "CHART_RENDER",
-        "pluginCode" : "PIE_3D"
-      },
       "readOnly" : true,
       "name" : "dashboard_sysportlet4_chart",
       "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json

 {
   "codeName" : "Usr0301355514",
-  "controlStyle" : "PIE_3D",
   "controlType" : "CHART",
   "coordinateSystem" : "XY",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -150,20 +149,20 @@
     "eChartsPos" : "yAxis",
     "eChartsType" : "value",
     "index" : 0,
-    "name" : "axis_yAxis_0",
+    "name" : "axis_yAxis_2",
     "position" : "left",
     "type" : "numeric",
+    "getUserParam" : {
+      "EC.axisLine" : "{\"show\":1}"
+    },
     "id" : "0"
   }, {
     "eChartsPos" : "yAxis",
     "eChartsType" : "value",
     "index" : 1,
-    "name" : "axis_yAxis_2",
+    "name" : "axis_yAxis_0",
     "position" : "left",
     "type" : "numeric",
-    "getUserParam" : {
-      "EC.axisLine" : "{\"show\":1}"
-    },
     "id" : "1"
   } ],
   "getPSControlLogics" : [ {
@@ -248,13 +247,8 @@
         "modelref" : true,
         "id" : "1"
       },
-      "getPSChartYAxis" : {
-        "modelref" : true,
-        "id" : "1"
-      },
       "type" : "XY",
       "x" : [ "NAME" ],
-      "y" : [ "SCORES" ],
       "id" : "0"
     },
     "getPSNavigateContexts" : [ {
@@ -308,8 +302,13 @@
         "modelref" : true,
         "id" : "1"
       },
+      "getPSChartYAxis" : {
+        "modelref" : true,
+        "id" : "1"
+      },
       "type" : "XY",
       "x" : [ "NAME" ],
+      "y" : [ "AGE" ],
       "id" : "0"
     },
     "getPSNavigateParams" : [ {
@@ -330,10 +329,6 @@
     "showTitle" : false,
     "id" : "0"
   },
-  "getPSSysPFPlugin" : {
-    "pluginType" : "CHART_RENDER",
-    "pluginCode" : "PIE_3D"
-  },
   "readOnly" : true,
   "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",
   "modeltype" : "PSDECHART",

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

@@ -186,7 +186,6 @@
           },
           "getPSControls" : [ {
             "codeName" : "Usr0301355514",
-            "controlStyle" : "PIE_3D",
             "controlType" : "CHART",
             "coordinateSystem" : "XY",
             "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -336,20 +335,20 @@
               "eChartsPos" : "yAxis",
               "eChartsType" : "value",
               "index" : 0,
-              "name" : "axis_yAxis_0",
+              "name" : "axis_yAxis_2",
               "position" : "left",
               "type" : "numeric",
+              "getUserParam" : {
+                "EC.axisLine" : "{\"show\":1}"
+              },
               "id" : "0"
             }, {
               "eChartsPos" : "yAxis",
               "eChartsType" : "value",
               "index" : 1,
-              "name" : "axis_yAxis_2",
+              "name" : "axis_yAxis_0",
               "position" : "left",
               "type" : "numeric",
-              "getUserParam" : {
-                "EC.axisLine" : "{\"show\":1}"
-              },
               "id" : "1"
             } ],
             "getPSControlHandler" : {
@@ -497,13 +496,8 @@
                   "modelref" : true,
                   "id" : "1"
                 },
-                "getPSChartYAxis" : {
-                  "modelref" : true,
-                  "id" : "1"
-                },
                 "type" : "XY",
                 "x" : [ "NAME" ],
-                "y" : [ "SCORES" ],
                 "id" : "0"
               },
               "getPSNavigateContexts" : [ {
@@ -557,8 +551,13 @@
                   "modelref" : true,
                   "id" : "1"
                 },
+                "getPSChartYAxis" : {
+                  "modelref" : true,
+                  "id" : "1"
+                },
                 "type" : "XY",
                 "x" : [ "NAME" ],
+                "y" : [ "AGE" ],
                 "id" : "0"
               },
               "getPSNavigateParams" : [ {
@@ -579,10 +578,6 @@
               "showTitle" : false,
               "id" : "0"
             },
-            "getPSSysPFPlugin" : {
-              "pluginType" : "CHART_RENDER",
-              "pluginCode" : "PIE_3D"
-            },
             "readOnly" : true,
             "name" : "dashboard_sysportlet2_chart",
             "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

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

@@ -71,7 +71,6 @@
     },
     "getPSControls" : [ {
       "codeName" : "Usr0301355514",
-      "controlStyle" : "PIE_3D",
       "controlType" : "CHART",
       "coordinateSystem" : "XY",
       "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -221,20 +220,20 @@
         "eChartsPos" : "yAxis",
         "eChartsType" : "value",
         "index" : 0,
-        "name" : "axis_yAxis_0",
+        "name" : "axis_yAxis_2",
         "position" : "left",
         "type" : "numeric",
+        "getUserParam" : {
+          "EC.axisLine" : "{\"show\":1}"
+        },
         "id" : "0"
       }, {
         "eChartsPos" : "yAxis",
         "eChartsType" : "value",
         "index" : 1,
-        "name" : "axis_yAxis_2",
+        "name" : "axis_yAxis_0",
         "position" : "left",
         "type" : "numeric",
-        "getUserParam" : {
-          "EC.axisLine" : "{\"show\":1}"
-        },
         "id" : "1"
       } ],
       "getPSControlHandler" : {
@@ -393,13 +392,8 @@
             "modelref" : true,
             "id" : "1"
           },
-          "getPSChartYAxis" : {
-            "modelref" : true,
-            "id" : "1"
-          },
           "type" : "XY",
           "x" : [ "NAME" ],
-          "y" : [ "SCORES" ],
           "id" : "0"
         },
         "getPSNavigateContexts" : [ {
@@ -453,8 +447,13 @@
             "modelref" : true,
             "id" : "1"
           },
+          "getPSChartYAxis" : {
+            "modelref" : true,
+            "id" : "1"
+          },
           "type" : "XY",
           "x" : [ "NAME" ],
+          "y" : [ "AGE" ],
           "id" : "0"
         },
         "getPSNavigateParams" : [ {
@@ -475,10 +474,6 @@
         "showTitle" : false,
         "id" : "0"
       },
-      "getPSSysPFPlugin" : {
-        "pluginType" : "CHART_RENDER",
-        "pluginCode" : "PIE_3D"
-      },
       "readOnly" : true,
       "name" : "chartexpbar_chart",
       "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

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

@@ -292,7 +292,6 @@
     "modeltype" : "PSDEFORM_SEARCHFORM"
   }, {
     "codeName" : "Usr0301355514",
-    "controlStyle" : "PIE_3D",
     "controlType" : "CHART",
     "coordinateSystem" : "XY",
     "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -441,20 +440,20 @@
       "eChartsPos" : "yAxis",
       "eChartsType" : "value",
       "index" : 0,
-      "name" : "axis_yAxis_0",
+      "name" : "axis_yAxis_2",
       "position" : "left",
       "type" : "numeric",
+      "getUserParam" : {
+        "EC.axisLine" : "{\"show\":1}"
+      },
       "id" : "0"
     }, {
       "eChartsPos" : "yAxis",
       "eChartsType" : "value",
       "index" : 1,
-      "name" : "axis_yAxis_2",
+      "name" : "axis_yAxis_0",
       "position" : "left",
       "type" : "numeric",
-      "getUserParam" : {
-        "EC.axisLine" : "{\"show\":1}"
-      },
       "id" : "1"
     } ],
     "getPSControlHandler" : {
@@ -602,13 +601,8 @@
           "modelref" : true,
           "id" : "1"
         },
-        "getPSChartYAxis" : {
-          "modelref" : true,
-          "id" : "1"
-        },
         "type" : "XY",
         "x" : [ "NAME" ],
-        "y" : [ "SCORES" ],
         "id" : "0"
       },
       "getPSNavigateContexts" : [ {
@@ -662,8 +656,13 @@
           "modelref" : true,
           "id" : "1"
         },
+        "getPSChartYAxis" : {
+          "modelref" : true,
+          "id" : "1"
+        },
         "type" : "XY",
         "x" : [ "NAME" ],
+        "y" : [ "AGE" ],
         "id" : "0"
       },
       "getPSNavigateParams" : [ {
@@ -687,10 +686,6 @@
     "getPSSysCss" : {
       "cssName" : "test2"
     },
-    "getPSSysPFPlugin" : {
-      "pluginType" : "CHART_RENDER",
-      "pluginCode" : "PIE_3D"
-    },
     "readOnly" : true,
     "name" : "chart",
     "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

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

@@ -2061,7 +2061,6 @@
       },
       "getPSControls" : [ {
         "codeName" : "Usr0301355514",
-        "controlStyle" : "PIE_3D",
         "controlType" : "CHART",
         "coordinateSystem" : "XY",
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -2211,20 +2210,20 @@
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 0,
-          "name" : "axis_yAxis_0",
+          "name" : "axis_yAxis_2",
           "position" : "left",
           "type" : "numeric",
+          "getUserParam" : {
+            "EC.axisLine" : "{\"show\":1}"
+          },
           "id" : "0"
         }, {
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 1,
-          "name" : "axis_yAxis_2",
+          "name" : "axis_yAxis_0",
           "position" : "left",
           "type" : "numeric",
-          "getUserParam" : {
-            "EC.axisLine" : "{\"show\":1}"
-          },
           "id" : "1"
         } ],
         "getPSControlHandler" : {
@@ -2372,13 +2371,8 @@
               "modelref" : true,
               "id" : "1"
             },
-            "getPSChartYAxis" : {
-              "modelref" : true,
-              "id" : "1"
-            },
             "type" : "XY",
             "x" : [ "NAME" ],
-            "y" : [ "SCORES" ],
             "id" : "0"
           },
           "getPSNavigateContexts" : [ {
@@ -2432,8 +2426,13 @@
               "modelref" : true,
               "id" : "1"
             },
+            "getPSChartYAxis" : {
+              "modelref" : true,
+              "id" : "1"
+            },
             "type" : "XY",
             "x" : [ "NAME" ],
+            "y" : [ "AGE" ],
             "id" : "0"
           },
           "getPSNavigateParams" : [ {
@@ -2454,10 +2453,6 @@
           "showTitle" : false,
           "id" : "0"
         },
-        "getPSSysPFPlugin" : {
-          "pluginType" : "CHART_RENDER",
-          "pluginCode" : "PIE_3D"
-        },
         "readOnly" : true,
         "name" : "dashboard_sysportlet4_chart",
         "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

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

@@ -2061,7 +2061,6 @@
       },
       "getPSControls" : [ {
         "codeName" : "Usr0301355514",
-        "controlStyle" : "PIE_3D",
         "controlType" : "CHART",
         "coordinateSystem" : "XY",
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -2211,20 +2210,20 @@
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 0,
-          "name" : "axis_yAxis_0",
+          "name" : "axis_yAxis_2",
           "position" : "left",
           "type" : "numeric",
+          "getUserParam" : {
+            "EC.axisLine" : "{\"show\":1}"
+          },
           "id" : "0"
         }, {
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 1,
-          "name" : "axis_yAxis_2",
+          "name" : "axis_yAxis_0",
           "position" : "left",
           "type" : "numeric",
-          "getUserParam" : {
-            "EC.axisLine" : "{\"show\":1}"
-          },
           "id" : "1"
         } ],
         "getPSControlHandler" : {
@@ -2372,13 +2371,8 @@
               "modelref" : true,
               "id" : "1"
             },
-            "getPSChartYAxis" : {
-              "modelref" : true,
-              "id" : "1"
-            },
             "type" : "XY",
             "x" : [ "NAME" ],
-            "y" : [ "SCORES" ],
             "id" : "0"
           },
           "getPSNavigateContexts" : [ {
@@ -2432,8 +2426,13 @@
               "modelref" : true,
               "id" : "1"
             },
+            "getPSChartYAxis" : {
+              "modelref" : true,
+              "id" : "1"
+            },
             "type" : "XY",
             "x" : [ "NAME" ],
+            "y" : [ "AGE" ],
             "id" : "0"
           },
           "getPSNavigateParams" : [ {
@@ -2454,10 +2453,6 @@
           "showTitle" : false,
           "id" : "0"
         },
-        "getPSSysPFPlugin" : {
-          "pluginType" : "CHART_RENDER",
-          "pluginCode" : "PIE_3D"
-        },
         "readOnly" : true,
         "name" : "dashboard_sysportlet4_chart",
         "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

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

@@ -4838,7 +4838,6 @@
       },
       "getPSControls" : [ {
         "codeName" : "Usr0301355514",
-        "controlStyle" : "PIE_3D",
         "controlType" : "CHART",
         "coordinateSystem" : "XY",
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -4988,20 +4987,20 @@
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 0,
-          "name" : "axis_yAxis_0",
+          "name" : "axis_yAxis_2",
           "position" : "left",
           "type" : "numeric",
+          "getUserParam" : {
+            "EC.axisLine" : "{\"show\":1}"
+          },
           "id" : "0"
         }, {
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 1,
-          "name" : "axis_yAxis_2",
+          "name" : "axis_yAxis_0",
           "position" : "left",
           "type" : "numeric",
-          "getUserParam" : {
-            "EC.axisLine" : "{\"show\":1}"
-          },
           "id" : "1"
         } ],
         "getPSControlHandler" : {
@@ -5149,13 +5148,8 @@
               "modelref" : true,
               "id" : "1"
             },
-            "getPSChartYAxis" : {
-              "modelref" : true,
-              "id" : "1"
-            },
             "type" : "XY",
             "x" : [ "NAME" ],
-            "y" : [ "SCORES" ],
             "id" : "0"
           },
           "getPSNavigateContexts" : [ {
@@ -5209,8 +5203,13 @@
               "modelref" : true,
               "id" : "1"
             },
+            "getPSChartYAxis" : {
+              "modelref" : true,
+              "id" : "1"
+            },
             "type" : "XY",
             "x" : [ "NAME" ],
+            "y" : [ "AGE" ],
             "id" : "0"
           },
           "getPSNavigateParams" : [ {
@@ -5231,10 +5230,6 @@
           "showTitle" : false,
           "id" : "0"
         },
-        "getPSSysPFPlugin" : {
-          "pluginType" : "CHART_RENDER",
-          "pluginCode" : "PIE_3D"
-        },
         "readOnly" : true,
         "name" : "db_sysportlet2_chart",
         "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

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

@@ -2308,7 +2308,6 @@
       },
       "getPSControls" : [ {
         "codeName" : "Usr0301355514",
-        "controlStyle" : "PIE_3D",
         "controlType" : "CHART",
         "coordinateSystem" : "XY",
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -2458,20 +2457,20 @@
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 0,
-          "name" : "axis_yAxis_0",
+          "name" : "axis_yAxis_2",
           "position" : "left",
           "type" : "numeric",
+          "getUserParam" : {
+            "EC.axisLine" : "{\"show\":1}"
+          },
           "id" : "0"
         }, {
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 1,
-          "name" : "axis_yAxis_2",
+          "name" : "axis_yAxis_0",
           "position" : "left",
           "type" : "numeric",
-          "getUserParam" : {
-            "EC.axisLine" : "{\"show\":1}"
-          },
           "id" : "1"
         } ],
         "getPSControlHandler" : {
@@ -2619,13 +2618,8 @@
               "modelref" : true,
               "id" : "1"
             },
-            "getPSChartYAxis" : {
-              "modelref" : true,
-              "id" : "1"
-            },
             "type" : "XY",
             "x" : [ "NAME" ],
-            "y" : [ "SCORES" ],
             "id" : "0"
           },
           "getPSNavigateContexts" : [ {
@@ -2679,8 +2673,13 @@
               "modelref" : true,
               "id" : "1"
             },
+            "getPSChartYAxis" : {
+              "modelref" : true,
+              "id" : "1"
+            },
             "type" : "XY",
             "x" : [ "NAME" ],
+            "y" : [ "AGE" ],
             "id" : "0"
           },
           "getPSNavigateParams" : [ {
@@ -2701,10 +2700,6 @@
           "showTitle" : false,
           "id" : "0"
         },
-        "getPSSysPFPlugin" : {
-          "pluginType" : "CHART_RENDER",
-          "pluginCode" : "PIE_3D"
-        },
         "readOnly" : true,
         "name" : "db_sysportlet3_chart",
         "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

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

@@ -14062,7 +14062,6 @@
       },
       "getPSControls" : [ {
         "codeName" : "Usr0301355514",
-        "controlStyle" : "PIE_3D",
         "controlType" : "CHART",
         "coordinateSystem" : "XY",
         "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -14212,20 +14211,20 @@
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 0,
-          "name" : "axis_yAxis_0",
+          "name" : "axis_yAxis_2",
           "position" : "left",
           "type" : "numeric",
+          "getUserParam" : {
+            "EC.axisLine" : "{\"show\":1}"
+          },
           "id" : "0"
         }, {
           "eChartsPos" : "yAxis",
           "eChartsType" : "value",
           "index" : 1,
-          "name" : "axis_yAxis_2",
+          "name" : "axis_yAxis_0",
           "position" : "left",
           "type" : "numeric",
-          "getUserParam" : {
-            "EC.axisLine" : "{\"show\":1}"
-          },
           "id" : "1"
         } ],
         "getPSControlHandler" : {
@@ -14373,13 +14372,8 @@
               "modelref" : true,
               "id" : "1"
             },
-            "getPSChartYAxis" : {
-              "modelref" : true,
-              "id" : "1"
-            },
             "type" : "XY",
             "x" : [ "NAME" ],
-            "y" : [ "SCORES" ],
             "id" : "0"
           },
           "getPSNavigateContexts" : [ {
@@ -14433,8 +14427,13 @@
               "modelref" : true,
               "id" : "1"
             },
+            "getPSChartYAxis" : {
+              "modelref" : true,
+              "id" : "1"
+            },
             "type" : "XY",
             "x" : [ "NAME" ],
+            "y" : [ "AGE" ],
             "id" : "0"
           },
           "getPSNavigateParams" : [ {
@@ -14455,10 +14454,6 @@
           "showTitle" : false,
           "id" : "0"
         },
-        "getPSSysPFPlugin" : {
-          "pluginType" : "CHART_RENDER",
-          "pluginCode" : "PIE_3D"
-        },
         "readOnly" : true,
         "name" : "dashboard_sysportlet4_chart",
         "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",
@@ -45874,7 +45869,6 @@
           },
           "getPSControls" : [ {
             "codeName" : "Usr0301355514",
-            "controlStyle" : "PIE_3D",
             "controlType" : "CHART",
             "coordinateSystem" : "XY",
             "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Usr0301355514.json",
@@ -46024,20 +46018,20 @@
               "eChartsPos" : "yAxis",
               "eChartsType" : "value",
               "index" : 0,
-              "name" : "axis_yAxis_0",
+              "name" : "axis_yAxis_2",
               "position" : "left",
               "type" : "numeric",
+              "getUserParam" : {
+                "EC.axisLine" : "{\"show\":1}"
+              },
               "id" : "0"
             }, {
               "eChartsPos" : "yAxis",
               "eChartsType" : "value",
               "index" : 1,
-              "name" : "axis_yAxis_2",
+              "name" : "axis_yAxis_0",
               "position" : "left",
               "type" : "numeric",
-              "getUserParam" : {
-                "EC.axisLine" : "{\"show\":1}"
-              },
               "id" : "1"
             } ],
             "getPSControlHandler" : {
@@ -46185,13 +46179,8 @@
                   "modelref" : true,
                   "id" : "1"
                 },
-                "getPSChartYAxis" : {
-                  "modelref" : true,
-                  "id" : "1"
-                },
                 "type" : "XY",
                 "x" : [ "NAME" ],
-                "y" : [ "SCORES" ],
                 "id" : "0"
               },
               "getPSNavigateContexts" : [ {
@@ -46245,8 +46234,13 @@
                   "modelref" : true,
                   "id" : "1"
                 },
+                "getPSChartYAxis" : {
+                  "modelref" : true,
+                  "id" : "1"
+                },
                 "type" : "XY",
                 "x" : [ "NAME" ],
+                "y" : [ "AGE" ],
                 "id" : "0"
               },
               "getPSNavigateParams" : [ {
@@ -46267,10 +46261,6 @@
               "showTitle" : false,
               "id" : "0"
             },
-            "getPSSysPFPlugin" : {
-              "pluginType" : "CHART_RENDER",
-              "pluginCode" : "PIE_3D"
-            },
             "readOnly" : true,
             "name" : "db_sysportlet2_chart",
             "modelid" : "A1BCD468-3027-4DAF-A36E-F8900BF586DA",

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: