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

39eda0f3 · ibizdev · 2450275f · 39eda0f3 · 39eda0f3 · 39eda0f3
--- a/app_Web/pnpm-lock.yaml
+++ b/app_Web/pnpm-lock.yaml
@@ -952,10 +952,10 @@ packages:
  /@ibiz-template/controller@0.0.1-beta.134(@ibiz-template/core@0.0.1-beta.134)(@ibiz-template/model@0.0.1-beta.134)(@ibiz-template/runtime@0.0.1-beta.134)(@ibiz-template/service@0.0.1-beta.134)(lodash-es@4.17.21)(qs@6.11.2)(qx-util@0.4.8):
    resolution: {integrity: sha512-HEmFZElEr3cXmfhPN6EUQp2BbNHw9TjGKXuOCbcS2OrwdvwMnC53a055uC3rzKugp7mC608Dr1EfxwmuDTAXkw==}
    peerDependencies:
-      '@ibiz-template/core': ^0.0.1-beta.30
-      '@ibiz-template/model': ^0.0.1-beta.30
-      '@ibiz-template/runtime': ^0.0.1-beta.30
-      '@ibiz-template/service': ^0.0.1-beta.30
+      '@ibiz-template/core': ^0.0.1-beta.132
+      '@ibiz-template/model': ^0.0.1-beta.132
+      '@ibiz-template/runtime': ^0.0.1-beta.132
+      '@ibiz-template/service': ^0.0.1-beta.132
      lodash-es: ^4.17.21
      qs: ^6.11.0
      qx-util: ^0.4.8
@@ -965,7 +965,7 @@ packages:
      '@ibiz-template/runtime': 0.0.1-beta.134(@ibiz-template/core@0.0.1-beta.134)(@ibiz-template/model@0.0.1-beta.134)(@ibiz-template/service@0.0.1-beta.134)(qx-util@0.4.8)
      '@ibiz-template/service': 0.0.1-beta.134(@ibiz-template/core@0.0.1-beta.134)(@ibiz-template/model@0.0.1-beta.134)(qx-util@0.4.8)(ramda@0.29.1)
      async-validator: 4.2.5
-      dayjs: 1.11.7
+      dayjs: 1.11.10
      lodash-es: 4.17.21
      qs: 6.11.2
      qx-util: 0.4.8
@@ -978,11 +978,11 @@ packages:
      qx-util: ^0.4.8
      ramda: ^0.28.0
    dependencies:
-      axios: 1.4.0
+      axios: 1.6.2
      lodash-es: 4.17.21
      loglevel: 1.8.1
      pluralize: 8.0.0
-      qs: 6.11.1
+      qs: 6.11.2
      qx-util: 0.4.8
      ramda: 0.29.1
    transitivePeerDependencies:
@@ -1005,9 +1005,9 @@ packages:
  /@ibiz-template/runtime@0.0.1-beta.134(@ibiz-template/core@0.0.1-beta.134)(@ibiz-template/model@0.0.1-beta.134)(@ibiz-template/service@0.0.1-beta.134)(qx-util@0.4.8):
    resolution: {integrity: sha512-/a+J7ACBxd6rRCF6HushHaXk1gUQWicizFE2KGEeZ8U7wQ9jA+KuUe4VqWywA+lOX7lDXW9wdcs8E0gvgQI4QQ==}
    peerDependencies:
-      '@ibiz-template/core': ^0.0.1-beta.30
-      '@ibiz-template/model': ^0.0.1-beta.30
-      '@ibiz-template/service': ^0.0.1-beta.30
+      '@ibiz-template/core': ^0.0.1-beta.132
+      '@ibiz-template/model': ^0.0.1-beta.132
+      '@ibiz-template/service': ^0.0.1-beta.132
      qx-util: ^0.4.8
    dependencies:
      '@ibiz-template/command': 0.0.1-beta.50
@@ -1021,8 +1021,8 @@ packages:
  /@ibiz-template/service@0.0.1-beta.134(@ibiz-template/core@0.0.1-beta.134)(@ibiz-template/model@0.0.1-beta.134)(qx-util@0.4.8)(ramda@0.29.1):
    resolution: {integrity: sha512-+WJBrio8Yi+YdfyymL74H4SgKHLEUmeGTN/ApgwKj0TJByfmk2QYIbjb4G2kJJRaIsCPyPD5MnpsqV5OiNxT5Q==}
    peerDependencies:
-      '@ibiz-template/core': ^0.0.1-beta.30
-      '@ibiz-template/model': ^0.0.1-beta.30
+      '@ibiz-template/core': ^0.0.1-beta.132
+      '@ibiz-template/model': ^0.0.1-beta.132
      qx-util: ^0.4.8
      ramda: ^0.28.0
    dependencies:
@@ -1039,10 +1039,10 @@ packages:
  /@ibiz-template/vue-util@0.0.1-beta.134(@ibiz-template/controller@0.0.1-beta.134)(@ibiz-template/core@0.0.1-beta.134)(@ibiz-template/model@0.0.1-beta.134)(@ibiz-template/service@0.0.1-beta.134)(qs@6.11.2)(qx-util@0.4.8)(ramda@0.29.1)(vue-router@3.6.5)(vue@2.7.15):
    resolution: {integrity: sha512-p+YJ/uPVTA2mXdtmT5bqe17+uRtYO1GpMuFKzq4fImVSCn00bM14lIe7Wfc7lZTNk98VPLoCCgMER6rZmnL5sQ==}
    peerDependencies:
-      '@ibiz-template/controller': ^0.0.1-beta.30
-      '@ibiz-template/core': ^0.0.1-beta.30
-      '@ibiz-template/model': ^0.0.1-beta.30
-      '@ibiz-template/service': ^0.0.1-beta.30
+      '@ibiz-template/controller': ^0.0.1-beta.132
+      '@ibiz-template/core': ^0.0.1-beta.132
+      '@ibiz-template/model': ^0.0.1-beta.132
+      '@ibiz-template/service': ^0.0.1-beta.132
      qs: ^6.11.0
      qx-util: ^0.4.8
      ramda: ^0.28.0
@@ -1814,8 +1814,8 @@ packages:
    engines: {node: '>= 0.4'}
    dev: true

-  /axios@1.4.0:
-    resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==}
+  /axios@1.6.2:
+    resolution: {integrity: sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==}
    dependencies:
      follow-redirects: 1.15.2
      form-data: 4.0.0

--- 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-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
-        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

--- 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: