项目初始化

datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/dao/GenTableDao.java

@@ -2,7 +2,13 @@ package cn.datax.service.codegen.dao;
 
 import cn.datax.common.base.BaseDao;
 import cn.datax.service.codegen.api.entity.GenTableEntity;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
 
 /**
  * <p>
@@ -15,4 +21,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface GenTableDao extends BaseDao<GenTableEntity> {
 
+    @Override
+    GenTableEntity selectById(Serializable id);
+
+    @Override
+    <E extends IPage<GenTableEntity>> E selectPage(E page, @Param(Constants.WRAPPER) Wrapper<GenTableEntity> queryWrapper);
 }

datax-modules/codegen-service-parent/codegen-service/src/main/java/cn/datax/service/codegen/utils/Generate.java

@@ -18,11 +18,11 @@ import java.util.Map;
 
 public class Generate {
 
-    public static void main(String[] args) {
-//        DefaultIdentifierGenerator generator = new DefaultIdentifierGenerator();
-//        System.out.println(generator.nextId(null));
-        generateByTables("F://code", "standard", "cn.datax.service.data", "standard_", new String[]{"standard_dict", "standard_type"});
-    }
+//    public static void main(String[] args) {
+////        DefaultIdentifierGenerator generator = new DefaultIdentifierGenerator();
+////        System.out.println(generator.nextId(null));
+//        generateByTables("F://code", "masterdata", "cn.datax.service.data", "masterdata_", new String[]{"masterdata_model", "masterdata_model_column"});
+//    }
 
     /**
      * 根据表自动生成

datax-modules/codegen-service-parent/codegen-service/src/main/resources/mapper/GenTableMapper.xml

@@ -19,6 +19,9 @@
         <result column="business_name" property="businessName" />
         <result column="function_name" property="functionName" />
         <result column="function_author" property="functionAuthor" />
+    </resultMap>
+
+    <resultMap id="ExtendResultMap" type="cn.datax.service.codegen.api.entity.GenTableEntity" extends="BaseResultMap">
         <result column="column_json" property="columns" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
     </resultMap>
 
@@ -30,7 +33,31 @@
         create_time,
         update_by,
         update_time,
+        remark, table_name, table_comment, class_name, package_name, module_name, business_name, function_name, function_author
+    </sql>
+
+    <sql id="Extend_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
         remark, table_name, table_comment, class_name, package_name, module_name, business_name, function_name, function_author, column_json
     </sql>
 
+    <select id="selectById" resultMap="ExtendResultMap">
+        SELECT
+        <include refid="Extend_Column_List"></include>
+        FROM gen_table
+        WHERE 1=1 AND id = #{id}
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM gen_table
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>

datax-modules/data-market-service-parent/data-market-service-integration/src/main/java/cn/datax/service/data/market/integration/dao/ServiceIntegrationDao.java

@@ -2,7 +2,13 @@ package cn.datax.service.data.market.integration.dao;
 
 import cn.datax.common.base.BaseDao;
 import cn.datax.service.data.market.api.entity.ServiceIntegrationEntity;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
 
 /**
  * <p>
@@ -15,4 +21,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ServiceIntegrationDao extends BaseDao<ServiceIntegrationEntity> {
 
+    @Override
+    ServiceIntegrationEntity selectById(Serializable id);
+
+    @Override
+    <E extends IPage<ServiceIntegrationEntity>> E selectPage(E page, @Param(Constants.WRAPPER) Wrapper<ServiceIntegrationEntity> queryWrapper);
 }

datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/mapper/ServiceIntegrationMapper.xml

@@ -32,7 +32,32 @@
         update_by,
         update_time,
         remark,
+        create_dept, service_no, service_name, service_type
+    </sql>
+
+    <sql id="Extend_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        remark,
         create_dept, service_no, service_name, service_type, httpservice_json, webservice_json
     </sql>
 
+    <select id="selectById" resultMap="ExtendResultMap">
+        SELECT
+        <include refid="Extend_Column_List"></include>
+        FROM market_service_integration
+        WHERE 1=1 AND id = #{id}
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM market_service_integration
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>

datax-modules/data-market-service-parent/data-market-service/src/main/resources/mapper/ApiMaskMapper.xml

@@ -29,12 +29,23 @@
         create_dept,
         update_by,
         update_time,
+        api_id, mask_name, remark
+    </sql>
+
+    <sql id="Extend_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        create_dept,
+        update_by,
+        update_time,
         api_id, mask_name, remark, config_json
     </sql>
 
     <select id="selectById" resultMap="ExtendResultMap">
         SELECT
-        <include refid="Base_Column_List"></include>
+        <include refid="Extend_Column_List"></include>
         FROM market_api_mask
         WHERE 1=1 AND id = #{id}
     </select>

datax-modules/data-market-service-parent/data-market-service/src/main/resources/mapper/DataApiMapper.xml

@@ -36,11 +36,23 @@
         create_dept,
         update_by,
         update_time,
+        api_name, api_version, api_url, remark, req_method, res_type, deny
+    </sql>
+
+    <sql id="Extend_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        create_dept,
+        update_by,
+        update_time,
         api_name, api_version, api_url, remark, req_method, res_type, deny, limit_json, config_json, req_json, res_json
     </sql>
+
     <select id="selectById" resultMap="ExtendResultMap">
         SELECT
-        <include refid="Base_Column_List"></include>
+        <include refid="Extend_Column_List"></include>
         FROM market_api
         WHERE 1=1 AND id = #{id}
     </select>

datax-modules/data-masterdata-service-parent/data-masterdata-service-api/src/main/java/cn/datax/service/data/masterdata/api/dto/ModelColumnDto.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+
 /**
  * <p>
  * 主数据模型列信息表 实体DTO

datax-modules/data-metadata-service-parent/data-metadata-service-api/src/main/java/cn/datax/service/data/metadata/api/entity/MetadataSourceEntity.java

@@ -36,13 +36,13 @@ public class MetadataSourceEntity extends DataScopeBaseEntity {
     private String sourceName;
 
     /**
-     * 数据源连接信息
+     * 元数据同步1是0否
      */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private DbSchema dbSchema;
