<dev>

1.联调修改BUG<210929>

api-service-project/api-service-application/src/main/java/com/zorkdata/apiservice/application/application/ApiApplication.java

@@ -60,7 +60,7 @@ public interface ApiApplication {
      * @param apiDTO
      * @return
      */
-    Api addApi(ApiDTO apiDTO, String username);
+    Api addApi(ApiDTO apiDTO, String username, Integer userid);
 
     /**
      * 删除Api接口
@@ -123,7 +123,7 @@ public interface ApiApplication {
      * @param apiDTO
      * @return
      */
-    Api registApi(ApiDTO apiDTO, String username);
+    Api registApi(ApiDTO apiDTO, String username, Integer userid);
 
     /**
      * 查询我创建的Api
@@ -156,7 +156,7 @@ public interface ApiApplication {
      * @param sortType
      * @return
      */
-    InvokeResult listMyAuth(String username, Integer pageNo, Integer pageSize, String sortField, String sortType, Long startTime, Long endTime, String keyword);
+    InvokeResult listMyAuth(String username, Integer pageNo, Integer pageSize, String sortField, String sortType, Long startTime, Long endTime, String keyword, Integer userid);
 
     /**
      * 数据预览成功

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/assembler/ApiAssembler.java

 package com.zorkdata.apiservice.domain.assembler;
 
+import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
 import com.zorkdata.apiservice.domain.domain.Api;
+import com.zorkdata.apiservice.domain.domain.ApiAuth;
 import com.zorkdata.apiservice.domain.domain.ApiGroup;
-import com.zorkdata.apiservice.domain.dto.ApiDTO;
+import com.zorkdata.apiservice.domain.domain.ReturnParam;
+import com.zorkdata.apiservice.domain.dto.*;
+import com.zorkdata.apiservice.domain.listdto.WhiteListDTO;
 
+import javax.sql.DataSource;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @title: ApiAssembler
@@ -15,16 +22,18 @@ import java.util.Date;
  */
 public class ApiAssembler {
 
-    public static Api toApi(ApiDTO apiDTO,String username) {
+    public static Api toApi(ApiDTO apiDTO, String username, Integer userid) {
         Api api = new Api();
         if (0 == apiDTO.getId()) {
             api.setCreatedTime(new Date());
             api.setUpdatedTime(new Date());
             api.setCreatedBy(username);
             api.setUpdatedBy(username);
+            api.setUserId(userid);
         } else {
             api.setId(apiDTO.getId());
             api.setCreatedBy(username);
+            api.setUserId(userid);
             api.setUpdatedTime(new Date());
         }
         api.setPath(apiDTO.getPath());
@@ -55,4 +64,57 @@ public class ApiAssembler {
         api.setReturnParam(new Gson().toJson(apiDTO.getReturnParam()));
         return api;
     }
+
+    public static ApiDTO toApiDTO(Api api) {
+        ApiDTO apiDTO = new ApiDTO();
+
+        apiDTO.setPath(api.getPath());
+        apiDTO.setName(api.getName());
+        apiDTO.setDescription(api.getDescription());
+        apiDTO.setOvertime(api.getOvertime());
+        apiDTO.setSingleLimit(api.getSingleLimit());
+        apiDTO.setProtocol(api.getProtocol());
+        apiDTO.setRequestType(api.getRequestType());
+        apiDTO.setReturnType(api.getReturnType());
+        String whiteList = api.getWhiteList();
+        List<WhiteListDTO> requestParamDTOList = JSON.parseArray(whiteList, WhiteListDTO.class);
+
+        apiDTO.setWhiteList(requestParamDTOList);
+        apiDTO.setGroup(api.getGroup());
+
+        String dataSource = api.getDatasource();
+        DataSourceDTO dataSourceDTO = JSON.parseObject(dataSource, DataSourceDTO.class);
+        apiDTO.setDatasource(dataSourceDTO);
+
+        apiDTO.setPage(api.getPage());
+        apiDTO.setSourceHost(api.getSourceHost());
+        apiDTO.setSourcePath(api.getSourcePath());
+        apiDTO.setPageParam(api.getPageParam());
+        apiDTO.setQuerySql(api.getQuerySql());
+        apiDTO.setDataTable(api.getDataTable());
+        apiDTO.setRightCase(api.getRightCase());
+        apiDTO.setExcepitonCase(api.getExcepitonCase());
+        apiDTO.setStatus(api.getStatus());
+        apiDTO.setUserId(api.getUserId());
+        apiDTO.setSourceWay(api.getSourceWay());
+        apiDTO.setErrorCode(api.getErrorCode());
+
+
+        String constParams = api.getConstParams();
+        List<ConstParamDTO> constParamDTOS = JSON.parseArray(constParams, ConstParamDTO.class);
+        apiDTO.setConstParams(constParamDTOS);
+
+        String requestParam = api.getRequestParam();
+        List<RequestParamDTO> requestParamDTOS = JSON.parseArray(requestParam, RequestParamDTO.class);
+        apiDTO.setRequestParam(requestParamDTOS);
+
+        String returnParam = api.getReturnParam();
+        List<ReturnParamDTO> returnParamDTOS = JSON.parseArray(returnParam, ReturnParamDTO.class);
+        apiDTO.setReturnParam(returnParamDTOS);
+
+        apiDTO.setId(api.getId());
+        return apiDTO;
+    }
+
+
 }

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/domain/Api.java

@@ -210,7 +210,7 @@ public class Api extends AbstractEntity<Api, Integer, ApiRepository> {
     @Column(name = "return_param")
     private String returnParam;
 
-    @OneToMany(targetEntity = ApiAuth.class)
+    @OneToMany(targetEntity = ApiAuth.class, fetch = FetchType.LAZY)
     @JoinColumn(name = "api_id")
     private List<ApiAuth> apiAuthList;
 

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/dto/ApiDTO.java

@@ -2,8 +2,6 @@ package com.zorkdata.apiservice.domain.dto;
 
 import com.zorkdata.apiservice.domain.domain.ApiGroup;
 import com.zorkdata.apiservice.domain.domain.ConstParam;
-import com.zorkdata.apiservice.domain.listdto.DatasourceDTO;
-import com.zorkdata.apiservice.domain.listdto.GroupIdDTO;
 import com.zorkdata.apiservice.domain.listdto.WhiteListDTO;
 import lombok.Data;
 
@@ -66,7 +64,7 @@ public class ApiDTO {
     /**
      * 数据源
      */
-    private DatasourceDTO datasource;
+    private DataSourceDTO datasource;
     /**
      * 是否分页
      */
@@ -137,7 +135,7 @@ public class ApiDTO {
 
     private List<ReturnParamDTO> returnParam;
 
-    private List<ConstParam> constParams;
+    private List<ConstParamDTO> constParams;
 
 
 

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/dto/DataSourceDTO.java

 package com.zorkdata.apiservice.domain.dto;
 
+import com.zorkdata.apiservice.domain.listdto.JdbcConfigDTO;
 import lombok.Data;
 
 import java.util.Date;
@@ -38,7 +39,7 @@ public class DataSourceDTO {
     /**
      * 数据库连接配置
      */
-    private String jdbcConfig;
+    private JdbcConfigDTO jdbcConfig;
 
 
     private String ip;

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/listdto/DatasourceDTO.java

-package com.zorkdata.apiservice.domain.listdto;
-
-import lombok.Data;
-
-/**
- * @title: Datasource
- * @Author Linxinfeng
- * @Date: 2021-09-2021/9/9 009-22:54
- */
-@Data
-public class DatasourceDTO {
-    private Integer id;
-    private String name;
-    private String datasourceType;
-    private JdbcConfigDTO jdbcConfig;
-}

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/repository/ApiAuthRepository.java

@@ -51,6 +51,7 @@ public interface ApiAuthRepository extends JpaRepository<ApiAuth, Integer>, JpaS
      * @param apiId
      * @return
      */
-    ApiAuth findByApiId(Integer apiId);
+    @Query(value = "select user_id from api_auth where api_id= ?1", nativeQuery = true)
+    List<Integer> findByApiId(Integer apiId);
 
 }

api-service-project/api-service-domain/src/main/java/com/zorkdata/apiservice/domain/repository/ApiRepository.java

@@ -2,6 +2,7 @@ package com.zorkdata.apiservice.domain.repository;
 
 import com.zorkdata.apiservice.domain.domain.Api;
 import com.zorkdata.apiservice.domain.domain.ApiAuth;
+import com.zorkdata.apiservice.domain.domain.User;
 import com.zorkdata.apiservice.domain.dto.ApiDTO;
 import com.zorkdata.dddlib.domain.EntityRepository;
 import org.springframework.data.jpa.domain.Specification;
@@ -47,13 +48,25 @@ public interface ApiRepository extends EntityRepository<Api, Integer> {
      * @param sortField
      * @param pageNo
      * @param pageSize
-     * @param userId
+     * @param userid
      * @param start
      * @param end
      * @return
      */
     @Query(value = " select a.* from `api_auth` ap left join api a on a.id = ap.api_id where (a.name like CONCAT ('%',?1,'%') or a.description like CONCAT ('%',?1,'%') or a.created_by like CONCAT ('%',?1,'%')) and ap.user_id = ?6 and a.created_time between ?7 and ?8 order by ?2 ?3 limit ?4,?5  ", nativeQuery = true)
-    List<Api> listMyAuth(String keyword, String sortType, String sortField, Integer pageNo, Integer pageSize, Integer userId, String start, String end);
+    List<Api> listMyAuth(String keyword, String sortType, String sortField, Integer pageNo, Integer pageSize, Integer userid, String start, String end);
+
+    /**
+     * listMyAuth
+     *
+     * @param keyword
+     * @param userid
+     * @param start
+     * @param end
+     * @return
+     */
+    @Query(value = " select count(*) from `api_auth` ap left join api a on a.id = ap.api_id where (a.name like CONCAT ('%',?1,'%') or a.description like CONCAT ('%',?1,'%') or a.created_by like CONCAT ('%',?1,'%')) and ap.user_id = ?2 and a.created_time between ?3 and ?4 ", nativeQuery = true)
+    Integer listMyAuthCount(String keyword, Integer userid, String start, String end);
 
     /**
      * listMyAuth2
@@ -62,11 +75,21 @@ public interface ApiRepository extends EntityRepository<Api, Integer> {
      * @param sortType
      * @param sortField
      * @param pageSize
-     * @param userId
+     * @param userid
      * @return
      */
     @Query(value = " select a.* from `api_auth` ap left join api a on a.id = ap.api_id where (a.name like CONCAT ('%',?1,'%') or a.description like CONCAT ('%',?1,'%') or a.created_by like CONCAT ('%',?1,'%')) and ap.user_id = ?6  order by ?2 ?3 limit ?4,?5  ", nativeQuery = true)
-    List<Api> listMyAuthTwo(String keyword, String sortType, String sortField, Integer pageNo, Integer pageSize, Integer userId);
+    List<Api> listMyAuthTwo(String keyword, String sortType, String sortField, Integer pageNo, Integer pageSize, Integer userid);
+
+    /**
+     * listMyAuth2
+     *
+     * @param keyword
+     * @param userid
+     * @return
+     */
+    @Query(value = " select count(*) from `api_auth` ap left join api a on a.id = ap.api_id where (a.name like CONCAT ('%',?1,'%') or a.description like CONCAT ('%',?1,'%') or a.created_by like CONCAT ('%',?1,'%')) and ap.user_id = ?2 ", nativeQuery = true)
+    Integer listMyAuthTwoCount(String keyword, Integer userid);
 
     /**
      * selectApiName
@@ -112,4 +135,22 @@ public interface ApiRepository extends EntityRepository<Api, Integer> {
      */
     @Query(value = "select status from api where name = ?1 ", nativeQuery = true)
     Integer findStatusByName(String apiName);
+
+    /**
+     * 根据apiId查询createUid
+     *
+     * @param apiId
+     * @return
+     */
+    @Query(value = "select user_id from api where id = ?1 ", nativeQuery = true)
+    Integer findCreateUidByApiId(Integer apiId);
+
+    /**
+     * 根据apiId查询白名单
+     *
+     * @param apiId
+     * @return
+     */
+    @Query(value = "select white_list from api where id = ?1 ", nativeQuery = true)
+    String findWhiteList(Integer apiId);
 }

api-service-project/api-service-facade/src/main/java/com/zorkdata/apiservice/facade/facade/ApiFacade.java

@@ -74,7 +74,7 @@ public interface ApiFacade {
      * @param apiDTO
      * @return
      */
-    InvokeResult addApi(ApiDTO apiDTO, String username);
+    InvokeResult addApi(ApiDTO apiDTO, String username, Integer userid);
 
     /**
      * 删除Api接口
@@ -122,7 +122,7 @@ public interface ApiFacade {
      * @param apiDTO
      * @return
      */
-    InvokeResult registApi(ApiDTO apiDTO, String username);
+    InvokeResult registApi(ApiDTO apiDTO, String username, Integer userid);
 
 
     /**
@@ -155,7 +155,7 @@ public interface ApiFacade {
      * @param sortType
      * @return
      */
-    InvokeResult listMyAuth(String username, Integer pageNo, Integer pageSize, String sortField, String sortType, Long startTime, Long endTime, String keyword);
+    InvokeResult listMyAuth(String username, Integer pageNo, Integer pageSize, String sortField, String sortType, Long startTime, Long endTime, String keyword, Integer userid);
 
     /**
      * 数据预览

api-service-project/api-service-facade/src/main/java/com/zorkdata/apiservice/facade/impl/ApiServicueFacadeImpl.java

@@ -84,11 +84,11 @@ public class ApiServicueFacadeImpl implements ApiFacade {
     }
 
     @Override
-    public InvokeResult addApi(ApiDTO apiDTO, String username) {
+    public InvokeResult addApi(ApiDTO apiDTO, String username, Integer userid) {
         InvokeResult invokeResult;
         try {
             invokeResult = InvokeResult.success();
-            Api api = apiApplication.addApi(apiDTO, username);
+            Api api = apiApplication.addApi(apiDTO, username, userid);
             invokeResult.setData(api);
         } catch (Exception e) {
             log.error("保存Api失败", e);
@@ -183,11 +183,11 @@ public class ApiServicueFacadeImpl implements ApiFacade {
     }
 
     @Override
-    public InvokeResult registApi(ApiDTO apiDTO, String username) {
+    public InvokeResult registApi(ApiDTO apiDTO, String username, Integer userid) {
         InvokeResult invokeResult;
         try {
             invokeResult = InvokeResult.success();
-            Api api = apiApplication.registApi(apiDTO, username);
+            Api api = apiApplication.registApi(apiDTO, username, userid);
             invokeResult.setData(api);
         } catch (Exception e) {
             log.error("保存Api失败", e);
@@ -215,8 +215,8 @@ public class ApiServicueFacadeImpl implements ApiFacade {
     }
 
     @Override
-    public InvokeResult listMyAuth(String username, Integer pageNo, Integer pageSize, String sortField, String sortType, Long startTime, Long endTime, String keyword) {
-        return apiApplication.listMyAuth(username, pageNo, pageSize, sortField, sortType, startTime, endTime, keyword);
+    public InvokeResult listMyAuth(String username, Integer pageNo, Integer pageSize, String sortField, String sortType, Long startTime, Long endTime, String keyword, Integer userid) {
+        return apiApplication.listMyAuth(username, pageNo, pageSize, sortField, sortType, startTime, endTime, keyword, userid);
     }
 
     @Override

api-service-project/api-service-web/src/main/java/com/zorkdata/apiservice/BaseController.java

@@ -44,6 +44,15 @@ public abstract class BaseController {
         PigUser pigUser = SecurityUtils.getUser();
         return new UserWapper(pigUser);
     }
+    /**
+     * 读取 当前用户id
+     *
+     * @return
+     */
+    protected Integer getUserId() {
+        PigUser pigUser = SecurityUtils.getUser();
+        return pigUser.getId();
+    }
 
     /**
      * 取当前用户登录态token

api-service-project/api-service-web/src/main/java/com/zorkdata/apiservice/config/bean/ApiRestTemplateConfig.java

@@ -2,8 +2,15 @@ package com.zorkdata.apiservice.config.bean;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @title: RestTemplateConfig
  * @Author Linxinfeng
@@ -13,6 +20,31 @@ import org.springframework.web.client.RestTemplate;
 public class ApiRestTemplateConfig {
     @Bean(name = "remoteRestTemplate")
     public RestTemplate restTemplate() {
-        return new RestTemplate();
+        RestTemplate restTemplate = new RestTemplate(getFactory());
+        //这个地方需要配置消息转换器，不然收到消息后转换会出现异常
+        restTemplate.setMessageConverters(getConverts());
+        return restTemplate;
+    }
+
+    private SimpleClientHttpRequestFactory getFactory() {
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setConnectTimeout(60000);
+        factory.setReadTimeout(60000);
+        return factory;
+    }
+
+    private List<HttpMessageConverter<?>> getConverts() {
+        List<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
+        // String转换器
+        StringHttpMessageConverter stringConvert = new StringHttpMessageConverter();
+        List<MediaType> stringMediaTypes = new ArrayList<MediaType>() {{
+            //添加响应数据格式，不匹配会报401
+            add(MediaType.TEXT_PLAIN);
+            add(MediaType.TEXT_HTML);
+            add(MediaType.APPLICATION_JSON);
+        }};
+        stringConvert.setSupportedMediaTypes(stringMediaTypes);
+        messageConverters.add(stringConvert);
+        return messageConverters;
     }
 }

api-service-project/api-service-web/src/main/java/com/zorkdata/apiservice/controller/ApiServicueController.java

@@ -5,6 +5,7 @@ import com.zorkdata.apiservice.BaseController;
 import com.zorkdata.apiservice.application.cache.DataSourceCache;
 import com.zorkdata.apiservice.application.dbutils.MysqlDataType;
 import com.zorkdata.apiservice.application.dbutils.SqlServerDataType;
+import com.zorkdata.apiservice.domain.domain.ApiGroup;
 import com.zorkdata.apiservice.domain.domain.DataSource;
 import com.zorkdata.apiservice.domain.dto.ApiAuthDTO;
 import com.zorkdata.apiservice.domain.dto.ApiDTO;
@@ -117,7 +118,8 @@ public class ApiServicueController extends BaseController {
     public InvokeResult addApi(@RequestBody ApiDTO apiDTO) {
         BkUser user = super.getUser();
         String username = user.getUsername();
-        return apiFacade.addApi(apiDTO, username);
+        Integer userid = super.getUserId();
+        return apiFacade.addApi(apiDTO, username, userid);
     }
 
     @Inner(value = false)
@@ -125,7 +127,8 @@ public class ApiServicueController extends BaseController {
     public InvokeResult registApi(@RequestBody ApiDTO apiDTO) {
         BkUser user = super.getUser();
         String username = user.getUsername();
-        return apiFacade.registApi(apiDTO, username);
+        Integer userid = super.getUserId();
+        return apiFacade.registApi(apiDTO, username, userid);
     }
 
     @Inner(value = false)
@@ -234,7 +237,8 @@ public class ApiServicueController extends BaseController {
     ) {
         BkUser user = super.getUser();
         String username = user.getUsername();
-        return apiFacade.listMyAuth(username, pageNo, pageSize, sortField, sortType, startTime, endTime, keyword);
+        Integer userid = super.getUserId();
+        return apiFacade.listMyAuth(username, pageNo, pageSize, sortField, sortType, startTime, endTime, keyword, userid);
     }
 
     @Inner(value = false)
@@ -269,4 +273,10 @@ public class ApiServicueController extends BaseController {
         return apiFacade.executeApi(apiName, inParam);
     }
 
+    @Inner(value = false)
+    @PostMapping("/csPost")
+    public InvokeResult csPost(@RequestBody ApiGroupDTO apiGroupDTO) {
+        return InvokeResult.success("获取SqlServer数据类型成功!");
+    }
+
 }