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

修改group_id国际化中文

Browse Source 
隐藏dnsResStrategy 无策略配置信息
去掉dnsResStrategy新增的默认策略号
来函信息增加title的必输项验证
特定协议隐藏配置分组ID
This commit is contained in:
duandongmei
2018-07-18 20:08:12 +08:00
parent 726dff6d0c
commit 7560d7bb42
10 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
View File

@@ -46,12 +46,12 @@ public class DnsResStrategyController extends BaseController {
initFormCondition(model, cfg);
model.addAttribute("isAdd", false);
}else{
//不存在响应策略为0的配置，则新策略时，cfgId默认为0
/*//不存在响应策略为0的配置，则新策略时，cfgId默认为0
DnsResStrategy dns0=dnsResStrategyService.getDnsResStrategy(0l,null);
if(dns0 == null){
cfg.setCfgId(0l);
cfg.setCfgDesc("无策略");
}
}*/
initFormCondition(model, cfg);
model.addAttribute("isAdd", true);
}

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

@@ -123,6 +123,7 @@
<if test="functionId != null">
AND r.function_id=#{functionId,jdbcType=INTEGER}
</if>
<![CDATA[ and r.cfg_id <> 0]]>
<!-- 数据范围过滤 -->
${sqlMap.dsf}
</trim>
@@ -159,6 +160,7 @@
<if test="cfgId != null">
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
</if>
<![CDATA[ and r.cfg_id <> 0]]>
</where>
order by cfg_Id
</select>

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

@@ -384,7 +384,7 @@ ip_type=IP\u7C7B\u578B
#==========tedingfuwu begin=====================
protocol_code=\u534F\u8BAE\u53F7
protocol_name=\u534F\u8BAE\u540D\u79F0
group_id=maat\u7AEF\u914D\u7F6E\u5206\u7EC4ID
group_id=\u914D\u7F6E\u5206\u7EC4ID
input_protocol_id=\u8BF7\u8F93\u5165\u534F\u8BAEID
input_integer=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6574\u6570\u503C
protocol_desc=\u534F\u8BAE\u63CF\u8FF0

1
src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
View File

@@ -77,6 +77,7 @@ $(function(){
<label class="control-label col-md-3"><spring:message code="policy_name"/></label>
<div class="col-md-6">
<select name="dnsStrategyId" class="selectpicker show-tick form-control">
<option value="0" ><spring:message code="select"/></option>
<c:forEach items="${dnsResStrategys }" var="dnsStrategy">
<option value="${dnsStrategy.cfgId}" <c:if test="${_cfg.dnsStrategyId==dnsStrategy.cfgId }">selected</c:if>><spring:message code="${dnsStrategy.cfgDesc}"/></option>
</c:forEach>

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

@@ -24,11 +24,6 @@ $(function(){
var flag = true;
var cfgId=$("#cfgId").val();
var message="";
if(cfgId <=100 && cfgId != 0){
//message="策略号值只能为0，或大于100";
message="<spring:message code='policy_number_value_valid'/>";
flag=false;
}
if(flag){
if($("#isAdd").val() == 'true'){
$.ajax({
@@ -103,7 +98,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="policy_number"/></label>
<div class="col-md-6">
<input class="form-control required number" <c:if test="${!isAdd}" >readonly="true"</c:if> type="text" id="cfgId" name="cfgId" value="${_cfg.cfgId}">
<input class="form-control required number" <c:if test="${!isAdd}" >readonly="true"</c:if> type="text" id="cfgId" min="101" name="cfgId" value="${_cfg.cfgId}">
</div>
<div for="cfgId"></div>
</div>

4
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
View File

@@ -286,7 +286,9 @@
<tbody>
<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
<tr>
<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
<td>
<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
</td>
<td>${cfg.cfgId }</td>
<td>
<a href="javascript:;" data-original-title="${cfg.cfgDesc}"

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

@@ -42,9 +42,9 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="title"></spring:message>:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="title"></spring:message>:</label>
<div class="col-md-4">
<input type="text" class="form-control" name="requestTitle" maxlength="512" value="${requestInfo.requestTitle}">
<input type="text" class="form-control required" name="requestTitle" maxlength="512" value="${requestInfo.requestTitle}">
</div>
</div>
<div class="form-group">

1
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -175,6 +175,7 @@
code="policy_name" /></label>
<div class="col-md-6">
<select name="dnsStrategyId" class="selectpicker show-tick form-control">
<option value="0" ><spring:message code="select"/></option>
<c:forEach items="${dnsResStrategys }" var="dnsStrategy">
<option value="${dnsStrategy.cfgId}" <c:if test="${_cfg.dnsStrategyId==dnsStrategy.cfgId }">selected</c:if>><spring:message code="${dnsStrategy.cfgDesc}"/></option>
</c:forEach>

2
src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
View File

@@ -117,7 +117,7 @@
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="group_id"/>:</label>
<div class="col-md-4">
<form:input path="groupId" htmlEscape="false" maxlength="50" range="[0,2147483647]" class="form-control digits" placeholder="0"/>
<form:input path="groupId" htmlEscape="false" maxlength="50" range="[0,2147483647]" class="form-control digits hidden" placeholder="0"/>
</div>
</div>
<%-- <div class="form-group">

2
src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
View File

@@ -163,7 +163,7 @@
<option value="specServiceName"><spring:message code="protocol_name"/></option>
</select>
</div>
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='input'/><spring:message code='protocol_code'/>" type="text" onchange="casec()" maxlength="60">
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='input'/><spring:message code='protocol_name'/>" type="text" onchange="casec()" maxlength="60">
</div>