diff --git a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java index 6cfa2c4bd..787b3ae22 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java @@ -99,7 +99,10 @@ public class AppFeatureCfgController extends BaseController { List l7ProtoList = specificServiceCfgService.findAllSpecificServiceCfg(specificServiceCfg, null); model.addAttribute("_cfg", entity); - model.addAttribute("l7ProtoList", l7ProtoList); + model.addAttribute("l7ProtoList", l7ProtoList); + if(entity.getFunctionId() == 567) { // APP关联特征配置 + return "/cfg/app/appCorrelationFeatureCfgForm"; + } return "/cfg/app/appMultiFeatureCfgForm"; } diff --git a/src/main/resources/sql/20190221/add_function_region_dict.sql b/src/main/resources/sql/20190221/add_function_region_dict.sql new file mode 100644 index 000000000..deba66b3d --- /dev/null +++ b/src/main/resources/sql/20190221/add_function_region_dict.sql @@ -0,0 +1,2 @@ +-- APP关联特征配置 增加控管参数组件 +INSERT INTO `function_region_dict` (`function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`, `is_import`) VALUES ('567', '', '7', 'APP_FEATURE_PROPERTIES', 'APP特征属性组件', '1', '1', '9', NULL, '2019-02-01 10:47:28', NULL, '2019-02-01 10:47:32', '', '1', '', '', '', '', NULL, NULL, NULL, NULL, NULL, '2', '0'); diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appCorrelationFeatureCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appCorrelationFeatureCfgForm.jsp new file mode 100644 index 000000000..d1b674d34 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/app/appCorrelationFeatureCfgForm.jsp @@ -0,0 +1,373 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + +
+ + + + + +

+ +

+
+
+
+
+
+ + + + + + + +
+
+
+ +
+ + + + + + + + + +
+
+
+
+ + +
+ +
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + + +

+ + + + +

+
+
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+
+ + +
+
+ +
+ +
+
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ +
+
+
+
+
+
+ + + + + + +

+ + +

+ +
hidden disabled"> + + + + <%@include file="/WEB-INF/views/cfg/app/appFeatureProp.jsp"%> +
+ + + + + + + + +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + +
+
+
+
+
+ + \ No newline at end of file