demoadmin 发布系统代码 [ibz-dst，应用]

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzdst/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzdst/
-      mvn clean package -Papi
-      cd ibzdst-provider/ibzdst-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdst-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/domain/DABuild.java

@@ -141,14 +141,6 @@ public class DABuild extends EntityMP implements Serializable {
         this.dadimension = dadimension;
         this.modify("dadimension", (dadimension!=null)?dadimension:(new ArrayList()));
     }
-    /**
-     * 指标
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private List<cn.ibizlab.core.analysis.domain.DAMetric> metrics;
-
 
     /**
      * 设置 [名称]

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/IDAMetricService.java

@@ -41,7 +41,6 @@ public interface IDAMetricService extends IService<DAMetric> {
     Page<DAMetric> searchDefault(DAMetricSearchContext context);
     List<DAMetric> selectByBuildId(String build_id);
     void removeByBuildId(String build_id);
-    void saveByBuildId(String build_id, List<DAMetric> list) ;
     /**
      *自定义查询SQL
      * @param sql  select * from table where id =#{et.param}

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DABuildServiceImpl.java

@@ -64,7 +64,6 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
         if(!this.retBool(this.baseMapper.insert(et))) {
             return false;
         }
-        dametricService.saveByBuildId(et.getBuildId(), et.getMetrics());
         CachedBeanCopier.copy(get(et.getBuildId()), et);
         return true;
     }
@@ -83,7 +82,6 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
         if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("buildid", et.getBuildId()))) {
             return false;
         }
-        dametricService.saveByBuildId(et.getBuildId(), et.getMetrics());
         CachedBeanCopier.copy(get(et.getBuildId()), et);
         return true;
     }
@@ -98,7 +96,6 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
     @Override
     @Transactional
     public boolean remove(String key) {
-        dametricService.removeByBuildId(key) ;
         boolean result = removeById(key);
         return result ;
     }
@@ -118,7 +115,6 @@ public class DABuildServiceImpl extends ServiceImpl<DABuildMapper, DABuild> impl
             et.setBuildId(key);
         }
         else {
-            et.setMetrics(dametricService.selectByBuildId(key));
         }
         return et;
     }

ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DAMetricServiceImpl.java

@@ -214,38 +214,6 @@ public class DAMetricServiceImpl extends ServiceImpl<DAMetricMapper, DAMetric> i
         this.remove(new QueryWrapper<DAMetric>().eq("buildid",build_id));
     }
 
-    public IDAMetricService getProxyService() {
-        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
-    }
-	@Override
-    public void saveByBuildId(String build_id,List<DAMetric> list) {
-        if(list==null)
-            return;
-        Set<String> delIds=new HashSet<String>();
-        List<DAMetric> _update=new ArrayList<DAMetric>();
-        List<DAMetric> _create=new ArrayList<DAMetric>();
-        for(DAMetric before:selectByBuildId(build_id)){
-            delIds.add(before.getMetricId());
-        }
-        for(DAMetric sub:list) {
-            sub.setBuildId(build_id);
-            if(ObjectUtils.isEmpty(sub.getMetricId()))
-                sub.setMetricId((String)sub.getDefaultKey(true));
-            if(delIds.contains(sub.getMetricId())) {
-                delIds.remove(sub.getMetricId());
-                _update.add(sub);
-            }
-            else
-                _create.add(sub);
-        }
-        if(_update.size()>0)
-            getProxyService().updateBatch(_update);
-        if(_create.size()>0)
-            getProxyService().createBatch(_create);
-        if(delIds.size()>0)
-            getProxyService().removeBatch(delIds);
-	}
-
 
     /**
      * 查询集合 数据集
@@ -309,6 +277,9 @@ public class DAMetricServiceImpl extends ServiceImpl<DAMetricMapper, DAMetric> i
 
 
 
+    public IDAMetricService getProxyService() {
+        return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
+    }
 }
 
 

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_build-80-1">
+    <changeSet author="root" id="tab-da_build-81-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="a_A_5d9d78509" id="tab-da_chart-22-2">
+    <changeSet author="root" id="tab-da_chart-22-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="a_A_5d9d78509" id="tab-da_metric-63-3">
+    <changeSet author="root" id="tab-da_metric-64-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="a_A_5d9d78509" id="tab-da_report-24-4">
+    <changeSet author="root" id="tab-da_report-24-4">
         <createTable tableName="IBZDAREPORT">
                 <column name="REPORTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/>
@@ -104,7 +104,7 @@
 
 
     <!--输出实体[DST_DATASOURCE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-7-5">
+    <changeSet author="root" id="tab-dst_datasource-7-5">
         <createTable tableName="IBZDATASOURCE">
                 <column name="DSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
@@ -120,7 +120,7 @@
 
 
     <!--输出实体[DST_SYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_system-5-6">
+    <changeSet author="root" id="tab-dst_system-5-6">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
@@ -140,7 +140,7 @@
 
 
     <!--输出实体[RU_EXECLOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_execlog-31-7">
+    <changeSet author="root" id="tab-ru_execlog-31-7">
         <createTable tableName="IBZRULELOG">
                 <column name="RU_EXECLOGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_EXECLOG_RU_EXECLOGID"/>
@@ -170,7 +170,7 @@
 
 
     <!--输出实体[RU_EXECRESULT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_execresult-46-8">
+    <changeSet author="root" id="tab-ru_execresult-46-8">
         <createTable tableName="IBZRULERESULT">
                 <column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/>
@@ -210,7 +210,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-2-9">
+    <changeSet author="root" id="tab-meta_dataset-2-9">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -232,7 +232,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-13-10">
+    <changeSet author="root" id="tab-meta_entity-13-10">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -264,7 +264,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_field-7-11">
+    <changeSet author="root" id="tab-meta_field-7-11">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -328,7 +328,7 @@
 
 
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_model-75-12">
+    <changeSet author="root" id="tab-meta_model-75-12">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
@@ -354,7 +354,7 @@
 
 
     <!--输出实体[META_MODULE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_module-7-13">
+    <changeSet author="root" id="tab-meta_module-7-13">
         <createTable tableName="IBZMODULE">
                 <column name="MODULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
@@ -372,7 +372,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-6-14">
+    <changeSet author="root" id="tab-meta_relation-6-14">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
@@ -404,7 +404,7 @@
 
 
     <!--输出实体[RU_ENGINE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_engine-46-15">
+    <changeSet author="root" id="tab-ru_engine-46-15">
         <createTable tableName="IBZRULEENGINE">
                 <column name="ENGINEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
@@ -432,7 +432,7 @@
 
 
     <!--输出实体[RU_ITEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_item-80-16">
+    <changeSet author="root" id="tab-ru_item-80-16">
         <createTable tableName="IBZRULE">
                 <column name="RULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
@@ -469,7 +469,7 @@
         <!--输出实体[DA_BUILD]外键关系 -->
         <!--输出实体[DA_CHART]外键关系 -->
         <!--输出实体[DA_METRIC]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-da_metric-63-17">
+    <changeSet author="root" id="fk-da_metric-64-17">
        <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]外键关系 -->

ibzdst-provider/ibzdst-provider-api/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzdst-provider-api.jar
 
-EXPOSE 40011
+EXPOSE 8081
 
 ADD ibzdst-provider-api.jar /ibzdst-provider-api.jar

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

@@ -22,34 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
         imagePullPolicy: Always
         ports:
-        - 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"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_A_5d9d78509"
-        - name: NACOS
-          value: "172.16.100.243:8848"      
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
-          value: "ibizdev"      
+        - containerPort: 8081
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -69,9 +42,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 40011
-    targetPort: 40011
-    nodePort: 40011
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: ibzdst-provider-api

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

@@ -3,23 +3,9 @@ services:
   ibzdst-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
     ports:
-      - "40011:40011"
+      - "8081:8081"
     networks:
       - agent_network
-    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
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits: