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

app_web/public/assets/json/data-dictionary.json

@@ -426,6 +426,28 @@
                 "codename":"Notinc2s",
                 "value": "NOTINC2S",
                 
+                "disabled": false
+            }
+            , {
+                "id": "EQARRAY",
+                "label": "数组内容相同",
+                "text": "数组内容相同",
+                "class":"",
+                "data":"",
+                "codename":"Eqarray",
+                "value": "EQARRAY",
+                
+                "disabled": false
+            }
+            , {
+                "id": "NOTEQARRAY",
+                "label": "数组内容不同",
+                "text": "数组内容不同",
+                "class":"",
+                "data":"",
+                "codename":"Noteqarray",
+                "value": "NOTEQARRAY",
+                
                 "disabled": false
             }
         ]

app_web/src/locale/lanres/codelist/codelist_BO_CN_base.ts

@@ -60,6 +60,8 @@ function getLocaleResourceBase(){
           "NOTMATCHES": commonLogic.appcommonhandle("NOT MATCHES",null),
           "INC2S": commonLogic.appcommonhandle("INC2S",null),
           "NOTINC2S": commonLogic.appcommonhandle("NOTINC2S",null),
+          "EQARRAY": commonLogic.appcommonhandle("数组内容相同",null),
+          "NOTEQARRAY": commonLogic.appcommonhandle("数组内容不同",null),
           "empty": commonLogic.appcommonhandle("",null)
       },
       YesNo: {

app_web/src/locale/lanres/codelist/codelist_en_US_base.ts

@@ -60,6 +60,8 @@ function getLocaleResourceBase(){
           "NOTMATCHES": commonLogic.appcommonhandle("NOT MATCHES",null),
           "INC2S": commonLogic.appcommonhandle("INC2S",null),
           "NOTINC2S": commonLogic.appcommonhandle("NOTINC2S",null),
+          "EQARRAY": commonLogic.appcommonhandle("数组内容相同",null),
+          "NOTEQARRAY": commonLogic.appcommonhandle("数组内容不同",null),
           "empty": commonLogic.appcommonhandle("",null)
       },
       YesNo: {

app_web/src/locale/lanres/codelist/codelist_zh_CN_base.ts

@@ -60,6 +60,8 @@ function getLocaleResourceBase(){
           "NOTMATCHES": commonLogic.appcommonhandle("NOT MATCHES",null),
           "INC2S": commonLogic.appcommonhandle("INC2S",null),
           "NOTINC2S": commonLogic.appcommonhandle("NOTINC2S",null),
+          "EQARRAY": commonLogic.appcommonhandle("数组内容相同",null),
+          "NOTEQARRAY": commonLogic.appcommonhandle("数组内容不同",null),
           "empty": commonLogic.appcommonhandle("",null),
       },
       YesNo: {

app_web/src/mock/codelist/codelist.ts

@@ -434,6 +434,28 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 "codename":"Notinc2s",
                 value: "NOTINC2S",
                 
+                disabled: false,
+            },
+            {
+                id: "EQARRAY",
+                label: "数组内容相同",
+                text: "数组内容相同",
+                "class":"",
+                "data":"",
+                "codename":"Eqarray",
+                value: "EQARRAY",
+                
+                disabled: false,
+            },
+            {
+                id: "NOTEQARRAY",
+                label: "数组内容不同",
+                text: "数组内容不同",
+                "class":"",
+                "data":"",
+                "codename":"Noteqarray",
+                value: "NOTEQARRAY",
+                
                 disabled: false,
             },
         ]

app_web/src/widgets/dict-catalog/default-searchform/default-searchform-base.vue

@@ -698,7 +698,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -734,7 +734,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue

@@ -331,6 +331,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -853,7 +867,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -948,7 +962,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1054,7 +1068,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1847,7 +1861,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcatalogpickupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcataloggridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -1914,7 +1928,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcatalogpickupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_dictcataloggridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -1985,7 +1999,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1993,7 +2007,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.dictcatalog){
@@ -2060,7 +2074,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_web/src/widgets/meta-entity/main-grid/main-grid-base.vue

@@ -2467,18 +2467,6 @@ export default class MainBase extends Vue implements ControlInterface {
 }
 </script>
 
-<style lang='less'>
-@import './main-grid.less';
-</style>mberof MainBase
-     */
-    public resetGridData(row: any, property: string, rowIndex: number) {
-        if(this.actualIsOpenEdit) {
-        }
-    }
-
-}
-</script>
-
 <style lang='less'>
 @import './main-grid.less';
 </style>
\ No newline at end of file

app_web/src/widgets/rule-item/default-searchform/default-searchform-base.vue

@@ -838,7 +838,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -874,7 +874,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

config.xml

@@ -37,12 +37,6 @@
 	  git clone -b master $para2 ibzdst/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzdst/
-      mvn clean package -Papi
-      mvn install -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/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_build-7-1">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-da_chart-2-2">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-da_metric-25-3">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-da_report-16-4">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-dict_catalog-11-5">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-dict_option-15-6">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-dst_datasource-9-7">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-dst_system-1-8">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-ru_execlog-1-9">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-ru_execresult-2-10">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-meta_dataset-1-11">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-meta_entity-6-12">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-meta_field-12-13">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-meta_model-1-14">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-meta_module-1-15">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-meta_relation-10-16">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-ru_engine-30-17">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-ru_item-17-18">
+    <changeSet author="root" 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="a_A_5d9d78509" id="tab-etl_table_sync-81-19">
+    <changeSet author="root" 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="a_A_5d9d78509" id="fk-da_metric-25-20">
+    <changeSet author="root" 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="a_A_5d9d78509" id="fk-dict_option-15-21">
+    <changeSet author="root" 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 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&serverTimezone=GMT%2B8"
-        - 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,29 +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
-    #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
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

ibzdst-util/src/main/java/cn/ibizlab/util/dict/StaticDict.java

@@ -2361,7 +2361,9 @@ public class StaticDict {
         MATCHES("MATCHES","MATCHES"),
         NOTMATCHES("NOTMATCHES","NOT MATCHES"),
         INC2S("INC2S","INC2S"),
-        NOTINC2S("NOTINC2S","NOTINC2S");
+        NOTINC2S("NOTINC2S","NOTINC2S"),
+        EQARRAY("EQARRAY","数组内容相同"),
+        NOTEQARRAY("NOTEQARRAY","数组内容不同");
 
         private String value;
         private String text;