+    private Integer sourceSync;
 
     /**
-     * 元数据同步1是0否
+     * 数据源连接信息
      */
-    private Integer sourceSync;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private DbSchema dbSchema;
 }

datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/controller/MetadataColumnController.java

@@ -160,8 +160,8 @@ public class MetadataColumnController extends BaseController {
             @ApiImplicitParam(name = "metadataColumnQuery", value = "查询实体metadataColumnQuery", required = false, dataType = "MetadataColumnQuery")
     })
     @GetMapping("/tree/{level}")
-    public R getDataMetadataTree(@PathVariable String level, MetadataColumnQuery metadataColumnQuery) {
-        List<MetadataTreeVo> list = metadataColumnService.getDataMetadataTree(level, metadataColumnQuery);
+    public R getDataMetadataTree(@PathVariable String level) {
+        List<MetadataTreeVo> list = metadataColumnService.getDataMetadataTree(level);
         return R.ok().setData(list);
     }
 }

datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/dao/MetadataSourceDao.java

@@ -2,7 +2,14 @@ package cn.datax.service.data.metadata.dao;
 
 import cn.datax.common.base.BaseDao;
 import cn.datax.service.data.metadata.api.entity.MetadataSourceEntity;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +22,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface MetadataSourceDao extends BaseDao<MetadataSourceEntity> {
 
+    @Override
+    MetadataSourceEntity selectById(Serializable id);
+
+    @Override
+    List<MetadataSourceEntity> selectList(@Param(Constants.WRAPPER) Wrapper<MetadataSourceEntity> queryWrapper);
+
+    @Override
+    <E extends IPage<MetadataSourceEntity>> E selectPage(E page, @Param(Constants.WRAPPER) Wrapper<MetadataSourceEntity> queryWrapper);
 }

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

@@ -3,7 +3,6 @@ package cn.datax.service.data.metadata.service;
 import cn.datax.service.data.metadata.api.dto.MetadataColumnDto;
 import cn.datax.common.base.BaseService;
 import cn.datax.service.data.metadata.api.entity.MetadataColumnEntity;
