HZY_ZERIC_0209 部署微服务接口 [ibz-dst，micorservice]

config.xml

@@ -37,6 +37,10 @@
 	  git clone -b master $para2 ibzdst/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzdst/
+      mvn clean package -Papi-war
+      cd ibzdst-provider/ibzdst-provider-api
+      mvn -Papi-war exec:exec@prepare
+      mvn -Papi-war exec:exec@buildpush  
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzdst-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="root" id="tab-da_build-7-1">
+    <changeSet author="a_A_5d9d78509" id="tab-da_build-7-1">
         <createTable tableName="IBZDABUILD">
                 <column name="BUILDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
@@ -32,7 +32,7 @@
 
 
     <!--输出实体[DA_CHART]数据结构 -->
-    <changeSet author="root" id="tab-da_chart-2-2">
+    <changeSet author="a_A_5d9d78509" id="tab-da_chart-2-2">
         <createTable tableName="IBZDACHART">
                 <column name="CHARTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_CHART_CHARTID"/>
@@ -54,7 +54,7 @@
 
 
     <!--输出实体[DA_METRIC]数据结构 -->
-    <changeSet author="root" id="tab-da_metric-25-3">
+    <changeSet author="a_A_5d9d78509" id="tab-da_metric-25-3">
         <createTable tableName="IBZDAMETRIC">
                 <column name="DA_METRICID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
@@ -82,7 +82,7 @@
 
 
     <!--输出实体[DA_REPORT]数据结构 -->
-    <changeSet author="root" id="tab-da_report-16-4">
+    <changeSet author="a_A_5d9d78509" id="tab-da_report-16-4">
         <createTable tableName="IBZDAREPORT">
                 <column name="REPORTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/>
@@ -102,7 +102,7 @@
 
 
     <!--输出实体[DICT_CATALOG]数据结构 -->
-    <changeSet author="root" id="tab-dict_catalog-11-5">
+    <changeSet author="a_A_5d9d78509" id="tab-dict_catalog-11-5">
         <createTable tableName="IBZDICTCATALOG">
                 <column name="CID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/>
@@ -128,7 +128,7 @@
 
 
     <!--输出实体[DICT_OPTION]数据结构 -->
-    <changeSet author="root" id="tab-dict_option-15-6">
+    <changeSet author="a_A_5d9d78509" id="tab-dict_option-15-6">
         <createTable tableName="IBZDICTOPTION">
                 <column name="VKEY" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
@@ -168,7 +168,7 @@
 
 
     <!--输出实体[DST_DATASOURCE]数据结构 -->
-    <changeSet author="root" id="tab-dst_datasource-9-7">
+    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-9-7">
         <createTable tableName="IBZDATASOURCE">
                 <column name="DSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
@@ -184,7 +184,7 @@
 
 
     <!--输出实体[DST_SYSTEM]数据结构 -->
-    <changeSet author="root" id="tab-dst_system-1-8">
+    <changeSet author="a_A_5d9d78509" id="tab-dst_system-1-8">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
@@ -204,7 +204,7 @@
 
 
     <!--输出实体[RU_EXECLOG]数据结构 -->
-    <changeSet author="root" id="tab-ru_execlog-1-9">
+    <changeSet author="a_A_5d9d78509" id="tab-ru_execlog-1-9">
         <createTable tableName="IBZRULELOG">
                 <column name="RU_EXECLOGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_EXECLOG_RU_EXECLOGID"/>
@@ -234,7 +234,7 @@
 
 
     <!--输出实体[RU_EXECRESULT]数据结构 -->
-    <changeSet author="root" id="tab-ru_execresult-2-10">
+    <changeSet author="a_A_5d9d78509" id="tab-ru_execresult-2-10">
         <createTable tableName="IBZRULERESULT">
                 <column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/>
@@ -274,7 +274,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="root" id="tab-meta_dataset-1-11">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-1-11">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -296,7 +296,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="root" id="tab-meta_entity-6-12">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-6-12">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -328,7 +328,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="root" id="tab-meta_field-12-13">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_field-12-13">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -392,7 +392,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="root" id="tab-meta_model-1-14">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_model-1-14">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
@@ -418,7 +418,7 @@
 
 
     <!--输出实体[META_MODULE]数据结构 -->
-    <changeSet author="root" id="tab-meta_module-1-15">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_module-1-15">
         <createTable tableName="IBZMODULE">
                 <column name="MODULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
