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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
修改国际化文件；
修改dns和account的匹配方式为多种匹配方式
app和asn的监测配置都默认为记录全日志
样例的level修改时未展示正确的level值
This commit is contained in:
duandongmei
2018-09-17 15:36:06 +08:00
parent 26856ab612 fe68f75c1b
commit a7c617cd2b
13 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1069,8 +1069,8 @@ website=\u7F51\u7AD9\u57DF\u540D
p2p_ip_config_type=IP\u914D\u7F6E\u7C7B\u578B
p2p_hash_type=HASH\u7C7B\u578B
NTC_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
WHITE_LIST_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
NTC_SUBSCRIBE_ID=\u8D26\u53F7
WHITE_LIST_SUBSCRIBE_ID=\u8D26\u53F7
app_header_config=APP\u5C42\u5934\u7279\u5F81
app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81
@@ -1090,7 +1090,7 @@ file_desc=\u6587\u4EF6\u63CF\u8FF0
content_type=\u5185\u5BB9\u7C7B\u578B
content_length=\u6587\u4EF6\u957F\u5EA6
response_file=\u54CD\u5E94\u6587\u4EF6
APP_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
APP_SUBSCRIBE_ID=\u8D26\u53F7
reply_file=\u54CD\u5E94\u6587\u4EF6
app_topic_domain_cfg=\u4E3B\u9898\u7F51\u7AD9
#=====================about app Tcp=================================

3
src/main/resources/sql/20180914/update_function_service_dict.sql Normal file
View File

@@ -0,0 +1,3 @@
#修改人脸识别阻断和监测的serviceId
UPDATE `function_service_dict` SET `service_id`='268' , `action`='16' WHERE `dict_id`='121';
UPDATE `function_service_dict` SET `service_id`='396' , `action`='1' WHERE `dict_id`='122';

2
src/main/resources/sql/20180917/update_region_dict.sql Normal file
View File

@@ -0,0 +1,2 @@
#update account and DNS match_method=0,1,2,3
update function_region_dict set config_match_method='0,1,2,3' where dict_id in (16,28);

2
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
View File

@@ -143,7 +143,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 0}">
<c:if test="${dict.itemCode eq 1}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
View File

@@ -143,7 +143,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 0}">
<c:if test="${dict.itemCode eq 1}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
View File

@@ -172,7 +172,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 0}">
<c:if test="${dict.itemCode eq 1}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
View File

@@ -171,7 +171,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 0}">
<c:if test="${dict.itemCode eq 1}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
View File

@@ -221,7 +221,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 0}">
<c:if test="${dict.itemCode eq 1}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
View File

@@ -172,7 +172,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 0}">
<c:if test="${dict.itemCode eq 1}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>

39
src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
View File

@@ -159,26 +159,29 @@ $(function(){
</div>
<!-- dolog begin-->
<div class="row " >
<div class="col-md-6" hidden="true">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="0" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="0" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 1}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose> --%>
</c:forEach>
</div>
</div>
</div>
</div>
<!-- dolog end-->
<c:forEach items="${regionList}" var="region">

31
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
View File

@@ -234,25 +234,28 @@ $(function(){
<div for="action"></div>
</div>
</div>
<div class="col-md-6" hidden="true">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="0" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
<c:if test="${dict.itemCode eq 1}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose> --%>
</c:forEach>
</div>
</div>
</div>
<!-- WEBSITE -->
<div class="col-md-6">
<div class="form-group">

5
src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp
View File

@@ -50,7 +50,6 @@ $(function(){
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
<input type="hidden" id="requestId" name="requestId" value="0">
<!-- 配置域类型 -->
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
@@ -111,6 +110,10 @@ $(function(){
<!-- desc and action -->
<%-- <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>--%>
<input type="hidden" name="requestId" value="0"/>
<input type="hidden" name="classify" value="0"/>
<input type="hidden" name="attribute" value="0"/>
<input type="hidden" name="lable" value="0"/>
</div>
<div class="form-actions">
<div class="row">

4
src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
View File

@@ -91,7 +91,7 @@ function hiddenlevel(){
$("input[name='level']").val(0);
}else {
$(".leveL").removeClass("hidden");
$("input[name='level']").val('');
// $("input[name='level']").val('');
}
}
</script>
@@ -219,7 +219,7 @@ function hiddenlevel(){
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[0,100]" type="text" name="level" value="">
<input class="form-control required number" range="[0,100]" type="text" name="level" value="${_cfg.level }">
</div>
<div for="level"></div>
</div>