From 3567a3f35b1895232f2762e395d996ff20e3af16 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Fri, 20 Aug 2021 23:15:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4=E4=BE=9D=E8=B5=96=202.?= =?UTF-8?q?=20=E5=AE=8C=E5=96=84=E7=B3=BB=E7=BB=9F=E3=80=81api=E4=B8=8E?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B9=8B=E9=97=B4=E7=9A=84=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 -- .../pojo/bos/header/HeaderBO.java | 20 +- .../bos/responseparams/ResponseParamsBO.java | 9 - .../pojo/bos/system/SystemBO.java | 12 +- .../pojo/dtos/header/HeaderDTO.java | 24 +- .../responseparams/ResponseParamsDTO.java | 10 - .../pojo/dtos/system/SystemDTO.java | 55 +++- .../pojo/pos/header/HeaderPO.java | 21 +- .../pos/responseparams/ResponseParamsPO.java | 9 - .../pojo/pos/system/SystemPO.java | 12 +- .../gatewaymanage/pojo/vos/api/ApiVO.java | 4 + .../pojo/vos/header/HeaderVO.java | 30 ++- .../vos/responseparams/ResponseParamsVO.java | 16 +- .../pojo/vos/system/SystemVO.java | 16 +- .../mybatis/mapper/header/header-mapper.xml | 58 ++--- .../responseparams/response-params-mapper.xml | 14 -- .../mybatis/mapper/system/system-mapper.xml | 26 +- src/main/resources/static/route/api/list.html | 45 ++++ src/main/resources/static/route/api/save.html | 223 +++++++--------- .../resources/static/route/api/update.html | 237 +++++++----------- .../resources/static/route/header/list.html | 30 +-- .../resources/static/route/header/save.html | 84 +------ .../resources/static/route/header/update.html | 81 +----- .../static/route/requestparams/list.html | 26 +- .../static/route/requestparams/save.html | 104 ++------ .../static/route/requestparams/update.html | 101 ++------ .../static/route/responseparams/list.html | 26 +- .../static/route/responseparams/save.html | 106 ++------ .../static/route/responseparams/update.html | 103 ++------ .../resources/static/route/system/list.html | 57 ++++- .../resources/static/route/system/save.html | 122 +++++++-- .../resources/static/route/system/update.html | 123 +++++++-- 32 files changed, 755 insertions(+), 1064 deletions(-) diff --git a/pom.xml b/pom.xml index d62fc65..3210a90 100644 --- a/pom.xml +++ b/pom.xml @@ -69,26 +69,11 @@ - - ink.wgink - service-group - 1.0-SNAPSHOT - - - ink.wgink - service-position - 1.0-SNAPSHOT - ink.wgink service-role 1.0-SNAPSHOT - - ink.wgink - basic-app - 1.0-SNAPSHOT - ink.wgink login-base diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/header/HeaderBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/header/HeaderBO.java index 951a5c3..8c9962d 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/header/HeaderBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/header/HeaderBO.java @@ -13,8 +13,8 @@ public class HeaderBO { private String headerId; private String systemId; private String apiId; - private String key; - private String value; + private String headerName; + private String headerValue; private String summary; public String getHeaderId() { @@ -41,20 +41,20 @@ public class HeaderBO { this.apiId = apiId; } - public String getKey() { - return key == null ? "" : key.trim(); + public String getHeaderName() { + return headerName == null ? "" : headerName.trim(); } - public void setKey(String key) { - this.key = key; + public void setHeaderName(String headerName) { + this.headerName = headerName; } - public String getValue() { - return value == null ? "" : value.trim(); + public String getHeaderValue() { + return headerValue == null ? "" : headerValue.trim(); } - public void setValue(String value) { - this.value = value; + public void setHeaderValue(String headerValue) { + this.headerValue = headerValue; } public String getSummary() { diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/responseparams/ResponseParamsBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/responseparams/ResponseParamsBO.java index 12536d2..3c19d42 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/responseparams/ResponseParamsBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/responseparams/ResponseParamsBO.java @@ -15,7 +15,6 @@ public class ResponseParamsBO { private String apiId; private String paramsName; private String paramsSummary; - private String paramsType; private String paramsDataType; private Integer paramsIsRequired; private String paramsExample; @@ -60,14 +59,6 @@ public class ResponseParamsBO { this.paramsSummary = paramsSummary; } - public String getParamsType() { - return paramsType == null ? "" : paramsType.trim(); - } - - public void setParamsType(String paramsType) { - this.paramsType = paramsType; - } - public String getParamsDataType() { return paramsDataType == null ? "" : paramsDataType.trim(); } diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/system/SystemBO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/system/SystemBO.java index 239050d..93f4c17 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/bos/system/SystemBO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/bos/system/SystemBO.java @@ -5,7 +5,7 @@ package ink.wgink.gatewaymanage.pojo.bos.system; * @ClassName: SystemBO * @Description: 接口系统 * @Author: CodeFactory - * @Date: 2021-08-16 15:03:18 + * @Date: 2021-08-20 20:09:08 * @Version: 3.0 **/ public class SystemBO { @@ -15,7 +15,7 @@ public class SystemBO { private String summary; private String logo; private String gatewayContext; - private String schema; + private String requestSchema; private String ipAddress; private String systemContext; private String auditStatus; @@ -68,12 +68,12 @@ public class SystemBO { this.gatewayContext = gatewayContext; } - public String getSchema() { - return schema == null ? "" : schema.trim(); + public String getRequestSchema() { + return requestSchema == null ? "" : requestSchema.trim(); } - public void setSchema(String schema) { - this.schema = schema; + public void setRequestSchema(String requestSchema) { + this.requestSchema = requestSchema; } public String getIpAddress() { diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/header/HeaderDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/header/HeaderDTO.java index 39eb56f..971f174 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/header/HeaderDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/header/HeaderDTO.java @@ -20,10 +20,10 @@ public class HeaderDTO { private String systemId; @ApiModelProperty(name = "apiId", value = "接口ID") private String apiId; - @ApiModelProperty(name = "key", value = "键名") - private String key; - @ApiModelProperty(name = "value", value = "键值") - private String value; + @ApiModelProperty(name = "headerName", value = "键名") + private String headerName; + @ApiModelProperty(name = "headerValue", value = "键值") + private String headerValue; @ApiModelProperty(name = "summary", value = "说明") private String summary; @@ -51,20 +51,20 @@ public class HeaderDTO { this.apiId = apiId; } - public String getKey() { - return key == null ? "" : key.trim(); + public String getHeaderName() { + return headerName == null ? "" : headerName.trim(); } - public void setKey(String key) { - this.key = key; + public void setHeaderName(String headerName) { + this.headerName = headerName; } - public String getValue() { - return value == null ? "" : value.trim(); + public String getHeaderValue() { + return headerValue == null ? "" : headerValue.trim(); } - public void setValue(String value) { - this.value = value; + public void setHeaderValue(String headerValue) { + this.headerValue = headerValue; } public String getSummary() { diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/responseparams/ResponseParamsDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/responseparams/ResponseParamsDTO.java index d3cd512..3128997 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/responseparams/ResponseParamsDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/responseparams/ResponseParamsDTO.java @@ -24,8 +24,6 @@ public class ResponseParamsDTO { private String paramsName; @ApiModelProperty(name = "paramsSummary", value = "参数说明") private String paramsSummary; - @ApiModelProperty(name = "paramsType", value = "参数类型") - private String paramsType; @ApiModelProperty(name = "paramsDataType", value = "参数数据类型") private String paramsDataType; @ApiModelProperty(name = "paramsIsRequired", value = "是否必填") @@ -73,14 +71,6 @@ public class ResponseParamsDTO { this.paramsSummary = paramsSummary; } - public String getParamsType() { - return paramsType == null ? "" : paramsType.trim(); - } - - public void setParamsType(String paramsType) { - this.paramsType = paramsType; - } - public String getParamsDataType() { return paramsDataType == null ? "" : paramsDataType.trim(); } diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/system/SystemDTO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/system/SystemDTO.java index 819b619..bd9e613 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/system/SystemDTO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/dtos/system/SystemDTO.java @@ -4,11 +4,10 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; /** - * * @ClassName: SystemDTO * @Description: 接口系统 * @Author: CodeFactory - * @Date: 2021-08-16 15:03:18 + * @Date: 2021-08-20 20:09:08 * @Version: 3.0 **/ @ApiModel @@ -24,8 +23,8 @@ public class SystemDTO { private String logo; @ApiModelProperty(name = "gatewayContext", value = "网关上下文") private String gatewayContext; - @ApiModelProperty(name = "schema", value = "请求方式") - private String schema; + @ApiModelProperty(name = "requestSchema", value = "请求方式") + private String requestSchema; @ApiModelProperty(name = "ipAddress", value = "系统地址") private String ipAddress; @ApiModelProperty(name = "systemContext", value = "系统上下文") @@ -40,6 +39,14 @@ public class SystemDTO { private String auditReason; @ApiModelProperty(name = "gmtCreate", value = "创建时间") private String gmtCreate; + @ApiModelProperty(name = "creator", value = "创建人") + private String creator; + @ApiModelProperty(name = "gmtModified", value = "修改时间") + private String gmtModified; + @ApiModelProperty(name = "modifier", value = "修改人") + private String modifier; + @ApiModelProperty(name = "isDelete", value = "是否删除") + private Integer isDelete; public String getSystemId() { return systemId == null ? "" : systemId.trim(); @@ -81,12 +88,12 @@ public class SystemDTO { this.gatewayContext = gatewayContext; } - public String getSchema() { - return schema == null ? "" : schema.trim(); + public String getRequestSchema() { + return requestSchema == null ? "" : requestSchema.trim(); } - public void setSchema(String schema) { - this.schema = schema; + public void setRequestSchema(String requestSchema) { + this.requestSchema = requestSchema; } public String getIpAddress() { @@ -145,5 +152,37 @@ public class SystemDTO { this.gmtCreate = gmtCreate; } + public String getCreator() { + return creator == null ? "" : creator.trim(); + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtModified() { + return gmtModified == null ? "" : gmtModified.trim(); + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public String getModifier() { + return modifier == null ? "" : modifier.trim(); + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + } diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/header/HeaderPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/header/HeaderPO.java index da1049a..e5b9757 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/header/HeaderPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/header/HeaderPO.java @@ -1,7 +1,6 @@ package ink.wgink.gatewaymanage.pojo.pos.header; /** - * * @ClassName: HeaderPO * @Description: 请求头 * @Author: CodeFactory @@ -13,8 +12,8 @@ public class HeaderPO { private String headerId; private String systemId; private String apiId; - private String key; - private String value; + private String headerName; + private String headerValue; private String summary; public String getHeaderId() { @@ -41,20 +40,20 @@ public class HeaderPO { this.apiId = apiId; } - public String getKey() { - return key == null ? "" : key.trim(); + public String getHeaderName() { + return headerName == null ? "" : headerName.trim(); } - public void setKey(String key) { - this.key = key; + public void setHeaderName(String headerName) { + this.headerName = headerName; } - public String getValue() { - return value == null ? "" : value.trim(); + public String getHeaderValue() { + return headerValue == null ? "" : headerValue.trim(); } - public void setValue(String value) { - this.value = value; + public void setHeaderValue(String headerValue) { + this.headerValue = headerValue; } public String getSummary() { diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/responseparams/ResponseParamsPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/responseparams/ResponseParamsPO.java index 4981e08..4b33415 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/responseparams/ResponseParamsPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/responseparams/ResponseParamsPO.java @@ -15,7 +15,6 @@ public class ResponseParamsPO { private String apiId; private String paramsName; private String paramsSummary; - private String paramsType; private String paramsDataType; private Integer paramsIsRequired; private String paramsExample; @@ -60,14 +59,6 @@ public class ResponseParamsPO { this.paramsSummary = paramsSummary; } - public String getParamsType() { - return paramsType == null ? "" : paramsType.trim(); - } - - public void setParamsType(String paramsType) { - this.paramsType = paramsType; - } - public String getParamsDataType() { return paramsDataType == null ? "" : paramsDataType.trim(); } diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/system/SystemPO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/system/SystemPO.java index ef64769..3ac7251 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/pos/system/SystemPO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/pos/system/SystemPO.java @@ -5,7 +5,7 @@ package ink.wgink.gatewaymanage.pojo.pos.system; * @ClassName: SystemPO * @Description: 接口系统 * @Author: CodeFactory - * @Date: 2021-08-16 15:03:18 + * @Date: 2021-08-20 20:09:08 * @Version: 3.0 **/ public class SystemPO { @@ -15,7 +15,7 @@ public class SystemPO { private String summary; private String logo; private String gatewayContext; - private String schema; + private String requestSchema; private String ipAddress; private String systemContext; private String auditStatus; @@ -68,12 +68,12 @@ public class SystemPO { this.gatewayContext = gatewayContext; } - public String getSchema() { - return schema == null ? "" : schema.trim(); + public String getRequestSchema() { + return requestSchema == null ? "" : requestSchema.trim(); } - public void setSchema(String schema) { - this.schema = schema; + public void setRequestSchema(String requestSchema) { + this.requestSchema = requestSchema; } public String getIpAddress() { diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/vos/api/ApiVO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/vos/api/ApiVO.java index 98adde0..05acad7 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/vos/api/ApiVO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/vos/api/ApiVO.java @@ -17,14 +17,18 @@ import io.swagger.annotations.ApiModelProperty; public class ApiVO { @ApiModelProperty(name = "systemId", value = "系统ID") + @CheckEmptyAnnotation(name = "系统ID") private String systemId; @ApiModelProperty(name = "title", value = "标题") + @CheckEmptyAnnotation(name = "标题") private String title; @ApiModelProperty(name = "summary", value = "说明") private String summary; @ApiModelProperty(name = "url", value = "请求地址") + @CheckEmptyAnnotation(name = "请求地址") private String url; @ApiModelProperty(name = "method", value = "方法") + @CheckEmptyAnnotation(name = "方法") private String method; @ApiModelProperty(name = "requestExampleUrl", value = "请求示例") private String requestExampleUrl; diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/vos/header/HeaderVO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/vos/header/HeaderVO.java index 7719a67..08f51af 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/vos/header/HeaderVO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/vos/header/HeaderVO.java @@ -1,7 +1,6 @@ package ink.wgink.gatewaymanage.pojo.vos.header; import ink.wgink.annotation.CheckEmptyAnnotation; -import ink.wgink.annotation.CheckNumberAnnotation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -17,14 +16,19 @@ import io.swagger.annotations.ApiModelProperty; public class HeaderVO { @ApiModelProperty(name = "systemId", value = "系统ID") + @CheckEmptyAnnotation(name = "系统ID") private String systemId; @ApiModelProperty(name = "apiId", value = "接口ID") + @CheckEmptyAnnotation(name = "接口ID") private String apiId; - @ApiModelProperty(name = "key", value = "键名") - private String key; - @ApiModelProperty(name = "value", value = "键值") - private String value; + @ApiModelProperty(name = "headerName", value = "键名") + @CheckEmptyAnnotation(name = "键名") + private String headerName; + @ApiModelProperty(name = "headerValue", value = "键值") + @CheckEmptyAnnotation(name = "键值") + private String headerValue; @ApiModelProperty(name = "summary", value = "说明") + @CheckEmptyAnnotation(name = "说明") private String summary; public String getSystemId() { @@ -43,20 +47,20 @@ public class HeaderVO { this.apiId = apiId; } - public String getKey() { - return key == null ? "" : key.trim(); + public String getHeaderName() { + return headerName == null ? "" : headerName.trim(); } - public void setKey(String key) { - this.key = key; + public void setHeaderName(String headerName) { + this.headerName = headerName; } - public String getValue() { - return value == null ? "" : value.trim(); + public String getHeaderValue() { + return headerValue == null ? "" : headerValue.trim(); } - public void setValue(String value) { - this.value = value; + public void setHeaderValue(String headerValue) { + this.headerValue = headerValue; } public String getSummary() { diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/vos/responseparams/ResponseParamsVO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/vos/responseparams/ResponseParamsVO.java index 523f2a3..c620a31 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/vos/responseparams/ResponseParamsVO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/vos/responseparams/ResponseParamsVO.java @@ -17,19 +17,21 @@ import io.swagger.annotations.ApiModelProperty; public class ResponseParamsVO { @ApiModelProperty(name = "systemId", value = "系统ID") + @CheckEmptyAnnotation(name = "系统ID") private String systemId; @ApiModelProperty(name = "apiId", value = "接口ID") + @CheckEmptyAnnotation(name = "接口ID") private String apiId; @ApiModelProperty(name = "paramsName", value = "参数名") + @CheckEmptyAnnotation(name = "参数名") private String paramsName; @ApiModelProperty(name = "paramsSummary", value = "参数说明") + @CheckEmptyAnnotation(name = "参数说明") private String paramsSummary; - @ApiModelProperty(name = "paramsType", value = "参数类型") - private String paramsType; @ApiModelProperty(name = "paramsDataType", value = "参数数据类型") private String paramsDataType; @ApiModelProperty(name = "paramsIsRequired", value = "是否必填") - @CheckNumberAnnotation(name = "是否必填") + @CheckNumberAnnotation(name = "是否为空") private Integer paramsIsRequired; @ApiModelProperty(name = "paramsExample", value = "参数示例") private String paramsExample; @@ -66,14 +68,6 @@ public class ResponseParamsVO { this.paramsSummary = paramsSummary; } - public String getParamsType() { - return paramsType == null ? "" : paramsType.trim(); - } - - public void setParamsType(String paramsType) { - this.paramsType = paramsType; - } - public String getParamsDataType() { return paramsDataType == null ? "" : paramsDataType.trim(); } diff --git a/src/main/java/ink/wgink/gatewaymanage/pojo/vos/system/SystemVO.java b/src/main/java/ink/wgink/gatewaymanage/pojo/vos/system/SystemVO.java index 4a02d48..c1347c7 100644 --- a/src/main/java/ink/wgink/gatewaymanage/pojo/vos/system/SystemVO.java +++ b/src/main/java/ink/wgink/gatewaymanage/pojo/vos/system/SystemVO.java @@ -1,7 +1,5 @@ package ink.wgink.gatewaymanage.pojo.vos.system; -import ink.wgink.annotation.CheckEmptyAnnotation; -import ink.wgink.annotation.CheckNumberAnnotation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty; * @ClassName: SystemVO * @Description: 接口系统 * @Author: CodeFactory - * @Date: 2021-08-16 15:03:18 + * @Date: 2021-08-20 20:09:08 * @Version: 3.0 **/ @ApiModel @@ -24,8 +22,8 @@ public class SystemVO { private String logo; @ApiModelProperty(name = "gatewayContext", value = "网关上下文") private String gatewayContext; - @ApiModelProperty(name = "schema", value = "请求方式") - private String schema; + @ApiModelProperty(name = "requestSchema", value = "请求方式") + private String requestSchema; @ApiModelProperty(name = "ipAddress", value = "系统地址") private String ipAddress; @ApiModelProperty(name = "systemContext", value = "系统上下文") @@ -63,12 +61,12 @@ public class SystemVO { this.gatewayContext = gatewayContext; } - public String getSchema() { - return schema == null ? "" : schema.trim(); + public String getRequestSchema() { + return requestSchema == null ? "" : requestSchema.trim(); } - public void setSchema(String schema) { - this.schema = schema; + public void setRequestSchema(String requestSchema) { + this.requestSchema = requestSchema; } public String getIpAddress() { diff --git a/src/main/resources/mybatis/mapper/header/header-mapper.xml b/src/main/resources/mybatis/mapper/header/header-mapper.xml index f08fed3..b894f4b 100644 --- a/src/main/resources/mybatis/mapper/header/header-mapper.xml +++ b/src/main/resources/mybatis/mapper/header/header-mapper.xml @@ -6,8 +6,8 @@ - - + + @@ -15,8 +15,8 @@ - - + + @@ -24,8 +24,8 @@ - - + + @@ -35,15 +35,15 @@ header_id, system_id, api_id, - key, - value, + header_name, + header_value, summary ) VALUES( #{headerId}, #{systemId}, #{apiId}, - #{key}, - #{value}, + #{headerName}, + #{headerValue}, #{summary} ) @@ -71,11 +71,11 @@ api_id = #{apiId}, - - key = #{key}, + + header_name = #{headerName}, - - value = #{value}, + + header_value = #{headerValue}, summary = #{summary}, @@ -90,8 +90,8 @@ SELECT t1.system_id, t1.api_id, - t1.key, - t1.value, + t1.header_name, + t1.header_value, t1.summary, t1.header_id FROM @@ -110,8 +110,8 @@ t1.header_id, t1.system_id, t1.api_id, - t1.key, - t1.value, + t1.header_name, + t1.header_value, t1.summary FROM api_header t1 @@ -129,8 +129,8 @@ t1.header_id, t1.system_id, t1.api_id, - t1.key, - t1.value, + t1.header_name, + t1.header_value, t1.summary FROM api_header t1 @@ -148,8 +148,8 @@ t1.header_id, t1.system_id, t1.api_id, - t1.key, - t1.value, + t1.header_name, + t1.header_value, t1.summary, 1 FROM @@ -159,7 +159,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.id LIKE CONCAT('%', #{header_namewords}, '%') ) @@ -177,8 +177,8 @@ t1.header_id, t1.system_id, t1.api_id, - t1.key, - t1.value, + t1.header_name, + t1.header_value, t1.summary FROM api_header t1 @@ -187,7 +187,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.id LIKE CONCAT('%', #{header_namewords}, '%') ) @@ -205,8 +205,8 @@ t1.header_id, t1.system_id, t1.api_id, - t1.key, - t1.value, + t1.header_name, + t1.header_value, t1.summary FROM api_header t1 @@ -215,7 +215,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.id LIKE CONCAT('%', #{header_namewords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/responseparams/response-params-mapper.xml b/src/main/resources/mybatis/mapper/responseparams/response-params-mapper.xml index 4195f49..ab5009a 100644 --- a/src/main/resources/mybatis/mapper/responseparams/response-params-mapper.xml +++ b/src/main/resources/mybatis/mapper/responseparams/response-params-mapper.xml @@ -8,7 +8,6 @@ - @@ -20,7 +19,6 @@ - @@ -32,7 +30,6 @@ - @@ -46,7 +43,6 @@ api_id, params_name, params_summary, - params_type, params_data_type, params_is_required, params_example @@ -56,7 +52,6 @@ #{apiId}, #{paramsName}, #{paramsSummary}, - #{paramsType}, #{paramsDataType}, #{paramsIsRequired}, #{paramsExample} @@ -92,9 +87,6 @@ params_summary = #{paramsSummary}, - - params_type = #{paramsType}, - params_data_type = #{paramsDataType}, @@ -116,7 +108,6 @@ t1.api_id, t1.params_name, t1.params_summary, - t1.params_type, t1.params_data_type, t1.params_is_required, t1.params_example, @@ -139,7 +130,6 @@ t1.api_id, t1.params_name, t1.params_summary, - t1.params_type, t1.params_data_type, t1.params_is_required, t1.params_example @@ -161,7 +151,6 @@ t1.api_id, t1.params_name, t1.params_summary, - t1.params_type, t1.params_data_type, t1.params_is_required, t1.params_example @@ -183,7 +172,6 @@ t1.api_id, t1.params_name, t1.params_summary, - t1.params_type, t1.params_data_type, t1.params_is_required, t1.params_example, @@ -215,7 +203,6 @@ t1.api_id, t1.params_name, t1.params_summary, - t1.params_type, t1.params_data_type, t1.params_is_required, t1.params_example @@ -246,7 +233,6 @@ t1.api_id, t1.params_name, t1.params_summary, - t1.params_type, t1.params_data_type, t1.params_is_required, t1.params_example diff --git a/src/main/resources/mybatis/mapper/system/system-mapper.xml b/src/main/resources/mybatis/mapper/system/system-mapper.xml index 077f4dc..0804f03 100644 --- a/src/main/resources/mybatis/mapper/system/system-mapper.xml +++ b/src/main/resources/mybatis/mapper/system/system-mapper.xml @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -66,7 +66,7 @@ summary, logo, gateway_context, - schema, + request_schema, ip_address, system_context, audit_status, @@ -84,7 +84,7 @@ #{summary}, #{logo}, #{gatewayContext}, - #{schema}, + #{requestSchema}, #{ipAddress}, #{systemContext}, #{auditStatus}, @@ -142,8 +142,8 @@ gateway_context = #{gatewayContext}, - - schema = #{schema}, + + request_schema = #{requestSchema}, ip_address = #{ipAddress}, @@ -165,7 +165,7 @@ t1.summary, t1.logo, t1.gateway_context, - t1.schema, + t1.request_schema, t1.ip_address, t1.system_context, t1.system_id @@ -187,7 +187,7 @@ t1.summary, t1.logo, t1.gateway_context, - t1.schema, + t1.request_schema, t1.ip_address, t1.system_context, t1.audit_status, @@ -217,7 +217,7 @@ t1.summary, t1.logo, t1.gateway_context, - t1.schema, + t1.request_schema, t1.ip_address, t1.system_context, t1.audit_status, @@ -247,7 +247,7 @@ t1.summary, t1.logo, t1.gateway_context, - t1.schema, + t1.request_schema, t1.ip_address, t1.system_context, t1.audit_status, @@ -291,7 +291,7 @@ t1.summary, t1.logo, t1.gateway_context, - t1.schema, + t1.request_schema, t1.ip_address, t1.system_context, t1.audit_status, @@ -338,7 +338,7 @@ t1.summary, t1.logo, t1.gateway_context, - t1.schema, + t1.request_schema, t1.ip_address, t1.system_context, t1.audit_status, diff --git a/src/main/resources/static/route/api/list.html b/src/main/resources/static/route/api/list.html index 583028c..bbcdeb1 100644 --- a/src/main/resources/static/route/api/list.html +++ b/src/main/resources/static/route/api/list.html @@ -266,6 +266,21 @@ return rowData; } }, + {field: 'headerParams', width: 80, title: '头参数', align:'center', fixed: 'right', + templet: function(row) { + return ''; + } + }, + {field: 'requestParams', width: 90, title: '请求参数', align:'center', fixed: 'right', + templet: function(row) { + return ''; + } + }, + {field: 'responseParams', width: 90, title: '响应参数', align:'center', fixed: 'right', + templet: function(row) { + return ''; + } + }, ] ], page: true, @@ -393,6 +408,36 @@ } } }); + + table.on('tool(dataTable)', function(obj) { + var event = obj.event; + var data = obj.data; + if(event === 'headerParamsEvent') { + top.dialog.open({ + url: top.restAjax.path('route/header/list.html?systemId={systemId}&apiId={apiId}', [data.systemId, data.apiId]), + title: '头参数列表', + width: '500px', + height: '400px', + onClose: function() {} + }); + } else if(event === 'requestParamsEvent') { + top.dialog.open({ + url: top.restAjax.path('route/requestparams/list.html?systemId={systemId}&apiId={apiId}', [data.systemId, data.apiId]), + title: '请求参数列表', + width: '500px', + height: '400px', + onClose: function() {} + }); + } else if(event === 'responseParamsEvent') { + top.dialog.open({ + url: top.restAjax.path('route/responseparams/list.html?systemId={systemId}&apiId={apiId}', [data.systemId, data.apiId]), + title: '响应参数列表', + width: '500px', + height: '400px', + onClose: function() {} + }); + } + }); }); diff --git a/src/main/resources/static/route/api/save.html b/src/main/resources/static/route/api/save.html index 8652fcc..4aebb0c 100644 --- a/src/main/resources/static/route/api/save.html +++ b/src/main/resources/static/route/api/save.html @@ -9,7 +9,8 @@ - + +
@@ -23,15 +24,21 @@
- -
- -
+ +
+
- +
- +
@@ -41,19 +48,25 @@
- +
- +
+
不包含系统上下文,以根路径开头,如果有变量,用 花括号 "{}" 包含变量
- +
- +
- +
@@ -61,37 +74,40 @@
-
+
-
+
-
+
-
- +
+
- + +
-
- +
+
- + +
-
- +
+
- + +
@@ -106,9 +122,7 @@
- - - +
- +
- +
@@ -41,57 +47,66 @@
- +
- +
+
不包含系统上下文,以根路径开头,如果有变量,用 花括号 "{}" 包含变量
- +
- +
- +
- +
-
+
- +
-
+
- +
-
+
-
- +
+
- + +
-
- +
+
- + +
-
- +
+
- + +
@@ -106,9 +121,7 @@
- - - + - - - - - - - - - - - -
- +
- +
+
这里的上下文是指接口在访问网关时请求的根路径,不同的系统路径不能重复,不能以根路径开头
- +
- +
+
这里的请求方式指的是网关请求后端系统时所用到的方式。只支持 http 和 https
- +
- +
+
只能是 ip 或 域名,不包含 请求方式 和 上下文
- +
- +
+
这里的上下文是指接口在访问网关时请求的根路径,统一地址,不同的系统路径不能重复,最好与 网关上下文 保持一致
@@ -76,8 +112,6 @@
- -
- +
- +
+
这里的上下文是指接口在访问网关时请求的根路径,不同的系统路径不能重复,不能以根路径开头
- +
- +
+
这里的请求方式指的是网关请求后端系统时所用到的方式。只支持 http 和 https
- +
- +
+
只能是 ip 或 域名,不包含 请求方式 和 上下文
- +
- +
+
这里的上下文是指接口在访问网关时请求的根路径,统一地址,不同的系统路径不能重复,最好与 网关上下文 保持一致
@@ -76,8 +112,6 @@
- -