@@ -436,7 +436,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="root" id="tab-meta_relation-10-16">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-10-16">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
@@ -468,7 +468,7 @@
 
 
     <!--输出实体[RU_ENGINE]数据结构 -->
-    <changeSet author="root" id="tab-ru_engine-30-17">
+    <changeSet author="a_A_5d9d78509" id="tab-ru_engine-30-17">
         <createTable tableName="IBZRULEENGINE">
                 <column name="ENGINEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
@@ -496,7 +496,7 @@
 
 
     <!--输出实体[RU_ITEM]数据结构 -->
-    <changeSet author="root" id="tab-ru_item-17-18">
+    <changeSet author="a_A_5d9d78509" id="tab-ru_item-17-18">
         <createTable tableName="IBZRULE">
                 <column name="RULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
@@ -532,7 +532,7 @@
 
 
     <!--输出实体[ETL_TABLE_SYNC]数据结构 -->
-    <changeSet author="root" id="tab-etl_table_sync-81-19">
+    <changeSet author="a_A_5d9d78509" id="tab-etl_table_sync-81-19">
         <createTable tableName="IBZTABLESYNC">
                 <column name="SYNCID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_ETL_TABLE_SYNC_SYNCID"/>
@@ -587,13 +587,13 @@
         <!--输出实体[DA_BUILD]外键关系 -->
         <!--输出实体[DA_CHART]外键关系 -->
         <!--输出实体[DA_METRIC]外键关系 -->
-    <changeSet author="root" id="fk-da_metric-25-20">
+    <changeSet author="a_A_5d9d78509" id="fk-da_metric-25-20">
        <addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/>
     </changeSet>
         <!--输出实体[DA_REPORT]外键关系 -->
         <!--输出实体[DICT_CATALOG]外键关系 -->
         <!--输出实体[DICT_OPTION]外键关系 -->
-    <changeSet author="root" id="fk-dict_option-15-21">
+    <changeSet author="a_A_5d9d78509" id="fk-dict_option-15-21">
        <addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/>
     </changeSet>
         <!--输出实体[DST_DATASOURCE]外键关系 -->

ibzdst-provider/ibzdst-provider-api/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 /ibzdst-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40011
 
 ADD ibzdst-provider-api.jar /ibzdst-provider-api.jar

ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api-k8s.yaml

@@ -22,7 +22,38 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 8081
+        - containerPort: 40011
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.180.237"      
+        - name: SERVER_PORT
+          value: "40011"
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
+          value: "172.16.100.243:8848"
+        - name: SPRING_REDIS_HOST
+          value: "172.16.100.243"
+        - name: SPRING_REDIS_PORT
+          value: "6379"
+        - name: SPRING_REDIS_DATABASE
+          value: "0"
+        - name: SPRING_DATASOURCE_USERNAME
+          value: "a_A_5d9d78509"
+        - name: SPRING_DATASOURCE_PASSWORD
+          value: "@6dEfb3@"
+        - name: SPRING_DATASOURCE_URL
+          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true&serverTimezone=GMT%2B8"
+        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
+          value: "com.mysql.jdbc.Driver"
+        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
+          value: "a_A_5d9d78509"
+        - name: IBIZ_DEPLOY_ISDOCKER
+          value: "true"      
+        - name: IBIZ_DEPLOY_PACKAGETYPE
+          value: "war"      
+        - name: NACOS
+          value: "172.16.100.243:8848"      
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
+          value: "ibizdev"      
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -42,9 +73,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 8081
-    targetPort: 8081
-    nodePort: 8081
+    port: 40011
+    targetPort: 40011
+    nodePort: 40011
     protocol: TCP
   selector:
     app: ibzdst-provider-api

ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api.yaml

@@ -3,9 +3,31 @@ services:
   ibzdst-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40011:40011"
     networks:
       - agent_network
+    #logging:
+    #  driver: loki
+    #  options:
+    #    loki-url: "http://172.16.240.111:3100/loki/api/v1/push"
+    #    max-size: "50m"
+    #    max-file: "10"
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40011
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true&serverTimezone=GMT%2B8
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - IBIZ_DEPLOY_ISDOCKER=true
+      - IBIZ_DEPLOY_PACKAGETYPE=war
+      - NACOS=172.16.100.243:8848
+      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits: