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 '序号，主键，自增长',
+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) 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政务网',
+    `requestUrl` varchar(128)      COMMENT '请求路径',
+    `timeoutValue` int(8)      COMMENT '超时时间（秒）',
+    `limitStrategy` tinyint(2)      COMMENT '限流策略1:分钟,2:小时',
+    `network` varchar(64)      COMMENT '访问网络1互联网2政务网',
     `description` text      COMMENT '接口描述',
-  `flowControl` text COMMENT '流控信息',
-  `authorizeInfo` text COMMENT '授权信息',
-  `interfaceTag` tinyint(2) DEFAULT NULL 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 '响应数据',
-  `errorCode` text COMMENT '错误码',
-  `changeHistory` text COMMENT '变更历史',
+    `remark` 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='产品接口表';
+    `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/model/ProductInterfaceEntity.java

@@ -2,11 +2,11 @@ package com.mortals.xhx.module.product.model;
 
 import com.mortals.xhx.module.product.model.vo.ProductInterfaceVo;
 /**
-* 产品接口实体对象
-*
-* @author zxfei
-* @date 2023-02-22
-*/
+ * 产品接口实体对象
+ *
+ * @author zxfei
+ * @date 2023-05-16
+ */
 
 public class ProductInterfaceEntity extends ProductInterfaceVo {
     private static final long serialVersionUID = 1L;
@@ -52,13 +52,9 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
      */
     private String description;
     /**
-    * 流控信息
-    */
-    private String flowControl;
-    /**
-    * 授权信息
+     * 内容类型
      */
-    private String authorizeInfo;
+    private String contentType;
     /**
      * 标签
      */
@@ -67,22 +63,26 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
      * 来源1自有2非自有
      */
     private Integer interfaceSource;
+    /**
+     * 入参是否加密
+     */
+    private Integer inEncrypt;
     /**
      * 请求参数
      */
     private String requestParameters;
     /**
-    * 响应数据
+     * 出参是否加密
      */
-    private String responseParameters;
+    private Integer outEncrypt;
     /**
-    * 错误码
+     * 响应数据
      */
-    private String errorCode;
+    private String responseParameters;
     /**
-    * 变更历史
+     * 接口描述
      */
-    private String changeHistory;
+    private String remark;
 
 
 
@@ -228,32 +228,18 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
         this.description = description;
     }
     /**
-    * 获取 流控信息
-    * @return String
-    */
-    public String getFlowControl(){
-        return flowControl;
-    }
-    /**
-    * 设置 流控信息
-    * @param flowControl
-    */
-    public void setFlowControl(String flowControl){
-        this.flowControl = flowControl;
-    }
-    /**
-    * 获取 授权信息
+     * 获取 内容类型
      * @return String
      */
-    public String getAuthorizeInfo(){
-        return authorizeInfo;
+    public String getContentType(){
+        return contentType;
     }
     /**
-    * 设置 授权信息
-    * @param authorizeInfo
+     * 设置 内容类型
+     * @param contentType
      */
-    public void setAuthorizeInfo(String authorizeInfo){
-        this.authorizeInfo = authorizeInfo;
+    public void setContentType(String contentType){
+        this.contentType = contentType;
     }
     /**
      * 获取 标签
@@ -283,6 +269,20 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
     public void setInterfaceSource(Integer interfaceSource){
         this.interfaceSource = interfaceSource;
     }
+    /**
+     * 获取 入参是否加密
+     * @return Integer
+     */
+    public Integer getInEncrypt(){
+        return inEncrypt;
+    }
+    /**
+     * 设置 入参是否加密
+     * @param inEncrypt
+     */
+    public void setInEncrypt(Integer inEncrypt){
+        this.inEncrypt = inEncrypt;
+    }
     /**
      * 获取 请求参数
      * @return String
@@ -297,6 +297,20 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
     public void setRequestParameters(String requestParameters){
         this.requestParameters = requestParameters;
     }
+    /**
+     * 获取 出参是否加密
+     * @return Integer
+     */
+    public Integer getOutEncrypt(){
+        return outEncrypt;
+    }
+    /**
+     * 设置 出参是否加密
+     * @param outEncrypt
+     */
+    public void setOutEncrypt(Integer outEncrypt){
+        this.outEncrypt = outEncrypt;
+    }
     /**
      * 获取 响应数据
      * @return String
@@ -312,32 +326,18 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
         this.responseParameters = responseParameters;
     }
     /**
-    * 获取 错误码
-    * @return String
-    */
-    public String getErrorCode(){
-        return errorCode;
-    }
-    /**
-    * 设置 错误码
-    * @param errorCode
-    */
-    public void setErrorCode(String errorCode){
-        this.errorCode = errorCode;
-    }
-    /**
-    * 获取 变更历史
+     * 获取 接口描述
      * @return String
      */
-    public String getChangeHistory(){
-        return changeHistory;
+    public String getRemark(){
+        return remark;
     }
     /**
-    * 设置 变更历史
-    * @param changeHistory
+     * 设置 接口描述
+     * @param remark
      */
-    public void setChangeHistory(String changeHistory){
-        this.changeHistory = changeHistory;
+    public void setRemark(String remark){
+        this.remark = remark;
     }
 
 
@@ -371,14 +371,14 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
         sb.append(",limitStrategy:").append(getLimitStrategy());
         sb.append(",network:").append(getNetwork());
         sb.append(",description:").append(getDescription());
-        sb.append(",flowControl:").append(getFlowControl());
-        sb.append(",authorizeInfo:").append(getAuthorizeInfo());
+        sb.append(",contentType:").append(getContentType());
         sb.append(",interfaceTag:").append(getInterfaceTag());
         sb.append(",interfaceSource:").append(getInterfaceSource());
+        sb.append(",inEncrypt:").append(getInEncrypt());
         sb.append(",requestParameters:").append(getRequestParameters());
+        sb.append(",outEncrypt:").append(getOutEncrypt());
         sb.append(",responseParameters:").append(getResponseParameters());
-        sb.append(",errorCode:").append(getErrorCode());
-        sb.append(",changeHistory:").append(getChangeHistory());
+        sb.append(",remark:").append(getRemark());
         return sb.toString();
     }
 
@@ -404,20 +404,20 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
 
         this.description = "";
 
-            this.flowControl = "";
-
-            this.authorizeInfo = "";
+        this.contentType = "";
 
         this.interfaceTag = null;
 
         this.interfaceSource = 1;
 
+        this.inEncrypt = null;
+
         this.requestParameters = "";
 
-            this.responseParameters = "";
+        this.outEncrypt = null;
 
-            this.errorCode = "";
+        this.responseParameters = "";
 
-            this.changeHistory = "";
+        this.remark = "";
     }
 }
\ No newline at end of file

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);
     }