-import cn.datax.service.data.metadata.api.query.MetadataColumnQuery;
 import cn.datax.service.data.metadata.api.vo.MetadataTreeVo;
 
 import java.util.List;
@@ -28,5 +27,5 @@ public interface MetadataColumnService extends BaseService<MetadataColumnEntity>
 
     void deleteMetadataColumnBatch(List<String> ids);
 
-    List<MetadataTreeVo> getDataMetadataTree(String level, MetadataColumnQuery metadataColumnQuery);
+    List<MetadataTreeVo> getDataMetadataTree(String level);
 }

datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/service/impl/MetadataColumnServiceImpl.java

 package cn.datax.service.data.metadata.service.impl;
 
 import cn.datax.common.core.DataConstant;
+import cn.datax.common.core.RedisConstant;
+import cn.datax.common.redis.service.RedisService;
 import cn.datax.service.data.metadata.api.dto.MetadataColumnDto;
 import cn.datax.service.data.metadata.api.entity.MetadataColumnEntity;
 import cn.datax.service.data.metadata.api.entity.MetadataSourceEntity;
 import cn.datax.service.data.metadata.api.entity.MetadataTableEntity;
 import cn.datax.service.data.metadata.api.enums.DataLevel;
-import cn.datax.service.data.metadata.api.query.MetadataColumnQuery;
 import cn.datax.service.data.metadata.api.vo.MetadataTreeVo;
