Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

portal-manager/db/product_db.sql

@@ -19,32 +19,33 @@ CREATE TABLE `mortals_xhx_product` (
 -- 产品接口表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_product_interface`;
-CREATE TABLE `mortals_xhx_product_interface` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
-  `productId` bigint(20) NOT NULL COMMENT '产品id',
-  `interfaceName` varchar(128) NOT NULL COMMENT '接口名称',
-  `versionNumber` varchar(64) NOT NULL COMMENT '版本号',
-  `requestType` tinyint(2) DEFAULT '1' COMMENT '请求类型1:POST,2:GET',
-  `requestProtocol` tinyint(2) DEFAULT '1' COMMENT '请求协议1:HTTP,2:HTTPS',
-  `requestUrl` varchar(128) DEFAULT NULL COMMENT '请求路径',
-  `timeoutValue` int(8) DEFAULT NULL COMMENT '超时时间（秒）',
-  `limitStrategy` tinyint(2) DEFAULT NULL COMMENT '限流策略1:分钟,2:小时',
-  `network` varchar(64) DEFAULT NULL COMMENT '访问网络1互联网2政务网',
-  `description` text COMMENT '接口描述',
-  `flowControl` text COMMENT '流控信息',
-  `authorizeInfo` text COMMENT '授权信息',
-  `interfaceTag` tinyint(2) DEFAULT NULL COMMENT '标签',
-  `interfaceSource` tinyint(2) DEFAULT '1' COMMENT '来源1自有2非自有',
-  `requestParameters` text COMMENT '请求参数',
-  `responseParameters` text COMMENT '响应数据',
-  `errorCode` text COMMENT '错误码',
-  `changeHistory` text COMMENT '变更历史',
-  `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
-  `createTime` datetime NOT NULL COMMENT '创建时间',
-  `updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
-  `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='产品接口表';
+CREATE TABLE mortals_xhx_product_interface(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `productId` bigint(20) NOT NULL     COMMENT '产品id',
+    `interfaceName` varchar(128) NOT NULL     COMMENT '接口名称',
+    `versionNumber` varchar(64) NOT NULL     COMMENT '版本号',
+    `requestType` tinyint(2)    DEFAULT '1'  COMMENT '请求类型1:POST,2:GET',
+    `requestProtocol` tinyint(2)    DEFAULT '1'  COMMENT '请求协议1:HTTP,2:HTTPS',
+    `requestUrl` varchar(128)      COMMENT '请求路径',
+    `timeoutValue` int(8)      COMMENT '超时时间（秒）',
+    `limitStrategy` tinyint(2)      COMMENT '限流策略1:分钟,2:小时',
+    `network` varchar(64)      COMMENT '访问网络1互联网2政务网',
+    `description` text      COMMENT '接口描述',
+    `contentType` varchar(128)      COMMENT '内容类型',
+    `interfaceTag` tinyint(2)      COMMENT '标签',
+    `interfaceSource` tinyint(2)    DEFAULT '1'  COMMENT '来源1自有2非自有',
+    `inEncrypt` tinyint(2)      COMMENT '入参是否加密',
+    `requestParameters` text      COMMENT '请求参数',
+    `outEncrypt` tinyint(2)      COMMENT '出参是否加密',
+    `responseParameters` text      COMMENT '响应数据',
+    `remark` text      COMMENT '接口描述',
+    `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+    `createTime` datetime NOT NULL     COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='产品接口';
+
 
 -- ----------------------------
 -- 产品应用表

portal-manager/src/main/java/com/mortals/xhx/module/product/web/ProductInterfaceController.java

@@ -33,9 +33,12 @@ public class ProductInterfaceController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "requestType", paramService.getParamBySecondOrganize("ProductInterface","requestType"));
         this.addDict(model, "requestProtocol", paramService.getParamBySecondOrganize("ProductInterface","requestProtocol"));
         this.addDict(model, "limitStrategy", paramService.getParamBySecondOrganize("ProductInterface","limitStrategy"));
+        this.addDict(model, "contentType", paramService.getParamBySecondOrganize("ProductInterface","contentType"));
         this.addDict(model, "network", paramService.getParamBySecondOrganize("ProductInterface","network"));
         this.addDict(model, "interfaceTag", paramService.getParamBySecondOrganize("ProductInterface","interfaceTag"));
         this.addDict(model, "interfaceSource", paramService.getParamBySecondOrganize("ProductInterface","interfaceSource"));
+        this.addDict(model, "inEncrypt", paramService.getParamBySecondOrganize("ProductApps","isEnable"));
+        this.addDict(model, "outEncrypt", paramService.getParamBySecondOrganize("ProductApps","isEnable"));
         super.init(model, context);
     }