项目初始化

datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-modules/data-market-service-parent/data-market-service-api-mapping/src/main/java/cn/datax/service/data/market/api/mapping/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-modules/data-market-service-parent/data-market-service/src/main/java/cn/datax/service/data/market/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-modules/data-metadata-service-parent/data-metadata-service-console/src/main/java/cn/datax/service/data/metadata/console/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-modules/email-service-parent/email-service/src/main/java/cn/datax/service/email/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-modules/file-service-parent/file-service/src/main/java/cn/datax/service/file/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-modules/quartz-service-parent/quartz-service/src/main/java/cn/datax/service/quartz/config/SchedulerConfig.java

@@ -4,9 +4,15 @@ import cn.datax.service.quartz.quartz.utils.ScheduleUtil;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import lombok.AllArgsConstructor;
 import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.spi.TriggerFiredBundle;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.boot.autoconfigure.quartz.QuartzDataSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.quartz.AdaptableJobFactory;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
+import org.springframework.stereotype.Component;
 
 import javax.sql.DataSource;
 
@@ -26,9 +32,53 @@ public class SchedulerConfig {
         return factory;
     }
 
+//    /**
+//     * 该类主要是为了把 job 对象的注入到 spring 中
+//     */
+//    @Component("quartzJobFactory")
+//    public static class QuartzJobFactory extends AdaptableJobFactory {
+//        //这个对象可以通过 ApplicationContext.getAutowireCapableBeanFactory()获取
+//        private final AutowireCapableBeanFactory capableBeanFactory;
+//
+//        public QuartzJobFactory(AutowireCapableBeanFactory capableBeanFactory) {
+//            this.capableBeanFactory = capableBeanFactory;
+//        }
+//        /**
+//         * Job 对象的实例化过程是在Quartz中进行的，通过重写此方法 把job 实例注入到spring容器中
+//         */
+//        @Override
+//        protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
+//            //调用父类的方法
+//            Object jobInstance = super.createJobInstance(bundle);
+//            //注入到spring容器
+//            capableBeanFactory.autowireBean(jobInstance);
+//            return jobInstance;
+//        }
+//    }
+
+//    /**
+//     * 注入scheduler到spring
+//     * @param quartzJobFactory
+//     * @return Scheduler
+//     * @throws Exception
+//     */
+//    @Bean(name = "scheduler")
+//    public Scheduler scheduler(QuartzJobFactory quartzJobFactory) throws Exception {
+//        SchedulerFactoryBean factoryBean = new SchedulerFactoryBean();
+//        factoryBean.setJobFactory(quartzJobFactory);
+//        factoryBean.setDataSource(quartzDataSource());
+//        factoryBean.afterPropertiesSet();
+//        Scheduler scheduler = factoryBean.getScheduler();
+//        scheduler.start();
+//        // 设置ScheduleUtil的定时处理对象
+//        ScheduleUtil.setScheduler(scheduler);
+//        return scheduler;
+//    }
+
     @Bean(name = "scheduler")
-    public Scheduler scheduler() {
+    public Scheduler scheduler() throws SchedulerException {
         Scheduler scheduler = schedulerFactoryBean().getScheduler();
+        scheduler.start();
         // 设置ScheduleUtil的定时处理对象
         ScheduleUtil.setScheduler(scheduler);
         return scheduler;

datax-modules/quartz-service-parent/quartz-service/src/main/java/cn/datax/service/quartz/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-modules/system-service-parent/system-service/src/main/java/cn/datax/service/system/config/SwaggerProperties.java

@@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(ignoreUnknownFields = false, prefix = "swagger")
 public class SwaggerProperties {
 
+    private Boolean enable;
     private String title;
     private String description;
     private String version;
@@ -12,6 +13,14 @@ public class SwaggerProperties {
     private String basePackage;
     private Contact contact;
 
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public String getTitle() {
         return title;
     }

datax-ui/src/views/metadata/changerecord/ChangeRecordAdd.vue

@@ -4,7 +4,7 @@
             <div slot="header" class="clearfix">
               <span>{{ title }}</span>
               <el-button-group style="float: right;">
-                <el-button size="mini" icon="el-icon-plus" v-if="active == 2" round @click="submitForm" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled">{{loadingOptions.loadingText}}</el-button>
+                <el-button size="mini" icon="el-icon-plus" round @click="submitForm" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled">{{loadingOptions.loadingText}}</el-button>
                 <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
               </el-button-group>
             </div>

datax-ui/src/views/metadata/changerecord/ChangeRecordEdit.vue

@@ -4,7 +4,7 @@
           <div slot="header" class="clearfix">
             <span>{{ title }}</span>
             <el-button-group style="float: right;">
-              <el-button size="mini" icon="el-icon-plus" v-if="active == 2" round @click="submitForm" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled">{{loadingOptions.loadingText}}</el-button>
+              <el-button size="mini" icon="el-icon-plus" round @click="submitForm" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled">{{loadingOptions.loadingText}}</el-button>
               <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
             </el-button-group>
           </div>

datax-ui/src/views/metadata/datacolumn/DataColumnList.vue

 <template>
   <div>
-    <el-row :gutter="20">
-      <el-col :span="4">
-        <el-card class="box-card" shadow="always">
+    <el-card class="box-card" shadow="always">
+      <el-row :gutter="20">
+        <el-col :span="4">
           <el-tree
             :data="treeOptions"
             default-expand-all
@@ -12,10 +12,8 @@
             :props="defaultProps"
             @node-click="handleNodeClick"
           ></el-tree>
-        </el-card>
-      </el-col>
-      <el-col :span="20">
-        <el-card class="box-card" shadow="always">
+        </el-col>
+        <el-col :span="20">
           <el-form :model="queryParams" ref="queryForm" :inline="true">
             <el-form-item label="字段名称" prop="columnName">
               <el-input
@@ -139,9 +137,9 @@
             :page-size.sync="queryParams.pageSize"
             :total="total"
           ></el-pagination>
-        </el-card>
-      </el-col>
-    </el-row>
+        </el-col>
+      </el-row>
+    </el-card>
   </div>
 </template>
 
@@ -255,6 +253,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery () {
       this.$refs['queryForm'].resetFields()
+      this.queryParams.sourceId = ''
+      this.queryParams.tableId = ''
       this.handleQuery()
     },
     /** 刷新列表 */
@@ -289,8 +289,10 @@ export default {
     handleNodeClick (data) {
       if ('database' === data.type) {
         this.queryParams.sourceId = data.id
+        this.queryParams.tableId = ''
       } else if ('table' === data.type) {
         this.queryParams.tableId = data.id
+        this.queryParams.sourceId = ''
       }
       this.getList()
     },