gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

obj-group-list列表界面注释子配置展开三角;form表单注释http选项

Browse Source
This commit is contained in:
wangxin
2019-06-13 21:05:14 +08:00
parent 7501eb4317
commit 98f1722bdd
4 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/nis.properties
View File

@@ -540,4 +540,9 @@ trafficDestIPStatisticNew=v2/trafficDestIPStatistic
#\u67e5\u8be2\u6d41\u91cf\u7edf\u8ba1\u83dc\u5355-\u7edf\u8ba1\u4e2dSubscriberID\u7edf\u8ba1\u7684\u6570\u636e\u63a5\u53e3
trafficSubscriberIDStatisticNew=v2/trafficSubscriberIDStatistic
#HTTP(S)\u64cd\u63a7\u65e5\u5fd7\u63a5\u53e3
policyevent=v1/policyevent
policyevent=v1/policyevent
#obj_group_list
ip_obj_group_type=5
url_obj_group_type=7
subid_obj_group_type=9
domain_obj_group_type=8

60
src/main/resources/service/service_config.xml
View File

@@ -7,10 +7,10 @@
</service>
<!-- IP Address -->
<service id="16" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP地址封堵">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="NTC_IP"></serviceCfg>
</service>
<service id="128" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP地址监测">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="NTC_IP"></serviceCfg>
</service>
<service id="3" functionId="5" serviceType="2" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP drop">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
@@ -146,27 +146,27 @@
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service> -->
<service id="152" functionId="635" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="HTTP关键字监测">
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" maatTable="NTC_HTTP_REQ_BODY,NTC_HTTP_RES_BODY"></serviceCfg>
</service>
<service id="40" functionId="635" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="HTTP关键字封堵">
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" maatTable="NTC_HTTP_REQ_BODY,NTC_HTTP_RES_BODY"></serviceCfg>
</service>
<service id="129" functionId="8" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="HTTP高级配置监测">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="NTC_UNIVERSAL_IP" protocolMaatTable="NTC_UNIVERSAL_PROTO_TYPE"></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" maatTable="NTC_HTTP_URL"></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" maatTable="NTC_HTTP_REQ_BODY,NTC_HTTP_RES_ BODY"></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" maatTable="NTC_HTTP_REQ_HDR"></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" maatTable="NTC_HTTP_RES_HDR"></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" maatTable="NTC_SUBSCRIBE_ID"></serviceCfg>
<userRegion regionKey="HTTP_HEADER" regionColumn="district" userRegionPosition="2"></userRegion>
</service>
<service id="17" functionId="8" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="HTTP高级配置封堵">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" maatTable="NTC_HTTP_URL"></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" maatTable="NTC_HTTP_REQ_BODY,NTC_HTTP_RES_BODY"></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" maatTable="NTC_HTTP_REQ_HDR"></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" maatTable="NTC_HTTP_RES_HDR"></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" maatTable="NTC_SUBSCRIBE_ID"></serviceCfg>
</service>
<service id="66" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址白名单">
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
@@ -269,8 +269,8 @@
<userRegion regionKey="pps_threadshold" regionColumn="ppsThreadshold" userRegionPosition="1"></userRegion>
</service>
<service id="512" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="拦截监测">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="PXY_INTERCEPT_IP"></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" maatTable="PXY_INTERCEPT_DOMAIN"></serviceCfg>
<!-- <userRegion regionKey="keyring_id" regionColumn="userRegion1" userRegionPosition="0" ></userRegion>
<userRegion regionKey="DOMAIN_ID" regionColumn="compileId" userRegionPosition="0"></userRegion>
<userRegion regionKey="DOMAIN_STR" regionColumn="cfgKeywords" userRegionPosition="0"></userRegion>
@@ -298,20 +298,20 @@
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
</service>
<service id="592" functionId="210" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="代理控制策略监测">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="PXY_CTRL_IP"></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" maatTable="PXY_CTRL_HTTP_URL"></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" maatTable="PXY_CTRL_HTTP_REQ_BODY,PXY_CTRL_HTTP_RES_BODY"></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" maatTable="PXY_CTRL_HTTP_REQ_HDR"></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" maatTable="PXY_CTRL_HTTP_RES_HDR"></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" maatTable="PXY_CTRL_SUBSCRIBE_ID"></serviceCfg>
</service>
<service id="576" functionId="207" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="代理控制策略封堵">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="PXY_CTRL_IP"></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" maatTable="PXY_CTRL_HTTP_URL"></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" maatTable="PXY_CTRL_HTTP_REQ_BODY,PXY_CTRL_HTTP_RES_BODY"></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" maatTable="PXY_CTRL_HTTP_REQ_HDR"></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" maatTable="PXY_CTRL_HTTP_RES_HDR"></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" maatTable="PXY_CTRL_SUBSCRIBE_ID"></serviceCfg>
<userRegion regionKey="code" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
<userRegion regionKey="content" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
<userRegion regionKey="content_file_id" regionColumn="userRegion3" userRegionPosition="0"></userRegion>
@@ -435,4 +435,6 @@
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="0" serviceIds="512,592" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组监测"></service>
<service id="-1" serviceIds="576" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组阻断"></service>
</serviceList>

2
src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
View File

@@ -308,7 +308,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<select name="userRegion1" data-live-search="true" class="selectpicker form-control">
<option value="https" <c:if test="${_cfg.userRegion1 eq 'https'}">selected</c:if>><spring:message code="HTTPS"/></option>
<option value="intercept" <c:if test="${_cfg.userRegion1 eq 'intercept'}">selected</c:if>> <spring:message code="intercept"/></option>
<option value="http" <c:if test="${_cfg.userRegion1 eq 'http'}">selected</c:if>> <spring:message code="HTTP"/></option>
<%--<option value="http" <c:if test="${_cfg.userRegion1 eq 'http'}">selected</c:if>> <spring:message code="HTTP"/></option>--%>
</select>
</div>
</div>

2
src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
View File

@@ -409,7 +409,7 @@
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td>
<span id="open${status.index}" class="" compileId="${cfg.compileId}" cfgId="${cfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<%--<span id="open${status.index}" class="" compileId="${cfg.compileId}" cfgId="${cfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>--%>
<input type="checkbox" class="i-checks child-checks" id="${cfg.cfgId}" value="${cfg.isAudit}">
</td>
<td>${cfg.compileId }</td>