Merge remote-tracking branch 'origin/dm_dev' into dm_dev

# Conflicts:
#	jz-dm-apigateway/src/main/java/com/jz/dm/service/request/ApiQueryService.java

database/zc/api_gateway.sql

@@ -140,10 +140,10 @@ CREATE TABLE `t_api_req_log` (
   `response_params`text COMMENT '返回参数',
   `request_url`    varchar(64) DEFAULT NULL COMMENT '请求路径',
   `request_method` varchar(100) DEFAULT NULL COMMENT '请求方法',
-  `request_type`   varchar(20) DEFAULT NULL COMMENT '请求类型（方式）',
   `encry_mode`     varchar(20) DEFAULT NULL COMMENT '加密方式:MD5,RSA',
   `trans_mode`     varchar(20) DEFAULT NULL COMMENT '传输方式:POST,GET',
   `request_token`  varchar(64) DEFAULT NULL COMMENT '客户请求token',
+  `handler_status`  varchar(20) NOT NULL DEFAULT '0' COMMENT '处理状态: 0未处理,1已处理'
   `request_consuming`  varchar(64) DEFAULT NULL COMMENT '请求总耗时',
   `request_start_time` datetime DEFAULT NULL COMMENT '请求开始时间',
   `request_end_time`   datetime DEFAULT NULL COMMENT '请求结束时间',

jz-dm-apigateway/pom.xml

@@ -136,6 +136,20 @@
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-data-redis</artifactId>
         </dependency>
+
+        <!-- 代码自动生成依赖 begin -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+        <!-- velocity -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <!-- 代码自动生成依赖 end-->
     </dependencies>
 
     <build>

jz-dm-apigateway/src/main/java/com/jz/dm/common/util/OpenApiResultCode.java

@@ -21,29 +21,37 @@ public enum OpenApiResultCode implements ResultCode {
     /** 无效参数 */
     ILLEGAL_ARGUMENT("ILLEGAL_ARGUMENT", "无效参数"),
 
+    /** 请求数据异常 */
+    REQUEST_DATA_EXCEPTION("REQUEST_DATA_EXCEPTION", "请求数据异常"),
+
+
     /** 名类型不支持 */
     SIGN_TYPE_NOT_SUPPORT("SIGN_TYPE_NOT_SUPPORT", "签名类型不支持"),
 
     /** 数据签名错误 */
     DATA_SIGN_ERROR("DATA_SIGN_ERROR", "数据签名错误"),
 
-    /** 公钥格式错误 */
+ /*   *//** 公钥格式错误 *//*
     PUBLIC_KEY_FORMAT_ERROR("PUBLIC_KEY_FORMAT_ERROR", "公钥格式错误"),
 
-    /** 私钥格式错误 */
-    PRIVATE_KEY_FORMAT_ERROR("PRIVATE_KEY_FORMAT_ERROR", "私钥格式错误"),
+    *//** 私钥格式错误 *//*
+    PRIVATE_KEY_FORMAT_ERROR("PRIVATE_KEY_FORMAT_ERROR", "私钥格式错误"),*/
 
     /** 响应数据格式错误 */
     RESPONSE_DATA_FORMAT_ERROR("RESPONSE_DATA_FORMAT_ERROR", "响应数据格式错误"),
 
     /** 签名校验错误 */
     SIGN_VERIFY_ERROR("SIGN_VERIFY_ERROR", "签名校验错误"),
+/*
+    *//** 不支持该信息摘要算法 *//*
+    NO_SUCH_MD_ALGORITHM("NO_SUCH_MD_ALGORITHM", "不支持该信息摘要算法"),*/
 
-    /** 不支持该信息摘要算法 */
-    NO_SUCH_MD_ALGORITHM("NO_SUCH_MD_ALGORITHM", "不支持该信息摘要算法"),
+/*
+    */
+/** 信息摘要错误 *//*
 
-    /** 信息摘要错误 */
     MESSAGE_DIGEST_ERROR("MESSAGE_DIGEST_ERROR", "信息摘要错误"),
+*/
 
     /** 数据加密错误 */
     DATA_ENCRYPTION_ERROR("DATA_ENCRYPTION_ERROR", "数据加密错误"),;

jz-dm-apigateway/src/main/java/com/jz/dm/config/GatewayConfiguration.java

+package com.jz.dm.config;
+
+/**
+ * @author ZC
+ * @PACKAGE_NAME: com.jz.dm.config
+ * @PROJECT_NAME: jz-dm-parent
+ * @NAME: GatewayConfiguration
+ * @DATE: 2021-2-5/10:58
+ * @DAY_NAME_SHORT: 周五
+ * @Description: 详情github地址:https://github.com/alibaba/Sentinel/blob/master/sentinel-demo/sentinel-demo-spring-cloud-gateway/src/main/java/com/alibaba/csp/sentinel/demo/spring/sc/gateway/GatewayConfiguration.java
+ **/
+/*@Configuration
+public class GatewayConfiguration {
+
+    private final List<ViewResolver> viewResolvers;
+    private final ServerCodecConfigurer serverCodecConfigurer;
+
+    public GatewayConfiguration(ObjectProvider<List<ViewResolver>> viewResolversProvider,
+                                ServerCodecConfigurer serverCodecConfigurer) {
+        this.viewResolvers = viewResolversProvider.getIfAvailable(Collections::emptyList);
+        this.serverCodecConfigurer = serverCodecConfigurer;
+    }
+
+    @Bean
+    @Order(Ordered.HIGHEST_PRECEDENCE)
+    public SentinelGatewayBlockExceptionHandler sentinelGatewayBlockExceptionHandler() {
+        // Register the block exception handler for Spring Cloud Gateway.
+        return new SentinelGatewayBlockExceptionHandler(viewResolvers, serverCodecConfigurer);
+    }
+
+    @Bean
+    @Order(-1)
+    public GlobalFilter sentinelGatewayFilter() {
+        return new SentinelGatewayFilter();
+    }
+
+    @PostConstruct
+    public void doInit() {
+        initCustomizedApis();
+        initGatewayRules();
+    }
+
+    private void initCustomizedApis() {
+        Set<ApiDefinition> definitions = new HashSet<>();
+        ApiDefinition api1 = new ApiDefinition("some_customized_api")
+                .setPredicateItems(new HashSet<ApiPredicateItem>() {{
+                    add(new ApiPathPredicateItem().setPattern("/ahas"));
+                    add(new ApiPathPredicateItem().setPattern("/product/**")
+                            .setMatchStrategy(SentinelGatewayConstants.URL_MATCH_STRATEGY_PREFIX));
+                }});
+        ApiDefinition api2 = new ApiDefinition("another_customized_api")
+                .setPredicateItems(new HashSet<ApiPredicateItem>() {{
+                    add(new ApiPathPredicateItem().setPattern("/**")
+                            .setMatchStrategy(SentinelGatewayConstants.URL_MATCH_STRATEGY_PREFIX));
+                }});
+        definitions.add(api1);
+        definitions.add(api2);
+        GatewayApiDefinitionManager.loadApiDefinitions(definitions);
+    }
+
+    private void initGatewayRules() {
+        Set<GatewayFlowRule> rules = new HashSet<>();
+        rules.add(new GatewayFlowRule("aliyun_route")
+                .setCount(10)
+                .setIntervalSec(1)
+        );
+        rules.add(new GatewayFlowRule("aliyun_route")
+                .setCount(2)
+                .setIntervalSec(2)
+                .setBurst(2)
+                .setParamItem(new GatewayParamFlowItem()
+                        .setParseStrategy(SentinelGatewayConstants.PARAM_PARSE_STRATEGY_CLIENT_IP)
+                )
+        );
+        rules.add(new GatewayFlowRule("httpbin_route")
+                .setCount(10)
+                .setIntervalSec(1)
+                .setControlBehavior(RuleConstant.CONTROL_BEHAVIOR_RATE_LIMITER)
+                .setMaxQueueingTimeoutMs(600)
+                .setParamItem(new GatewayParamFlowItem()
+                        .setParseStrategy(SentinelGatewayConstants.PARAM_PARSE_STRATEGY_HEADER)
+                        .setFieldName("X-Sentinel-Flag")
+                )
+        );
+        rules.add(new GatewayFlowRule("httpbin_route")
+                .setCount(1)
+                .setIntervalSec(1)
+                .setParamItem(new GatewayParamFlowItem()
+                        .setParseStrategy(SentinelGatewayConstants.PARAM_PARSE_STRATEGY_URL_PARAM)
+                        .setFieldName("pa")
+                )
+        );
+        rules.add(new GatewayFlowRule("httpbin_route")
+                .setCount(2)
+                .setIntervalSec(30)
+                .setParamItem(new GatewayParamFlowItem()
+                        .setParseStrategy(SentinelGatewayConstants.PARAM_PARSE_STRATEGY_URL_PARAM)
+                        .setFieldName("type")
+                        .setPattern("warn")
+                        .setMatchStrategy(SentinelGatewayConstants.PARAM_MATCH_STRATEGY_CONTAINS)
+                )
+        );
+
+        rules.add(new GatewayFlowRule("some_customized_api")
+                .setResourceMode(SentinelGatewayConstants.RESOURCE_MODE_CUSTOM_API_NAME)
+                .setCount(5)
+                .setIntervalSec(1)
+                .setParamItem(new GatewayParamFlowItem()
+                        .setParseStrategy(SentinelGatewayConstants.PARAM_PARSE_STRATEGY_URL_PARAM)
+                        .setFieldName("pn")
+                )
+        );
+        GatewayRuleManager.loadRules(rules);
+    }
+}*/

jz-dm-apigateway/src/main/java/com/jz/dm/config/MybatisPlusConfig.java

@@ -27,6 +27,13 @@ public class MybatisPlusConfig {
         paginationInterceptor.setLimit(500);
         // 开启 count 的 join 优化,只针对部分 left join
         paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
+
         return paginationInterceptor;
     }
+  /*  @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor(){
+        MybatisPlusInterceptor plusInterceptor =new MybatisPlusInterceptor();
+       // plusInterceptor.addInnerInterceptor();
+        return plusInterceptor;
+    }*/
 }

jz-dm-apigateway/src/main/java/com/jz/dm/config/SentinelConfig.java

@@ -21,7 +21,7 @@ import java.util.List;
  * @NAME: SentinelConfig
  * @DATE: 2021-1-7/15:57
  * @DAY_NAME_SHORT: 周四
- * @Description: 限流熔断初始化配置
+ * @Description: 限流熔断初始化配置(只初始化一次,重启系统后配置从新进行初始化)
  **/
 @Configuration
 public class SentinelConfig {

jz-dm-apigateway/src/main/java/com/jz/dm/config/WebAppConfigurer.java

@@ -29,6 +29,8 @@ public class WebAppConfigurer extends WebMvcConfigurerAdapter {
                         "/**/*.js",              //js静态资源
                         "/**/*.css"             //css静态资源
                 );
+
+
     }
     @Bean
     public AccessLimitInterceptor getAccessLimitInterceptor() {

jz-dm-apigateway/src/main/java/com/jz/dm/controller/AuthController.java

@@ -116,4 +116,14 @@ public class AuthController {
     public Mono<Result> resetSalt(@RequestBody @Validated SaltResetReq req) {
         return Mono.fromSupplier(() -> authService.updateSaltInfo(req));
     }
+    /**
+     * @Description: 商城授权续费
+     * @Author: Mr.zhang
+     * @Date: 2020-12-26
+     */
+    @ApiOperation("商城授权续费")
+    @PostMapping(value = "/auth-renew")
+    public Mono<Result> authRenew(@RequestBody @Validated AuthRenewUpdateReq req) {
+        return Mono.fromSupplier(() -> authService.updateAuthDate(req));
+    }
 }

jz-dm-apigateway/src/main/java/com/jz/dm/controller/GatewayController.java

@@ -9,6 +9,7 @@ import com.jz.dm.models.enity.GatewayRequest;
 import com.jz.dm.models.enity.GatewayResponse;
 import com.jz.dm.models.enity.RequestContext;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -35,17 +36,18 @@ public class GatewayController {
 
     //@RequestMapping(value = "/gateway", consumes = "application/json")
     @PostMapping(value="/gateway",consumes = "application/json")
+    @ApiOperation(value = "Api请求接口")
     public String gateway(@RequestBody String json, HttpServletRequest httpServletRequest,
                           HttpServletResponse httpServletResponse) {
         GatewayRequest gatewayRequest = JSON.parseObject(json, GatewayRequest.class);
         return doGateway(gatewayRequest, httpServletRequest, httpServletResponse);
     }
 
-    @RequestMapping(value = "/gateway")
+ /*   @RequestMapping(value = "/gateway")
     public String gateway(GatewayRequest gatewayRequest, HttpServletRequest httpServletRequest,
                           HttpServletResponse httpServletResponse) {
         return doGateway(gatewayRequest, httpServletRequest, httpServletResponse);
-    }
+    }*/
 
     private String doGateway(GatewayRequest gatewayRequest, HttpServletRequest httpServletRequest,
                              HttpServletResponse httpServletResponse) {

jz-dm-apigateway/src/main/java/com/jz/dm/controller/ProducerController.java

@@ -38,9 +38,10 @@ public class ProducerController {
      */
     @ApiOperation("获取文件夹列表")
     @GetMapping(value = "/getFileCatalog")
-    public Mono<Result> getFileCatalog(@RequestParam(name = "projectId")Long projectId) {
+    public Mono<Result> getFileCatalog(@RequestParam(name = "projectId") Long projectId) {
         return Mono.fromSupplier(() -> producerService.getFileCatalog(projectId));
     }
+
     /**
      * @Description:创建文件夹
      * @Author: Mr.zhang
@@ -51,6 +52,7 @@ public class ProducerController {
     public Mono<Result> createProjectFolder(@RequestBody @Valid CreateFolderReq req) {
         return Mono.fromSupplier(() -> producerService.createProjectFolder(req));
     }
+
     /**
      * @Description:服务发布列表
      * @Author: Mr.zhang
@@ -61,6 +63,7 @@ public class ProducerController {
     public Mono<Result> getServiceIssueList(@RequestBody @Valid ServiceIssueReq req) {
         return Mono.fromSupplier(() -> producerService.getServiceIssueList(req));
     }
+
     /**
      * @Description:服务发布/服务取消
      * @Author: Mr.zhang
@@ -68,9 +71,9 @@ public class ProducerController {
      */
     @ApiOperation("服务发布/服务取消")
     @GetMapping(value = "/optionApiIssueStatus")
-    public Mono<Result> optionApiIssueStatus(@RequestParam(name = "id")Long id,
-                                             @RequestParam(name="optStatus")Boolean optStatus) {
-        return Mono.fromSupplier(() -> producerService.optionApiIssueStatus(id,optStatus));
+    public Mono<Result> optionApiIssueStatus(@RequestParam(name = "id") Long id,
+                                             @RequestParam(name = "optStatus") Boolean optStatus) {
+        return Mono.fromSupplier(() -> producerService.optionApiIssueStatus(id, optStatus));
     }
 
     /**
@@ -81,7 +84,7 @@ public class ProducerController {
     @ApiOperation("Api制作(获取ApiId)")
     @PostMapping(value = "/getCustomApiId")
     public Mono<Result> getCustomApiId() {
-        return Mono.fromSupplier(() ->producerService.getCustomApiId());
+        return Mono.fromSupplier(() -> producerService.getCustomApiId());
     }
 
     /**
@@ -94,6 +97,7 @@ public class ProducerController {
     public Mono<Result> makeCustomApi(@RequestBody @Valid ApiInterfaceReq req) {
         return Mono.fromSupplier(() -> Result.of_success(producerService.saveInterfaceAPi(req)));
     }
+
     /**
      * @Description:Api制作(数据查询/标签查询)
      * @Author: Mr.zhang
@@ -152,7 +156,7 @@ public class ProducerController {
     }*/
 
 
-/*
+    /*
      *//**
      * @Description:获取数据源配置
      * @Author: Mr.zhang

jz-dm-apigateway/src/main/java/com/jz/dm/filter/AuthFilter.java

@@ -79,7 +79,7 @@ public class AuthFilter extends AbstractFilter {
         try {
             ApiInterface apiInterface = apiInterfaceService.getApiInfo(request.getApiKey());
             if (null == apiInterface) {
-                throw new GatewayException(GatewayResultCode.ILLEGAL_REQUEST);
+                throw new GatewayException(GatewayResultCode.REQUEST_INFO_UNEXIST);
             }
             //下架状态$$ 检查是否有有效调用的api,如果有就放行,没有就置为无效
             if (ApiStatusEnum.SOLDOUT.name().equals(apiInterface.getStatus())) {

jz-dm-apigateway/src/main/java/com/jz/dm/filter/CheckArgsFilter.java

@@ -42,7 +42,7 @@ public class CheckArgsFilter extends AbstractFilter {
             request.setFormat(Format.JSON.name());
         }
         try {
-            request.setVersion("v1.0.0");
+            request.setVersion("1.0.0");
             //格式，目前仅支持JSON
             Format.valueOf(request.getFormat());
             //请求使用的编码格式，如UTF-8,GBK,GB2312等

jz-dm-apigateway/src/main/java/com/jz/dm/filter/InvokeRouteFilter.java

 package com.jz.dm.filter;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.jz.dm.common.constant.Constants;
 import com.jz.dm.common.constant.LoggingConstants;
@@ -9,6 +10,7 @@ import com.jz.dm.gateway.DefaultOpenApiDispatcher;
 import com.jz.dm.models.enity.DispatchContext;
 import com.jz.dm.models.enity.GatewayRequest;
 import com.jz.dm.models.enity.GatewayResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Component;
  * @author key
  */
 @Component("invokeRouteFilter")
+@Slf4j
 public class InvokeRouteFilter extends AbstractFilter {
 
     /** openapi dispatcher logger */
@@ -41,14 +44,13 @@ public class InvokeRouteFilter extends AbstractFilter {
     protected void internalDoFilter(GatewayRequest request, GatewayResponse response,
                                     FilterChain chain) {
         String openApiResponse = null;
-        //当前系统时间戳
         long startTime = System.currentTimeMillis();
         try {
             DispatchContext context = new DispatchContext();
-            context.setApiKey(request.getApiKey());//apiKey
-            context.setOpenApiMethod(request.getMethod()); //方法 例如:tradd.add
-            context.setOpenApiParams(request.getParams());//入参
-            context.setOpenApiVersion(request.getVersion()); //版本号
+            context.setApiKey(request.getApiKey());
+            context.setOpenApiMethod(request.getMethod());
+            context.setOpenApiParams(request.getParams());
+            context.setOpenApiVersion(request.getVersion());
             //扩展参数
             for (GatewayRequest.Attribute attribute : request.getExtAttributes().values()) {
                 if (attribute != null && attribute.isPass) {
@@ -56,10 +58,11 @@ public class InvokeRouteFilter extends AbstractFilter {
                 }
             }
             openApiResponse = defaultOpenApiDispatcher.doDispatch(context);
-
             JSONObject jsonObject = (JSONObject) JSON.parse(openApiResponse);
             response.setAttribute(jsonObject);
-        } finally {
+        }catch (JSONException ex){
+            log.error("json exchange exception =",ex.getMessage());
+        }finally {
             long elapseTime = System.currentTimeMillis() - startTime;
             LogUtil.info(DISPATCHER_LOGGER,
                 "gateway do default dispatch,request=" + request + ",response=" + openApiResponse

jz-dm-apigateway/src/main/java/com/jz/dm/filter/VerifySignFilter.java

@@ -5,7 +5,6 @@ import com.jz.common.utils.Md5;
 import com.jz.dm.common.constant.Constants;
 import com.jz.dm.common.enums.GatewayResultCode;
 import com.jz.dm.common.exception.GatewayException;
-import com.jz.dm.common.exception.SignatureException;
 import com.jz.dm.common.util.LogUtil;
 import com.jz.dm.common.util.MapUtil;
 import com.jz.dm.models.domian.ApiAuth;
@@ -52,7 +51,7 @@ public class VerifySignFilter extends AbstractFilter {
                     //需要传入授权码
                     ApiAuth apiAuthInfo = apiInterfaceService.getApiAuthInfo(request.getApiKey(), authCode);
                     if (null == apiAuthInfo) {
-                        throw new GatewayException(GatewayResultCode.ILLEGAL_REQUEST);
+                        throw new GatewayException(GatewayResultCode.REQUEST_NOT_AUTH);
                     }
                     String sign = Md5.encrypt(signParams, apiAuthInfo.getSalt());
                     if (!request.getSign().equals(sign)) {
@@ -63,9 +62,8 @@ public class VerifySignFilter extends AbstractFilter {
                 }
             }
             chain.doFilter(request, response);
-        } catch (SignatureException ex) {
-            LogUtil.error(LOGGER, ex,
-                    "sign response error. response=" + response.getResponse());
+        } catch (GatewayException ex) {
+            LogUtil.error(LOGGER, ex,"sign response error. response=" + response.getResponse());
             response.clearAttributes();
             response.setCode(ex.getResultCode().getCode());
             response.setMsg(ex.getResultCode().getMsg());
@@ -73,11 +71,6 @@ public class VerifySignFilter extends AbstractFilter {
             if (ex instanceof GatewayException) {
                 throw (GatewayException) ex;
             }
-            LogUtil.error(LOGGER, ex,
-                    "signatureFilter doFilter error. response=" + response.getResponse());
-            response.clearAttributes();
-            response.setCode(GatewayResultCode.UNKNOWN_EXCEPTION.getCode());
-            response.setMsg(GatewayResultCode.UNKNOWN_EXCEPTION.getMsg());
         }
     }
 

jz-dm-apigateway/src/main/java/com/jz/dm/gateway/DefaultOpenApiDispatcher.java

@@ -45,7 +45,8 @@ public class DefaultOpenApiDispatcher implements OpenApiDispatcher {
     @Resource
     public void setOpenApiServices(List<OpenApiService> openApiServiceList) {
         for (OpenApiService openApiService : openApiServiceList) {
-            String openApiServiceKey = getOpenApiServiceKey(openApiService.getOpenApiMethod(),openApiService.getOpenApiVersion());
+            String openApiServiceKey = getOpenApiServiceKey(openApiService.getOpenApiMethod(),
+                    openApiService.getOpenApiVersion());
             openApiServices.put(openApiServiceKey, openApiService);
         }
     }
@@ -84,8 +85,8 @@ public class DefaultOpenApiDispatcher implements OpenApiDispatcher {
             return JSON.toJSONString(response.getAttributes());
         }
         if (StringUtil.isEmpty(response.getCode())) {
-            response.setCode(OpenApiResultCode.UNKNOWN_EXCEPTION.getCode());
-            response.setMsg(OpenApiResultCode.UNKNOWN_EXCEPTION.getMsg());
+            response.setCode(OpenApiResultCode.REQUEST_DATA_EXCEPTION.getCode());
+            response.setMsg(OpenApiResultCode.REQUEST_DATA_EXCEPTION.getMsg());
         }
         return JSON.toJSONString(response.getAttributes());
     }

jz-dm-apigateway/src/main/java/com/jz/dm/generate/MybatisPlusGenerate.java

+package com.jz.dm.generate;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
+import com.baomidou.mybatisplus.generator.config.GlobalConfig;
+import com.baomidou.mybatisplus.generator.config.PackageConfig;
+import com.baomidou.mybatisplus.generator.config.StrategyConfig;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Scanner;
+
+/**
+ * @author ZC
+ * @PACKAGE_NAME: com.jz.dm.generate
+ * @PROJECT_NAME: jz-dm-parent
+ * @NAME: MybatisPlusGenerate
+ * @DATE: 2021-1-30/12:43
+ * @DAY_NAME_SHORT: 周六
+ * @Description:
+ **/
+public class MybatisPlusGenerate {
+        public static void main(String[] args) {
+            //1. 全局配置
+            GlobalConfig config = new GlobalConfig();
+            // 是否支持AR模式
+            config.setActiveRecord(true)
+                    // 作者
+                    .setAuthor("ZC")
+                    // 生成路径，最好使用绝对路径，window路径是不一样的
+                    //TODO  TODO  TODO  TODO
+                    .setOutputDir("/Users/xdclass/Desktop/demo/src/main/java")
+                    // 文件覆盖
+                    .setFileOverride(true)
+                    // 主键策略
+                    .setIdType(IdType.AUTO)
+
+                    .setDateType(DateType.ONLY_DATE)
+                    // 设置生成的service接口的名字的首字母是否为I，默认Service是以I开头的
+                    .setServiceName("%sService")
+
+                    //实体类结尾名称
+                    .setEntityName("%sDO")
+
+                    //生成基本的resultMap
+                    .setBaseResultMap(true)
+
+                    //不使用AR模式
+                    .setActiveRecord(false)
+
+                    //生成基本的SQL片段
+                    .setBaseColumnList(true);
+
+            //2. 数据源配置
+            DataSourceConfig dsConfig = new DataSourceConfig();
+            // 设置数据库类型
+            dsConfig.setDbType(DbType.MYSQL)
+                    .setDriverName("com.mysql.cj.jdbc.Driver")
+                    //TODO  TODO  TODO  TODO
+                    .setUrl("jdbc:mysql://127.0.0.1:3306/xd_shop?useSSL=false")
+                    .setUsername("root")
+                    .setPassword("xdclass.net");
+
+            //3. 策略配置globalConfiguration中
+            StrategyConfig stConfig = new StrategyConfig();
+
+            //全局大写命名
+            stConfig.setCapitalMode(true)
+                    // 数据库表映射到实体的命名策略
+                    .setNaming(NamingStrategy.underline_to_camel)
+
+                    //使用lombok
+                    .setEntityLombokModel(true)
+
+                    //使用restcontroller注解
+                    .setRestControllerStyle(true)
+
+                    // 生成的表, 支持多表一起生成，以数组形式填写
+                    //TODO  TODO  TODO  TODO 两个方式，直接写，或者使用命令行输入
+                    .setInclude("product", "banner", "address", "coupon", "product_order");
+            //.setInclude(scanner("表名，多个英文逗号分割").split(","));
+
+            //TODO  TODO  TODO  TODO
+            //4. 包名策略配置(生成的项目包名)
+            PackageConfig pkConfig = new PackageConfig();
+            pkConfig.setParent("net.xdclass.shopmanager")
+                    .setMapper("mapper")
+                    .setService("service")
+                    .setController("controller")
+                    .setEntity("model")
+                    .setXml("mapper");
+
+            //5. 整合配置
+            AutoGenerator ag = new AutoGenerator();
+            ag.setGlobalConfig(config)
+                    .setDataSource(dsConfig)
+                    .setStrategy(stConfig)
+                    .setPackageInfo(pkConfig);
+
+            //6. 执行操作
+            ag.execute();
+            System.out.println("======= 小滴课堂 Done 相关代码生成完毕  ========");
+        }
+
+        /**
+         * <p>
+         * 读取控制台内容
+         * </p>
+         */
+        public static String scanner(String tip) {
+            Scanner scanner = new Scanner(System.in);
+            StringBuilder help = new StringBuilder();
+            help.append("请输入" + tip + "：");
+            System.out.println(help.toString());
+            if (scanner.hasNext()) {
+                String ipt = scanner.next();
+                if (StringUtils.isNotBlank(ipt)) {
+                    return ipt;
+                }
+            }
+            throw new MybatisPlusException("请输入正确的" + tip + "！");
+        }
+}

jz-dm-apigateway/src/main/java/com/jz/dm/mapper/ApiInterfaceFileMapper.java

@@ -3,6 +3,7 @@ package com.jz.dm.mapper;
 import com.jz.common.base.BaseMapper;
 import com.jz.dm.models.domian.ApiInterfaceFile;
 import com.jz.dm.models.dto.ApiInterfaceFileDto;
+import com.jz.dm.models.dto.DataFileDto;
 
 import java.util.List;
 
@@ -22,4 +23,11 @@ public interface ApiInterfaceFileMapper extends BaseMapper<ApiInterfaceFile> {
      * @return
      */
     List<ApiInterfaceFileDto> getFileFolderLevel(Long projectId);
+
+    /**
+     * 查询出所有项目文件列表
+     * @param projectId
+     * @return
+     */
+    List<DataFileDto> listFileFolders(Long projectId);
 }

jz-dm-apigateway/src/main/java/com/jz/dm/mapper/ApiSyncingDatasourceMapper.java

-package com.jz.dm.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jz.dm.models.domian.ApiSyncingDatasource;
-
-/**api数据源配置信息表 mapper
- * @author ybz
- *
- */
-public interface ApiSyncingDatasourceMapper extends BaseMapper<ApiSyncingDatasource> {
-
-}

jz-dm-apigateway/src/main/java/com/jz/dm/mapper/ApiSyncingDatasourceTypeMapper.java

-package com.jz.dm.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jz.dm.models.domian.ApiSyncingDatasourceType;
-
-/**api数据源类型信息表 mapper
- * @author ybz
- *
- */
-public interface ApiSyncingDatasourceTypeMapper extends BaseMapper<ApiSyncingDatasourceType> {
-
-}

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiInterface.java

@@ -149,4 +149,15 @@ public class ApiInterface extends BaseObject implements Serializable {
 	@TableField(exist = false)
 	private String respCode;
 
+	/*---------------------------------日志查询--------------------------------*/
+	/**
+	 * 日志id
+	 * */
+	@TableField(exist = false)
+	private Long logId;
+	/**
+	 * 是否测试
+	 * */
+	@TableField(exist = false)
+	private Boolean isTest;
 }

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiInterfaceCustom.java

@@ -105,7 +105,4 @@ public class ApiInterfaceCustom extends BaseObject implements Serializable {
 	@TableField("page_row")
     private Long pageRow;
 
-
-
-
 }

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiInterfaceFile.java

@@ -9,6 +9,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -58,4 +59,6 @@ public class ApiInterfaceFile extends BaseObject implements Serializable {
 	@TableField("status")
     private String status;
 
+	@TableField(exist = false)
+	private List<ApiInterfaceFile> children;//子集
 }

jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiReqLog.java

@@ -88,13 +88,17 @@ public class ApiReqLog implements Serializable {
 	*/
 	@TableField("request_token")
     private String requestToken;
-
+	/**
+	 * 处理状态 默认为0 未处理
+	 */
+	@TableField("handler_status")
+	private String handlerStatus;
 	/**
 	* 请求总耗时
 	*/
 	@ApiModelProperty("请求总耗时")
 	@TableField("request_consuming")
-    private Double requestConsuming;
+    private String requestConsuming;
 	/**
 	* 请求开始时间
 	*/

jz-dm-apigateway/src/main/java/com/jz/dm/models/dto/DataFileDto.java

+package com.jz.dm.models.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author ZC
+ * @PACKAGE_NAME: com.jz.dm.models.dto
+ * @PROJECT_NAME: jz-dm-parent
+ * @NAME: DataFileDto
+ * @DATE: 2021-2-4/17:23
+ * @DAY_NAME_SHORT: 周四
+ * @Description:
+ **/
+@Data
+@ApiModel
+public class DataFileDto implements Serializable {
+
+    @ApiModelProperty(value = "文件id")
+    private Long id;
+    @ApiModelProperty(value = "项目编号")
+    private Long projectId;
+    @ApiModelProperty(value = "父类id")
+    private Long parentId;
+    @ApiModelProperty(value = "文件名称")
+    private String name;
+    @ApiModelProperty(value = "子类集合")
+    private List<DataFileDto> children;
+}

jz-dm-apigateway/src/main/java/com/jz/dm/models/enity/GatewayRequest.java

@@ -94,7 +94,7 @@ public class GatewayRequest implements Serializable {
     public String toString() {
         return "GatewayRequest [appKey=" + apiKey + ", method=" + method + ", format=" + format
                + ", signType=" + signType + ", sign=" + sign
-               + ", timestamp=" + timestamp + ", version=" + version
+               + ", timestamp=" + timestamp
                + ", params=" + params + ", extAttributes="
                + extAttributes + "]";
     }

jz-dm-apigateway/src/main/java/com/jz/dm/models/req/auth/AuthRenewUpdateReq.java

+package com.jz.dm.models.req.auth;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author ZC
+ * @PACKAGE_NAME: com.jz.dm.models.req.auth
+ * @PROJECT_NAME: jz-dm-parent
+ * @NAME: AuthRenewUpdateReq
+ * @DATE: 2021-2-5/16:54
+ * @DAY_NAME_SHORT: 周五
+ * @Description:
+ **/
+@ApiModel
+@Data
+public class AuthRenewUpdateReq implements Serializable {
+    @ApiModelProperty(value = "授权码",required = true)
+    @NotNull(message = "授权码不能为空")
+    private String authCode;
+
+    @ApiModelProperty(value = "有效截止时间",required = true)
+    @NotNull(message = "有效截止时间不能空")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String validEndTime;
+}

jz-dm-apigateway/src/main/java/com/jz/dm/models/resp/SendDataReq.java

@@ -3,7 +3,6 @@ package com.jz.dm.models.resp;
 import com.jz.common.bean.BasePageBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;

jz-dm-apigateway/src/main/java/com/jz/dm/service/ApiLogService.java

 package com.jz.dm.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jz.common.bean.PageInfoResponse;
 import com.jz.common.utils.Result;
 import com.jz.dm.models.domian.ApiReqLog;
 import com.jz.dm.models.dto.DataBankNumberErrorDto;
 import com.jz.dm.models.req.DataBankNumberErrorReq;
 import com.jz.dm.models.req.LogInfoDetailReq;
 import com.jz.dm.models.req.LogInfoListReq;
-import net.sf.json.JSONObject;
-
-import java.util.List;
 
 /**
  * @author ZC
@@ -45,9 +41,9 @@ public interface ApiLogService {
     /**
      * 根据id更新日志
      * @param id
-     * @param jsonObject
+     * @param response
      */
-    void updateLog(Long id, JSONObject jsonObject);
+    void updateLog(Long id,String response);
 
     /**
      * 统计API调用数据
@@ -63,4 +59,10 @@ public interface ApiLogService {
      */
     Result<DataBankNumberErrorDto> queryNumberAndError(DataBankNumberErrorReq req);
 
+    /**
+     * 根据apikey查询日志信息
+     * @param apiKey
+     * @return
+     */
+    Long getReqLogging(String apiKey);
 }

jz-dm-apigateway/src/main/java/com/jz/dm/service/AuthService.java

@@ -91,4 +91,11 @@ public interface AuthService {
      * @return
      */
     Result getServiceAuthList(ServiceAuthReq req);
+
+    /**
+     * 更新授权时间
+     * @param req
+     * @return
+     */
+    Result updateAuthDate(AuthRenewUpdateReq req);
 }

jz-dm-apigateway/src/main/java/com/jz/dm/service/impl/ApiLogServiceImpl.java

 package com.jz.dm.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,12 +15,12 @@ import com.jz.dm.models.req.LogInfoDetailReq;
 import com.jz.dm.models.req.LogInfoListReq;
 import com.jz.dm.service.ApiLogService;
 import lombok.extern.slf4j.Slf4j;
-
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -46,8 +45,10 @@ public class ApiLogServiceImpl implements ApiLogService {
     // 加锁
     @Autowired
     private ReentrantRedisLock lock;
+
     /**
      * 日志信息列表
+     *
      * @param req
      * @return
      */
@@ -55,26 +56,26 @@ public class ApiLogServiceImpl implements ApiLogService {
     public IPage<ApiReqLog> listApiLog(LogInfoListReq req) {
         IPage<ApiReqLog> page = new Page<>(req.getPageNum(), req.getPageSize());
         QueryWrapper<ApiReqLog> query = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(req.getApiKey())){
-            query.eq("api_key",req.getApiKey());
+        if (StringUtils.isNotBlank(req.getApiKey())) {
+            query.eq("api_key", req.getApiKey());
         }
-        if (StringUtils.isNotBlank(req.getStatus())){
-           query.eq("status",req.getStatus());
+        if (StringUtils.isNotBlank(req.getStatus())) {
+            query.eq("status", req.getStatus());
         }
-        if (StringUtils.isNotBlank(req.getRequestToken())){
-            query.eq("request_token",req.getRequestToken());
+        if (StringUtils.isNotBlank(req.getRequestToken())) {
+            query.eq("request_token", req.getRequestToken());
         }
-        if (StringUtils.isNotBlank(req.getCreateDate())){
+        if (StringUtils.isNotBlank(req.getCreateDate())) {
             String startTime = req.getCreateDate().substring(0, 10) + " 00:00:00";
             String endTime = req.getCreateDate().substring(11, 21) + " 23:59:59";
-            query.between("create_date",startTime, endTime);
+            query.between("create_date", startTime, endTime);
         }
 
-        query.eq("is_deleted",0);
+        query.eq("is_deleted", 0);
         query.orderByDesc("create_date");
         IPage<ApiReqLog> apiReqLogIPage = apiReqLogMapper.selectPage(page, query);
         // 数据银行-历史查询返回参数
-        if (req.getHistoryQuery().equals("01") && req.getHistoryQuery() != null){
+        if (req.getHistoryQuery().equals("01") && req.getHistoryQuery() != null) {
             for (ApiReqLog record : apiReqLogIPage.getRecords()) {
                 DataBankNumberErrorReq errorReq = new DataBankNumberErrorReq();
                 List<Map<String, String>> reqList = new ArrayList<>();
@@ -97,6 +98,7 @@ public class ApiLogServiceImpl implements ApiLogService {
 
     /**
      * 查询日志详情
+     *
      * @param req
      * @return
      */
@@ -107,25 +109,28 @@ public class ApiLogServiceImpl implements ApiLogService {
 
     /**
      * 保存日志
+     *
      * @param reqLog
      */
     @Override
     public void insetLogInfo(ApiReqLog reqLog) {
         apiReqLogMapper.insert(reqLog);
     }
+
     /**
      * api计量统计
+     *
      * @param date
      * @return
      */
     @Override
-    public Result countAPiCallStat(String date ) {
-        Date dateParam =null;
+    public Result countAPiCallStat(String date) {
+        Date dateParam = null;
         try {
             SimpleDateFormat dateFormat = new SimpleDateFormat("YYYY-MM");
             dateParam = dateFormat.parse(date);
-        }catch (Exception ex){
-           log.error("时间转换异常:{}",ex.getMessage());
+        } catch (Exception ex) {
+            log.error("时间转换异常:{}", ex.getMessage());
         }
         return Result.of_success(apiReqLogMapper.countApiCallMonthData(dateParam));
     }
@@ -150,43 +155,70 @@ public class ApiLogServiceImpl implements ApiLogService {
     }
 
 
-
     /**
      * 根据id更新日志
+     *
      * @param id
-     * @param jsonObject
+     * @param response
      */
     @Override
-    public void updateLog(Long id, JSONObject jsonObject) {
+    public void updateLog(Long id,String response) {
+        com.alibaba.fastjson.JSONObject jsonObject = null;
+        if (StringUtils.isNotBlank(response)) {
+            jsonObject = com.alibaba.fastjson.JSONObject.parseObject(response);
+        }
         try {
             /*ApiReqLog apiReqLog = apiReqLogMapper.maxId(id);*/
             ApiReqLog apiReqLog = apiReqLogMapper.selectById(id);
-            if (null != apiReqLog){
+            if (null != apiReqLog) {
                 UpdateWrapper<ApiReqLog> update = new UpdateWrapper<>();
-                if (200 == jsonObject.getInt("code")){
+               if (null != response){
+                   if (jsonObject.getString("return_code").equals("ESC00000") &&
+                           jsonObject.getString("return_message").equals("SUCCESS")) {
                        update.set("status", GeneralStatusTypeEnum.SUCCEED);
-                }else {
+                   } else {
                        update.set("status", GeneralStatusTypeEnum.FAIL);
                    }
-                update.set("response_params",jsonObject.toString());
-                update.set("update_date",new Date());
-                update.set("request_end_time",new Date());
+               }else {
+                   update.set("status", GeneralStatusTypeEnum.SUCCEED);
+               }
+                update.set("response_params", response);
+                update.set("update_date", new Date());
+                update.set("request_end_time", new Date());
+                update.set("handler_status", "1");
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(apiReqLog.getRequestStartTime());
-                Long time = System.currentTimeMillis() - calendar.getTimeInMillis() / 1000;
-                double timeConsuming = time.doubleValue();
-                update.set("request_consuming",timeConsuming);
-                update.eq("id",id);
-                if (apiReqLogMapper.update(null,update) == 0){
+                Long time = (System.currentTimeMillis() - calendar.getTimeInMillis());
+                update.set("request_consuming", time.toString() + "ms");
+                update.eq("id", id);
+                if (apiReqLogMapper.update(null, update) == 0) {
                     log.info("~~~~~~~~~~~更新日志信息失败~~~~~~~~");
                 }
-            }else {
-                log.info("id为:{}",id+"--------------日志信息不存在");
+            } else {
+                log.info("id为:{}", id + "--------------日志信息不存在");
             }
-        }catch (Exception ex){
-            log.error("更新日志返回信息异常:{}",ex.getMessage());
+        } catch (Exception ex) {
+            log.error("更新日志返回信息异常:{}", ex.getMessage());
         }
     }
 
-
+    /**
+     * 根据apiKey查询日志
+     *
+     * @param apiKey
+     * @return
+     */
+    @Override
+    public Long getReqLogging(String apiKey) {
+        QueryWrapper<ApiReqLog> queryWra = new QueryWrapper<>();
+        queryWra.select("id");
+        queryWra.eq("api_key", apiKey);
+        queryWra.eq("handler_status", 0);
+        queryWra.isNull("status");
+        List<ApiReqLog> apiReqLogs = apiReqLogMapper.selectList(queryWra);
+        if (!CollectionUtils.isEmpty(apiReqLogs)) {
+            return apiReqLogs.get(apiReqLogs.size() - 1).getId();
+        }
+        return null;
+    }
 }

jz-dm-apigateway/src/main/java/com/jz/dm/service/impl/AuthServiceImpl.java

@@ -381,4 +381,28 @@ public class AuthServiceImpl implements AuthService {
         }
         return null;
     }
+
+    /**
+     * 更新授权续费信息
+     * @param req
+     * @return
+     */
+    @Override
+    public Result updateAuthDate(AuthRenewUpdateReq req) {
+        QueryWrapper<ApiAuth> queryWra = new QueryWrapper<>();
+        queryWra.eq("auth_code",req.getAuthCode());
+        queryWra.eq("is_deleted",0);
+        queryWra.eq("status",GeneralStatusTypeEnum.VALID.name());
+        ApiAuth apiAuth = apiAuthMapper.selectOne(queryWra);
+        if (null == apiAuth){
+            return Result.of_error("授权信息不存在!");
+        }
+        UpdateWrapper<ApiAuth> updateWra = new UpdateWrapper<>();
+        updateWra.set("valid_end_time",req.getValidEndTime());
+        updateWra.eq("id",apiAuth.getId());
+        if (apiAuthMapper.update(null, updateWra) == 0){
+            return Result.of_error(ResultMsg.UPDATE_FAIL);
+        }
+        return Result.of_success(ResultMsg.UPDATE_SUCCESS);
+    }
 }

jz-dm-apigateway/src/main/java/com/jz/dm/service/impl/ProducerServiceImpl.java

@@ -16,12 +16,16 @@ import com.jz.dm.common.enums.GeneralStatusTypeEnum;
 import com.jz.dm.common.enums.apiInterface.ApiInfoOutTypeEnum;
 import com.jz.dm.common.enums.apiInterface.ApiStatusEnum;
 import com.jz.dm.common.util.RandomUtil;
-import com.jz.dm.mapper.*;
+import com.jz.dm.mapper.ApiInterfaceCustomMapper;
+import com.jz.dm.mapper.ApiInterfaceFileMapper;
+import com.jz.dm.mapper.ApiInterfaceMapper;
+import com.jz.dm.mapper.ApiOpenApiEsFieldsMapper;
 import com.jz.dm.models.domian.ApiInterface;
 import com.jz.dm.models.domian.ApiInterfaceCustom;
 import com.jz.dm.models.domian.ApiInterfaceFile;
 import com.jz.dm.models.domian.ApiOpenApiEsFields;
 import com.jz.dm.models.dto.ApiServiceApplyDto;
+import com.jz.dm.models.dto.DataFileDto;
 import com.jz.dm.models.req.folder.CreateFolderReq;
 import com.jz.dm.models.req.producer.ApiInterfaceReq;
 import com.jz.dm.models.req.producer.ServiceIssueReq;
@@ -58,12 +62,8 @@ public class ProducerServiceImpl implements ProducerService {
     @Resource
     private ApiInterfaceMapper apiInterfaceMapper;
     @Resource
-    private ApiSyncingDatasourceMapper apiSyncingDatasourceMapper;
-    @Resource
     private ApiOpenApiEsFieldsMapper apiOpenApiEsFieldsMapper;
     @Resource
-    private ApiOpenApiEsTagconfigMapper apiOpenApiEsTagconfigMapper;
-    @Resource
     private ApiInterfaceCustomMapper apiInterfaceCustomMapper;
     @Resource
     private ApiInterfaceFileMapper apiInterfaceFileMapper;
@@ -99,9 +99,35 @@ public class ProducerServiceImpl implements ProducerService {
      */
     @Override
     public Result getFileCatalog(Long projectId) {
-        return Result.of_success(apiInterfaceFileMapper.getFileFolderLevel(projectId));
+        List<DataFileDto> interfaceFiles = apiInterfaceFileMapper.listFileFolders(projectId);
+        ArrayList<DataFileDto> children=null;
+        if (CollectionUtils.isNotEmpty(interfaceFiles)) {
+          //  for (ApiInterfaceFile interfaceFile : interfaceFiles) {
+                //if (0 == interfaceFile.getParentId()){
+                    children = recursiveTree(0L, interfaceFiles);
+                //}
+           // }
+          }
+        return Result.of_success(children);
+
+       //return Result.of_success(apiInterfaceFileMapper.getFileFolderLevel(projectId));
     }
 
+    private  ArrayList<DataFileDto> recursiveTree(Long parentId, List<DataFileDto> allList) {
+        ArrayList<DataFileDto> files = new ArrayList<>();
+        for (DataFileDto interfaceFile : allList) {
+            if (Objects.equals(parentId,interfaceFile.getParentId())){
+                DataFileDto file = new DataFileDto();
+                file.setId(interfaceFile.getId());
+                file.setProjectId(interfaceFile.getProjectId());
+                file.setParentId(interfaceFile.getParentId());
+                file.setChildren(recursiveTree(interfaceFile.getId(),allList));
+                files.add(file);
+            }
+        }
+       /* files.forEach(System.out::println);*/
+        return files;
+    }
 
     /**
      * 创建文件夹
@@ -116,7 +142,7 @@ public class ProducerServiceImpl implements ProducerService {
             if (null == interfaceFile) {
                 return Result.of_error("父级文件夹不存在!");
             }
-            if (!req.getFileSource().equals(interfaceFile.getFileSource())){
+            if (!req.getFileSource().equals(interfaceFile.getFileSource())) {
                 return Result.of_error("父级文件类型错误!");
             }
         }
@@ -147,7 +173,7 @@ public class ProducerServiceImpl implements ProducerService {
         ApiInterfaceFile interfaceFile = new ApiInterfaceFile();
         BeanUtils.copyProperties(req, interfaceFile);
         interfaceFile.setStatus(GeneralStatusTypeEnum.VALID.name());
-        if (null == interfaceFile.getParentId() || "".equals(interfaceFile.getParentId())){
+        if (null == interfaceFile.getParentId() || "".equals(interfaceFile.getParentId())) {
             interfaceFile.setParentId(0L);//默认父类id为零
         }
         if (apiInterfaceFileMapper.insert(interfaceFile) == 0) {
@@ -225,7 +251,7 @@ public class ProducerServiceImpl implements ProducerService {
      */
     @Override
     public Result getCustomApiId() {
-        return Result.of_success(ResultMsg.SUCCESS,getApiKey());
+        return Result.of_success(ResultMsg.SUCCESS, getApiKey());
     }
 
 
@@ -239,7 +265,7 @@ public class ProducerServiceImpl implements ProducerService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
     public Result addBigDataMakeApi(ApiInterfaceReq req) {
         ApiInterface anInterface = apiInterfaceService.getApiInfo(req.apiKey);
-        if (null != anInterface){
+        if (null != anInterface) {
             return Result.of_error("API已存在!");
         }
         if ("10002".equals(req.getApiType())) {//数据查询
@@ -254,7 +280,7 @@ public class ProducerServiceImpl implements ProducerService {
                 return Result.of_error("限流次数不能小于或者等于零");
             }
         }
-        if (null == req.getSignType() || 0 ==req.getSignType()) {
+        if (null == req.getSignType() || 0 == req.getSignType()) {
             return Result.of_error("加密类型错误!");
         }
         if (StringUtils.isNotBlank(req.getLimitType())) {
@@ -274,7 +300,7 @@ public class ProducerServiceImpl implements ProducerService {
             }
         } else {  //保存
             ApiInterface apiInterface = saveApiBaseData(req);
-            if (saveApiExtendData(req,apiInterface.getId())) {
+            if (saveApiExtendData(req, apiInterface.getId())) {
                 throw ResponseException.of_error(ResultMsg.INSERT_FAIL);
             }
         }
@@ -289,7 +315,7 @@ public class ProducerServiceImpl implements ProducerService {
      * @param req
      */
     private void saveTableField(ApiInterfaceReq req) {
-        if (StringUtils.isBlank(req.getTableFields())){
+        if (StringUtils.isBlank(req.getTableFields())) {
             return;
         }
         QueryWrapper<ApiOpenApiEsFields> queryOpenApi = new QueryWrapper<>();
@@ -334,7 +360,7 @@ public class ProducerServiceImpl implements ProducerService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Result saveInterfaceAPi(ApiInterfaceReq req) {
         ApiInterface anInterface = apiInterfaceService.getApiInfo(req.apiKey);
-        if (null != anInterface){
+        if (null != anInterface) {
             return Result.of_error("API已存在!");
         }
         if (StringUtils.isNotBlank(req.getLimitType())) {
@@ -350,7 +376,7 @@ public class ProducerServiceImpl implements ProducerService {
                 return Result.of_error("限流次数不能小于或者等于零");
             }
         }
-        if (StringUtils.isBlank(req.getTargetUrl())){
+        if (StringUtils.isBlank(req.getTargetUrl())) {
             return Result.of_error("目标地址不存在!");
         }
         //校验文件夹信息
@@ -358,7 +384,7 @@ public class ProducerServiceImpl implements ProducerService {
             return Result.of_error("目标文件夹不存在!");
         }
         ApiInterface apiInterface = saveApiBaseData(req);
-        if (saveApiExtendData(req,apiInterface.getId())) {
+        if (saveApiExtendData(req, apiInterface.getId())) {
             throw ResponseException.of_error("保存Api扩展信息失败!");
         }
         //缓存API信息
@@ -368,11 +394,12 @@ public class ProducerServiceImpl implements ProducerService {
 
     /**
      * 保存APi扩展信息
+     *
      * @param id
      * @param req
      * @return
      */
-    private boolean saveApiExtendData(ApiInterfaceReq req,Long id) {
+    private boolean saveApiExtendData(ApiInterfaceReq req, Long id) {
         ApiInterfaceCustom custom = new ApiInterfaceCustom();
         BeanUtils.copyProperties(req, custom);
         custom.setApiInterfaceId(id);
@@ -492,9 +519,9 @@ public class ProducerServiceImpl implements ProducerService {
         ApiInterfaceCustom interfaceCustom = null;
         if (null != apiInterface) {
             QueryWrapper<ApiInterfaceCustom> query = new QueryWrapper<>();
-            query.eq("api_interface_id",req.getId());
-            query.eq("api_key",apiInterface.getApiKey());
-            query.eq("is_deleted",0);
+            query.eq("api_interface_id", req.getId());
+            query.eq("api_key", apiInterface.getApiKey());
+            query.eq("is_deleted", 0);
             interfaceCustom = apiInterfaceCustomMapper.selectOne(query);
         }
         if (null == interfaceCustom) {
@@ -583,7 +610,7 @@ public class ProducerServiceImpl implements ProducerService {
             object.put("targetUrl", req.getTargetUrl());
             object.put("outputType", ApiInfoOutTypeEnum.JSON.name());
             object.put("reqType", req.getReqType());
-            object.put("apiType",req.getApiType());
+            object.put("apiType", req.getApiType());
             String apiKey = TagConstants.OPEN_API_CACHE_KEY + req.getApiKey();
             String paramKey = redisUtils.get(apiKey);
             if (null != paramKey) {

jz-dm-apigateway/src/main/java/com/jz/dm/web/aspect/SystemLogAspect.java

 package com.jz.dm.web.aspect;
 
-
 import com.jz.common.utils.IpUtils;
 import com.jz.common.utils.JsonUtils;
 import com.jz.common.utils.UrlUtil;
@@ -17,10 +16,8 @@ import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -54,25 +51,26 @@ public class SystemLogAspect {
     @Resource
     private ApiReqLogMapper apiReqLogMapper;
 
-   /* //前置通知切入点
+    //前置通知切入点
     @Pointcut("@annotation(com.jz.dm.web.annotation.ApiLogAspect)")
     public void beforeAspect() {
-    }*/
+    }
 
     //最终通知切入点
-    @Pointcut("@annotation(com.jz.dm.web.annotation.ApiLogAspect)")
+   /* @Pointcut("@annotation(com.jz.dm.web.annotation.ApiLogAspect)")
     public void lastAspect() {
-    }
+    }*/
 
     //环绕通知切入点
-    @Pointcut("@annotation(com.jz.dm.web.annotation.ApiLogAspect)")
+   /* @Pointcut("@annotation(com.jz.dm.web.annotation.ApiLogAspect)")
     public void aroundAspect() {
-    }
+    }*/
 
 
-    @Around("aroundAspect()")
+    /*@Around("aroundAspect()")
     public void doAround(ProceedingJoinPoint joinPoint) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
         String ip = IpUtils.getIpAddr(request);
         //获取用户请求方法的参数并序列化为JSON格式字符串
         String params = "";
@@ -103,11 +101,9 @@ public class SystemLogAspect {
                 reqLog.setRequestIp(ip);
                 reqLog.setApiKey(jsonObject.getString("apiKey"));
                 reqLog.setRequestParams(params);
-                reqLog.setResponseParams("");//响应参数
                 reqLog.setRequestUrl(url);
                 reqLog.setRequestMethod(contextPath);
                 reqLog.setEncryMode(jsonObject.getString("signType")); //加密方式:MD5,RSA
-                //reqLog.setEncryMode("MD5"); //加密方式暂时写死MD5
                 reqLog.setTransMode(request.getMethod());//传输方式 GET POST
                 reqLog.setRequestToken(jsonParamsList.getString("authCode"));
                 reqLog.setRequestStartTime(new Date());
@@ -116,10 +112,12 @@ public class SystemLogAspect {
                 if (null != reqLog) {
                     apiReqLogMapper.insert(reqLog);
                 }
-            /*    Object result = joinPoint.proceed(joinPoint.getArgs());
+                Object proceed = joinPoint.proceed();
+                System.out.println("proceed"+proceed);
+                Object result = joinPoint.proceed(joinPoint.getArgs());
                 jsonResult = JSONObject.fromObject(result);
                 log.info("around响应结果为{}", jsonResult);
-                apiLogService.updateLog(reqLog.getId(), jsonResult);*/
+                apiLogService.updateLog(reqLog.getId(), jsonResult);
             } catch (GatewayException ex) {
                 log.info("切面处理保存异常信息:{}", ex.getMessage());
                 apiLogService.updateLog(reqLog.getId(), jsonResult);
@@ -127,10 +125,9 @@ public class SystemLogAspect {
                 throwable.printStackTrace();
             }
         }
-    }
-    /*@Before("beforeAspect()")
+    }*/
+    @Before("beforeAspect()")
     public void doBefore(JoinPoint joinPoint) {
-        //日志信息收集切面
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String ip = IpUtils.getIpAddr(request);
         //获取用户请求方法的参数并序列化为JSON格式字符串
@@ -140,47 +137,55 @@ public class SystemLogAspect {
                 params += JsonUtils.objectToJson(joinPoint.getArgs()[i]) + ";";
             }
         }
+        if (StringUtils.isNotBlank(params)) {
+            params = params.substring(0, params.length() - 1).split(";")[0];
+        }
         //获取请求路径
         String url = UrlUtil.getServerUrl(request);
         // 访问项目名
         String contextPath = request.getContextPath();
-        //JSONObject jsonObject = JSONObject.parseObject(params);
-        //String param = jsonObject.getString("params");
-        //JSONObject object = JSONObject.parseObject(param);
-        //String token = object.getString("token");
-        try {
-            log.info("~~~~~~~~~~~~~~~~~~~~~~~前置通知记录请求信息~~~~~~~~~~~~~~~~");
+        log.info("around请求参数为{}", params);
+        //动态修改其参数
+        //注意，如果调用joinPoint.proceed()方法，则修改的参数值不会生效，必须调用joinPoint.proceed(Object[] args)
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(params);
+        String paramsList = jsonObject.getString("openApiParams");
+        com.alibaba.fastjson.JSONObject jsonParamsList = com.alibaba.fastjson.JSONObject.parseObject(paramsList);
         ApiReqLog reqLog = new ApiReqLog();
+        JSONObject jsonResult = null;
+        Boolean isTest = jsonParamsList.getBoolean("isTest");
+        //不保存测试数据
+        if (!isTest) {
+            try {
                 reqLog.setRequestIp(ip);
-            // reqLog.setApiKey(jsonObject.getString("apiKey"));
+                reqLog.setApiKey(jsonObject.getString("apiKey"));
                 reqLog.setRequestParams(params);
-            reqLog.setResponseParams("");//响应参数
                 reqLog.setRequestUrl(url);
-            reqLog.setRequestMethod(contextPath);
-            reqLog.setEncryMode(SignType.MD5.name()); //加密方式:MD5,RSA
-            reqLog.setTransMode(request.getMethod());//传输方式 GET POST
-            // reqLog.setRequestToken(token);
-            reqLog.setRequestTime(new Date());
+                reqLog.setEncryMode("MD5");
+                reqLog.setTransMode(request.getMethod());
+                reqLog.setRequestToken(jsonParamsList.getString("authCode"));
+                reqLog.setRequestStartTime(new Date());
                 reqLog.setRemark(getServiceMethodDescription(joinPoint));
-            System.out.println(reqLog);
+                log.info("请求参数:", reqLog);
                 if (null != reqLog) {
-                apiLogService.insetLogInfo(reqLog);
+                    apiReqLogMapper.insert(reqLog);
+                }
+            } catch (GatewayException ex) {
+                log.error("切面处理保存异常信息:{}", ex.getMessage());
+              /*  apiLogService.updateLog(reqLog.getId(), jsonResult);*/
+            } catch (Throwable throwable) {
+                throwable.printStackTrace();
             }
-        } catch (Exception e) {
-            log.error("~~~~~~~~~~~~~~~~~~~~~~~前置通知异常~~~~~~~~~~~~~~~~~~~~~~~");
-            log.error("异常信息{}", e.getMessage());
         }
 
-    }*/
-    /**
+    }
+ /*   *//**
      * 返回异常通知，返回抛出异常的时候执行的通知，可以获得返回的异常
      * 可以访问到异常对象，且可以指定在出现特定异常的时候再执行通知代码
-     */
+     *//*
     @AfterReturning(value = "lastAspect()", returning = "result")
     public void afterReturn(JoinPoint joinPoint, Object result) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
                 .getRequest();
-        log.info("~~~~~~~~~~~~~~~~~~~~~~最终通知执行~~~~~~~~~~~~~~~~~~~~~~~~");
         String classType = joinPoint.getTarget().getClass().getName();
         try {
             Class<?> clazz = Class.forName(classType);
@@ -199,8 +204,8 @@ public class SystemLogAspect {
             JSONObject jsonObject = JSONObject.fromObject(args[1]);
             Map mapResult = (Map) jsonObject;
             //将返回的result参数取出
-        /*    Map<String, Object> res = (Map<String, Object>) mapResult.get("data");
-            Integer id = (Integer) res.get("id");*/
+            Map<String, Object> res = (Map<String, Object>) mapResult.get("attributes");
+            Integer id = (Integer) res.get("id");
             JSONObject data = jsonObject.getJSONObject("attributes");
             log.info("最终通知得到结果:{}",jsonObject);
            // apiLogService.updateLog(reqLog.getId(), jsonResult);
@@ -210,7 +215,7 @@ public class SystemLogAspect {
             log.error("异常信息{}", e.getMessage());
         }
 
-     }
+     }*/
 
     /**
      * 获取注解中对方法的描述信息 用于service层注解

jz-dm-apigateway/src/main/resources/application.yml

@@ -25,18 +25,18 @@ spring:
       transport:
         # sentinel-dashboard服务地址  # sentinel-dashboard-1.6.0 的访问路径 ，
         #启动方式java -jar sentinel-dashboard-1.6.0.jar --server.port=9090
-        dashboard: localhost:8080
+        dashboard: 127.0.0.1:8080
         heartbeat-interval-ms: 500
         # 项目本地会启动一个服务的端口号，默认8719，用于与sentinel-dashboard通讯
         port: 8719
         #服务器ip
-        clientIp: 192.168.1.114
-      filter:
+#        clientIp: 192.168.1.114
+#      filter:
         # 需要进行限流监控的接口，多个匹配用逗号隔开
-        url-patterns: /*
-      servlet:
+#        url-patterns: /*
+#      servlet:
           # 触发限流后重定向的页面
-       block-page: /sentinel/block
+#       block-page: /sentinel/block
       #取消Sentinel控制台懒加载
       eager: true
 

jz-dm-apigateway/src/main/resources/mapper/ApiInterfaceFileMapper.xml

@@ -23,4 +23,13 @@
       ) src
      ORDER BY id
  </select>
+    <select id="listFileFolders" resultType="com.jz.dm.models.dto.DataFileDto">
+        SELECT id AS id,
+               project_id AS projectId,
+               file_name AS fileName,
+               parent_id AS parentId
+         FROM t_api_interface_file
+         WHERE project_id =#{projectId}
+          AND `status`='VALID' AND is_deleted =0
+    </select>
 </mapper>
\ No newline at end of file

jz-dm-apigateway/src/main/resources/mapper/ApiSyncingDatasourceMapper.xml

-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.jz.dm.mapper.ApiSyncingDatasourceMapper" >
-  <sql id="Base_Column_List">
-    id, datasource_type, datasource_name, datasource_desc, project_id,
-    jdbc_url, db_name, user_name, password, endpoint,
-    bucket, access_id, access_key, protocol, host,
-    port, default_fs, table_schema, data_status, remark,
-    create_date, create_user, update_date, update_user, is_deleted
-  </sql>
-</mapper>

jz-dm-apigateway/src/main/resources/mapper/ApiSyncingDatasourceTypeMapper.xml

-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.jz.dm.mapper.ApiSyncingDatasourceTypeMapper" >
-
-  <sql id="Base_Column_List">
-    id, datasource, datasource_catecode, datasource_catename, datasource_type,
-    img_url, data_status, is_enabled, datasource_catetype, driver_class_name,
-    is_enable_test, default_source_script, default_target_script, is_enable_source, is_enable_target,
-    remark, create_date, create_user, update_date, update_user,
-    is_deleted
-  </sql>
-
-</mapper>

jz-dm-common/src/main/java/com/jz/common/utils/UrlUtil.java

@@ -24,12 +24,14 @@ public class UrlUtil {
         int port = request.getServerPort();
         // 访问项目名
         String contextPath = request.getContextPath();
-        String url = "%s://%s%s%s";
+        //接口路径
+        String requestURI = request.getRequestURI();
+        String url = "%s://%s%s%s%s";
         String portStr = "";
         if (port != 80) {
             portStr += ":" + port;
         }
-        return String.format(url, agreement, serverName, portStr, contextPath);
+        return String.format(url, agreement, serverName, portStr, contextPath,requestURI);
 
     }
 }