-import cn.datax.service.data.metadata.dao.MetadataSourceDao;
-import cn.datax.service.data.metadata.dao.MetadataTableDao;
 import cn.datax.service.data.metadata.service.MetadataColumnService;
 import cn.datax.service.data.metadata.mapstruct.MetadataColumnMapper;
 import cn.datax.service.data.metadata.dao.MetadataColumnDao;
 import cn.datax.common.base.BaseServiceImpl;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -38,17 +37,14 @@ import java.util.stream.Collectors;
 public class MetadataColumnServiceImpl extends BaseServiceImpl<MetadataColumnDao, MetadataColumnEntity> implements MetadataColumnService {
 
     @Autowired
-    private MetadataSourceDao metadataSourceDao;
-
-    @Autowired
-    private MetadataTableDao metadataTableDao;
-
-    @Autowired
     private MetadataColumnDao metadataColumnDao;
 
     @Autowired
     private MetadataColumnMapper metadataColumnMapper;
 
+    @Autowired
+    private RedisService redisService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public MetadataColumnEntity saveMetadataColumn(MetadataColumnDto metadataColumnDto) {
@@ -84,43 +80,41 @@ public class MetadataColumnServiceImpl extends BaseServiceImpl<MetadataColumnDao
     }
 
     @Override
-    public List<MetadataTreeVo> getDataMetadataTree(String level, MetadataColumnQuery metadataColumnQuery) {
-        List<MetadataSourceEntity> sourceList = metadataSourceDao.selectList(Wrappers.<MetadataSourceEntity>lambdaQuery()
-                .eq(StrUtil.isNotBlank(metadataColumnQuery.getSourceId()), MetadataSourceEntity::getId, metadataColumnQuery.getSourceId()));
-        List<MetadataTableEntity> tableList = metadataTableDao.selectList(Wrappers.<MetadataTableEntity>lambdaQuery()
-                .eq(StrUtil.isNotBlank(metadataColumnQuery.getTableId()), MetadataTableEntity::getId, metadataColumnQuery.getTableId()));
-        List<MetadataColumnEntity> columnList = metadataColumnDao.selectList(Wrappers.emptyWrapper());
-        List<MetadataTreeVo> list = sourceList.stream().filter(s -> DataConstant.EnableState.ENABLE.getKey().equals(s.getStatus()))
+    public List<MetadataTreeVo> getDataMetadataTree(String level) {
+        List<MetadataSourceEntity> sourceList = (List<MetadataSourceEntity>) redisService.get(RedisConstant.METADATA_SOURCE_KEY);
+        List<MetadataTreeVo> list = Optional.ofNullable(sourceList).orElseGet(ArrayList::new).stream().filter(s -> DataConstant.EnableState.ENABLE.getKey().equals(s.getStatus()))
                 .map(m -> {
                     MetadataTreeVo tree = new MetadataTreeVo();
                     tree.setId(m.getId());
                     tree.setType(DataLevel.DATABASE.getKey());
                     tree.setLabel(m.getSourceName());
                     if (DataLevel.getLevel(level).getLevel() >= DataLevel.TABLE.getLevel()) {
-                        tree.setChildren(getTableChildrens(m.getId(), level, tableList, columnList));
+                        tree.setChildren(getTableChildrens(m.getId(), level));
                     }
                     return tree;
                 }).collect(Collectors.toList());
         return list;
     }
 
-    private List<MetadataTreeVo> getTableChildrens(String id, String level, List<MetadataTableEntity> tableList, List<MetadataColumnEntity> columnList) {
-        List<MetadataTreeVo> children = tableList.stream().filter(m -> Objects.equals(id, m.getSourceId()))
+    private List<MetadataTreeVo> getTableChildrens(String id, String level) {
+        List<MetadataTableEntity> tableList = (List<MetadataTableEntity>) redisService.hget(RedisConstant.METADATA_TABLE_KEY, id);
+        List<MetadataTreeVo> children = Optional.ofNullable(tableList).orElseGet(ArrayList::new).stream()
                 .map(m -> {
                     MetadataTreeVo tree = new MetadataTreeVo();
                     tree.setId(m.getId());
                     tree.setType(DataLevel.TABLE.getKey());
                     tree.setLabel(StrUtil.isBlank(m.getTableComment()) ? m.getTableName() : m.getTableComment());
                     if (DataLevel.getLevel(level).getLevel() >= DataLevel.COLUMN.getLevel()) {
-                        tree.setChildren(getColumnChildrens(m.getId(), columnList));
+                        tree.setChildren(getColumnChildrens(m.getId()));
                     }
                     return tree;
                 }).collect(Collectors.toList());
         return children;
     }
 
-    private List<MetadataTreeVo> getColumnChildrens(String id, List<MetadataColumnEntity> columnList) {
-        List<MetadataTreeVo> children = columnList.stream().filter(m -> Objects.equals(id, m.getTableId()))
+    private List<MetadataTreeVo> getColumnChildrens(String id) {
+        List<MetadataColumnEntity> columnList = (List<MetadataColumnEntity>) redisService.hget(RedisConstant.METADATA_COLUMN_KEY, id);
+        List<MetadataTreeVo> children = Optional.ofNullable(columnList).orElseGet(ArrayList::new).stream()
                 .map(m -> {
                     MetadataTreeVo tree = new MetadataTreeVo();
                     tree.setId(m.getId());

datax-modules/data-metadata-service-parent/data-metadata-service/src/main/resources/mapper/MetadataSourceMapper.xml

@@ -15,6 +15,9 @@
         <result column="db_type" property="dbType" />
         <result column="source_name" property="sourceName" />
         <result column="source_sync" property="sourceSync" />
+    </resultMap>
+
+    <resultMap id="ExtendResultMap" type="cn.datax.service.data.metadata.api.entity.MetadataSourceEntity" extends="BaseResultMap">
         <result column="db_schema" property="dbSchema" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
     </resultMap>
 
@@ -28,7 +31,40 @@
         update_by,
         update_time,
         remark,
+        db_type, source_name, source_sync
+    </sql>
+
+    <sql id="Extend_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        create_dept,
+        update_by,
+        update_time,
+        remark,
         db_type, source_name, source_sync, db_schema
     </sql>
 
+    <select id="selectById" resultMap="ExtendResultMap">
+        SELECT
+        <include refid="Extend_Column_List"></include>
+        FROM metadata_source
+        WHERE 1=1 AND id = #{id}
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM metadata_source
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM metadata_source
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>

datax-modules/data-visual-service-parent/data-visual-service/src/main/java/cn/datax/service/data/visual/dao/DataSetDao.java

@@ -2,7 +2,14 @@ package cn.datax.service.data.visual.dao;
 
 import cn.datax.common.base.BaseDao;
 import cn.datax.service.data.visual.api.entity.DataSetEntity;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +22,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface DataSetDao extends BaseDao<DataSetEntity> {
 
+    @Override
+    DataSetEntity selectById(Serializable id);
+
+    @Override
+    List<DataSetEntity> selectList(@Param(Constants.WRAPPER) Wrapper<DataSetEntity> queryWrapper);
+
+    @Override
+    <E extends IPage<DataSetEntity>> E selectPage(E page, @Param(Constants.WRAPPER) Wrapper<DataSetEntity> queryWrapper);
 }

datax-modules/data-visual-service-parent/data-visual-service/src/main/resources/mapper/DataSetDao.xml → datax-modules/data-visual-service-parent/data-visual-service/src/main/resources/mapper/DataSetMapper.xml

@@ -15,6 +15,9 @@
         <result column="source_id" property="sourceId" />
         <result column="set_name" property="setName" />
         <result column="set_sql" property="setSql" />
+    </resultMap>
+
+    <resultMap id="ExtendResultMap" type="cn.datax.service.data.visual.api.entity.DataSetEntity" extends="BaseResultMap">
         <result column="schema_json" property="schemaConfig" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
     </resultMap>
 
@@ -28,7 +31,40 @@
         update_by,
         update_time,
         remark,
+        source_id, set_name, set_sql
+    </sql>
+
+    <sql id="Extend_Column_List">
+        id,
+        status,
+        create_by,
+        create_time,
+        create_dept,
+        update_by,
+        update_time,
+        remark,
         source_id, set_name, set_sql, schema_json
     </sql>
 
+    <select id="selectById" resultMap="ExtendResultMap">
+        SELECT
+        <include refid="Extend_Column_List"></include>
+        FROM visual_data_set
+        WHERE 1=1 AND id = #{id}
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM visual_data_set
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM visual_data_set
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>

datax-ui/src/api/metadata/datacolumn.js

@@ -53,10 +53,9 @@ export function updateDataColumn (data) {
   })
 }
 
-export function getDataMetadataTree (level, data) {
+export function getDataMetadataTree (level) {
   return request({
     url: '/data/metadata/columns/tree/' + level,
-    method: 'get',
-    params: data
+    method: 'get'
   })
 }

datax-ui/src/views/market/dataservice/DataServiceAdd.vue

@@ -25,16 +25,16 @@
           </el-form-item>
           <template v-if="form.serviceType === '1'">
             <el-form-item label="服务请求地址" prop="serviceUrl">
-              <el-input v-model="form.serviceUrl" placeholder="请输入服务请求地址" />
+              <el-input v-model="form.httpService.url" placeholder="请输入服务请求地址" />
             </el-form-item>
             <el-form-item label="服务请求头" prop="serviceHeader">
-              <el-input v-model="form.serviceHeader" placeholder="请输入服务请求头，如{key:val}格式" />
+              <el-input v-model="form.httpService.header" placeholder="请输入服务请求头，如{key:val}格式" />
             </el-form-item>
             <el-form-item label="服务请求参数" prop="serviceParam">
-              <el-input v-model="form.serviceParam" placeholder="请输入服务请求参数，如{key:val}格式" />
+              <el-input v-model="form.httpService.param" placeholder="请输入服务请求参数，如{key:val}格式" />
             </el-form-item>
             <el-form-item label="服务请求方式" prop="serviceHttpMethod">
-              <el-select v-model="form.serviceHttpMethod" placeholder="请选择请求方式">
+              <el-select v-model="form.httpService.httpMethod" placeholder="请选择请求方式">
                 <el-option
                   v-for="dict in httpMethodOptions"
                   :key="dict.id"
@@ -46,16 +46,16 @@
           </template>
           <template v-if="form.serviceType === '2'">
             <el-form-item label="服务wsdl地址" prop="serviceWsdl">
-              <el-input v-model="form.serviceWsdl" placeholder="请输入服务wsdl地址" />
+              <el-input v-model="form.webService.wsdl" placeholder="请输入服务wsdl地址" />
             </el-form-item>
             <el-form-item label="服务命名空间" prop="serviceTargetNamespace">
-              <el-input v-model="form.serviceTargetNamespace" placeholder="请输入服务命名空间" />
+              <el-input v-model="form.webService.targetNamespace" placeholder="请输入服务命名空间" />
             </el-form-item>
             <el-form-item label="服务方法" prop="serviceMethod">
-              <el-input v-model="form.serviceMethod" placeholder="请输入服务方法" />
+              <el-input v-model="form.webService.method" placeholder="请输入服务方法" />
             </el-form-item>
             <el-form-item label="服务请求报文" prop="serviceSoap">
-              <el-input v-model="form.serviceSoap" type="textarea" placeholder="请输入服务请求报文" />
+              <el-input v-model="form.webService.soap" type="textarea" placeholder="请输入服务请求报文" />
             </el-form-item>
           </template>
           <el-form-item label="状态" prop="status">
@@ -113,7 +113,9 @@ export default {
       // 表单参数
       form: {
         serviceType: '1',
-        status: '1'
+        status: '1',
+        httpService: {},
+        webService: {}
       },
       // 表单校验
       rules: {

datax-ui/src/views/market/dataservice/DataServiceDetail.vue

@@ -9,13 +9,13 @@
       </div>
       <div :style="classCardbody">
         <el-form ref="form" :model="form" label-width="80px" disabled>
-          <el-form-item label="服务名称" prop="serviceName">
+          <el-form-item label="服务名称">
             <el-input v-model="form.serviceName" placeholder="请输入服务名称" />
           </el-form-item>
-          <el-form-item label="服务编号" prop="serviceNo">
+          <el-form-item label="服务编号">
             <el-input v-model="form.serviceNo" />
           </el-form-item>
-          <el-form-item label="服务类型" prop="serviceType">
+          <el-form-item label="服务类型">
             <el-select v-model="form.serviceType">
               <el-option
                 v-for="item in serviceTypeOptions"
@@ -26,17 +26,17 @@
             </el-select>
           </el-form-item>
           <template v-if="form.serviceType === '1'">
-            <el-form-item label="服务请求地址" prop="serviceUrl">
-              <el-input v-model="form.serviceUrl" placeholder="请输入服务请求地址" />
+            <el-form-item label="服务请求地址">
+              <el-input v-model="form.httpService.url" placeholder="请输入服务请求地址" />
             </el-form-item>
-            <el-form-item label="服务请求头" prop="serviceHeader">
-              <el-input v-model="form.serviceHeader" placeholder="请输入服务请求头" />
+            <el-form-item label="服务请求头">
+              <el-input v-model="form.httpService.header" placeholder="请输入服务请求头，如{key:val}格式" />
             </el-form-item>
-            <el-form-item label="服务请求参数" prop="serviceParam">
-              <el-input v-model="form.serviceParam" placeholder="请输入服务请求参数" />
+            <el-form-item label="服务请求参数">
+              <el-input v-model="form.httpService.param" placeholder="请输入服务请求参数，如{key:val}格式" />
             </el-form-item>
-            <el-form-item label="服务请求方式" prop="serviceHttpMethod">
-              <el-select v-model="form.serviceHttpMethod" placeholder="请选择请求方式">
+            <el-form-item label="服务请求方式">
+              <el-select v-model="form.httpService.httpMethod" placeholder="请选择请求方式">
                 <el-option
                   v-for="dict in httpMethodOptions"
                   :key="dict.id"
@@ -47,17 +47,17 @@
             </el-form-item>
           </template>
           <template v-if="form.serviceType === '2'">
-            <el-form-item label="服务wsdl地址" prop="serviceWsdl">
-              <el-input v-model="form.serviceWsdl" placeholder="请输入服务wsdl地址" />
+            <el-form-item label="服务wsdl地址">
+              <el-input v-model="form.webService.wsdl" placeholder="请输入服务wsdl地址" />
             </el-form-item>
-            <el-form-item label="服务命名空间" prop="serviceTargetNamespace">
-              <el-input v-model="form.serviceTargetNamespace" placeholder="请输入服务命名空间" />
+            <el-form-item label="服务命名空间">
+              <el-input v-model="form.webService.targetNamespace" placeholder="请输入服务命名空间" />
             </el-form-item>
-            <el-form-item label="服务方法" prop="serviceMethod">
-              <el-input v-model="form.serviceMethod" placeholder="请输入服务方法" />
+            <el-form-item label="服务方法">
+              <el-input v-model="form.webService.method" placeholder="请输入服务方法" />
             </el-form-item>
-            <el-form-item label="服务请求报文" prop="serviceSoap">
-              <el-input v-model="form.serviceSoap" type="textarea" placeholder="请输入服务请求报文" />
+            <el-form-item label="服务请求报文">
+              <el-input v-model="form.webService.soap" type="textarea" placeholder="请输入服务请求报文" />
             </el-form-item>
           </template>
           <el-form-item label="状态" prop="status">

datax-ui/src/views/market/dataservice/DataServiceEdit.vue

@@ -28,16 +28,16 @@
           </el-form-item>
           <template v-if="form.serviceType === '1'">
             <el-form-item label="服务请求地址" prop="serviceUrl">
-              <el-input v-model="form.serviceUrl" placeholder="请输入服务请求地址" />
+              <el-input v-model="form.httpService.url" placeholder="请输入服务请求地址" />
             </el-form-item>
             <el-form-item label="服务请求头" prop="serviceHeader">
-              <el-input v-model="form.serviceHeader" placeholder="请输入服务请求头" />
+              <el-input v-model="form.httpService.header" placeholder="请输入服务请求头，如{key:val}格式" />
             </el-form-item>
             <el-form-item label="服务请求参数" prop="serviceParam">
-              <el-input v-model="form.serviceParam" placeholder="请输入服务请求参数" />
+              <el-input v-model="form.httpService.param" placeholder="请输入服务请求参数，如{key:val}格式" />
             </el-form-item>
             <el-form-item label="服务请求方式" prop="serviceHttpMethod">
-              <el-select v-model="form.serviceHttpMethod" placeholder="请选择请求方式">
+              <el-select v-model="form.httpService.httpMethod" placeholder="请选择请求方式">
                 <el-option
                   v-for="dict in httpMethodOptions"
                   :key="dict.id"
@@ -49,16 +49,16 @@
           </template>
           <template v-if="form.serviceType === '2'">
             <el-form-item label="服务wsdl地址" prop="serviceWsdl">
-              <el-input v-model="form.serviceWsdl" placeholder="请输入服务wsdl地址" />
+              <el-input v-model="form.webService.wsdl" placeholder="请输入服务wsdl地址" />
             </el-form-item>
             <el-form-item label="服务命名空间" prop="serviceTargetNamespace">
-              <el-input v-model="form.serviceTargetNamespace" placeholder="请输入服务命名空间" />
+              <el-input v-model="form.webService.targetNamespace" placeholder="请输入服务命名空间" />
             </el-form-item>
             <el-form-item label="服务方法" prop="serviceMethod">
-              <el-input v-model="form.serviceMethod" placeholder="请输入服务方法" />
+              <el-input v-model="form.webService.method" placeholder="请输入服务方法" />
             </el-form-item>
             <el-form-item label="服务请求报文" prop="serviceSoap">
-              <el-input v-model="form.serviceSoap" type="textarea" placeholder="请输入服务请求报文" />
+              <el-input v-model="form.webService.soap" type="textarea" placeholder="请输入服务请求报文" />
             </el-form-item>
           </template>
           <el-form-item label="状态" prop="status">

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

 <template>
   <div>
-    <el-card class="box-card" shadow="always">
-      <el-row :gutter="20">
-        <el-col :span="4">
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <el-card class="box-card tree-wrapper" shadow="always">
           <el-tree
             :data="treeOptions"
             ref="tree"
@@ -14,8 +14,10 @@
             @node-click="handleNodeClick"
             :render-content="renderContent"
           ></el-tree>
-        </el-col>
-        <el-col :span="20" style="border-left: 2px solid #aaa;">
+        </el-card>
+      </el-col>
+      <el-col :span="18">
+        <el-card class="box-card" shadow="always">
           <el-form :model="queryParams" ref="queryForm" :inline="true">
             <el-form-item label="字段名称" prop="columnName">
               <el-input
@@ -139,9 +141,9 @@
             :page-size.sync="queryParams.pageSize"
             :total="total"
           ></el-pagination>
-        </el-col>
-      </el-row>
-    </el-card>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -224,7 +226,7 @@ export default {
     },
     /** 查询树结构 */
     getTree () {
-      getDataMetadataTree('table', {}).then(response => {
+      getDataMetadataTree('table').then(response => {
         if (response.success) {
           const { data } = response
           this.treeOptions = data
@@ -332,12 +334,22 @@ export default {
   float: right;
 }
 
-::v-deep .custom-tree-node {
-  flex: 1;
-  display: flex;
-  font-size: 14px;
-  .icon {
-    margin-right: 5px;
+.tree-wrapper {
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 450px;
+  .el-tree {
+    min-width: 100%;
+    font-size: 14px;
+    display: inline-block;
+    ::v-deep .custom-tree-node {
+      flex: 1;
+      display: flex;
+      font-size: 14px;
+      .icon {
+        margin-right: 5px;
+      }
+    }
   }
 }
 </style>

datax-ui/src/views/metadata/datamap/index.vue

@@ -27,7 +27,7 @@
             <el-button type="primary" :disabled="btnEnable" @click="onSubmit">查询</el-button>
           </el-form-item>
         </el-form>
-        <div class="line"></div>
+        <el-divider></el-divider>
         <div id="chart" :style="{width: '100%', height: '85%'}"></div>
       </div>
     </el-card>
@@ -46,7 +46,7 @@ export default {
     return {
       classCardbody: {
         overflow: 'auto',
-        height: document.body.offsetHeight - 170 + 'px'
+        height: document.body.offsetHeight - 150 + 'px'
       },
       searchForm: {
         sourceId: '',
@@ -455,8 +455,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.line {
-  height: 1px;
-  background-color: #e0e6ed;
+::v-deep .el-divider {
+  margin: 0;
 }
 </style>

datax-ui/src/views/metadata/datasearch/index.vue

@@ -15,7 +15,7 @@
               </el-input>
             </el-col>
           </el-row>
-          <div class="line"></div>
+          <el-divider></el-divider>
           <el-row>
             <el-col :span="24">
               <source-pane v-if="type === '1'" :data="dataList"></source-pane>
@@ -66,7 +66,7 @@ export default {
     return {
       classCardbody: {
         overflow: 'auto',
-        height: document.body.offsetHeight - 170 + 'px'
+        height: document.body.offsetHeight - 150 + 'px'
       },
       searchExecuting: false,
       type: '',
@@ -162,9 +162,7 @@ export default {
   }
 }
 
-.line {
-  height: 1px;
-  background-color: #e0e6ed;
-  margin: 10px 0;
+::v-deep .el-divider {
+  margin: 0;
 }
 </style>

datax-ui/src/views/metadata/sqlconsole/index.vue

@@ -89,7 +89,7 @@ export default {
     return {
       classCardbody: {
         overflow: 'auto',
-        height: document.body.offsetHeight - 170 + 'px'
+        height: document.body.offsetHeight - 160 + 'px'
       },
       // 数据源数据字典
       sourceOptions: [],

datax-ui/src/views/system/user/UserList.vue

 <template>
   <div>
-    <el-card class="box-card" shadow="always">
-      <el-row :gutter="20">
-        <el-col :span="4">
+    <el-row :gutter="20">
+      <el-col :span="4">
+        <el-card class="box-card tree-wrapper" shadow="always">
           <el-tree
             ref="dept"
             :data="deptOptions"
@@ -12,8 +12,10 @@
             :props="defaultProps"
             @node-click="handleNodeClick"
           />
-        </el-col>
-        <el-col :span="20" style="border-left: 2px solid #aaa;">
+        </el-card>
+      </el-col>
+      <el-col :span="20">
+        <el-card class="box-card" shadow="always">
           <el-form ref="queryForm" :model="queryParams" :inline="true">
             <el-form-item label="用户名称" prop="username">
               <el-input
@@ -193,9 +195,9 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
           />
-        </el-col>
-      </el-row>
-    </el-card>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -444,4 +446,15 @@ export default {
 .right-toolbar {
   float: right;
 }
+
+.tree-wrapper {
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 450px;
+  .el-tree {
+    min-width: 100%;
+    font-size: 14px;
+    display: inline-block;
+  }
+}
 </style>