Merge branch 'master' into eureka

doc/.gitignore

@@ -0,0 +1,27 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+*.png
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+

doc/docs/files/10092_接口限流.md

@@ -2,10 +2,10 @@
 
 SOP提供了简单的接口限流策略：
 
-- 漏桶策略：每秒处理固定数量的请求，超出请求返回错误信息。
+- 窗口策略：每秒处理固定数量的请求，超出请求返回错误信息。
 - 令牌桶策略：每秒放置固定数量的令牌数，每个请求进来后先去拿令牌，拿到了令牌才能继续，拿不到则等候令牌重新生成了再拿。
 
-如果一个接口设置了漏桶策略，假设接口每秒可处理5个请求，一秒内同时有6个请求进来，前5个接口是能够访问的，第六个请求将返回错误信息。
+如果一个接口设置了窗口策略，假设接口每秒可处理5个请求，一秒内同时有6个请求进来，前5个接口是能够访问的，第六个请求将返回错误信息。
 
 如果设置了令牌桶策略，桶的容量是5，那么每秒中生成5个令牌，同一时间有6个请求进来，那么前5个能成功拿到令牌继续，第六个则等待，令牌重新生成了再拿。
 

doc/docs/files/90011_原理分析之如何存储路由.md

@@ -15,14 +15,9 @@ this.publisher.publishEvent(new HeartbeatEvent(this, this.nacosWatchIndex.getAnd
 
 ```java
 public class AbstractConfiguration implements ApplicationContextAware, ApplicationListener<HeartbeatEvent> {
-        /**
-         * nacos事件监听，每次微服务变化会触发这个方法
-         * @see org.springframework.cloud.alibaba.nacos.discovery.NacosWatch NacosWatch
-         * @param heartbeatEvent
-         */
-        @Override
-        public void onApplicationEvent(HeartbeatEvent heartbeatEvent) {
-            ...这里加载路由信息
+        @EventListener(classes = HeartbeatEvent.class)
+        public void listenEvent(ApplicationEvent heartbeatEvent) {
+            // 有服务注册进来
         }
 }
 ```
@@ -32,23 +27,26 @@ public class AbstractConfiguration implements ApplicationContextAware, Applicati
 加载路由伪代码如下：
 
 ```java
-public void onApplicationEvent(HeartbeatEvent heartbeatEvent) {
-    // 获取nacos中的服务实例列表
-    List<Instance> allInstances = namingService.getAllInstances(serviceName);
-    for(Instance instance : allInstances) {
-        // 微服务提供的接口
-        String url = "http://" + instance.getIp + ":" + instance.getPort + "/sop/routes";
-        ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
+@Override
+public void onAddInstance(InstanceDefinition instance) {
+    String serviceName = instance.getServiceId();
+    String url = getRouteRequestUrl(instance);
+    log.info("拉取路由配置，serviceId: {}, url: {}", serviceName, url);
+    ResponseEntity<String> responseEntity = getRestTemplate().getForEntity(url, String.class);
     if (responseEntity.getStatusCode() == HttpStatus.OK) {
-            // 返回来的路由信息
         String body = responseEntity.getBody();
-            ...加载路由到本地
-        }
+        ServiceRouteInfo serviceRouteInfo = JSON.parseObject(body, ServiceRouteInfo.class);
+        baseRouteCache.load(serviceRouteInfo, callback -> routesProcessor.saveRoutes(serviceRouteInfo, instance));
+    } else {
+        log.error("拉取路由配置异常，url: {}, status: {}, body: {}", url, responseEntity.getStatusCodeValue(), responseEntity.getBody());
     }
 }
 ```
 
-完整代码可参看`com.gitee.sop.gatewaycommon.manager.ServiceRoutesLoader.java`
+参考代码：
+
+- `com.gitee.sop.gatewaycommon.route.RegistryListener`以及实现类
+- `com.gitee.sop.gatewaycommon.route.ServiceRouteListener`
 
 路由的存储方式是一个Map，key为路由id，即接口名+版本号。
 
@@ -56,7 +54,7 @@ public void onApplicationEvent(HeartbeatEvent heartbeatEvent) {
 /**
  * key：nameVersion
  */
-private Map<String, ZuulTargetRoute> nameVersionTargetRouteMap;
+private static final Map<String, GatewayTargetRoute> routes = synchronizedMap(new LinkedHashMap<>());
 ```
 
 因为客户端调用接口都会传递一个接口名和版本号，因此通过这两个字段能够很快查询出路由信息，进行路由转发操作。

doc/docs/files/90100_常见问题.md

@@ -1,10 +1,5 @@
 # 常见问题
 
-## 在zuul过滤器中获取请求参数
-
-```java
-ApiParam param = ZuulContext.getApiParam();
-```
 
 ## 在SpringCloudGateway中获取请求参数
 
@@ -15,41 +10,15 @@ ApiParam apiParam = ServerWebExchangeUtil.getApiParam(exchange);
 ## 微服务端如何获取appId等参数
 
 ```java
-OpenContext openContext = ServiceContext.getCurrentContext().getOpenContext();
-String appId = openContext.getAppId();
+String app_id = request.getParameter("app_id");
 ```
 
-## 在其它地方获取业务参数
-
-```java
-OpenContext openContext = ServiceContext.getCurrentContext().getOpenContext();
-Story bizObject = (Story)openContext.getBizObject();
-
-或
-
-OpenContext openContext = ServiceContext.getCurrentContext().getOpenContext();
-Story bizObject = openContext.getBizObject(Story.class);
-```
 
 ## 如何关闭签名验证
 
 - 针对某一个接口关闭签名验证
 `@Open(value = "alipay.story.get", ignoreValidate = true)`
 
-- 针对所有接口关闭签名验证
-
-```java
-@Configuration
-public class ZuulConfig extends AlipayZuulConfiguration {
-
-    static {
-        ...
-        ApiConfig.getInstance().setIgnoreValidate(true);
-        ...
-    }
-
-}
-```
 
 ## 注册到eureka显示hostname，非ip
 
@@ -103,26 +72,6 @@ yml添加：
 ribbon.ReadTimeout= 60000
 ```
 
-## 指定了context-path（拉取路由404）
-
-微服务项目定义了`server.servlet.context-path=/story-service`，同时必须指定：
-
-```properties
-spring.cloud.nacos.discovery.metadata.context-path=${server.servlet.context-path}
-```
-
-yml配置如下：
-
-```yaml
-spring:
-  cloud:
-    nacos:
-      discovery:
-        metadata:
-          context-path: ${server.servlet.context-path}
-```
-
-不然网关无法拉取路由信息
 
 ## 其它微服务没有开放接口，需要排除
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/param/LimitNewAddParam.java

@@ -30,8 +30,8 @@ public class LimitNewAddParam {
     @NotBlank(message = "serviceId can not null")
     private String serviceId;
 
-    /** 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type */
-    @ApiDocField(description = "限流策略，1：漏桶策略，2：令牌桶策略")
+    /** 限流策略，1：窗口策略，2：令牌桶策略, 数据库字段：limit_type */
+    @ApiDocField(description = "限流策略，1：窗口策略，2：令牌桶策略")
     @NotNull(message = "limitType不能为空")
     private Byte limitType;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/param/LimitNewUpdateParam.java

@@ -35,8 +35,8 @@ public class LimitNewUpdateParam {
     @NotBlank(message = "serviceId can not null")
     private String serviceId;
 
-    /** 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type */
-    @ApiDocField(description = "限流策略，1：漏桶策略，2：令牌桶策略")
+    /** 限流策略，1：窗口策略，2：令牌桶策略, 数据库字段：limit_type */
+    @ApiDocField(description = "限流策略，1：窗口策略，2：令牌桶策略")
     @NotNull(message = "limitType不能为空")
     private Byte limitType;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/param/LimitParam.java

@@ -20,8 +20,8 @@ public class LimitParam {
     @NotBlank(message = "serviceId can not null")
     private String serviceId;
 
-    /** 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type */
-    @ApiDocField(description = "限流策略，1：漏桶策略，2：令牌桶策略")
+    /** 限流策略，1：窗口策略，2：令牌桶策略, 数据库字段：limit_type */
+    @ApiDocField(description = "限流策略，1：窗口策略，2：令牌桶策略")
     @NotNull
     private Byte limitType;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/result/LimitNewVO.java

@@ -41,9 +41,9 @@ public class LimitNewVO {
     private String serviceId;
 
     /**
-     * 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type
+     * 限流策略，1：窗口策略，2：令牌桶策略, 数据库字段：limit_type
      */
-    @ApiDocField(description = "限流策略，1：漏桶策略，2：令牌桶策略")
+    @ApiDocField(description = "限流策略，1：窗口策略，2：令牌桶策略")
     private Byte limitType;
 
     /**

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/result/LimitVO.java

@@ -32,9 +32,9 @@ public class LimitVO {
     private String serviceId;
 
     /**
-     * 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type
+     * 限流策略，1：窗口策略，2：令牌桶策略, 数据库字段：limit_type
      */
-    @ApiDocField(description = "限流策略，1：漏桶策略，2：令牌桶策略")
+    @ApiDocField(description = "限流策略，1：窗口策略，2：令牌桶策略")
     private Byte limitType;
 
     /**

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/ConfigLimitDto.java

@@ -21,7 +21,7 @@ public class ConfigLimitDto {
     /** 服务id, 数据库字段：service_id */
     private String serviceId;
 
-    /** 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type */
+    /** 限流策略，1：窗口策略，2：令牌桶策略, 数据库字段：limit_type */
     private Byte limitType;
 
     /** 每秒可处理请求数, 数据库字段：exec_count_per_second */

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/RouteDefinition.java

@@ -1,89 +0,0 @@
-package com.gitee.sop.adminserver.bean;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.gitee.easyopen.doc.annotation.ApiDocField;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author tanghc
- */
-@Data
-public class RouteDefinition {
-    /**
-     * 路由的Id
-     */
-    @ApiDocField(description = "路由id")
-    private String id = "";
-
-    /**
-     * 接口名
-     */
-    private String name;
-
-    /**
-     * 版本号
-     */
-    private String version;
-
-    /**
-     * 路由断言集合配置
-     */
-    @JSONField(serialize = false)
-    private List<GatewayPredicateDefinition> predicates = new ArrayList<>();
-
-    /**
-     * 路由过滤器集合配置
-     */
-    @JSONField(serialize = false)
-    private List<GatewayFilterDefinition> filters = new ArrayList<>();
-
-    /**
-     * 路由规则转发的目标uri
-     */
-    @ApiDocField(description = "uri")
-    private String uri;
-
-    /**
-     * uri后面跟的path
-     */
-    @ApiDocField(description = "path")
-    private String path;
-
-    /**
-     * 路由执行的顺序
-     */
-    private int order = 0;
-
-    /**
-     * 是否忽略验证，业务参数验证除外
-     */
-    @ApiDocField(description = "是否忽略验证，业务参数验证除外，1：忽略，0：不忽略")
-    private int ignoreValidate;
-
-    /**
-     * 状态，0：待审核，1：启用，2：禁用
-     */
-    @ApiDocField(description = "状态，0：待审核，1：启用，2：禁用")
-    private int status = 1;
-
-    /**
-     * 合并结果，统一格式输出
-     */
-    @ApiDocField(description = "合并结果，统一格式输出，1：合并，0：不合并")
-    private int mergeResult = 1;
-
-    /**
-     * 是否需要授权才能访问
-     */
-    @ApiDocField(description = "是否需要授权才能访问，1：是，0：否")
-    private int permission;
-
-    /**
-     * 是否是自定义路由
-     */
-    @ApiDocField(description = "是否是自定义路由，1：是，0：否")
-    private int custom;
-}

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/ServiceRouteInfo.java

@@ -1,26 +0,0 @@
-package com.gitee.sop.adminserver.bean;
-
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author tanghc
- */
-@Data
-public class ServiceRouteInfo {
-    /** 服务名称，对应spring.application.name */
-    private String serviceId;
-
-    private Date createTime = new Date();
-
-    private Date updateTime = new Date();
-
-    private String description;
-
-    private List<RouteDefinition> routeDefinitionList;
-
-    /** 是否是自定义服务，1：是，0：否 */
-    private int custom;
-}

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/common/LimitEnum.java

@@ -6,7 +6,7 @@ package com.gitee.sop.adminserver.common;
  */
 public enum LimitEnum {
     /**
-     * 限流策略，1：漏桶策略
+     * 限流策略，1：窗口策略
      */
     TYPE_LEAKY_BUCKET((byte) 1),
     /**

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigLimit.java

@@ -37,7 +37,7 @@ public class ConfigLimit {
     /** 服务id, 数据库字段：service_id */
     private String serviceId;
 
-    /** 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type */
+    /** 限流策略，1：窗口策略，2：令牌桶策略, 数据库字段：limit_type */
     private Byte limitType;
 
     /** 每秒可处理请求数, 数据库字段：exec_count_per_second */

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigRouteLimit.java

@@ -1,58 +0,0 @@
-package com.gitee.sop.adminserver.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-
-/**
- * 表名：config_route_limit
- * 备注：路由限流配置
- *
- * @author tanghc
- */
-@Table(name = "config_route_limit")
-@Data
-public class ConfigRouteLimit {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    /**  数据库字段：id */
-    private Integer id;
-
-    /** 路由id, 数据库字段：route_id */
-    private String routeId;
-
-    /** serviceId, 数据库字段：service_id */
-    private String serviceId;
-
-    /** 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type */
-    private Byte limitType;
-
-    /** 每秒可处理请求数, 数据库字段：exec_count_per_second */
-    private Integer execCountPerSecond;
-
-    /** 返回的错误码, 数据库字段：limit_code */
-    private String limitCode;
-
-    /** 返回的错误信息, 数据库字段：limit_msg */
-    private String limitMsg;
-
-    /** 令牌桶容量, 数据库字段：token_bucket_count */
-    private Integer tokenBucketCount;
-
-    /** 1:开启，0关闭, 数据库字段：limit_status */
-    private Byte limitStatus;
-
-    /**  数据库字段：gmt_create */
-    private Date gmtCreate;
-
-    /**  数据库字段：gmt_modified */
-    private Date gmtModified;
-}

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/IsvInfo.java

@@ -28,15 +28,6 @@ public class IsvInfo {
     /** appKey, 数据库字段：app_key */
     private String appKey;
 
-    /** 不再使用，转移到isv_keys表 */
-    private String secret = "";
-
-    /** 公钥,不再使用，转移到isv_keys表 数据库字段：pub_key */
-    private String pubKey;
-
-    /** 私钥,不再使用，转移到isv_keys表 数据库字段：pri_key */
-    private String priKey;
-
     /** 1启用，2禁用, 数据库字段：status */
     private Byte status;
 

sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/mapper/ConfigRouteLimitMapper.java

@@ -1,12 +0,0 @@
-package com.gitee.sop.adminserver.mapper;
-
-import com.gitee.fastmybatis.core.mapper.CrudMapper;
-
-import com.gitee.sop.adminserver.entity.ConfigRouteLimit;
-
-
-/**
- * @author tanghc
- */
-public interface ConfigRouteLimitMapper extends CrudMapper<ConfigRouteLimit, Integer> {
-}

sop-admin/sop-admin-server/src/main/resources/public/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title>SOP Admin</title><link href=static/css/chunk-elementUI.81cf475c.css rel=stylesheet><link href=static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=static/css/app.c6dfb7ee.css rel=stylesheet></head><body><noscript><strong>We're sorry but SOP Admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function(e){function n(n){for(var r,c,a=n[0],f=n[1],i=n[2],d=0,l=[];d<a.length;d++)c=a[d],u[c]&&l.push(u[c][0]),u[c]=0;for(r in f)Object.prototype.hasOwnProperty.call(f,r)&&(e[r]=f[r]);h&&h(n);while(l.length)l.shift()();return o.push.apply(o,i||[]),t()}function t(){for(var e,n=0;n<o.length;n++){for(var t=o[n],r=!0,c=1;c<t.length;c++){var a=t[c];0!==u[a]&&(r=!1)}r&&(o.splice(n--,1),e=f(f.s=t[0]))}return e}var r={},c={runtime:0},u={runtime:0},o=[];function a(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-25908fca":"66819987","chunk-2c1f2e8f":"f092c0a0","chunk-2d0d32e7":"213708f2","chunk-2d2085ef":"91d75f3c","chunk-2d221c34":"20057287","chunk-42f006d4":"a9dde27f","chunk-4de1c2b6":"e74e3d03","chunk-73b2dcec":"60c5d8e9","chunk-9b31c83a":"52bc6b2c","chunk-9f479afe":"3e73ea9f","chunk-c3ce42fe":"9517b588"}[e]+".js"}function f(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.e=function(e){var n=[],t={"chunk-25908fca":1,"chunk-2c1f2e8f":1,"chunk-42f006d4":1,"chunk-4de1c2b6":1,"chunk-73b2dcec":1,"chunk-9b31c83a":1,"chunk-c3ce42fe":1};c[e]?n.push(c[e]):0!==c[e]&&t[e]&&n.push(c[e]=new Promise(function(n,t){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-25908fca":"a66354ec","chunk-2c1f2e8f":"0314067f","chunk-2d0d32e7":"31d6cfe0","chunk-2d2085ef":"31d6cfe0","chunk-2d221c34":"31d6cfe0","chunk-42f006d4":"670cde16","chunk-4de1c2b6":"a37cd815","chunk-73b2dcec":"ed391cc5","chunk-9b31c83a":"3b12267b","chunk-9f479afe":"31d6cfe0","chunk-c3ce42fe":"6b789903"}[e]+".css",u=f.p+r,o=document.getElementsByTagName("link"),a=0;a<o.length;a++){var i=o[a],d=i.getAttribute("data-href")||i.getAttribute("href");if("stylesheet"===i.rel&&(d===r||d===u))return n()}var l=document.getElementsByTagName("style");for(a=0;a<l.length;a++){i=l[a],d=i.getAttribute("data-href");if(d===r||d===u)return n()}var h=document.createElement("link");h.rel="stylesheet",h.type="text/css",h.onload=n,h.onerror=function(n){var r=n&&n.target&&n.target.src||u,o=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");o.code="CSS_CHUNK_LOAD_FAILED",o.request=r,delete c[e],h.parentNode.removeChild(h),t(o)},h.href=u;var s=document.getElementsByTagName("head")[0];s.appendChild(h)}).then(function(){c[e]=0}));var r=u[e];if(0!==r)if(r)n.push(r[2]);else{var o=new Promise(function(n,t){r=u[e]=[n,t]});n.push(r[2]=o);var i,d=document.createElement("script");d.charset="utf-8",d.timeout=120,f.nc&&d.setAttribute("nonce",f.nc),d.src=a(e),i=function(n){d.onerror=d.onload=null,clearTimeout(l);var t=u[e];if(0!==t){if(t){var r=n&&("load"===n.type?"missing":n.type),c=n&&n.target&&n.target.src,o=new Error("Loading chunk "+e+" failed.\n("+r+": "+c+")");o.type=r,o.request=c,t[1](o)}u[e]=void 0}};var l=setTimeout(function(){i({type:"timeout",target:d})},12e4);d.onerror=d.onload=i,document.head.appendChild(d)}return Promise.all(n)},f.m=e,f.c=r,f.d=function(e,n,t){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)f.d(t,r,function(n){return e[n]}.bind(null,r));return t},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="",f.oe=function(e){throw console.error(e),e};var i=window["webpackJsonp"]=window["webpackJsonp"]||[],d=i.push.bind(i);i.push=n,i=i.slice();for(var l=0;l<i.length;l++)n(i[l]);var h=d;t()})([]);</script><script src=static/js/chunk-elementUI.298ac98c.js></script><script src=static/js/chunk-libs.75deb05f.js></script><script src=static/js/app.8d6768e7.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=favicon.ico><title>SOP Admin</title><link href=static/css/chunk-elementUI.81cf475c.css rel=stylesheet><link href=static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=static/css/app.c6dfb7ee.css rel=stylesheet></head><body><noscript><strong>We're sorry but SOP Admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function(e){function n(n){for(var r,c,a=n[0],f=n[1],i=n[2],d=0,l=[];d<a.length;d++)c=a[d],u[c]&&l.push(u[c][0]),u[c]=0;for(r in f)Object.prototype.hasOwnProperty.call(f,r)&&(e[r]=f[r]);h&&h(n);while(l.length)l.shift()();return o.push.apply(o,i||[]),t()}function t(){for(var e,n=0;n<o.length;n++){for(var t=o[n],r=!0,c=1;c<t.length;c++){var a=t[c];0!==u[a]&&(r=!1)}r&&(o.splice(n--,1),e=f(f.s=t[0]))}return e}var r={},c={runtime:0},u={runtime:0},o=[];function a(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-25908fca":"66819987","chunk-2c1f2e8f":"f092c0a0","chunk-2d0d32e7":"213708f2","chunk-2d2085ef":"91d75f3c","chunk-2d221c34":"20057287","chunk-4bdcb5ea":"cf292569","chunk-4de1c2b6":"e74e3d03","chunk-73b2dcec":"60c5d8e9","chunk-9b31c83a":"52bc6b2c","chunk-9f479afe":"3e73ea9f","chunk-c3ce42fe":"9517b588"}[e]+".js"}function f(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.e=function(e){var n=[],t={"chunk-25908fca":1,"chunk-2c1f2e8f":1,"chunk-4bdcb5ea":1,"chunk-4de1c2b6":1,"chunk-73b2dcec":1,"chunk-9b31c83a":1,"chunk-c3ce42fe":1};c[e]?n.push(c[e]):0!==c[e]&&t[e]&&n.push(c[e]=new Promise(function(n,t){for(var r="static/css/"+({}[e]||e)+"."+{"chunk-25908fca":"a66354ec","chunk-2c1f2e8f":"0314067f","chunk-2d0d32e7":"31d6cfe0","chunk-2d2085ef":"31d6cfe0","chunk-2d221c34":"31d6cfe0","chunk-4bdcb5ea":"b23e7407","chunk-4de1c2b6":"a37cd815","chunk-73b2dcec":"ed391cc5","chunk-9b31c83a":"3b12267b","chunk-9f479afe":"31d6cfe0","chunk-c3ce42fe":"6b789903"}[e]+".css",u=f.p+r,o=document.getElementsByTagName("link"),a=0;a<o.length;a++){var i=o[a],d=i.getAttribute("data-href")||i.getAttribute("href");if("stylesheet"===i.rel&&(d===r||d===u))return n()}var l=document.getElementsByTagName("style");for(a=0;a<l.length;a++){i=l[a],d=i.getAttribute("data-href");if(d===r||d===u)return n()}var h=document.createElement("link");h.rel="stylesheet",h.type="text/css",h.onload=n,h.onerror=function(n){var r=n&&n.target&&n.target.src||u,o=new Error("Loading CSS chunk "+e+" failed.\n("+r+")");o.code="CSS_CHUNK_LOAD_FAILED",o.request=r,delete c[e],h.parentNode.removeChild(h),t(o)},h.href=u;var s=document.getElementsByTagName("head")[0];s.appendChild(h)}).then(function(){c[e]=0}));var r=u[e];if(0!==r)if(r)n.push(r[2]);else{var o=new Promise(function(n,t){r=u[e]=[n,t]});n.push(r[2]=o);var i,d=document.createElement("script");d.charset="utf-8",d.timeout=120,f.nc&&d.setAttribute("nonce",f.nc),d.src=a(e),i=function(n){d.onerror=d.onload=null,clearTimeout(l);var t=u[e];if(0!==t){if(t){var r=n&&("load"===n.type?"missing":n.type),c=n&&n.target&&n.target.src,o=new Error("Loading chunk "+e+" failed.\n("+r+": "+c+")");o.type=r,o.request=c,t[1](o)}u[e]=void 0}};var l=setTimeout(function(){i({type:"timeout",target:d})},12e4);d.onerror=d.onload=i,document.head.appendChild(d)}return Promise.all(n)},f.m=e,f.c=r,f.d=function(e,n,t){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)f.d(t,r,function(n){return e[n]}.bind(null,r));return t},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="",f.oe=function(e){throw console.error(e),e};var i=window["webpackJsonp"]=window["webpackJsonp"]||[],d=i.push.bind(i);i.push=n,i=i.slice();for(var l=0;l<i.length;l++)n(i[l]);var h=d;t()})([]);</script><script src=static/js/chunk-elementUI.298ac98c.js></script><script src=static/js/chunk-libs.75deb05f.js></script><script src=static/js/app.2e027154.js></script></body></html>

sop-admin/sop-admin-server/src/main/resources/public/static/css/chunk-4bdcb5ea.b23e7407.css

@@ -1 +1 @@
-.custom-tree-node{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:14px;padding-right:8px}.el-input.is-disabled .el-input__inner,.el-radio__input.is-disabled+span.el-radio__label{color:#909399}.limit-tip[data-v-3fb78f74]{cursor:pointer;margin-left:10px}
+.custom-tree-node{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:14px;padding-right:8px}.el-input.is-disabled .el-input__inner,.el-radio__input.is-disabled+span.el-radio__label{color:#909399}.limit-tip[data-v-08125a7c]{cursor:pointer;margin-left:10px}

sop-admin/sop-admin-vue/src/views/service/limit.vue

@@ -177,8 +177,8 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item v-show="checkTypeKey(2)" prop="appKey" label="AppKey" :rules="checkTypeKey(2) ? rulesLimit.appKey : []">
-              <el-input v-model="limitDialogFormData.appKey" placeholder="需要限流的appKey" />
+            <el-form-item v-show="checkTypeKey(2)" prop="appKey" label="AppId" :rules="checkTypeKey(2) ? rulesLimit.appKey : []">
+              <el-input v-model="limitDialogFormData.appKey" placeholder="需要限流的AppId" />
             </el-form-item>
             <el-form-item v-show="checkTypeKey(3)" label="限流IP" prop="limitIp" :rules="checkTypeKey(3) ? rulesLimit.ip : []">
               <el-input v-model="limitDialogFormData.limitIp" type="textarea" :rows="2" placeholder="多个用英文逗号隔开" />
@@ -495,7 +495,7 @@ export default {
       }
       if (row.appKey) {
         val.push(row.appKey)
-        html.push('AppKey')
+        html.push('AppId')
       }
       if (row.limitIp) {
         val.push(row.limitIp)

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/bean/AbstractTargetRoute.java

@@ -1,32 +0,0 @@
-package com.gitee.sop.gatewaycommon.bean;
-
-/**
- * @author tanghc
- */
-public abstract class AbstractTargetRoute<T> implements TargetRoute<T> {
-
-    private ServiceRouteInfo serviceRouteInfo;
-    private RouteDefinition routeDefinition;
-    private T targetRoute;
-
-    public AbstractTargetRoute(ServiceRouteInfo serviceRouteInfo, RouteDefinition routeDefinition, T targetRoute) {
-        this.serviceRouteInfo = serviceRouteInfo;
-        this.routeDefinition = routeDefinition;
-        this.targetRoute = targetRoute;
-    }
-
-    @Override
-    public ServiceRouteInfo getServiceRouteInfo() {
-        return serviceRouteInfo;
-    }
-
-    @Override
-    public RouteDefinition getRouteDefinition() {
-        return routeDefinition;
-    }
-
-    @Override
-    public T getTargetRouteDefinition() {
-        return targetRoute;
-    }
-}

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/bean/RouteDefinition.java

@@ -1,9 +1,7 @@
 package com.gitee.sop.gatewaycommon.bean;
 
 import lombok.Data;
-import org.springframework.cloud.gateway.route.Route;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -77,10 +75,4 @@ public class RouteDefinition {
      */
     private int needToken;
 
-    /**
-     * 是否是兼容模式，即使用了@ApiAbility注解
-     */
-    private int compatibleMode;
-
-    private Route route;
 }

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/bean/ServiceDefinition.java

@@ -0,0 +1,26 @@
+package com.gitee.sop.gatewaycommon.bean;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author tanghc
+ */
+@Data
+public class ServiceDefinition {
+
+    /**
+     * 服务名称，对应spring.application.name
+     */
+    private String serviceId;
+
+    public ServiceDefinition(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String fetchServiceIdLowerCase() {
+        return serviceId.toLowerCase();
+    }
+}

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/bean/TargetRoute.java

@@ -3,14 +3,14 @@ package com.gitee.sop.gatewaycommon.bean;
 /**
  * @author tanghc
  */
-public interface TargetRoute<T> {
+public interface TargetRoute {
 
     /**
      * 返回服务信息
      *
      * @return 返回服务信息
      */
-    ServiceRouteInfo getServiceRouteInfo();
+    ServiceDefinition getServiceDefinition();
 
     /**
      * 返回微服务路由对象
@@ -19,10 +19,4 @@ public interface TargetRoute<T> {
      */
     RouteDefinition getRouteDefinition();
 
-    /**
-     * 返回网关路由对象
-     *
-     * @return 返回网关路由对象
-     */
-    T getTargetRouteDefinition();
 }

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/config/AbstractConfiguration.java

@@ -81,7 +81,7 @@ public class AbstractConfiguration implements ApplicationContextAware, Applicati
      * @param heartbeatEvent
      */
     @EventListener(classes = HeartbeatEvent.class)
-    public void listenNacosEvent(ApplicationEvent heartbeatEvent) {
+    public void listenEvent(ApplicationEvent heartbeatEvent) {
         // 没有启动完毕先等待
         if (!isStartupCompleted) {
             lock.lock();

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/EnvGrayFilter.java

@@ -32,7 +32,7 @@ public class EnvGrayFilter implements GlobalFilter, Ordered {
         if (targetRoute == null) {
             return chain.filter(exchange);
         }
-        String serviceId = targetRoute.getServiceRouteInfo().fetchServiceIdLowerCase();
+        String serviceId = targetRoute.getServiceDefinition().fetchServiceIdLowerCase();
         // 如果服务在灰度阶段，返回一个灰度版本号
         String version = envGrayManager.getVersion(serviceId, nameVersion);
         if (version != null && envGrayManager.containsKey(serviceId, apiParam.fetchAppKey())) {

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java

@@ -5,7 +5,6 @@ import com.gitee.sop.gatewaycommon.bean.SopConstants;
 import com.gitee.sop.gatewaycommon.exception.ApiException;
 import com.gitee.sop.gatewaycommon.gateway.ServerWebExchangeUtil;
 import com.gitee.sop.gatewaycommon.gateway.route.GatewayForwardChooser;
-import com.gitee.sop.gatewaycommon.manager.EnvironmentKeys;
 import com.gitee.sop.gatewaycommon.param.ApiParam;
 import com.gitee.sop.gatewaycommon.route.ForwardInfo;
 import com.gitee.sop.gatewaycommon.util.RouteInterceptorUtil;

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/route/GatewayRouteCache.java

@@ -1,46 +1,102 @@
 package com.gitee.sop.gatewaycommon.gateway.route;
 
+import com.alibaba.fastjson.JSON;
 import com.gitee.sop.gatewaycommon.bean.RouteDefinition;
+import com.gitee.sop.gatewaycommon.bean.ServiceDefinition;
 import com.gitee.sop.gatewaycommon.bean.ServiceRouteInfo;
-import com.gitee.sop.gatewaycommon.manager.BaseRouteCache;
+import com.gitee.sop.gatewaycommon.manager.RouteLoader;
 import com.gitee.sop.gatewaycommon.manager.RouteRepository;
-import org.springframework.beans.BeanUtils;
-import org.springframework.cloud.gateway.filter.FilterDefinition;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.DigestUtils;
 
-import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
  * @author tanghc
  */
-public class GatewayRouteCache extends BaseRouteCache<GatewayTargetRoute> {
+@Slf4j
+public class GatewayRouteCache implements RouteLoader {
+
+    /**
+     * KEY:serviceId, value: md5
+     */
+    private Map<String, String> serviceIdMd5Map = new HashMap<>();
+
+    private RouteRepository<GatewayTargetRoute> routeRepository;
 
     public GatewayRouteCache(RouteRepository<GatewayTargetRoute> routeRepository) {
-        super(routeRepository);
+        this.routeRepository = routeRepository;
     }
 
     @Override
-    protected GatewayTargetRoute buildTargetRoute(ServiceRouteInfo serviceRouteInfo, RouteDefinition routeDefinition) {
-        org.springframework.cloud.gateway.route.RouteDefinition targetRoute = new org.springframework.cloud.gateway.route.RouteDefinition();
-        targetRoute.setId(routeDefinition.getId());
-        String path = routeDefinition.getPath();
-        if (path != null && path.contains("{") && path.contains("}")) {
-            path = path.replace('{', '?');
-            path = path.replace('}', '?');
-        }
-        targetRoute.setUri(URI.create(routeDefinition.getUri() + "/" + path));
-        targetRoute.setOrder(routeDefinition.getOrder());
-        // 添加过滤器
-        List<FilterDefinition> filterDefinitionList = routeDefinition.getFilters()
-                .stream()
-                .map(filter -> {
-                    FilterDefinition filterDefinition = new FilterDefinition();
-                    BeanUtils.copyProperties(filter, filterDefinition);
-                    return filterDefinition;
-                })
+    public void load(ServiceRouteInfo serviceRouteInfo, Consumer<Object> callback) {
+        try {
+            String serviceId = serviceRouteInfo.getServiceId();
+            String newMd5 = buildMd5(serviceRouteInfo.getRouteDefinitionList());
+            String oldMd5 = serviceIdMd5Map.get(serviceId);
+            if (Objects.equals(newMd5, oldMd5)) {
+                return;
+            }
+            serviceIdMd5Map.put(serviceId, newMd5);
+
+            List<RouteDefinition> routeDefinitionList = serviceRouteInfo.getRouteDefinitionList();
+            for (RouteDefinition routeDefinition : routeDefinitionList) {
+                this.add(serviceId, routeDefinition);
+                if (log.isDebugEnabled()) {
+                    log.debug("新增路由：{}", JSON.toJSONString(routeDefinition));
+                }
+            }
+            this.refresh();
+            callback.accept(null);
+        } catch (Exception e) {
+            log.error("加载路由信息失败，serviceRouteInfo:{}", serviceRouteInfo, e);
+        }
+    }
+
+    /**
+     * 添加路由信息到本地缓存，这里添加后Spring Cloud Gateway并不会识别路由，需要调用refresh()方法
+     *
+     * @see #refresh()
+     * @param serviceId 服务id
+     * @param routeDefinition 路由信息
+     */
+    public void add(String serviceId, RouteDefinition routeDefinition) {
+        GatewayTargetRoute targetRoute = new GatewayTargetRoute(new ServiceDefinition(serviceId), routeDefinition);
+        routeRepository.add(targetRoute);
+    }
+
+    /**
+     * 刷新路由到Spring Cloud Gateway路由管理器当中
+     */
+    public void refresh() {
+        this.routeRepository.refresh();
+    }
+
+    /**
+     * 构建路由id MD5
+     *
+     * @param routeDefinitionList 路由列表
+     * @return 返回MD5
+     */
+    private String buildMd5(List<RouteDefinition> routeDefinitionList) {
+        List<String> routeIdList = routeDefinitionList.stream()
+                .map(JSON::toJSONString)
+                .sorted()
                 .collect(Collectors.toList());
-        return new GatewayTargetRoute(serviceRouteInfo, routeDefinition, targetRoute);
+        String md5Source = org.apache.commons.lang3.StringUtils.join(routeIdList, "");
+        return DigestUtils.md5DigestAsHex(md5Source.getBytes(StandardCharsets.UTF_8));
+    }
+
+    @Override
+    public void remove(String serviceId) {
+        serviceIdMd5Map.remove(serviceId);
+        routeRepository.deleteAll(serviceId);
     }
 
 }

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/route/GatewayRouteRepository.java

@@ -1,19 +1,15 @@
 package com.gitee.sop.gatewaycommon.gateway.route;
 
-import com.gitee.sop.gatewaycommon.bean.AbstractTargetRoute;
 import com.gitee.sop.gatewaycommon.bean.RouteDefinition;
 import com.gitee.sop.gatewaycommon.manager.RouteRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.event.RefreshRoutesEvent;
 import org.springframework.cloud.gateway.route.Route;
 import org.springframework.cloud.gateway.route.RouteLocator;
 import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
 import org.springframework.context.ApplicationContext;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.util.PathMatcher;
 import reactor.core.publisher.Flux;
 
 import java.util.Collection;
@@ -32,8 +28,6 @@ import static java.util.Collections.synchronizedMap;
 @Slf4j
 public class GatewayRouteRepository implements RouteRepository<GatewayTargetRoute>, RouteLocator {
 
-    private final PathMatcher pathMatcher = new AntPathMatcher();
-
     private static final Map<String, GatewayTargetRoute> routes = synchronizedMap(new LinkedHashMap<>());
 
     @Autowired
@@ -56,7 +50,7 @@ public class GatewayRouteRepository implements RouteRepository<GatewayTargetRout
         RouteLocatorBuilder.Builder builder = routeLocatorBuilder.routes();
         List<RouteDefinition> routeDefinitionList = routes.values()
                 .stream()
-                .map(AbstractTargetRoute::getRouteDefinition)
+                .map(GatewayTargetRoute::getRouteDefinition)
                 .collect(Collectors.toList());
         routeDefinitionList.forEach(routeDefinition -> builder.route(routeDefinition.getId(),
                 r -> r.path(routeDefinition.getPath())
@@ -75,32 +69,7 @@ public class GatewayRouteRepository implements RouteRepository<GatewayTargetRout
         if (id == null) {
             return null;
         }
-        GatewayTargetRoute gatewayTargetRoute = routes.get(id);
-        if (gatewayTargetRoute != null) {
-            return gatewayTargetRoute;
-        }
-        for (Map.Entry<String, GatewayTargetRoute> entry : routes.entrySet()) {
-            // /food/get/?id?
-            String pattern = entry.getKey();
-            if (this.pathMatcher.match(pattern, id)) {
-                return clone(id, entry.getValue());
-            }
-        }
-        return null;
-    }
-
-    private GatewayTargetRoute clone(String path, GatewayTargetRoute gatewayTargetRoute) {
-        String prefix = "/" + gatewayTargetRoute.getServiceRouteInfo().getServiceId();
-        if (path.startsWith(prefix)) {
-            path = path.substring(prefix.length());
-        }
-        RouteDefinition routeDefinition = gatewayTargetRoute.getRouteDefinition();
-        RouteDefinition newRouteDefinition = new RouteDefinition();
-        BeanUtils.copyProperties(routeDefinition, newRouteDefinition);
-        newRouteDefinition.setPath(path);
-        return new GatewayTargetRoute(gatewayTargetRoute.getServiceRouteInfo()
-                , newRouteDefinition
-                , gatewayTargetRoute.getTargetRouteDefinition());
+        return routes.get(id);
     }
 
 
@@ -136,7 +105,7 @@ public class GatewayRouteRepository implements RouteRepository<GatewayTargetRout
     @Override
     public void deleteAll(String serviceId) {
         List<String> idList = routes.values().stream()
-                .filter(zuulTargetRoute -> StringUtils.equalsIgnoreCase(serviceId, zuulTargetRoute.getServiceRouteInfo().getServiceId()))
+                .filter(zuulTargetRoute -> StringUtils.equalsIgnoreCase(serviceId, zuulTargetRoute.getServiceDefinition().getServiceId()))
                 .map(zuulTargetRoute -> zuulTargetRoute.getRouteDefinition().getId())
                 .collect(Collectors.toList());
 

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/route/GatewayTargetRoute.java

@@ -1,15 +1,30 @@
 package com.gitee.sop.gatewaycommon.gateway.route;
 
-import com.gitee.sop.gatewaycommon.bean.AbstractTargetRoute;
 import com.gitee.sop.gatewaycommon.bean.RouteDefinition;
-import com.gitee.sop.gatewaycommon.bean.ServiceRouteInfo;
+import com.gitee.sop.gatewaycommon.bean.ServiceDefinition;
+import com.gitee.sop.gatewaycommon.bean.TargetRoute;
 
 /**
  * @author tanghc
  */
-public class GatewayTargetRoute extends AbstractTargetRoute<org.springframework.cloud.gateway.route.RouteDefinition> {
+public class GatewayTargetRoute implements TargetRoute {
 
-    public GatewayTargetRoute(ServiceRouteInfo serviceRouteInfo, RouteDefinition routeDefinition, org.springframework.cloud.gateway.route.RouteDefinition targetRoute) {
-        super(serviceRouteInfo, routeDefinition, targetRoute);
+    private ServiceDefinition serviceDefinition;
+    private RouteDefinition routeDefinition;
+
+
+    public GatewayTargetRoute(ServiceDefinition serviceDefinition, RouteDefinition routeDefinition) {
+        this.serviceDefinition = serviceDefinition;
+        this.routeDefinition = routeDefinition;
+    }
+
+    @Override
+    public ServiceDefinition getServiceDefinition() {
+        return serviceDefinition;
+    }
+
+    @Override
+    public RouteDefinition getRouteDefinition() {
+        return routeDefinition;
     }
 }

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/limit/DefaultLimitManager.java

@@ -39,7 +39,7 @@ public class DefaultLimitManager implements LimitManager {
             // 被限流了
             return counter.get(routeConfig.getId()).incrementAndGet() <= execCountPerSecond;
         } catch (ExecutionException e) {
-            log.error("漏桶限流出错，routeConfig:{}", routeConfig, e);
+            log.error("窗口限流出错，routeConfig:{}", routeConfig, e);
             return false;
         }
     }

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/limit/LimitType.java

@@ -7,7 +7,7 @@ package com.gitee.sop.gatewaycommon.limit;
  */
 public enum LimitType {
     /**
-     * 漏桶策略。每秒处理固定数量的请求，超出请求返回错误信息。
+     * 窗口策略。每秒处理固定数量的请求，超出请求返回错误信息。
      */
     LEAKY_BUCKET(1),
     /**

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/BaseRouteCache.java

@@ -1,90 +0,0 @@
-package com.gitee.sop.gatewaycommon.manager;
-
-import com.alibaba.fastjson.JSON;
-import com.gitee.sop.gatewaycommon.bean.RouteDefinition;
-import com.gitee.sop.gatewaycommon.bean.ServiceRouteInfo;
-import com.gitee.sop.gatewaycommon.bean.TargetRoute;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.DigestUtils;
-
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-/**
- * @author tanghc
- */
-@Slf4j
-public abstract class BaseRouteCache<T extends TargetRoute> implements RouteLoader {
-
-    /**
-     * KEY:serviceId, value: md5
-     */
-    private Map<String, String> serviceIdMd5Map = new HashMap<>();
-
-    private RouteRepository<T> routeRepository;
-
-    /**
-     * 构建目标路由对象，zuul和gateway定义的路由对象
-     *
-     * @param serviceRouteInfo       路由服务对象
-     * @param gatewayRouteDefinition 路由对象
-     * @return 返回目标路由对象
-     */
-    protected abstract T buildTargetRoute(ServiceRouteInfo serviceRouteInfo, RouteDefinition gatewayRouteDefinition);
-
-    public BaseRouteCache(RouteRepository<T> routeRepository) {
-        this.routeRepository = routeRepository;
-    }
-
-    @Override
-    public void load(ServiceRouteInfo serviceRouteInfo, Consumer<Object> callback) {
-        try {
-            String serviceId = serviceRouteInfo.getServiceId();
-            String newMd5 = buildMd5(serviceRouteInfo.getRouteDefinitionList());
-            String oldMd5 = serviceIdMd5Map.get(serviceId);
-            if (Objects.equals(newMd5, oldMd5)) {
-                return;
-            }
-            serviceIdMd5Map.put(serviceId, newMd5);
-
-            List<RouteDefinition> routeDefinitionList = serviceRouteInfo.getRouteDefinitionList();
-            for (RouteDefinition routeDefinition : routeDefinitionList) {
-                T targetRoute = this.buildTargetRoute(serviceRouteInfo, routeDefinition);
-                routeRepository.add(targetRoute);
-                if (log.isDebugEnabled()) {
-                    log.debug("新增路由：{}", JSON.toJSONString(routeDefinition));
-                }
-            }
-            this.routeRepository.refresh();
-            callback.accept(null);
-        } catch (Exception e) {
-            log.error("加载路由信息失败，serviceRouteInfo:{}", serviceRouteInfo, e);
-        }
-    }
-
-    /**
-     * 构建路由id MD5
-     *
-     * @param routeDefinitionList 路由列表
-     * @return 返回MD5
-     */
-    private String buildMd5(List<RouteDefinition> routeDefinitionList) {
-        List<String> routeIdList = routeDefinitionList.stream()
-                .map(JSON::toJSONString)
-                .sorted()
-                .collect(Collectors.toList());
-        String md5Source = org.apache.commons.lang3.StringUtils.join(routeIdList, "");
-        return DigestUtils.md5DigestAsHex(md5Source.getBytes(StandardCharsets.UTF_8));
-    }
-
-    @Override
-    public void remove(String serviceId) {
-        serviceIdMd5Map.remove(serviceId);
-        routeRepository.deleteAll(serviceId);
-    }
-}

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/ApiParam.java

@@ -16,7 +16,6 @@ import java.util.UUID;
 public class ApiParam extends JSONObject implements Param {
 
 
-
     public ApiParam() {
     }
 
@@ -25,39 +24,15 @@ public class ApiParam extends JSONObject implements Param {
     }
 
     private String requestId = UUID.randomUUID().toString().replace("-", "");
-    private boolean ignoreSign;
-    private boolean ignoreValidate;
-
-    private String restName;
-    private String restVersion;
 
     private String serviceId;
     private String ip;
-    private boolean restful;
     private boolean mergeResult = true;
 
     private boolean isGrayRequest;
 
     private transient UploadContext uploadContext;
 
-    public static ApiParam createRestfulApiParam(String path) {
-        ApiParam apiParam = new ApiParam();
-        apiParam.setName(path);
-        apiParam.setVersion("");
-        apiParam.setRestful(true);
-        apiParam.setMergeResult(false);
-        return apiParam;
-    }
-
-    public void fitNameVersion() {
-        if (restName != null) {
-            this.put(ParamNames.API_NAME, restName);
-        }
-        if (restVersion != null) {
-            this.put(ParamNames.VERSION_NAME, restVersion);
-        }
-    }
-
     public static ApiParam build(Map<String, ?> map) {
         ApiParam apiParam = new ApiParam();
         for (Map.Entry<String, ?> entry : map.entrySet()) {
@@ -82,25 +57,8 @@ public class ApiParam extends JSONObject implements Param {
         return sign;
     }
 
-    /**
-     * 是否忽略验证签名
-     *
-     * @return 返回true，忽略签名
-     */
-    public boolean fetchIgnoreSign() {
-        return ignoreSign;
-    }
-
-    public void setIgnoreSign(boolean ignoreSign) {
-        this.ignoreSign = ignoreSign;
-    }
-
-    public boolean fetchIgnoreValidate() {
-        return ignoreValidate;
-    }
-
-    public void setIgnoreValidate(boolean ignoreValidate) {
-        this.ignoreValidate = ignoreValidate;
+    public void setName(String name) {
+        put(ParamNames.API_NAME, name);
     }
 
     /**
@@ -108,15 +66,7 @@ public class ApiParam extends JSONObject implements Param {
      */
     @Override
     public String fetchName() {
-        String name = getString(ParamNames.API_NAME);
-        if (name == null) {
-            name = this.restName;
-        }
-        return name;
-    }
-
-    public void setName(String name) {
-        this.restName = name;
+        return getString(ParamNames.API_NAME);
     }
 
     public String fetchNameVersion() {
@@ -139,15 +89,7 @@ public class ApiParam extends JSONObject implements Param {
      */
     @Override
     public String fetchVersion() {
-        String version = getString(ParamNames.VERSION_NAME);
-        if (version == null) {
-            version = this.restVersion;
-        }
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.restVersion = version;
+        return getString(ParamNames.VERSION_NAME);
     }
 
     /**
@@ -162,6 +104,8 @@ public class ApiParam extends JSONObject implements Param {
         put(ParamNames.APP_KEY_NAME, appKey);
     }
 
+
+
     /**
      * 参数,urlencode后的
      */
@@ -244,14 +188,6 @@ public class ApiParam extends JSONObject implements Param {
         return super.hashCode();
     }
 
-    public void setRestName(String restName) {
-        this.restName = restName;
-    }
-
-    public void setRestVersion(String restVersion) {
-        this.restVersion = restVersion;
-    }
-
     public void setIp(String ip) {
         this.ip = ip;
     }
@@ -284,12 +220,8 @@ public class ApiParam extends JSONObject implements Param {
         this.mergeResult = mergeResult;
     }
 
-    public boolean fetchRestful() {
-        return restful;
-    }
-
-    public void setRestful(boolean restful) {
-        this.restful = restful;
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
     }
 
     public String fetchRequestId() {

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/BaseParamBuilder.java

@@ -1,76 +0,0 @@
-package com.gitee.sop.gatewaycommon.param;
-
-import com.gitee.sop.gatewaycommon.bean.RouteDefinition;
-import com.gitee.sop.gatewaycommon.bean.TargetRoute;
-import com.gitee.sop.gatewaycommon.manager.RouteRepository;
-import com.gitee.sop.gatewaycommon.manager.RouteRepositoryContext;
-import com.gitee.sop.gatewaycommon.message.ErrorEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.BooleanUtils;
-
-import java.util.Optional;
-
-/**
- * @author tanghc
- */
-@Slf4j
-public abstract class BaseParamBuilder<T> implements ParamBuilder<T> {
-
-    /**
-     * 构建请求参数
-     *
-     * @param ctx 请求request
-     * @return 返回请求参数
-     */
-    public abstract ApiParam buildRequestParams(T ctx);
-
-    /**
-     * 返回客户端ip
-     *
-     * @param ctx 请求request
-     * @return 返回ip
-     */
-    public abstract String getIP(T ctx);
-
-    /**
-     * 将版本号添加到header中
-     *
-     * @param ctx        请求request
-     * @param headerName headerName
-     * @param version    版本号
-     */
-    public abstract void setVersionInHeader(T ctx, String headerName, String version);
-
-    @Override
-    public ApiParam build(T ctx) {
-        ApiParam apiParam = this.buildRequestParams(ctx);
-        this.processApiParam(apiParam, ctx);
-        this.initOtherProperty(apiParam);
-        apiParam.setIp(this.getIP(ctx));
-        this.setVersionInHeader(ctx, ParamNames.HEADER_VERSION_NAME, apiParam.fetchVersion());
-        return apiParam;
-    }
-
-    protected void processApiParam(ApiParam param, T ctx) {
-
-    }
-
-    protected void initOtherProperty(ApiParam apiParam) {
-        RouteRepository<? extends TargetRoute> routeRepository = RouteRepositoryContext.getRouteRepository();
-        if (routeRepository == null) {
-            log.error("RouteRepositoryContext.setRouteRepository()方法未使用");
-            throw ErrorEnum.ISP_UNKNOWN_ERROR.getErrorMeta().getException();
-        }
-
-        String nameVersion = Optional.ofNullable(apiParam.fetchNameVersion()).orElse(String.valueOf(System.currentTimeMillis()));
-        TargetRoute targetRoute = routeRepository.get(nameVersion);
-        Integer ignoreValidate = Optional.ofNullable(targetRoute)
-                .map(TargetRoute::getRouteDefinition)
-                .map(RouteDefinition::getIgnoreValidate)
-                // 默认不忽略
-                .orElse(BooleanUtils.toInteger(false));
-        apiParam.setIgnoreValidate(BooleanUtils.toBoolean(ignoreValidate));
-    }
-
-}
-

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/param/ParamBuilder.java

@@ -1,14 +0,0 @@
-package com.gitee.sop.gatewaycommon.param;
-
-/**
- * @author tanghc
- */
-public interface ParamBuilder<T> {
-    /**
-     * 从request提取参数
-     * @param request
-     * @return 返回ApiParam
-     * @throws Exception
-     */
-    ApiParam build(T request);
-}

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/route/BaseForwardChooser.java

@@ -24,7 +24,7 @@ public abstract class BaseForwardChooser<T> implements ForwardChooser<T>, ApiPar
         ApiParam apiParam = getApiParam(t);
         String nameVersion = apiParam.fetchNameVersion();
         TargetRoute targetRoute = RouteRepositoryContext.getRouteRepository().get(nameVersion);
-        String serviceId = targetRoute.getServiceRouteInfo().fetchServiceIdLowerCase();
+        String serviceId = targetRoute.getServiceDefinition().fetchServiceIdLowerCase();
         // 如果服务在灰度阶段，返回一个灰度版本号
         String grayVersion = envGrayManager.getVersion(serviceId, nameVersion);
         // 如果是灰度环境

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/route/ServiceRouteListener.java

@@ -3,7 +3,7 @@ package com.gitee.sop.gatewaycommon.route;
 import com.alibaba.fastjson.JSON;
 import com.gitee.sop.gatewaycommon.bean.InstanceDefinition;
 import com.gitee.sop.gatewaycommon.bean.ServiceRouteInfo;
-import com.gitee.sop.gatewaycommon.manager.BaseRouteCache;
+import com.gitee.sop.gatewaycommon.gateway.route.GatewayRouteCache;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,10 +24,8 @@ public class ServiceRouteListener extends BaseServiceListener {
 
     private static final String METADATA_SOP_ROUTES_PATH = "sop.routes.path";
 
-    private static final String HEADER_RESTFUL = "restful";
-
     @Autowired
-    private BaseRouteCache<?> baseRouteCache;
+    private GatewayRouteCache gatewayRouteCache;
 
     @Autowired
     private RoutesProcessor routesProcessor;
@@ -35,7 +33,7 @@ public class ServiceRouteListener extends BaseServiceListener {
     @Override
     public void onRemoveService(String serviceId) {
         log.info("服务下线，删除路由配置，serviceId: {}", serviceId);
-        baseRouteCache.remove(serviceId);
+        gatewayRouteCache.remove(serviceId);
         routesProcessor.removeAllRoutes(serviceId);
     }
 
@@ -48,7 +46,7 @@ public class ServiceRouteListener extends BaseServiceListener {
         if (responseEntity.getStatusCode() == HttpStatus.OK) {
             String body = responseEntity.getBody();
             ServiceRouteInfo serviceRouteInfo = JSON.parseObject(body, ServiceRouteInfo.class);
-            baseRouteCache.load(serviceRouteInfo, callback -> routesProcessor.saveRoutes(serviceRouteInfo, instance));
+            gatewayRouteCache.load(serviceRouteInfo, callback -> routesProcessor.saveRoutes(serviceRouteInfo, instance));
         } else {
             log.error("拉取路由配置异常，url: {}, status: {}, body: {}", url, responseEntity.getStatusCodeValue(), responseEntity.getBody());
         }

sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/validate/ApiValidator.java

@@ -129,7 +129,7 @@ public class ApiValidator implements Validator {
     }
 
     private void initFields(TargetRoute targetRoute, ApiParam apiParam) {
-        apiParam.setServiceId(targetRoute.getServiceRouteInfo().getServiceId());
+        apiParam.setServiceId(targetRoute.getServiceDefinition().getServiceId());
         boolean mergeResult;
         Boolean defaultSetting = ApiContext.getApiConfig().getMergeResult();
         if (defaultSetting != null) {

sop-common/sop-service-common/pom.xml

@@ -36,11 +36,21 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
+
         <!-- optional -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -53,11 +63,6 @@
             <version>5.1.4.RELEASE</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>net.oschina.durcframework</groupId>
-            <artifactId>easyopen</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
@@ -68,11 +73,6 @@
             <artifactId>swagger-annotations</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -102,7 +102,6 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
 

sop-gateway/src/main/java/com/gitee/sop/gateway/entity/ConfigLimit.java

@@ -38,7 +38,7 @@ public class ConfigLimit {
     /** 服务id, 数据库字段：service_id */
     private String serviceId;
 
-    /** 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type */
+    /** 限流策略，1：窗口策略，2：令牌桶策略, 数据库字段：limit_type */
     private Byte limitType;
 
     /** 每秒可处理请求数, 数据库字段：exec_count_per_second */

sop-gateway/src/main/java/com/gitee/sop/gateway/entity/ConfigRouteLimit.java

@@ -28,7 +28,7 @@ public class ConfigRouteLimit {
     /** 路由id, 数据库字段：route_id */
     private String routeId;
 
-    /** 限流策略，1：漏桶策略，2：令牌桶策略, 数据库字段：limit_type */
+    /** 限流策略，1：窗口策略，2：令牌桶策略, 数据库字段：limit_type */
     private Byte limitType;
 
     /** 每秒可处理请求数, 数据库字段：exec_count_per_second */

sop-gateway/src/main/java/com/gitee/sop/gateway/entity/IsvInfo.java

@@ -28,15 +28,6 @@ public class IsvInfo {
     /** appKey, 数据库字段：app_key */
     private String appKey;
 
-    /** secret, 数据库字段：secret */
-    private String secret;
-
-    /** 公钥, 数据库字段：pub_key */
-    private String pubKey;
-
-    /** 私钥, 数据库字段：pri_key */
-    private String priKey;
-
     /** 1启用，2禁用, 数据库字段：status */
     private Byte status;
 

sop-gateway/src/main/java/com/gitee/sop/gateway/mapper/ConfigServiceRouteMapper.java

@@ -7,5 +7,5 @@ import com.gitee.sop.gateway.entity.ConfigServiceRoute;
 /**
  * @author tanghc
  */
-public interface ConfigServiceRouteMapper extends CrudMapper<ConfigServiceRoute, Long> {
+public interface ConfigServiceRouteMapper extends CrudMapper<ConfigServiceRoute, String> {
 }

sop-mysql5.6以下版本.sql

@@ -3,12 +3,6 @@ CREATE DATABASE IF NOT EXISTS `sop` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE u
 USE `sop`;
 
 
-
-
-SET @PREVIOUS_FOREIGN_KEY_CHECKS = @@FOREIGN_KEY_CHECKS;
-SET FOREIGN_KEY_CHECKS = 0;
-
-
 DROP TABLE IF EXISTS `user_info`;
 DROP TABLE IF EXISTS `perm_role_permission`;
 DROP TABLE IF EXISTS `perm_role`;
@@ -93,7 +87,7 @@ CREATE TABLE `config_limit` (
   `app_key` VARCHAR(128) DEFAULT NULL,
   `limit_ip` VARCHAR(300) DEFAULT NULL COMMENT '限流ip，多个用英文逗号隔开',
   `service_id` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '服务id',
-  `limit_type` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '限流策略，1：漏桶策略，2：令牌桶策略',
+  `limit_type` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '限流策略，1：窗口策略，2：令牌桶策略',
   `exec_count_per_second` INT(11) DEFAULT NULL COMMENT '每秒可处理请求数',
   `duration_seconds` INT(11) NOT NULL DEFAULT '1' COMMENT '限流持续时间，默认1秒，即每durationSeconds秒允许多少请求（当limit_type=1时有效）',
   `limit_code` VARCHAR(64) DEFAULT NULL COMMENT '返回的错误码',
@@ -123,7 +117,7 @@ CREATE TABLE `config_route_limit` (
   `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
   `route_id` VARCHAR(64) NOT NULL COMMENT '路由id',
   `service_id` VARCHAR(64) NOT NULL DEFAULT '',
-  `limit_type` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '限流策略，1：漏桶策略，2：令牌桶策略',
+  `limit_type` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '限流策略，1：窗口策略，2：令牌桶策略',
   `exec_count_per_second` INT(11) DEFAULT NULL COMMENT '每秒可处理请求数',
   `limit_code` VARCHAR(64) DEFAULT NULL COMMENT '返回的错误码',
   `limit_msg` VARCHAR(100) DEFAULT NULL COMMENT '返回的错误信息',
@@ -139,9 +133,6 @@ CREATE TABLE `config_route_limit` (
 CREATE TABLE `isv_info` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
   `app_key` VARCHAR(100) NOT NULL COMMENT 'appKey',
-  `secret` VARCHAR(200) DEFAULT NULL COMMENT 'secret',
-  `pub_key` TEXT COMMENT '公钥',
-  `pri_key` TEXT COMMENT '私钥',
   `status` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0' COMMENT '1启用，2禁用',
   `sign_type` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '1:RSA2,2:MD5',
   `remark` VARCHAR(128) DEFAULT NULL COMMENT '备注',
@@ -235,62 +226,11 @@ CREATE TABLE `config_service_route` (
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='路由配置';
 
 
-SET FOREIGN_KEY_CHECKS = @PREVIOUS_FOREIGN_KEY_CHECKS;
-
-
-SET @PREVIOUS_FOREIGN_KEY_CHECKS = @@FOREIGN_KEY_CHECKS;
-SET FOREIGN_KEY_CHECKS = 0;
-
-
-LOCK TABLES `admin_user_info` WRITE;
-ALTER TABLE `admin_user_info` DISABLE KEYS;
 INSERT INTO `admin_user_info` (`id`, `username`, `password`, `status`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'admin','a62cd510fb9a8a557a27ef279569091f',1,'2019-04-02 19:55:26','2019-04-02 19:55:26');
 ALTER TABLE `admin_user_info` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_common` WRITE;
-ALTER TABLE `config_common` DISABLE KEYS;
-ALTER TABLE `config_common` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_gray` WRITE;
-ALTER TABLE `config_gray` DISABLE KEYS;
-ALTER TABLE `config_gray` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_gray_instance` WRITE;
-ALTER TABLE `config_gray_instance` DISABLE KEYS;
-ALTER TABLE `config_gray_instance` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `config_ip_blacklist` WRITE;
-ALTER TABLE `config_ip_blacklist` DISABLE KEYS;
-ALTER TABLE `config_ip_blacklist` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_limit` WRITE;
-ALTER TABLE `config_limit` DISABLE KEYS;
-INSERT INTO `config_limit` (`id`, `route_id`, `app_key`, `limit_ip`, `service_id`, `limit_type`, `exec_count_per_second`, `limit_code`, `limit_msg`, `token_bucket_count`, `limit_status`, `order_index`, `remark`, `gmt_create`, `gmt_modified`) VALUES
-	(1,'alipay.story.get1.0','','192.168.1.1,172.2.2.3','story-service',2,5,'','',6,1,3,NULL,'2019-05-17 19:21:35','2019-05-21 09:12:15'),
-	(2,'alipay.story.get1.0','2019032617262200001','','story-service',2,5,'service-budy','服务器忙',10,1,0,'','2019-05-17 19:39:30','2019-05-21 15:36:52'),
-	(3,'alipay.story.find1.0','20190331562013861008375808','','story-service',1,3,'service-busy','服务器忙',5,1,1,NULL,'2019-05-17 20:20:32','2019-05-20 17:40:17'),
-	(4,'alipay.story.get1.2','','','story-service',1,5,'service-busy','服务器忙',3,1,1,'','2019-05-20 16:27:21','2019-05-21 15:53:10'),
-	(5,'','20190401562373796095328256','','story-service',1,5,'service-busy','服务器忙',5,1,0,'这个appKey调用很频繁，重点照顾','2019-05-21 15:48:08','2019-05-21 18:45:32'),
-	(6,'','','10.1.30.54','story-service',1,5,'service-busy','服务器忙',5,1,0,'这个ip在攻击我们','2019-05-21 15:55:33','2019-05-21 18:17:29'),
-	(7,'story.get1.1','','10.1.30.54','story-service',1,5,'service-busy','服务器忙',5,1,0,NULL,'2019-05-21 16:30:48','2019-05-21 16:30:48'),
-	(8,'','20190513577548661718777857','10.1.30.54','story-service',1,5,'service-busy','服务器忙',5,1,0,NULL,'2019-05-21 17:10:45','2019-05-21 17:10:52');
-ALTER TABLE `config_limit` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_route_base` WRITE;
-ALTER TABLE `config_route_base` DISABLE KEYS;
 INSERT INTO `config_route_base` (`id`, `route_id`, `status`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'story.get1.1',1,'2019-04-09 19:15:58','2019-04-09 19:16:54'),
 	(2,'alipay.story.get1.0',1,'2019-04-09 19:19:57','2019-04-19 14:45:33'),
@@ -300,40 +240,28 @@ INSERT INTO `config_route_base` (`id`, `route_id`, `status`, `gmt_create`, `gmt_
 	(6,'alipay.category.get1.0',1,'2019-05-06 16:50:39','2019-05-20 17:01:48'),
 	(7,'permission.story.get1.0',1,'2019-05-06 20:03:17','2019-05-06 20:03:21'),
 	(8,'goods.add1.0',1,'2019-05-13 17:23:00','2019-05-13 17:23:11');
-ALTER TABLE `config_route_base` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `config_route_limit` WRITE;
-ALTER TABLE `config_route_limit` DISABLE KEYS;
 INSERT INTO `config_route_limit` (`id`, `route_id`, `service_id`, `limit_type`, `exec_count_per_second`, `limit_code`, `limit_msg`, `token_bucket_count`, `limit_status`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'alipay.story.find1.0','story-service',1,10,'isp.service-busy','服务器正忙',NULL,1,'2019-04-10 20:55:08','2019-04-10 21:04:35'),
 	(2,'alipay.story.get1.0','story-service',2,5,'isp.service-busy','服务器正忙',5,0,'2019-04-10 21:05:51','2019-04-11 18:18:03'),
 	(3,'alipay.story.get1.2','story-service',2,10,'isp.service-busy','服务器正忙',3,1,'2019-04-11 17:26:04','2019-04-11 18:19:33'),
 	(4,'alipay.category.get1.0','story-service',1,5,'error-code','服务器忙',5,1,'2019-05-07 12:22:04','2019-05-07 12:25:06');
-ALTER TABLE `config_route_limit` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `isv_info` WRITE;
-ALTER TABLE `isv_info` DISABLE KEYS;
-INSERT INTO `isv_info` (`id`, `app_key`, `secret`, `pub_key`, `pri_key`, `status`, `sign_type`, `remark`, `gmt_create`, `gmt_modified`) VALUES
-	(1,'2019032617262200001','','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',1,1,NULL,'2019-03-27 10:10:34','2019-05-09 11:10:38'),
-	(3,'asdfasdf','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOJTAsGoAsNGJdzaWm835mtpcY2YxGr4NPjnhQmfUrPdT+Zgi6jmm+olYuygNeB8cOSALmTzgXlef+6SdwfRJVEMYVAO7hqF0Ood9zTOc+kolgnWJtqX54CoodfABt0SNS/bsr6hCAWu17RGnbgBaK+ZaJD3NVqXVXE8E30cYHiQIDAQAB','MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAM4lMCwagCw0Yl3Npabzfma2lxjZjEavg0+OeFCZ9Ss91P5mCLqOab6iVi7KA14Hxw5IAuZPOBeV5/7pJ3B9ElUQxhUA7uGoXQ6h33NM5z6SiWCdYm2pfngKih18AG3RI1L9uyvqEIBa7XtEaduAFor5lokPc1WpdVcTwTfRxgeJAgMBAAECgYAM3XFGL1k0aQiChiUCaEvJKTgAywLgHm/5dRC5JwKP8knqnn+I9P5QcV0jimPvaFjZ4VCdAvCjOC3EUNSvRn7wR2Lb1+BGZZePTdxtHWE2aqJ1W1SvgQTqMsLlPBRPnXo5XH/ng3WEH15ynd5NR035xAluaI0X/y+PsRxE6TlfIQJBAPSYUyXa2yaEqmvIN+ECKALCLLeDdi2YW3Kjahgz0X9V4Y4aTdrHh8y603zXC0Wy8HeOhwGoyciaS8SmjxCMn4UCQQDXweW8xsUreLH8hfVUtyiY/KgUz+R5foJDNXD7TLE9CDoPSHy09qBe99HyVCZg/gNJH4O+tNr6C4916dYaVk01AkBYZ2HOEc8ZmeOaty/zJHtfm9zbqykgi6upwISNINV8Z4bxfHJdO7bKeVANFBBf7a/aFmqXX/EmjxYJioW03o6dAkEAp7ViXJCtJpNU1pNSFZ2hgvmxtSu7zuyVWKSrw8rjYiuI5eRUe13RXsCHgzQB+Ra5exdyEsUGCaL+yosPD73RmQJBALGuM8EQUcBgrpgpeLZ39Ni1DYXYG9aj+u+ar/UL6kI1mCNFgwroO4EVIvXPVxikMxUgiE2tVaBML5nm8VDNJ7s=',2,1,NULL,'2019-03-27 11:01:11','2019-05-11 10:45:01'),
-	(5,'20190331562013861008375808','29864b93427447f5ac6c44df746f84ef','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4aMIx2q8rCVu5z6dgNQQSX2vwhvIcRb7FaqSk0ZK8AV9qQeE1TvfFVlAzOHlysE1yTRb0Mb6W2aw7IAS7Bkc3onYBQR4zNQYjYoDBzLukjF8o84hoVFRnh7sV8zszid2vb5H/YQr3M+5sYhlXY8KfILk3vhdbWpHM/umplcrxlwIDAQAB','MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALhowjHarysJW7nPp2A1BBJfa/CG8hxFvsVqpKTRkrwBX2pB4TVO98VWUDM4eXKwTXJNFvQxvpbZrDsgBLsGRzeidgFBHjM1BiNigMHMu6SMXyjziGhUVGeHuxXzOzOJ3a9vkf9hCvcz7mxiGVdjwp8guTe+F1takcz+6amVyvGXAgMBAAECgYBj40LFVGoryp7n0CYeg7kX5p4GJGKCk/jY4IIcUPTFZ4zydorxoDuvpag9hmqqh/r7XeyAC23sMi4LvLUzRRxPh+7PuwL6nLce7vytsMCZQTPpBgz7dUfbi2HAxsuMOLjH3sVGycutARJsz6bT+9PyBEuVtUqwBrDGpFvwT0z6yQJBAOANC8nysb+O4rn/fbJtHIhtQoV74yu00mLnfwv8/J1+WyAEc32WZ4KYINqCe8ft1UknhPQx9UV6JaPCnlpF6w0CQQDStJhd38uQ7dVUQZHGP24xS/K38AYiSheEr7uewhkJfC2cKqE/lBk3oEG4s7asjhwlFLWLWSBLVM/Ta9Yj0hYzAkBe82hxl1bY9bcEWFBu02rqLlOouk4V8bXPkIf5DqgIHsqDkR9Ys+r+H3ac4/uNSS/ApuzjiGCHpzJYalwtqb/pAkEAvAKlSm5dCC8QAaSYXJtQyfAI3hPwhTwzjBP6iAiNqqcBU62+QCr37Wiz/Alv4LzVZEj8TSDz7gP5hZ9dbo0RfQJBALJ7NhTaeMN4jxBJ6Xg4rNZPb4yhAXuFxCp+a+FyXTsbWnW/ar8KJ3LHox0GOao6wne4qN3h7eqLOrYnnvOSFl0=',1,2,NULL,'2019-03-31 20:34:12','2019-04-19 17:30:09'),
-	(6,'20190331562037310372184064','d6b2a6603236491f87eed958292be136','','',2,2,NULL,'2019-03-31 22:07:20','2019-05-07 18:14:53'),
-	(7,'20190401562373672858288128','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCOgSo6GfwM8a+rUT4m61nZa7q5cJpjL7luxQKuJvkMl/QydVrzRPinCh6zqgBJDa7YY2X6z5TyTkjYuDkYMrdyHcYvCDuJ0NpRPZMR+QDE70yp9wJ+kOqTa8bepJtxzuCYLxFz+wRsIFt0nIxC6ttCaM9OEw/Bflhws3xczw4uqQIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAI6BKjoZ/Azxr6tRPibrWdlrurlwmmMvuW7FAq4m+QyX9DJ1WvNE+KcKHrOqAEkNrthjZfrPlPJOSNi4ORgyt3Idxi8IO4nQ2lE9kxH5AMTvTKn3An6Q6pNrxt6km3HO4JgvEXP7BGwgW3ScjELq20Joz04TD8F+WHCzfFzPDi6pAgMBAAECgYA/zuQ6ieILZbjUDBe5U46yxQMh/6KRoQ/14m81zauckPm+EkA8R3jTSru+lPN1wpO0vqUuLf6ylI0XxT2DcUokOgY07ZdE54pu5XAsyY0eanFwt6C1LrHYpORV3Mp9XuI3fXrxYqVlxLuj1N7MGinXUuW7aZCHaEuSnZ55OL9dkQJBANKOeFiYDISSuIFHSrndSgr+a8E44jS/2/7lE49p5l3WVOFTHh0IZQNTs/IKsKJkUnYDE4W/Ab7NTnWZpXYeM30CQQCtQrtxPEzLl4dtupPOBJJoApj2lq7Q6tIGx178K6wS9Rz3GEvkA7fz1Tpm+nmPZflWZ9mVmEaVuMTMpl3HN/edAkBylyzx8lYltIALg5QskT1hvFNChkW9tYjyMROzIkxIV4Q8WPLzlAT9iYlOOfkld/nU1hnC2VAG2k9P+z2sigU1AkBAl1AptsEqZSMn1RalBy9NdypvQ12IpQIHZOwUNnO/3YEe3P/t0TUSwbs0CMyomOuLOsvy6QHnbypu4Na1HjhBAkAWjtdhuvU15HAa5jMgiUVfQM3YFuz2k3QkRagtZZ33bqnYs4wNxEZqB5t+vEj+8r3fmSN0BpNR1VW71j53Ir0H',1,1,NULL,'2019-04-01 20:24:01','2019-04-01 20:27:33'),
-	(8,'20190401562373796095328256','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbxn0En2cj29t8i+m1dT7seF9XQx3cEaoClXFTlmc78Y1ZuQFbyY99VSwv8JbtpGxPvBSVD9SPmXWNBRBbSHT+gxStcdXD9QeD3knGFy/1V+z3E2Rj/6LIlFmgTlGh1fmEgttPjsUW1Dj704/ydyIrw+CAyAMKQyrFg0wYmNW+UQIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJvGfQSfZyPb23yL6bV1Pux4X1dDHdwRqgKVcVOWZzvxjVm5AVvJj31VLC/wlu2kbE+8FJUP1I+ZdY0FEFtIdP6DFK1x1cP1B4PeScYXL/VX7PcTZGP/osiUWaBOUaHV+YSC20+OxRbUOPvTj/J3IivD4IDIAwpDKsWDTBiY1b5RAgMBAAECgYAE27/ycPZKjATgcYyseCeqQGbY1eMMhhCDXB3YuYwmtnXuInMEZdjv08Q5CovqhYJLSlZp/8BlaifcahgEgNIFQXmxAF0U0HsNC6W4Dk1gGgQaVmYaZv5ex7uIcFB1qFvlO60kWf82YeRnO5KsFBODOJ1XSNwqjL2GeLSHBSVyQQJBAOsvDmClBsETSdiNSFMz+D9WCnCh1Ip4AoCzA/yG+PRSwYjZDdceP2DXieiZXPlxTFZ7MIXxAafgeyeQA2hpkQUCQQCpkCUSbrZ+nd4BYdnxZOSf0//cUT0o6+3kROX7gsXV7zRAWWxojT6DkGVlduDLZM/hjWeHRjWUxKC/jgbzvundAkBckhUSrWJPNQxoFJRXS6l3JKLPWqOSLVKu3ce/6lCrurc66lSsS9eegrhhuZwDAzmNAMhEsGx6a72OAP2WZ5cRAkBd8cT4X2qw4BpePa6YdcPNYZHCqSfvgje9XwbkwGGH1A3pESJlEsxt7BShkKmfRu1+E/AmHJoXIJHHT5M+fKnpAkA+VfyAAviKeCwUSq+5oUa0B+ozEA3frp/40cKQP7k02aamocAQCDRaC1ZlWffeQqYMnYe1/Mjr/SdX/Ut3X0CC',1,1,NULL,'2019-04-01 20:24:25','2019-04-01 20:24:48'),
-	(9,'201904035630907729292csharp','','MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5+OvJxeSzf44NxQ/cl7Ii+BzPg2k6sRcvH4ffOtU5Dzq1/oEvg02nxIhmwOHBZmjbmuUu0aLsfglUTAwqfXftfAKZidshsgj9NNh0/kxk0avRZ1UoljWGz/FxVZA0ogbxxhohPZ9jWcD+eBQcIwF2DtHfAJqWWZrYFnCMeHD8mPzxo2kwXSvDzi0vf9I2tKiYvNG26a9FqeYtPOoi81sdS3+70HOMdxP8ejXtyfnKpKz7Dx506LCIRS5moWS3Q5eTLV3NGX/1CSJ8wpQA2DAQTjVhX5eVu7Yqz12t8W+sjWM/tHUR6cgwYYR10p7tSCeCPzkigjGxKm4cYXWtATQJQIDAQAB','MIIEowIBAAKCAQEA5+OvJxeSzf44NxQ/cl7Ii+BzPg2k6sRcvH4ffOtU5Dzq1/oEvg02nxIhmwOHBZmjbmuUu0aLsfglUTAwqfXftfAKZidshsgj9NNh0/kxk0avRZ1UoljWGz/FxVZA0ogbxxhohPZ9jWcD+eBQcIwF2DtHfAJqWWZrYFnCMeHD8mPzxo2kwXSvDzi0vf9I2tKiYvNG26a9FqeYtPOoi81sdS3+70HOMdxP8ejXtyfnKpKz7Dx506LCIRS5moWS3Q5eTLV3NGX/1CSJ8wpQA2DAQTjVhX5eVu7Yqz12t8W+sjWM/tHUR6cgwYYR10p7tSCeCPzkigjGxKm4cYXWtATQJQIDAQABAoIBAHFDsgrrJca+NKEan77ycwx3jnKx4WrWjOF4zVKL9AQjiSYDNgvKknJyPb3kpC/lEoHdxGERHSzJoxib7DkoIqRQYhPxj73pxj5QfYk3P7LLJNNg/LTrpXDb3nL8JV9wIflGf87qQvstZTDJEyFWE4jBs7Hr0BxovWvri8InnzkmERJ1cbGJgNHe1Y3Zo2tw0yaHxQCxLuajP+notRZhD9bEp7uKeI0w9AvlW6k8m/7y10F0BK/TlyW8rQiEC391yOiRYoMcUh4hd2Q9bMx3jngZgX8PXIvZZcup4/pvWlv1alwhB2tsnLdazP62r1MO80vLyLunzGO+7WwCjEYlVaECgYEA+lQRFmbhKaPuAuXMtY31Fbga8nedka5TjnEV7+/kX+yowE2OlNujF+ZG8UTddTxAGv56yVNi/mjRlgD74j8z0eOsgvOq9mwbCrgLhLo51H9O/wAxtb+hBKtC5l50pBr4gER6d8W6EQNTSGojnMIaLXTkAZ5Qf6Z8e2HFVdOn0X0CgYEA7SSrTokwzukt5KldNu5ukyyd+C3D1i6orbg6qD73EP9CfNMfGSBn7dDv9wMSJH01+Ty+RgTROgtjGRDbMJWnfbdt/61NePr9ar5sb6Nbsf7/I0w7cZF5dsaFYgzaOfQYquzXPbLQHkpMT64bqpv/Mwy4F2lFvaYWY5fA4pC2uckCgYEAg75Ym9ybJaoTqky8ttQ2Jy8UZ4VSVQhVC0My02sCWwWXLlXi8y7An+Rec73Ve0yxREOn5WrQT6pkmzh7V/ABWrYi5WxODpCIjtSbo0fLBa3Wqle00b0/hdCITetqIa/cFs1zUrOqICgK3bKWeXqiAkhhcwSZwwSgwOKM04Wn7ZUCgYBvhHX2mbdVJfyJ8kc+hMOE/E9RHRxiBVEXWHJlGi8PVCqNDq8qHr4g7Mdbzprig+s0yKblwHAvrpkseWvKHiZEjVTyDipHgShY4TGXEigVvUd37uppTrLi8xpYcJjS9gH/px7VCdiq1d+q/MJP6coJ1KphgATm2UrgDMYNBWaYWQKBgEHRxrmER7btUF60/YgcqPHFc8RpYQB2ZZE0kyKGDqk2Data1XYUY6vsPAU28yRLAaWr/D2H17iyLkxP80VLm6QhifxCadv90Q/Wl1DFfOJQMW6avyQ0so6G0wFq/LJxaFK4iLXQn1RJnmTp6BYiJMmK2BhFbRzw8ssMoF6ad2rr',1,1,NULL,'2019-04-03 19:54:05','2019-04-03 20:11:58'),
-	(10,'easyopen_test','G9w0BAQEFAAOCAQ8AMIIBCgKCA','','',1,2,NULL,'2019-04-19 17:19:34','2019-04-19 17:30:09'),
-	(11,'20190513577548661718777856','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdGjz3IE2VQteDjQaFacXLCAIqdEIIVcf7LW7f142V55Q0xtcjDTOHjBHExZsG64/Y5WKz4oQVWGnXwtrled8Qg0YAA7ueat8mE8NzJSm9txbfU9hwXB77nJxVkFyaSG1p0IZFrNQpbbUxTX9755deP7DdcSF148LLr091V++S3QIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ0aPPcgTZVC14ONBoVpxcsIAip0QghVx/stbt/XjZXnlDTG1yMNM4eMEcTFmwbrj9jlYrPihBVYadfC2uV53xCDRgADu55q3yYTw3MlKb23Ft9T2HBcHvucnFWQXJpIbWnQhkWs1ClttTFNf3vnl14/sN1xIXXjwsuvT3VX75LdAgMBAAECgYB68z/nQDa3q/oykDocS21qujfHtfi/wTKjVylAsdezC+wnab6RRhGf8XUuhGARiGWpn8whcBNjCTC8lVju4vQ5IIx4Hb74vwDDMtNXeqwkLmARLYu2ELibauezSeqom8/J8cR3ho7Hr4VHPTiC8qvePRmu8AvXVQz2T7SOhEjDGQJBAOm8XOivr+atiknLbQhmo508ON3sjoN9VMwK9cmnup+ZPCsurJTHRja0MJQNdOXObUVJ6wJhs1PHWT+vITfXGJ8CQQCsESzxOYTkZaqBUFjbWVf1rSwjOOsylweTuq44YIJkHhwMjHf3kN/UTXbxsBPUGeT7/+2K5UwQ9snUPr0yTBcDAkA0FMezBWqxgNu+g7iA1bYBVCjrskkzHVsmuA56Z4hbBZ71lEnaQOjxSYdFhhYVGsEYXlciSbjWoyXM3e4N7jzLAkB0ejv+H33CTsAZQZalBdnxSQTz4vf0CyDp9BkzuMELnQZHyF79i2i5gqbd/N+vWMgVfq4CtC3F3gnKT54rii6ZAkAMBIvHriT5Zbs1fW+oxBP1rHqdsRvqs1zEyIadvJgKAFwFEisryfdw2mWm3vxQQ22RlOquBiZEDIlyM0z2m9PJ',1,1,NULL,'2019-05-13 17:24:17','2019-05-13 17:24:17'),
-	(12,'20190513577548661718777857','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdGjz3IE2VQteDjQaFacXLCAIqdEIIVcf7LW7f142V55Q0xtcjDTOHjBHExZsG64/Y5WKz4oQVWGnXwtrled8Qg0YAA7ueat8mE8NzJSm9txbfU9hwXB77nJxVkFyaSG1p0IZFrNQpbbUxTX9755deP7DdcSF148LLr091V++S3QIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ0aPPcgTZVC14ONBoVpxcsIAip0QghVx/stbt/XjZXnlDTG1yMNM4eMEcTFmwbrj9jlYrPihBVYadfC2uV53xCDRgADu55q3yYTw3MlKb23Ft9T2HBcHvucnFWQXJpIbWnQhkWs1ClttTFNf3vnl14/sN1xIXXjwsuvT3VX75LdAgMBAAECgYB68z/nQDa3q/oykDocS21qujfHtfi/wTKjVylAsdezC+wnab6RRhGf8XUuhGARiGWpn8whcBNjCTC8lVju4vQ5IIx4Hb74vwDDMtNXeqwkLmARLYu2ELibauezSeqom8/J8cR3ho7Hr4VHPTiC8qvePRmu8AvXVQz2T7SOhEjDGQJBAOm8XOivr+atiknLbQhmo508ON3sjoN9VMwK9cmnup+ZPCsurJTHRja0MJQNdOXObUVJ6wJhs1PHWT+vITfXGJ8CQQCsESzxOYTkZaqBUFjbWVf1rSwjOOsylweTuq44YIJkHhwMjHf3kN/UTXbxsBPUGeT7/+2K5UwQ9snUPr0yTBcDAkA0FMezBWqxgNu+g7iA1bYBVCjrskkzHVsmuA56Z4hbBZ71lEnaQOjxSYdFhhYVGsEYXlciSbjWoyXM3e4N7jzLAkB0ejv+H33CTsAZQZalBdnxSQTz4vf0CyDp9BkzuMELnQZHyF79i2i5gqbd/N+vWMgVfq4CtC3F3gnKT54rii6ZAkAMBIvHriT5Zbs1fW+oxBP1rHqdsRvqs1zEyIadvJgKAFwFEisryfdw2mWm3vxQQ22RlOquBiZEDIlyM0z2m9PJ',1,1,NULL,'2019-05-13 17:24:17','2019-05-13 17:24:17');
-ALTER TABLE `isv_info` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `isv_keys` WRITE;
-ALTER TABLE `isv_keys` DISABLE KEYS;
+
+
+INSERT INTO `isv_info` (`id`, `app_key`, `status`, `sign_type`, `remark`, `gmt_create`, `gmt_modified`) VALUES
+	(1,'2019032617262200001',1,1,NULL,'2019-03-27 10:10:34','2019-05-09 11:10:38'),
+	(3,'asdfasdf',2,1,NULL,'2019-03-27 11:01:11','2019-05-11 10:45:01'),
+	(5,'20190331562013861008375808',1,2,NULL,'2019-03-31 20:34:12','2019-04-19 17:30:09'),
+	(6,'20190331562037310372184064',2,2,NULL,'2019-03-31 22:07:20','2019-05-07 18:14:53'),
+	(7,'20190401562373672858288128',1,1,NULL,'2019-04-01 20:24:01','2019-04-01 20:27:33'),
+	(8,'20190401562373796095328256',1,1,NULL,'2019-04-01 20:24:25','2019-04-01 20:24:48'),
+	(9,'201904035630907729292csharp',1,1,NULL,'2019-04-03 19:54:05','2019-04-03 20:11:58'),
+	(10,'easyopen_test',1,2,NULL,'2019-04-19 17:19:34','2019-04-19 17:30:09'),
+	(11,'20190513577548661718777856',1,1,NULL,'2019-05-13 17:24:17','2019-05-13 17:24:17'),
+	(12,'20190513577548661718777857',1,1,NULL,'2019-05-13 17:24:17','2019-05-13 17:24:17');
+
+
 INSERT INTO `isv_keys` (`id`, `app_key`, `sign_type`, `secret`, `key_format`, `public_key_isv`, `private_key_isv`, `public_key_platform`, `private_key_platform`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'2019032617262200001',1,'',1,'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','','','2019-08-13 15:18:39','2019-08-13 15:18:39'),
 	(2,'asdfasdf',1,'',1,'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOJTAsGoAsNGJdzaWm835mtpcY2YxGr4NPjnhQmfUrPdT+Zgi6jmm+olYuygNeB8cOSALmTzgXlef+6SdwfRJVEMYVAO7hqF0Ood9zTOc+kolgnWJtqX54CoodfABt0SNS/bsr6hCAWu17RGnbgBaK+ZaJD3NVqXVXE8E30cYHiQIDAQAB','MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAM4lMCwagCw0Yl3Npabzfma2lxjZjEavg0+OeFCZ9Ss91P5mCLqOab6iVi7KA14Hxw5IAuZPOBeV5/7pJ3B9ElUQxhUA7uGoXQ6h33NM5z6SiWCdYm2pfngKih18AG3RI1L9uyvqEIBa7XtEaduAFor5lokPc1WpdVcTwTfRxgeJAgMBAAECgYAM3XFGL1k0aQiChiUCaEvJKTgAywLgHm/5dRC5JwKP8knqnn+I9P5QcV0jimPvaFjZ4VCdAvCjOC3EUNSvRn7wR2Lb1+BGZZePTdxtHWE2aqJ1W1SvgQTqMsLlPBRPnXo5XH/ng3WEH15ynd5NR035xAluaI0X/y+PsRxE6TlfIQJBAPSYUyXa2yaEqmvIN+ECKALCLLeDdi2YW3Kjahgz0X9V4Y4aTdrHh8y603zXC0Wy8HeOhwGoyciaS8SmjxCMn4UCQQDXweW8xsUreLH8hfVUtyiY/KgUz+R5foJDNXD7TLE9CDoPSHy09qBe99HyVCZg/gNJH4O+tNr6C4916dYaVk01AkBYZ2HOEc8ZmeOaty/zJHtfm9zbqykgi6upwISNINV8Z4bxfHJdO7bKeVANFBBf7a/aFmqXX/EmjxYJioW03o6dAkEAp7ViXJCtJpNU1pNSFZ2hgvmxtSu7zuyVWKSrw8rjYiuI5eRUe13RXsCHgzQB+Ra5exdyEsUGCaL+yosPD73RmQJBALGuM8EQUcBgrpgpeLZ39Ni1DYXYG9aj+u+ar/UL6kI1mCNFgwroO4EVIvXPVxikMxUgiE2tVaBML5nm8VDNJ7s=','','','2019-08-13 15:18:39','2019-08-13 15:18:39'),
@@ -345,12 +273,8 @@ INSERT INTO `isv_keys` (`id`, `app_key`, `sign_type`, `secret`, `key_format`, `p
 	(8,'easyopen_test',2,'G9w0BAQEFAAOCAQ8AMIIBCgKCA',1,'','','','','2019-08-13 15:18:39','2019-08-13 15:18:39'),
 	(9,'20190513577548661718777856',1,'',1,'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdGjz3IE2VQteDjQaFacXLCAIqdEIIVcf7LW7f142V55Q0xtcjDTOHjBHExZsG64/Y5WKz4oQVWGnXwtrled8Qg0YAA7ueat8mE8NzJSm9txbfU9hwXB77nJxVkFyaSG1p0IZFrNQpbbUxTX9755deP7DdcSF148LLr091V++S3QIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ0aPPcgTZVC14ONBoVpxcsIAip0QghVx/stbt/XjZXnlDTG1yMNM4eMEcTFmwbrj9jlYrPihBVYadfC2uV53xCDRgADu55q3yYTw3MlKb23Ft9T2HBcHvucnFWQXJpIbWnQhkWs1ClttTFNf3vnl14/sN1xIXXjwsuvT3VX75LdAgMBAAECgYB68z/nQDa3q/oykDocS21qujfHtfi/wTKjVylAsdezC+wnab6RRhGf8XUuhGARiGWpn8whcBNjCTC8lVju4vQ5IIx4Hb74vwDDMtNXeqwkLmARLYu2ELibauezSeqom8/J8cR3ho7Hr4VHPTiC8qvePRmu8AvXVQz2T7SOhEjDGQJBAOm8XOivr+atiknLbQhmo508ON3sjoN9VMwK9cmnup+ZPCsurJTHRja0MJQNdOXObUVJ6wJhs1PHWT+vITfXGJ8CQQCsESzxOYTkZaqBUFjbWVf1rSwjOOsylweTuq44YIJkHhwMjHf3kN/UTXbxsBPUGeT7/+2K5UwQ9snUPr0yTBcDAkA0FMezBWqxgNu+g7iA1bYBVCjrskkzHVsmuA56Z4hbBZ71lEnaQOjxSYdFhhYVGsEYXlciSbjWoyXM3e4N7jzLAkB0ejv+H33CTsAZQZalBdnxSQTz4vf0CyDp9BkzuMELnQZHyF79i2i5gqbd/N+vWMgVfq4CtC3F3gnKT54rii6ZAkAMBIvHriT5Zbs1fW+oxBP1rHqdsRvqs1zEyIadvJgKAFwFEisryfdw2mWm3vxQQ22RlOquBiZEDIlyM0z2m9PJ','','','2019-08-13 15:18:39','2019-08-13 15:18:39'),
 	(10,'20190513577548661718777857',1,'',1,'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdGjz3IE2VQteDjQaFacXLCAIqdEIIVcf7LW7f142V55Q0xtcjDTOHjBHExZsG64/Y5WKz4oQVWGnXwtrled8Qg0YAA7ueat8mE8NzJSm9txbfU9hwXB77nJxVkFyaSG1p0IZFrNQpbbUxTX9755deP7DdcSF148LLr091V++S3QIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ0aPPcgTZVC14ONBoVpxcsIAip0QghVx/stbt/XjZXnlDTG1yMNM4eMEcTFmwbrj9jlYrPihBVYadfC2uV53xCDRgADu55q3yYTw3MlKb23Ft9T2HBcHvucnFWQXJpIbWnQhkWs1ClttTFNf3vnl14/sN1xIXXjwsuvT3VX75LdAgMBAAECgYB68z/nQDa3q/oykDocS21qujfHtfi/wTKjVylAsdezC+wnab6RRhGf8XUuhGARiGWpn8whcBNjCTC8lVju4vQ5IIx4Hb74vwDDMtNXeqwkLmARLYu2ELibauezSeqom8/J8cR3ho7Hr4VHPTiC8qvePRmu8AvXVQz2T7SOhEjDGQJBAOm8XOivr+atiknLbQhmo508ON3sjoN9VMwK9cmnup+ZPCsurJTHRja0MJQNdOXObUVJ6wJhs1PHWT+vITfXGJ8CQQCsESzxOYTkZaqBUFjbWVf1rSwjOOsylweTuq44YIJkHhwMjHf3kN/UTXbxsBPUGeT7/+2K5UwQ9snUPr0yTBcDAkA0FMezBWqxgNu+g7iA1bYBVCjrskkzHVsmuA56Z4hbBZ71lEnaQOjxSYdFhhYVGsEYXlciSbjWoyXM3e4N7jzLAkB0ejv+H33CTsAZQZalBdnxSQTz4vf0CyDp9BkzuMELnQZHyF79i2i5gqbd/N+vWMgVfq4CtC3F3gnKT54rii6ZAkAMBIvHriT5Zbs1fW+oxBP1rHqdsRvqs1zEyIadvJgKAFwFEisryfdw2mWm3vxQQ22RlOquBiZEDIlyM0z2m9PJ','','','2019-08-13 15:18:39','2019-08-13 15:18:39');
-ALTER TABLE `isv_keys` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `perm_isv_role` WRITE;
-ALTER TABLE `perm_isv_role` DISABLE KEYS;
 INSERT INTO `perm_isv_role` (`id`, `isv_id`, `role_code`, `gmt_create`, `gmt_modified`) VALUES
 	(18,5,'normal','2019-03-31 22:07:50','2019-03-31 22:07:50'),
 	(32,7,'normal','2019-04-01 20:27:33','2019-04-01 20:27:33'),
@@ -360,37 +284,19 @@ INSERT INTO `perm_isv_role` (`id`, `isv_id`, `role_code`, `gmt_create`, `gmt_mod
 	(52,6,'normal','2019-05-07 18:14:53','2019-05-07 18:14:53'),
 	(57,1,'normal','2019-05-09 11:10:38','2019-05-09 11:10:38'),
 	(58,11,'normal','2019-05-13 17:24:17','2019-05-13 17:24:17');
-ALTER TABLE `perm_isv_role` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `perm_role` WRITE;
-ALTER TABLE `perm_role` DISABLE KEYS;
 INSERT INTO `perm_role` (`id`, `role_code`, `description`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'normal','普通权限','2019-03-29 15:00:10','2019-03-29 15:00:10'),
 	(2,'vip','VIP权限','2019-03-29 15:00:27','2019-03-29 15:00:27');
-ALTER TABLE `perm_role` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `perm_role_permission` WRITE;
-ALTER TABLE `perm_role_permission` DISABLE KEYS;
 INSERT INTO `perm_role_permission` (`id`, `role_code`, `route_id`, `gmt_create`, `gmt_modified`) VALUES
 	(29,'normal','permission.story.get1.0','2019-05-06 18:29:16','2019-05-06 18:29:16');
-ALTER TABLE `perm_role_permission` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `user_info` WRITE;
-ALTER TABLE `user_info` DISABLE KEYS;
+
 INSERT INTO `user_info` (`id`, `username`, `password`, `nickname`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'zhangsan','123456','张三','2019-04-27 08:32:57','2019-04-27 08:32:57');
-ALTER TABLE `user_info` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-
-
-SET FOREIGN_KEY_CHECKS = @PREVIOUS_FOREIGN_KEY_CHECKS;
 
 

sop.sql

@@ -1,22 +1,17 @@
-/**
-适用于MYSQL 5.6+版本
-**/
+
 CREATE DATABASE IF NOT EXISTS `sop` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
 USE `sop`;
 
 
 
 
-SET @PREVIOUS_FOREIGN_KEY_CHECKS = @@FOREIGN_KEY_CHECKS;
-SET FOREIGN_KEY_CHECKS = 0;
-
-
 DROP TABLE IF EXISTS `user_info`;
 DROP TABLE IF EXISTS `perm_role_permission`;
 DROP TABLE IF EXISTS `perm_role`;
 DROP TABLE IF EXISTS `perm_isv_role`;
 DROP TABLE IF EXISTS `isv_keys`;
 DROP TABLE IF EXISTS `isv_info`;
+DROP TABLE IF EXISTS `config_service_route`;
 DROP TABLE IF EXISTS `config_route_limit`;
 DROP TABLE IF EXISTS `config_route_base`;
 DROP TABLE IF EXISTS `config_limit`;
@@ -25,7 +20,6 @@ DROP TABLE IF EXISTS `config_gray_instance`;
 DROP TABLE IF EXISTS `config_gray`;
 DROP TABLE IF EXISTS `config_common`;
 DROP TABLE IF EXISTS `admin_user_info`;
-DROP TABLE IF EXISTS `config_service_route`;
 
 
 CREATE TABLE `admin_user_info` (
@@ -95,7 +89,7 @@ CREATE TABLE `config_limit` (
   `app_key` varchar(128) DEFAULT NULL,
   `limit_ip` varchar(300) DEFAULT NULL COMMENT '限流ip，多个用英文逗号隔开',
   `service_id` varchar(64) NOT NULL DEFAULT '' COMMENT '服务id',
-  `limit_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '限流策略，1：漏桶策略，2：令牌桶策略',
+  `limit_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '限流策略，1：窗口策略，2：令牌桶策略',
   `exec_count_per_second` int(11) DEFAULT NULL COMMENT '每秒可处理请求数',
   `duration_seconds` int(11) NOT NULL DEFAULT '1' COMMENT '限流持续时间，默认1秒，即每durationSeconds秒允许多少请求（当limit_type=1时有效）',
   `limit_code` varchar(64) DEFAULT NULL COMMENT '返回的错误码',
@@ -125,7 +119,7 @@ CREATE TABLE `config_route_limit` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `route_id` varchar(64) NOT NULL COMMENT '路由id',
   `service_id` varchar(64) NOT NULL DEFAULT '',
-  `limit_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '限流策略，1：漏桶策略，2：令牌桶策略',
+  `limit_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '限流策略，1：窗口策略，2：令牌桶策略',
   `exec_count_per_second` int(11) DEFAULT NULL COMMENT '每秒可处理请求数',
   `limit_code` varchar(64) DEFAULT NULL COMMENT '返回的错误码',
   `limit_msg` varchar(100) DEFAULT NULL COMMENT '返回的错误信息',
@@ -138,12 +132,31 @@ CREATE TABLE `config_route_limit` (
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COMMENT='路由限流配置';
 
 
+CREATE TABLE `config_service_route` (
+  `id` varchar(128) NOT NULL DEFAULT '' COMMENT '路由id',
+  `service_id` varchar(128) NOT NULL DEFAULT '',
+  `name` varchar(128) NOT NULL DEFAULT '' COMMENT '接口名',
+  `version` varchar(64) NOT NULL DEFAULT '' COMMENT '版本号',
+  `predicates` varchar(256) DEFAULT NULL COMMENT '路由断言（SpringCloudGateway专用）',
+  `filters` varchar(256) DEFAULT NULL COMMENT '路由过滤器（SpringCloudGateway专用）',
+  `uri` varchar(128) NOT NULL DEFAULT '' COMMENT '路由规则转发的目标uri',
+  `path` varchar(128) NOT NULL DEFAULT '' COMMENT 'uri后面跟的path',
+  `order_index` int(11) NOT NULL DEFAULT '0' COMMENT '路由执行的顺序',
+  `ignore_validate` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否忽略验证，业务参数验证除外',
+  `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态，0：待审核，1：启用，2：禁用',
+  `merge_result` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否合并结果',
+  `permission` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否需要授权才能访问',
+  `need_token` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否需要token',
+  `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP,
+  `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `idx_serviceid` (`service_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='路由配置';
+
+
 CREATE TABLE `isv_info` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `app_key` varchar(100) NOT NULL COMMENT 'appKey',
-  `secret` varchar(200) DEFAULT NULL COMMENT 'secret',
-  `pub_key` text COMMENT '公钥',
-  `pri_key` text COMMENT '私钥',
   `status` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '1启用，2禁用',
   `sign_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '1:RSA2,2:MD5',
   `remark` varchar(128) DEFAULT NULL COMMENT '备注',
@@ -215,84 +228,11 @@ CREATE TABLE `user_info` (
   KEY `idx_unamepwd` (`username`,`password`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='用户信息表';
 
-CREATE TABLE `config_service_route` (
-  `id` varchar(128) NOT NULL DEFAULT '' COMMENT '路由id',
-  `service_id` varchar(128) NOT NULL DEFAULT '',
-  `name` varchar(128) NOT NULL DEFAULT '' COMMENT '接口名',
-  `version` varchar(64) NOT NULL DEFAULT '' COMMENT '版本号',
-  `predicates` varchar(256) DEFAULT NULL COMMENT '路由断言（SpringCloudGateway专用）',
-  `filters` varchar(256) DEFAULT NULL COMMENT '路由过滤器（SpringCloudGateway专用）',
-  `uri` varchar(128) NOT NULL DEFAULT '' COMMENT '路由规则转发的目标uri',
-  `path` varchar(128) NOT NULL DEFAULT '' COMMENT 'uri后面跟的path',
-  `order_index` int(11) NOT NULL DEFAULT '0' COMMENT '路由执行的顺序',
-  `ignore_validate` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否忽略验证，业务参数验证除外',
-  `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态，0：待审核，1：启用，2：禁用',
-  `merge_result` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否合并结果',
-  `permission` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否需要授权才能访问',
-  `need_token` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否需要token',
-  `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP,
-  `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `idx_serviceid` (`service_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='路由配置';
-
-
-SET FOREIGN_KEY_CHECKS = @PREVIOUS_FOREIGN_KEY_CHECKS;
-
 
-SET @PREVIOUS_FOREIGN_KEY_CHECKS = @@FOREIGN_KEY_CHECKS;
-SET FOREIGN_KEY_CHECKS = 0;
-
-
-LOCK TABLES `admin_user_info` WRITE;
-ALTER TABLE `admin_user_info` DISABLE KEYS;
 INSERT INTO `admin_user_info` (`id`, `username`, `password`, `status`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'admin','a62cd510fb9a8a557a27ef279569091f',1,'2019-04-02 19:55:26','2019-04-02 19:55:26');
-ALTER TABLE `admin_user_info` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_common` WRITE;
-ALTER TABLE `config_common` DISABLE KEYS;
-ALTER TABLE `config_common` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `config_gray` WRITE;
-ALTER TABLE `config_gray` DISABLE KEYS;
-ALTER TABLE `config_gray` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_gray_instance` WRITE;
-ALTER TABLE `config_gray_instance` DISABLE KEYS;
-ALTER TABLE `config_gray_instance` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_ip_blacklist` WRITE;
-ALTER TABLE `config_ip_blacklist` DISABLE KEYS;
-ALTER TABLE `config_ip_blacklist` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_limit` WRITE;
-ALTER TABLE `config_limit` DISABLE KEYS;
-INSERT INTO `config_limit` (`id`, `route_id`, `app_key`, `limit_ip`, `service_id`, `limit_type`, `exec_count_per_second`, `limit_code`, `limit_msg`, `token_bucket_count`, `limit_status`, `order_index`, `remark`, `gmt_create`, `gmt_modified`) VALUES
-	(1,'alipay.story.get1.0','','192.168.1.1,172.2.2.3','story-service',2,5,'','',6,1,3,NULL,'2019-05-17 19:21:35','2019-05-21 09:12:15'),
-	(2,'alipay.story.get1.0','2019032617262200001','','story-service',2,5,'service-budy','服务器忙',10,1,0,'','2019-05-17 19:39:30','2019-05-21 15:36:52'),
-	(3,'alipay.story.find1.0','20190331562013861008375808','','story-service',1,3,'service-busy','服务器忙',5,1,1,NULL,'2019-05-17 20:20:32','2019-05-20 17:40:17'),
-	(4,'alipay.story.get1.2','','','story-service',1,5,'service-busy','服务器忙',3,1,1,'','2019-05-20 16:27:21','2019-05-21 15:53:10'),
-	(5,'','20190401562373796095328256','','story-service',1,5,'service-busy','服务器忙',5,1,0,'这个appKey调用很频繁，重点照顾','2019-05-21 15:48:08','2019-05-21 18:45:32'),
-	(6,'','','10.1.30.54','story-service',1,5,'service-busy','服务器忙',5,1,0,'这个ip在攻击我们','2019-05-21 15:55:33','2019-05-21 18:17:29'),
-	(7,'story.get1.1','','10.1.30.54','story-service',1,5,'service-busy','服务器忙',5,1,0,NULL,'2019-05-21 16:30:48','2019-05-21 16:30:48'),
-	(8,'','20190513577548661718777857','10.1.30.54','story-service',1,5,'service-busy','服务器忙',5,1,0,NULL,'2019-05-21 17:10:45','2019-05-21 17:10:52');
-ALTER TABLE `config_limit` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `config_route_base` WRITE;
-ALTER TABLE `config_route_base` DISABLE KEYS;
 INSERT INTO `config_route_base` (`id`, `route_id`, `status`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'story.get1.1',1,'2019-04-09 19:15:58','2019-04-09 19:16:54'),
 	(2,'alipay.story.get1.0',1,'2019-04-09 19:19:57','2019-04-19 14:45:33'),
@@ -302,40 +242,28 @@ INSERT INTO `config_route_base` (`id`, `route_id`, `status`, `gmt_create`, `gmt_
 	(6,'alipay.category.get1.0',1,'2019-05-06 16:50:39','2019-05-20 17:01:48'),
 	(7,'permission.story.get1.0',1,'2019-05-06 20:03:17','2019-05-06 20:03:21'),
 	(8,'goods.add1.0',1,'2019-05-13 17:23:00','2019-05-13 17:23:11');
-ALTER TABLE `config_route_base` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `config_route_limit` WRITE;
-ALTER TABLE `config_route_limit` DISABLE KEYS;
 INSERT INTO `config_route_limit` (`id`, `route_id`, `service_id`, `limit_type`, `exec_count_per_second`, `limit_code`, `limit_msg`, `token_bucket_count`, `limit_status`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'alipay.story.find1.0','story-service',1,10,'isp.service-busy','服务器正忙',NULL,1,'2019-04-10 20:55:08','2019-04-10 21:04:35'),
 	(2,'alipay.story.get1.0','story-service',2,5,'isp.service-busy','服务器正忙',5,0,'2019-04-10 21:05:51','2019-04-11 18:18:03'),
 	(3,'alipay.story.get1.2','story-service',2,10,'isp.service-busy','服务器正忙',3,1,'2019-04-11 17:26:04','2019-04-11 18:19:33'),
 	(4,'alipay.category.get1.0','story-service',1,5,'error-code','服务器忙',5,1,'2019-05-07 12:22:04','2019-05-07 12:25:06');
-ALTER TABLE `config_route_limit` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `isv_info` WRITE;
-ALTER TABLE `isv_info` DISABLE KEYS;
-INSERT INTO `isv_info` (`id`, `app_key`, `secret`, `pub_key`, `pri_key`, `status`, `sign_type`, `remark`, `gmt_create`, `gmt_modified`) VALUES
-	(1,'2019032617262200001','','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',1,1,NULL,'2019-03-27 10:10:34','2019-05-09 11:10:38'),
-	(3,'asdfasdf','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOJTAsGoAsNGJdzaWm835mtpcY2YxGr4NPjnhQmfUrPdT+Zgi6jmm+olYuygNeB8cOSALmTzgXlef+6SdwfRJVEMYVAO7hqF0Ood9zTOc+kolgnWJtqX54CoodfABt0SNS/bsr6hCAWu17RGnbgBaK+ZaJD3NVqXVXE8E30cYHiQIDAQAB','MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAM4lMCwagCw0Yl3Npabzfma2lxjZjEavg0+OeFCZ9Ss91P5mCLqOab6iVi7KA14Hxw5IAuZPOBeV5/7pJ3B9ElUQxhUA7uGoXQ6h33NM5z6SiWCdYm2pfngKih18AG3RI1L9uyvqEIBa7XtEaduAFor5lokPc1WpdVcTwTfRxgeJAgMBAAECgYAM3XFGL1k0aQiChiUCaEvJKTgAywLgHm/5dRC5JwKP8knqnn+I9P5QcV0jimPvaFjZ4VCdAvCjOC3EUNSvRn7wR2Lb1+BGZZePTdxtHWE2aqJ1W1SvgQTqMsLlPBRPnXo5XH/ng3WEH15ynd5NR035xAluaI0X/y+PsRxE6TlfIQJBAPSYUyXa2yaEqmvIN+ECKALCLLeDdi2YW3Kjahgz0X9V4Y4aTdrHh8y603zXC0Wy8HeOhwGoyciaS8SmjxCMn4UCQQDXweW8xsUreLH8hfVUtyiY/KgUz+R5foJDNXD7TLE9CDoPSHy09qBe99HyVCZg/gNJH4O+tNr6C4916dYaVk01AkBYZ2HOEc8ZmeOaty/zJHtfm9zbqykgi6upwISNINV8Z4bxfHJdO7bKeVANFBBf7a/aFmqXX/EmjxYJioW03o6dAkEAp7ViXJCtJpNU1pNSFZ2hgvmxtSu7zuyVWKSrw8rjYiuI5eRUe13RXsCHgzQB+Ra5exdyEsUGCaL+yosPD73RmQJBALGuM8EQUcBgrpgpeLZ39Ni1DYXYG9aj+u+ar/UL6kI1mCNFgwroO4EVIvXPVxikMxUgiE2tVaBML5nm8VDNJ7s=',2,1,NULL,'2019-03-27 11:01:11','2019-05-11 10:45:01'),
-	(5,'20190331562013861008375808','29864b93427447f5ac6c44df746f84ef','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4aMIx2q8rCVu5z6dgNQQSX2vwhvIcRb7FaqSk0ZK8AV9qQeE1TvfFVlAzOHlysE1yTRb0Mb6W2aw7IAS7Bkc3onYBQR4zNQYjYoDBzLukjF8o84hoVFRnh7sV8zszid2vb5H/YQr3M+5sYhlXY8KfILk3vhdbWpHM/umplcrxlwIDAQAB','MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALhowjHarysJW7nPp2A1BBJfa/CG8hxFvsVqpKTRkrwBX2pB4TVO98VWUDM4eXKwTXJNFvQxvpbZrDsgBLsGRzeidgFBHjM1BiNigMHMu6SMXyjziGhUVGeHuxXzOzOJ3a9vkf9hCvcz7mxiGVdjwp8guTe+F1takcz+6amVyvGXAgMBAAECgYBj40LFVGoryp7n0CYeg7kX5p4GJGKCk/jY4IIcUPTFZ4zydorxoDuvpag9hmqqh/r7XeyAC23sMi4LvLUzRRxPh+7PuwL6nLce7vytsMCZQTPpBgz7dUfbi2HAxsuMOLjH3sVGycutARJsz6bT+9PyBEuVtUqwBrDGpFvwT0z6yQJBAOANC8nysb+O4rn/fbJtHIhtQoV74yu00mLnfwv8/J1+WyAEc32WZ4KYINqCe8ft1UknhPQx9UV6JaPCnlpF6w0CQQDStJhd38uQ7dVUQZHGP24xS/K38AYiSheEr7uewhkJfC2cKqE/lBk3oEG4s7asjhwlFLWLWSBLVM/Ta9Yj0hYzAkBe82hxl1bY9bcEWFBu02rqLlOouk4V8bXPkIf5DqgIHsqDkR9Ys+r+H3ac4/uNSS/ApuzjiGCHpzJYalwtqb/pAkEAvAKlSm5dCC8QAaSYXJtQyfAI3hPwhTwzjBP6iAiNqqcBU62+QCr37Wiz/Alv4LzVZEj8TSDz7gP5hZ9dbo0RfQJBALJ7NhTaeMN4jxBJ6Xg4rNZPb4yhAXuFxCp+a+FyXTsbWnW/ar8KJ3LHox0GOao6wne4qN3h7eqLOrYnnvOSFl0=',1,2,NULL,'2019-03-31 20:34:12','2019-04-19 17:30:09'),
-	(6,'20190331562037310372184064','d6b2a6603236491f87eed958292be136','','',2,2,NULL,'2019-03-31 22:07:20','2019-05-07 18:14:53'),
-	(7,'20190401562373672858288128','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCOgSo6GfwM8a+rUT4m61nZa7q5cJpjL7luxQKuJvkMl/QydVrzRPinCh6zqgBJDa7YY2X6z5TyTkjYuDkYMrdyHcYvCDuJ0NpRPZMR+QDE70yp9wJ+kOqTa8bepJtxzuCYLxFz+wRsIFt0nIxC6ttCaM9OEw/Bflhws3xczw4uqQIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAI6BKjoZ/Azxr6tRPibrWdlrurlwmmMvuW7FAq4m+QyX9DJ1WvNE+KcKHrOqAEkNrthjZfrPlPJOSNi4ORgyt3Idxi8IO4nQ2lE9kxH5AMTvTKn3An6Q6pNrxt6km3HO4JgvEXP7BGwgW3ScjELq20Joz04TD8F+WHCzfFzPDi6pAgMBAAECgYA/zuQ6ieILZbjUDBe5U46yxQMh/6KRoQ/14m81zauckPm+EkA8R3jTSru+lPN1wpO0vqUuLf6ylI0XxT2DcUokOgY07ZdE54pu5XAsyY0eanFwt6C1LrHYpORV3Mp9XuI3fXrxYqVlxLuj1N7MGinXUuW7aZCHaEuSnZ55OL9dkQJBANKOeFiYDISSuIFHSrndSgr+a8E44jS/2/7lE49p5l3WVOFTHh0IZQNTs/IKsKJkUnYDE4W/Ab7NTnWZpXYeM30CQQCtQrtxPEzLl4dtupPOBJJoApj2lq7Q6tIGx178K6wS9Rz3GEvkA7fz1Tpm+nmPZflWZ9mVmEaVuMTMpl3HN/edAkBylyzx8lYltIALg5QskT1hvFNChkW9tYjyMROzIkxIV4Q8WPLzlAT9iYlOOfkld/nU1hnC2VAG2k9P+z2sigU1AkBAl1AptsEqZSMn1RalBy9NdypvQ12IpQIHZOwUNnO/3YEe3P/t0TUSwbs0CMyomOuLOsvy6QHnbypu4Na1HjhBAkAWjtdhuvU15HAa5jMgiUVfQM3YFuz2k3QkRagtZZ33bqnYs4wNxEZqB5t+vEj+8r3fmSN0BpNR1VW71j53Ir0H',1,1,NULL,'2019-04-01 20:24:01','2019-04-01 20:27:33'),
-	(8,'20190401562373796095328256','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbxn0En2cj29t8i+m1dT7seF9XQx3cEaoClXFTlmc78Y1ZuQFbyY99VSwv8JbtpGxPvBSVD9SPmXWNBRBbSHT+gxStcdXD9QeD3knGFy/1V+z3E2Rj/6LIlFmgTlGh1fmEgttPjsUW1Dj704/ydyIrw+CAyAMKQyrFg0wYmNW+UQIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJvGfQSfZyPb23yL6bV1Pux4X1dDHdwRqgKVcVOWZzvxjVm5AVvJj31VLC/wlu2kbE+8FJUP1I+ZdY0FEFtIdP6DFK1x1cP1B4PeScYXL/VX7PcTZGP/osiUWaBOUaHV+YSC20+OxRbUOPvTj/J3IivD4IDIAwpDKsWDTBiY1b5RAgMBAAECgYAE27/ycPZKjATgcYyseCeqQGbY1eMMhhCDXB3YuYwmtnXuInMEZdjv08Q5CovqhYJLSlZp/8BlaifcahgEgNIFQXmxAF0U0HsNC6W4Dk1gGgQaVmYaZv5ex7uIcFB1qFvlO60kWf82YeRnO5KsFBODOJ1XSNwqjL2GeLSHBSVyQQJBAOsvDmClBsETSdiNSFMz+D9WCnCh1Ip4AoCzA/yG+PRSwYjZDdceP2DXieiZXPlxTFZ7MIXxAafgeyeQA2hpkQUCQQCpkCUSbrZ+nd4BYdnxZOSf0//cUT0o6+3kROX7gsXV7zRAWWxojT6DkGVlduDLZM/hjWeHRjWUxKC/jgbzvundAkBckhUSrWJPNQxoFJRXS6l3JKLPWqOSLVKu3ce/6lCrurc66lSsS9eegrhhuZwDAzmNAMhEsGx6a72OAP2WZ5cRAkBd8cT4X2qw4BpePa6YdcPNYZHCqSfvgje9XwbkwGGH1A3pESJlEsxt7BShkKmfRu1+E/AmHJoXIJHHT5M+fKnpAkA+VfyAAviKeCwUSq+5oUa0B+ozEA3frp/40cKQP7k02aamocAQCDRaC1ZlWffeQqYMnYe1/Mjr/SdX/Ut3X0CC',1,1,NULL,'2019-04-01 20:24:25','2019-04-01 20:24:48'),
-	(9,'201904035630907729292csharp','','MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5+OvJxeSzf44NxQ/cl7Ii+BzPg2k6sRcvH4ffOtU5Dzq1/oEvg02nxIhmwOHBZmjbmuUu0aLsfglUTAwqfXftfAKZidshsgj9NNh0/kxk0avRZ1UoljWGz/FxVZA0ogbxxhohPZ9jWcD+eBQcIwF2DtHfAJqWWZrYFnCMeHD8mPzxo2kwXSvDzi0vf9I2tKiYvNG26a9FqeYtPOoi81sdS3+70HOMdxP8ejXtyfnKpKz7Dx506LCIRS5moWS3Q5eTLV3NGX/1CSJ8wpQA2DAQTjVhX5eVu7Yqz12t8W+sjWM/tHUR6cgwYYR10p7tSCeCPzkigjGxKm4cYXWtATQJQIDAQAB','MIIEowIBAAKCAQEA5+OvJxeSzf44NxQ/cl7Ii+BzPg2k6sRcvH4ffOtU5Dzq1/oEvg02nxIhmwOHBZmjbmuUu0aLsfglUTAwqfXftfAKZidshsgj9NNh0/kxk0avRZ1UoljWGz/FxVZA0ogbxxhohPZ9jWcD+eBQcIwF2DtHfAJqWWZrYFnCMeHD8mPzxo2kwXSvDzi0vf9I2tKiYvNG26a9FqeYtPOoi81sdS3+70HOMdxP8ejXtyfnKpKz7Dx506LCIRS5moWS3Q5eTLV3NGX/1CSJ8wpQA2DAQTjVhX5eVu7Yqz12t8W+sjWM/tHUR6cgwYYR10p7tSCeCPzkigjGxKm4cYXWtATQJQIDAQABAoIBAHFDsgrrJca+NKEan77ycwx3jnKx4WrWjOF4zVKL9AQjiSYDNgvKknJyPb3kpC/lEoHdxGERHSzJoxib7DkoIqRQYhPxj73pxj5QfYk3P7LLJNNg/LTrpXDb3nL8JV9wIflGf87qQvstZTDJEyFWE4jBs7Hr0BxovWvri8InnzkmERJ1cbGJgNHe1Y3Zo2tw0yaHxQCxLuajP+notRZhD9bEp7uKeI0w9AvlW6k8m/7y10F0BK/TlyW8rQiEC391yOiRYoMcUh4hd2Q9bMx3jngZgX8PXIvZZcup4/pvWlv1alwhB2tsnLdazP62r1MO80vLyLunzGO+7WwCjEYlVaECgYEA+lQRFmbhKaPuAuXMtY31Fbga8nedka5TjnEV7+/kX+yowE2OlNujF+ZG8UTddTxAGv56yVNi/mjRlgD74j8z0eOsgvOq9mwbCrgLhLo51H9O/wAxtb+hBKtC5l50pBr4gER6d8W6EQNTSGojnMIaLXTkAZ5Qf6Z8e2HFVdOn0X0CgYEA7SSrTokwzukt5KldNu5ukyyd+C3D1i6orbg6qD73EP9CfNMfGSBn7dDv9wMSJH01+Ty+RgTROgtjGRDbMJWnfbdt/61NePr9ar5sb6Nbsf7/I0w7cZF5dsaFYgzaOfQYquzXPbLQHkpMT64bqpv/Mwy4F2lFvaYWY5fA4pC2uckCgYEAg75Ym9ybJaoTqky8ttQ2Jy8UZ4VSVQhVC0My02sCWwWXLlXi8y7An+Rec73Ve0yxREOn5WrQT6pkmzh7V/ABWrYi5WxODpCIjtSbo0fLBa3Wqle00b0/hdCITetqIa/cFs1zUrOqICgK3bKWeXqiAkhhcwSZwwSgwOKM04Wn7ZUCgYBvhHX2mbdVJfyJ8kc+hMOE/E9RHRxiBVEXWHJlGi8PVCqNDq8qHr4g7Mdbzprig+s0yKblwHAvrpkseWvKHiZEjVTyDipHgShY4TGXEigVvUd37uppTrLi8xpYcJjS9gH/px7VCdiq1d+q/MJP6coJ1KphgATm2UrgDMYNBWaYWQKBgEHRxrmER7btUF60/YgcqPHFc8RpYQB2ZZE0kyKGDqk2Data1XYUY6vsPAU28yRLAaWr/D2H17iyLkxP80VLm6QhifxCadv90Q/Wl1DFfOJQMW6avyQ0so6G0wFq/LJxaFK4iLXQn1RJnmTp6BYiJMmK2BhFbRzw8ssMoF6ad2rr',1,1,NULL,'2019-04-03 19:54:05','2019-04-03 20:11:58'),
-	(10,'easyopen_test','G9w0BAQEFAAOCAQ8AMIIBCgKCA','','',1,2,NULL,'2019-04-19 17:19:34','2019-04-19 17:30:09'),
-	(11,'20190513577548661718777856','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdGjz3IE2VQteDjQaFacXLCAIqdEIIVcf7LW7f142V55Q0xtcjDTOHjBHExZsG64/Y5WKz4oQVWGnXwtrled8Qg0YAA7ueat8mE8NzJSm9txbfU9hwXB77nJxVkFyaSG1p0IZFrNQpbbUxTX9755deP7DdcSF148LLr091V++S3QIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ0aPPcgTZVC14ONBoVpxcsIAip0QghVx/stbt/XjZXnlDTG1yMNM4eMEcTFmwbrj9jlYrPihBVYadfC2uV53xCDRgADu55q3yYTw3MlKb23Ft9T2HBcHvucnFWQXJpIbWnQhkWs1ClttTFNf3vnl14/sN1xIXXjwsuvT3VX75LdAgMBAAECgYB68z/nQDa3q/oykDocS21qujfHtfi/wTKjVylAsdezC+wnab6RRhGf8XUuhGARiGWpn8whcBNjCTC8lVju4vQ5IIx4Hb74vwDDMtNXeqwkLmARLYu2ELibauezSeqom8/J8cR3ho7Hr4VHPTiC8qvePRmu8AvXVQz2T7SOhEjDGQJBAOm8XOivr+atiknLbQhmo508ON3sjoN9VMwK9cmnup+ZPCsurJTHRja0MJQNdOXObUVJ6wJhs1PHWT+vITfXGJ8CQQCsESzxOYTkZaqBUFjbWVf1rSwjOOsylweTuq44YIJkHhwMjHf3kN/UTXbxsBPUGeT7/+2K5UwQ9snUPr0yTBcDAkA0FMezBWqxgNu+g7iA1bYBVCjrskkzHVsmuA56Z4hbBZ71lEnaQOjxSYdFhhYVGsEYXlciSbjWoyXM3e4N7jzLAkB0ejv+H33CTsAZQZalBdnxSQTz4vf0CyDp9BkzuMELnQZHyF79i2i5gqbd/N+vWMgVfq4CtC3F3gnKT54rii6ZAkAMBIvHriT5Zbs1fW+oxBP1rHqdsRvqs1zEyIadvJgKAFwFEisryfdw2mWm3vxQQ22RlOquBiZEDIlyM0z2m9PJ',1,1,NULL,'2019-05-13 17:24:17','2019-05-13 17:24:17'),
-	(12,'20190513577548661718777857','','MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdGjz3IE2VQteDjQaFacXLCAIqdEIIVcf7LW7f142V55Q0xtcjDTOHjBHExZsG64/Y5WKz4oQVWGnXwtrled8Qg0YAA7ueat8mE8NzJSm9txbfU9hwXB77nJxVkFyaSG1p0IZFrNQpbbUxTX9755deP7DdcSF148LLr091V++S3QIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ0aPPcgTZVC14ONBoVpxcsIAip0QghVx/stbt/XjZXnlDTG1yMNM4eMEcTFmwbrj9jlYrPihBVYadfC2uV53xCDRgADu55q3yYTw3MlKb23Ft9T2HBcHvucnFWQXJpIbWnQhkWs1ClttTFNf3vnl14/sN1xIXXjwsuvT3VX75LdAgMBAAECgYB68z/nQDa3q/oykDocS21qujfHtfi/wTKjVylAsdezC+wnab6RRhGf8XUuhGARiGWpn8whcBNjCTC8lVju4vQ5IIx4Hb74vwDDMtNXeqwkLmARLYu2ELibauezSeqom8/J8cR3ho7Hr4VHPTiC8qvePRmu8AvXVQz2T7SOhEjDGQJBAOm8XOivr+atiknLbQhmo508ON3sjoN9VMwK9cmnup+ZPCsurJTHRja0MJQNdOXObUVJ6wJhs1PHWT+vITfXGJ8CQQCsESzxOYTkZaqBUFjbWVf1rSwjOOsylweTuq44YIJkHhwMjHf3kN/UTXbxsBPUGeT7/+2K5UwQ9snUPr0yTBcDAkA0FMezBWqxgNu+g7iA1bYBVCjrskkzHVsmuA56Z4hbBZ71lEnaQOjxSYdFhhYVGsEYXlciSbjWoyXM3e4N7jzLAkB0ejv+H33CTsAZQZalBdnxSQTz4vf0CyDp9BkzuMELnQZHyF79i2i5gqbd/N+vWMgVfq4CtC3F3gnKT54rii6ZAkAMBIvHriT5Zbs1fW+oxBP1rHqdsRvqs1zEyIadvJgKAFwFEisryfdw2mWm3vxQQ22RlOquBiZEDIlyM0z2m9PJ',1,1,NULL,'2019-05-13 17:24:17','2019-05-13 17:24:17');
-ALTER TABLE `isv_info` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-LOCK TABLES `isv_keys` WRITE;
-ALTER TABLE `isv_keys` DISABLE KEYS;
+
+
+INSERT INTO `isv_info` (`id`, `app_key`, `status`, `sign_type`, `remark`, `gmt_create`, `gmt_modified`) VALUES
+	(1,'2019032617262200001',1,1,NULL,'2019-03-27 10:10:34','2019-05-09 11:10:38'),
+	(3,'asdfasdf',2,1,NULL,'2019-03-27 11:01:11','2019-05-11 10:45:01'),
+	(5,'20190331562013861008375808',1,2,NULL,'2019-03-31 20:34:12','2019-04-19 17:30:09'),
+	(6,'20190331562037310372184064',2,2,NULL,'2019-03-31 22:07:20','2019-05-07 18:14:53'),
+	(7,'20190401562373672858288128',1,1,NULL,'2019-04-01 20:24:01','2019-04-01 20:27:33'),
+	(8,'20190401562373796095328256',1,1,NULL,'2019-04-01 20:24:25','2019-04-01 20:24:48'),
+	(9,'201904035630907729292csharp',1,1,NULL,'2019-04-03 19:54:05','2019-04-03 20:11:58'),
+	(10,'easyopen_test',1,2,NULL,'2019-04-19 17:19:34','2019-04-19 17:30:09'),
+	(11,'20190513577548661718777856',1,1,NULL,'2019-05-13 17:24:17','2019-05-13 17:24:17'),
+	(12,'20190513577548661718777857',1,1,NULL,'2019-05-13 17:24:17','2019-05-13 17:24:17');
+
+
 INSERT INTO `isv_keys` (`id`, `app_key`, `sign_type`, `secret`, `key_format`, `public_key_isv`, `private_key_isv`, `public_key_platform`, `private_key_platform`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'2019032617262200001',1,'',1,'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlyb9aUBaljQP/vjmBFe1mF8HsWSvyfC2NTlpT/V9E+sBxTr8TSkbzJCeeeOEm4LCaVXL0Qz63MZoT24v7AIXTuMdj4jyiM/WJ4tjrWAgnmohNOegfntTto16C3l234vXz4ryWZMR/7W+MXy5B92wPGQEJ0LKFwNEoLspDEWZ7RdE53VH7w6y6sIZUfK+YkXWSwehfKPKlx+lDw3zRJ3/yvMF+U+BAdW/MfECe1GuBnCFKnlMRh3UKczWyXWkL6ItOpYHHJi/jx85op5BWDje2pY9QowzfN94+0DB3T7UvZeweu3zlP6diwAJDzLaFQX8ULfWhY+wfKxIRgs9NoiSAQIDAQAB','MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ=','','','2019-08-13 15:18:39','2019-08-13 15:18:39'),
 	(2,'asdfasdf',1,'',1,'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOJTAsGoAsNGJdzaWm835mtpcY2YxGr4NPjnhQmfUrPdT+Zgi6jmm+olYuygNeB8cOSALmTzgXlef+6SdwfRJVEMYVAO7hqF0Ood9zTOc+kolgnWJtqX54CoodfABt0SNS/bsr6hCAWu17RGnbgBaK+ZaJD3NVqXVXE8E30cYHiQIDAQAB','MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAM4lMCwagCw0Yl3Npabzfma2lxjZjEavg0+OeFCZ9Ss91P5mCLqOab6iVi7KA14Hxw5IAuZPOBeV5/7pJ3B9ElUQxhUA7uGoXQ6h33NM5z6SiWCdYm2pfngKih18AG3RI1L9uyvqEIBa7XtEaduAFor5lokPc1WpdVcTwTfRxgeJAgMBAAECgYAM3XFGL1k0aQiChiUCaEvJKTgAywLgHm/5dRC5JwKP8knqnn+I9P5QcV0jimPvaFjZ4VCdAvCjOC3EUNSvRn7wR2Lb1+BGZZePTdxtHWE2aqJ1W1SvgQTqMsLlPBRPnXo5XH/ng3WEH15ynd5NR035xAluaI0X/y+PsRxE6TlfIQJBAPSYUyXa2yaEqmvIN+ECKALCLLeDdi2YW3Kjahgz0X9V4Y4aTdrHh8y603zXC0Wy8HeOhwGoyciaS8SmjxCMn4UCQQDXweW8xsUreLH8hfVUtyiY/KgUz+R5foJDNXD7TLE9CDoPSHy09qBe99HyVCZg/gNJH4O+tNr6C4916dYaVk01AkBYZ2HOEc8ZmeOaty/zJHtfm9zbqykgi6upwISNINV8Z4bxfHJdO7bKeVANFBBf7a/aFmqXX/EmjxYJioW03o6dAkEAp7ViXJCtJpNU1pNSFZ2hgvmxtSu7zuyVWKSrw8rjYiuI5eRUe13RXsCHgzQB+Ra5exdyEsUGCaL+yosPD73RmQJBALGuM8EQUcBgrpgpeLZ39Ni1DYXYG9aj+u+ar/UL6kI1mCNFgwroO4EVIvXPVxikMxUgiE2tVaBML5nm8VDNJ7s=','','','2019-08-13 15:18:39','2019-08-13 15:18:39'),
@@ -347,12 +275,8 @@ INSERT INTO `isv_keys` (`id`, `app_key`, `sign_type`, `secret`, `key_format`, `p
 	(8,'easyopen_test',2,'G9w0BAQEFAAOCAQ8AMIIBCgKCA',1,'','','','','2019-08-13 15:18:39','2019-08-13 15:18:39'),
 	(9,'20190513577548661718777856',1,'',1,'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdGjz3IE2VQteDjQaFacXLCAIqdEIIVcf7LW7f142V55Q0xtcjDTOHjBHExZsG64/Y5WKz4oQVWGnXwtrled8Qg0YAA7ueat8mE8NzJSm9txbfU9hwXB77nJxVkFyaSG1p0IZFrNQpbbUxTX9755deP7DdcSF148LLr091V++S3QIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ0aPPcgTZVC14ONBoVpxcsIAip0QghVx/stbt/XjZXnlDTG1yMNM4eMEcTFmwbrj9jlYrPihBVYadfC2uV53xCDRgADu55q3yYTw3MlKb23Ft9T2HBcHvucnFWQXJpIbWnQhkWs1ClttTFNf3vnl14/sN1xIXXjwsuvT3VX75LdAgMBAAECgYB68z/nQDa3q/oykDocS21qujfHtfi/wTKjVylAsdezC+wnab6RRhGf8XUuhGARiGWpn8whcBNjCTC8lVju4vQ5IIx4Hb74vwDDMtNXeqwkLmARLYu2ELibauezSeqom8/J8cR3ho7Hr4VHPTiC8qvePRmu8AvXVQz2T7SOhEjDGQJBAOm8XOivr+atiknLbQhmo508ON3sjoN9VMwK9cmnup+ZPCsurJTHRja0MJQNdOXObUVJ6wJhs1PHWT+vITfXGJ8CQQCsESzxOYTkZaqBUFjbWVf1rSwjOOsylweTuq44YIJkHhwMjHf3kN/UTXbxsBPUGeT7/+2K5UwQ9snUPr0yTBcDAkA0FMezBWqxgNu+g7iA1bYBVCjrskkzHVsmuA56Z4hbBZ71lEnaQOjxSYdFhhYVGsEYXlciSbjWoyXM3e4N7jzLAkB0ejv+H33CTsAZQZalBdnxSQTz4vf0CyDp9BkzuMELnQZHyF79i2i5gqbd/N+vWMgVfq4CtC3F3gnKT54rii6ZAkAMBIvHriT5Zbs1fW+oxBP1rHqdsRvqs1zEyIadvJgKAFwFEisryfdw2mWm3vxQQ22RlOquBiZEDIlyM0z2m9PJ','','','2019-08-13 15:18:39','2019-08-13 15:18:39'),
 	(10,'20190513577548661718777857',1,'',1,'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdGjz3IE2VQteDjQaFacXLCAIqdEIIVcf7LW7f142V55Q0xtcjDTOHjBHExZsG64/Y5WKz4oQVWGnXwtrled8Qg0YAA7ueat8mE8NzJSm9txbfU9hwXB77nJxVkFyaSG1p0IZFrNQpbbUxTX9755deP7DdcSF148LLr091V++S3QIDAQAB','MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ0aPPcgTZVC14ONBoVpxcsIAip0QghVx/stbt/XjZXnlDTG1yMNM4eMEcTFmwbrj9jlYrPihBVYadfC2uV53xCDRgADu55q3yYTw3MlKb23Ft9T2HBcHvucnFWQXJpIbWnQhkWs1ClttTFNf3vnl14/sN1xIXXjwsuvT3VX75LdAgMBAAECgYB68z/nQDa3q/oykDocS21qujfHtfi/wTKjVylAsdezC+wnab6RRhGf8XUuhGARiGWpn8whcBNjCTC8lVju4vQ5IIx4Hb74vwDDMtNXeqwkLmARLYu2ELibauezSeqom8/J8cR3ho7Hr4VHPTiC8qvePRmu8AvXVQz2T7SOhEjDGQJBAOm8XOivr+atiknLbQhmo508ON3sjoN9VMwK9cmnup+ZPCsurJTHRja0MJQNdOXObUVJ6wJhs1PHWT+vITfXGJ8CQQCsESzxOYTkZaqBUFjbWVf1rSwjOOsylweTuq44YIJkHhwMjHf3kN/UTXbxsBPUGeT7/+2K5UwQ9snUPr0yTBcDAkA0FMezBWqxgNu+g7iA1bYBVCjrskkzHVsmuA56Z4hbBZ71lEnaQOjxSYdFhhYVGsEYXlciSbjWoyXM3e4N7jzLAkB0ejv+H33CTsAZQZalBdnxSQTz4vf0CyDp9BkzuMELnQZHyF79i2i5gqbd/N+vWMgVfq4CtC3F3gnKT54rii6ZAkAMBIvHriT5Zbs1fW+oxBP1rHqdsRvqs1zEyIadvJgKAFwFEisryfdw2mWm3vxQQ22RlOquBiZEDIlyM0z2m9PJ','','','2019-08-13 15:18:39','2019-08-13 15:18:39');
-ALTER TABLE `isv_keys` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `perm_isv_role` WRITE;
-ALTER TABLE `perm_isv_role` DISABLE KEYS;
 INSERT INTO `perm_isv_role` (`id`, `isv_id`, `role_code`, `gmt_create`, `gmt_modified`) VALUES
 	(18,5,'normal','2019-03-31 22:07:50','2019-03-31 22:07:50'),
 	(32,7,'normal','2019-04-01 20:27:33','2019-04-01 20:27:33'),
@@ -362,37 +286,17 @@ INSERT INTO `perm_isv_role` (`id`, `isv_id`, `role_code`, `gmt_create`, `gmt_mod
 	(52,6,'normal','2019-05-07 18:14:53','2019-05-07 18:14:53'),
 	(57,1,'normal','2019-05-09 11:10:38','2019-05-09 11:10:38'),
 	(58,11,'normal','2019-05-13 17:24:17','2019-05-13 17:24:17');
-ALTER TABLE `perm_isv_role` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `perm_role` WRITE;
-ALTER TABLE `perm_role` DISABLE KEYS;
 INSERT INTO `perm_role` (`id`, `role_code`, `description`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'normal','普通权限','2019-03-29 15:00:10','2019-03-29 15:00:10'),
 	(2,'vip','VIP权限','2019-03-29 15:00:27','2019-03-29 15:00:27');
-ALTER TABLE `perm_role` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `perm_role_permission` WRITE;
-ALTER TABLE `perm_role_permission` DISABLE KEYS;
 INSERT INTO `perm_role_permission` (`id`, `role_code`, `route_id`, `gmt_create`, `gmt_modified`) VALUES
 	(29,'normal','permission.story.get1.0','2019-05-06 18:29:16','2019-05-06 18:29:16');
-ALTER TABLE `perm_role_permission` ENABLE KEYS;
-UNLOCK TABLES;
 
 
-LOCK TABLES `user_info` WRITE;
-ALTER TABLE `user_info` DISABLE KEYS;
 INSERT INTO `user_info` (`id`, `username`, `password`, `nickname`, `gmt_create`, `gmt_modified`) VALUES
 	(1,'zhangsan','123456','张三','2019-04-27 08:32:57','2019-04-27 08:32:57');
-ALTER TABLE `user_info` ENABLE KEYS;
-UNLOCK TABLES;
-
-
-
-
-SET FOREIGN_KEY_CHECKS = @PREVIOUS_FOREIGN_KEY_CHECKS;
-