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

多媒体、国家代理do_log调整

Browse Source 
framework_log国际化改为c_log
This commit is contained in:
leijun
2019-01-13 18:32:53 +08:00
parent 78363077bf
commit 59ed7f6371
13 changed files with 85 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml
View File

@@ -38,6 +38,7 @@
<result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
<result column="group_1_name" property="group1Name" jdbcType="VARCHAR" />
<result column="compile_id" property="compileId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
<sql id="DnsResStrategyColumns">
r.cfg_id,r.cfg_desc,r.res_group_1_id,
@@ -47,7 +48,7 @@
,r.max_ttl,r.cfg_type,r.action
,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id
,r.is_area_effective,r.classify,r.attribute,r.lable
,r.is_area_effective,r.classify,r.attribute,r.lable,r.do_log
,r.area_effective_ids,r.function_id,r.cfg_region_code,r.compile_id
</sql>
@@ -229,7 +230,8 @@ LEFT JOIN dns_res_strategy r ON a.dns_strategy_id=r.res_group_1_id
max_ttl,
cfg_type,
compile_Id,
cfg_region_code
cfg_region_code,
do_log
)values (
#{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER},
@@ -263,7 +265,8 @@ LEFT JOIN dns_res_strategy r ON a.dns_strategy_id=r.res_group_1_id
#{maxTtl,jdbcType=INTEGER},
#{cfgType,jdbcType=VARCHAR},
#{compileId,jdbcType=INTEGER},
#{cfgRegionCode,jdbcType=INTEGER}
#{cfgRegionCode,jdbcType=INTEGER},
#{doLog,jdbcType=INTEGER}
)
</insert>
@@ -358,6 +361,9 @@ LEFT JOIN dns_res_strategy r ON a.dns_strategy_id=r.res_group_1_id
<if test="maxTtl != null" >
max_ttl = #{maxTtl,jdbcType=INTEGER},
</if>
<if test="doLog != null" >
do_log = #{doLog,jdbcType=INTEGER},
</if>
</trim>
</set>
<where>

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

@@ -1470,4 +1470,4 @@ history=\u5386\u53f2
all_columns_hidden=\u6240\u6709\u7684\u5217\u90fd\u9690\u85cf\u4e86\uff01
no_log=\u4E0D\u8BB0\u5F55
all_log=\u8BB0\u5F55\u6240\u6709\u65E5\u5FD7
framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7
c_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7

11
src/main/resources/sql/20190113/function_service_dict_add_do_log.sql Normal file
View File

@@ -0,0 +1,11 @@
#snat<61><74>ַ<EFBFBD>ع<EFBFBD><D8B9><EFBFBD>
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=834 AND function_id=633;
#snat ip
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=835 AND function_id=300;
#dnat ip
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=836 AND function_id=304;
#dns strategy
UPDATE function_service_dict SET config_do_log='0;2;2' WHERE service_id=65 AND function_id=400;
ALTER TABLE dns_res_strategy ADD COLUMN `do_log` int(11) DEFAULT NULL;

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

@@ -228,6 +228,7 @@ $(function(){
</div>
</div>
</div>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
@@ -237,10 +238,11 @@ $(function(){
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode}"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

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

@@ -216,9 +216,10 @@ $(function(){
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

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

@@ -390,7 +390,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq cfg.doLog }">
<c:if test="${dict.itemCode eq cfg.doLog and cfg.action!=64 }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>

37
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
View File

@@ -209,9 +209,10 @@
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }"
@@ -274,27 +275,31 @@
</div>
</div>
<%-- <div class="row">
<div class="col-md-6" hidden="true" >
<!-- dolog begin-->
<div class="row doLog">
<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: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-->
<!-- subscribeId配置 -->
<c:set var="subscribeIdCfgIndex" value="0"></c:set>
<c:forEach items="${regionList}" var="region" varStatus="status">

2
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -507,7 +507,7 @@
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDoLog="${service.configDoLog }"

2
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -626,7 +626,7 @@
</td>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<c:if test="${dict.itemCode eq indexCfg.doLog and indexCfg.action!=64 }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>

28
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
View File

@@ -146,9 +146,10 @@ $(function(){
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -164,6 +165,31 @@ $(function(){
</div>
</div>
</div>
<!-- dolog begin-->
<!-- <div class="row doLog"> -->
<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="${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> -->
<!-- dolog end-->
<div class="row">
<div class="col-md-6">
<div class="form-group">

7
src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp vendored
View File

@@ -362,10 +362,11 @@
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<spring:message code="${service.actionCode }"/>
@@ -384,7 +385,7 @@
</div>
</div>
<!-- 记录日志begin -->
<%-- <div class="row">
<div class="row doLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -404,7 +405,7 @@
</c:forEach>
</div>
</div>
</div> --%>
</div>
<!-- 记录日志end -->
<h4 class="form-section cacheAction">
<spring:message code="action_region" />

5
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
View File

@@ -171,9 +171,10 @@
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
serviceId="${service.serviceId }"
serviceId="${service.serviceId }" class="action"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -198,7 +199,7 @@
<c:set var="doLog" value="${_cfg.doLog }"/>
</c:if>
<!-- 记录日志begin -->
<div class="row">
<div class="row doLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

2
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -695,7 +695,7 @@
<c:if test="${action ne 128}">
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<c:if test="${dict.itemCode eq indexCfg.doLog and indexCfg.action!=64 }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>