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/Book/PSCALENDARS/TestCtrlPlugDayCalendarView_Calendar.json

@@ -31,14 +31,14 @@
     "itemStyle" : "DEFAULT",
     "itemType" : "calendarbookitem",
     "maxSize" : -1,
-    "memo" : "fileMap={\n      name: '%bookname%',\n      start: '%createdate%',\n      end: '%updatedate%',\n      timed: true,\n    }",
+    "memo" : "fileMap='{\n      name: '%bookname%',\n      start: '%createdate%',\n      end: '%updatedate%',\n      timed: true,\n    }'",
     "name" : "图书",
     "navViewParamJO" : {
+      "}'" : "",
       "timed" : "true,",
       "start" : "'%createdate%',",
       "name" : "'%bookname%',",
-      "filemap" : "{",
-      "}" : "",
+      "filemap" : "'{",
       "end" : "'%updatedate%',"
     },
     "getPSAppDEDataSet" : {
@@ -50,6 +50,10 @@
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
     },
     "getPSNavigateParams" : [ {
+      "key" : "}'",
+      "name" : "}'",
+      "rawValue" : true
+    }, {
       "key" : "end",
       "name" : "end",
       "value" : "'%updatedate%',",
@@ -64,14 +68,10 @@
       "name" : "name",
       "value" : "'%bookname%',",
       "rawValue" : true
-    }, {
-      "key" : "}",
-      "name" : "}",
-      "rawValue" : true
     }, {
       "key" : "filemap",
       "name" : "filemap",
-      "value" : "{",
+      "value" : "'{",
       "rawValue" : true
     }, {
       "key" : "start",

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

@@ -79,14 +79,14 @@
       "itemStyle" : "DEFAULT",
       "itemType" : "calendarbookitem",
       "maxSize" : -1,
-      "memo" : "fileMap={\n      name: '%bookname%',\n      start: '%createdate%',\n      end: '%updatedate%',\n      timed: true,\n    }",
+      "memo" : "fileMap='{\n      name: '%bookname%',\n      start: '%createdate%',\n      end: '%updatedate%',\n      timed: true,\n    }'",
       "name" : "图书",
       "navViewParamJO" : {
+        "}'" : "",
         "timed" : "true,",
         "start" : "'%createdate%',",
         "name" : "'%bookname%',",
-        "filemap" : "{",
-        "}" : "",
+        "filemap" : "'{",
         "end" : "'%updatedate%',"
       },
       "getPSAppDEDataSet" : {
@@ -98,6 +98,10 @@
         "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
       },
       "getPSNavigateParams" : [ {
+        "key" : "}'",
+        "name" : "}'",
+        "rawValue" : true
+      }, {
         "key" : "end",
         "name" : "end",
         "value" : "'%updatedate%',",
@@ -112,14 +116,10 @@
         "name" : "name",
         "value" : "'%bookname%',",
         "rawValue" : true
-      }, {
-        "key" : "}",
-        "name" : "}",
-        "rawValue" : true
       }, {
         "key" : "filemap",
         "name" : "filemap",
-        "value" : "{",
+        "value" : "'{",
         "rawValue" : true
       }, {
         "key" : "start",

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: