chitanda 部署微服务接口 [TrainSys，默认服务接口]

c877a367 · ibizdev · e568f9d2 · c877a367 · c877a367 · c877a367
--- a/config.xml
+++ b/config.xml
@@ -55,15 +55,14 @@
 	  git clone -b master $para2 trainsys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
-      if [ -e app_Web/.dynamic ]
-      then
-          cd app_Web
-      else
-          cd app_Web/app
-      fi
-      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
+      mvn clean package -Ptrainsys
+      mvn install -Ptrainsys
+      cd trainsys-provider
+      sed -i "s#dstimage#$para5#g" pom.xml 
+      sed -i "s#dstimage#$para5#g" src/main/docker/trainsys-provider-trainsys.yaml 
+      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-core/src/main/resources/liquibase/h2_table.xml
+++ b/trainsys-core/src/main/resources/liquibase/h2_table.xml
@@ -72,7 +72,7 @@
    </changeSet>

    <!--输出实体[PHONE]数据结构 -->
-    <changeSet author="root" id="tab-phone-23-3">
+    <changeSet author="root" id="tab-phone-31-3">
        <createTable tableName="T_PHONE">
                <column name="PHONEID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_PHONE"/>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone.json
@@ -221,6 +221,54 @@
    "tableType" : "MAIN"
  } ],
  "getAllPSDEDataQueries" : [ {
+    "getAllPSDEDataQueryCodes" : [ {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/ByIPhone/PSDEDQCODES/MYSQL5.json"
+    } ],
+    "codeName" : "ByIPhone",
+    "logicName" : "苹果手机",
+    "name" : "ByIPhone",
+    "getPSDEDQMain" : {
+      "getJoinPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+      },
+      "joinType" : "MAIN",
+      "name" : "PHONE",
+      "getPSDEDQGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "连接条件",
+        "getPSDEDQConditions" : [ {
+          "condOp" : "EQ",
+          "condType" : "SINGLE",
+          "condValue" : "Iphone",
+          "fieldName" : "PHONETYPE",
+          "name" : "PHONETYPE 等于(=) (Iphone)",
+          "getPSDEField" : {
+            "name" : "PHONETYPE",
+            "codeName" : "Phonetype"
+          }
+        } ]
+      }
+    },
+    "getPSDEDataQueryInput" : {
+      "name" : "ByIPhoneInput",
+      "getPSDEFilterDTO" : {
+        "modelref" : true,
+        "id" : "PhoneFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSDEDataQueryReturn" : {
+      "name" : "ByIPhoneResult",
+      "getPSDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "PhoneDTO"
+      },
+      "type" : "DTOS"
+    }
+  }, {
    "getAllPSDEDataQueryCodes" : [ {
      "modelref" : true,
      "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
@@ -326,6 +374,32 @@
    "viewLevel" : 0
  } ],
  "getAllPSDEDataSets" : [ {
+    "codeName" : "ByIPhone",
+    "logicName" : "苹果手机",
+    "name" : "ByIPhone",
+    "getPSDEDataQueries" : [ {
+      "modelref" : true,
+      "id" : "ByIPhone"
+    } ],
+    "getPSDEDataSetInput" : {
+      "name" : "ByIPhoneInput",
+      "getPSDEFilterDTO" : {
+        "modelref" : true,
+        "id" : "PhoneFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSDEDataSetReturn" : {
+      "name" : "ByIPhoneResult",
+      "getPSDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "PhoneDTO"
+      },
+      "type" : "PAGE"
+    },
+    "enableBackend" : true,
+    "enableFront" : true
+  }, {
    "codeName" : "Default",
    "logicName" : "数据集",
    "name" : "DEFAULT",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/ByIPhone/PSDEDQCODES/MYSQL5.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/ByIPhone/PSDEDQCODES/MYSQL5.json
+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeConds" : [ {
+    "condType" : "CUSTOM",
+    "customCond" : "( t1.`PHONETYPE` = 'Iphone' )",
+    "name" : "查询条件"
+  } ],
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEPTID`",
+    "name" : "DEPTID"
+  }, {
+    "expression" : "t1.`ORGID`",
+    "name" : "ORGID"
+  }, {
+    "expression" : "t1.`PHONEID`",
+    "name" : "PHONEID"
+  }, {
+    "expression" : "t1.`PHONENAME`",
+    "name" : "PHONENAME"
+  }, {
+    "expression" : "t1.`PHONETYPE`",
+    "name" : "PHONETYPE"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`PHONEID`,\nt1.`PHONENAME`,\nt1.`PHONETYPE`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PHONE` t1 \n",
+  "id" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/ByIPhone/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json
@@ -202,6 +202,30 @@
    "needResourceKey" : true
  } ],
  "getAllPSAppDEDataSets" : [ {
+    "codeName" : "FetchByIPhone",
+    "methodType" : "FETCH",
+    "name" : "FetchByIPhone",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "PhoneFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "PhoneDTO"
+      },
+      "type" : "PAGE"
+    },
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchbyiphone",
+    "builtinMethod" : false
+  }, {
    "codeName" : "FetchDefault",
    "methodType" : "FETCH",
    "name" : "FetchDefault",
@@ -604,6 +628,30 @@
    "requestParamType" : "ENTITY",
    "builtinMethod" : false,
    "needResourceKey" : true
+  }, {
+    "codeName" : "FetchByIPhone",
+    "methodType" : "FETCH",
+    "name" : "FetchByIPhone",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "PhoneFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "PhoneDTO"
+      },
+      "type" : "PAGE"
+    },
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchbyiphone",
+    "builtinMethod" : false
  }, {
    "codeName" : "FetchDefault",
    "methodType" : "FETCH",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -6840,6 +6840,30 @@
        "needResourceKey" : true
      } ],
      "getAllPSAppDEDataSets" : [ {
+        "codeName" : "FetchByIPhone",
+        "methodType" : "FETCH",
+        "name" : "FetchByIPhone",
+        "getPSAppDEMethodInput" : {
+          "name" : "输入对象",
+          "getPSAppDEMethodDTO" : {
+            "modelref" : true,
+            "id" : "PhoneFilterDTO"
+          },
+          "type" : "DTO"
+        },
+        "getPSAppDEMethodReturn" : {
+          "name" : "返回对象",
+          "getPSAppDEMethodDTO" : {
+            "modelref" : true,
+            "id" : "PhoneDTO"
+          },
+          "type" : "PAGE"
+        },
+        "requestMethod" : "POST",
+        "requestParamType" : "ENTITY",
+        "requestPath" : "/fetchbyiphone",
+        "builtinMethod" : false
+      }, {
        "codeName" : "FetchDefault",
        "methodType" : "FETCH",
        "name" : "FetchDefault",
@@ -7242,6 +7266,30 @@
        "requestParamType" : "ENTITY",
        "builtinMethod" : false,
        "needResourceKey" : true
+      }, {
+        "codeName" : "FetchByIPhone",
+        "methodType" : "FETCH",
+        "name" : "FetchByIPhone",
+        "getPSAppDEMethodInput" : {
+          "name" : "输入对象",
+          "getPSAppDEMethodDTO" : {
+            "modelref" : true,
+            "id" : "PhoneFilterDTO"
+          },
+          "type" : "DTO"
+        },
+        "getPSAppDEMethodReturn" : {
+          "name" : "返回对象",
+          "getPSAppDEMethodDTO" : {
+            "modelref" : true,
+            "id" : "PhoneDTO"
+          },
+          "type" : "PAGE"
+        },
+        "requestMethod" : "POST",
+        "requestParamType" : "ENTITY",
+        "requestPath" : "/fetchbyiphone",
+        "builtinMethod" : false
      }, {
        "codeName" : "FetchDefault",
        "methodType" : "FETCH",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
@@ -186,6 +186,32 @@
      },
      "requestMethod" : "POST",
      "needResourceKey" : true
+    }, {
+      "codeName" : "FetchByIPhone",
+      "dataAccessAction" : "READ",
+      "methodType" : "FETCH",
+      "name" : "FetchByIPhone",
+      "getPSDEDataSet" : {
+        "modelref" : true,
+        "id" : "ByIPhone"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PhoneFilterDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PhoneDTO"
+        },
+        "type" : "PAGE"
+      },
+      "requestMethod" : "POST"
    }, {
      "codeName" : "FetchDefault",
      "dataAccessAction" : "READ",

--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -34,7 +34,7 @@

    <profiles>
        <profile>
-            <id>runtime</id>
+            <id>trainsys</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 8081
+EXPOSE 50000

 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,7 +22,32 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 8081
+        - 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"      

 ---
 apiVersion: v1
@@ -35,9 +60,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 8081
-    targetPort: 8081
-    nodePort: 8081
+    port: 50000
+    targetPort: 50000
+    nodePort: 50000
    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,9 +3,23 @@ services:
  trainsys-provider:
    image: dstimage
    ports:
-      - "8081:8081"
+      - "50000:50000"
    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: