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
	src/main/resources/messages/message_zh_CN.properties
	
	修改是否十六进制选项选中值
This commit is contained in:
duandongmei
2018-08-24 19:47:32 +08:00
parent 7374c16da7 919c649e4e
commit 846985886f
24 changed files with 275 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -67,7 +67,7 @@ public class IpMultiplexController extends CommonController {
}
model.addAttribute("urlPrefix","/manipulation/ipmulitiplex");
model.addAttribute("requiresPermissionPrefix","ip:mulitiplex");
return "/cfg/common/ipForm";
return "/cfg/manipulation/ipmulitiplex/form";
}
@RequestMapping(value = {"/saveOrUpdate"})
public String saveOrUpdateIp(String cfgName,RedirectAttributes model, IpPortCfg cfg) {

2
src/main/java/com/nis/web/service/DictService.java
View File

@@ -52,7 +52,7 @@ public class DictService extends BaseService {
}else {//修改
//累加修改记录
String newRevision = "用户"+UserUtils.getUser().getName()+",在"+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"修改！";
String newRevision = "user:"+UserUtils.getUser().getName()+","+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"edit";
StringBuilder revisionBuilder = new StringBuilder(newRevision);
String oldRevision = sysDictName.getRevision();
if(!StringUtil.isBlank(oldRevision)){

4
src/main/java/com/nis/web/service/configuration/BgpCfgService.java
View File

@@ -80,6 +80,8 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
public void saveBgpCfg(CfgIndexInfo entity){
//设置区域运营商信息
setAreaEffectiveIds(entity);
entity.setIsValid(0);
entity.setIsAudit(0);
if(entity.getCfgId()==null){
Integer compileId = 0;
try {
@@ -142,6 +144,8 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
}
}else{
entity.setEditorId(entity.getCurrentUser().getId());
entity.setEditTime(new Date());
bgpCfgDao.updateCfgIndex(entity);
//无效子配置后，再新增子配置
bgpCfgDao.deleteIpCfg(entity);

2
src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
View File

@@ -542,7 +542,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
}
}
}
if(entity.getSslList()!=null){
if(entity.getNtcSubscribeIdCfgList()!=null){
for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});

4
src/main/java/com/nis/web/service/configuration/XmppCfgService.java
View File

@@ -72,6 +72,8 @@ public class XmppCfgService extends CrudService<XmppCfgDao,CfgIndexInfo> {
public void saveXmppCfg(CfgIndexInfo entity){
//设置区域运营商信息
setAreaEffectiveIds(entity);
entity.setIsValid(0);
entity.setIsAudit(0);
if(entity.getCfgId()==null){
Integer compileId = 0;
try {
@@ -112,6 +114,8 @@ public class XmppCfgService extends CrudService<XmppCfgDao,CfgIndexInfo> {
}else{
entity.setEditorId(entity.getCurrentUser().getId());
entity.setEditTime(new Date());
xmppCfgDao.updateCfgIndex(entity);
//无效子配置后，再新增子配置
xmppCfgDao.deleteXmppIpCfg(entity);

1
src/main/resources/messages/message_en.properties
View File

@@ -1120,5 +1120,6 @@ certificate_subject=Certificate Subject
not_Before_Time=Certificate Start Time
not_After_Time=Certificate End Time
certificate_validity=Certificate Validity Period
end_entity=End-entity Certificate
header=Header
layer=Layer

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

@@ -1118,3 +1118,5 @@ certificate_subject=\u8BC1\u4E66\u62E5\u6709\u8005
not_before_time=\u8BC1\u4E66\u8D77\u59CB\u65F6\u95F4
not_after_time=\u8BC1\u4E66\u7EC8\u6B62\u65F6\u95F4
certificate_validity=\u8BC1\u4E66\u6709\u6548\u671F
header=\u5173\u952E\u5B57
layer=\u5339\u914D\u533A\u57DF

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

@@ -332,7 +332,7 @@ ssl_ca_region=ssl_ca
ssl_ip_region=ssl_ip
bgp_ip_region=bgp_ip
behav_id_region=BEHAV_ID
rate_limit_region=RATE_LIMIT
rate_limit_region=Droprate
#\u5b58\u5728\u4e0e\u8868\u8fbe\u5f0f\u7684\u5173\u952e\u5b57\u7279\u6b8a\u5206\u9694\u7b26
keyword_expr=***and***
#\u65f6\u533a
@@ -343,7 +343,7 @@ service_ip_mulitiplex=768
service_ip_ratelimit=1057
service_domain_ratelimit=1058
#\u7528\u6237\u81ea\u5b9a\u4e49\u57df
userregion_rate_limit=RATE_LIMIT
userregion_rate_limit=Droprate
userregion_ir_strategy=IR_STRATEGY
userregion_ir_type=IR_TYPE
userregion_domain_id=DOMAIN_ID

2
src/main/webapp/WEB-INF/include/form/complexInfo.jsp
View File

@@ -6,6 +6,8 @@
<input type="hidden" name="cfgType" value="${region.configRegionValue }">
<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode }">
<input type="hidden" name="configMultiKeywords" value="${region.configRegionCode }">
<input type="hidden" name="configServiceType" value="${region.configServiceType }">
<input type="hidden" name="configHex" value="${region.configHex }">
</head>
<c:if test="${!empty region.configDistrict }">
<div class="row">

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

@@ -154,7 +154,7 @@ $(function(){
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="district" /></label>
<spring:message code="layer" /></label>
<div class="col-md-6">
<select name="district"
class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
@@ -186,7 +186,7 @@ $(function(){
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="keywords" /></label>
<spring:message code="header" /></label>
<!-- 此配置的关键词可以输入多个关键词 -->
<c:if test="${region.configMultiKeywords eq 1}">
<div class="col-md-6">

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

@@ -277,7 +277,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6">
<input class="form-control required digest" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
<input class="form-control required digest" range="[0,1]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
</div>
<div for="ratelimit"></div>
</div>

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

@@ -149,18 +149,19 @@ $(function(){
<div for="action"></div>
</div>
</div>
<c:if test="${!empty region.configDistrict }">
<%-- <c:if test="${!empty region.configDistrict }"> --%>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="district" /></label>
<div class="col-md-6">
<select name="district"
<select name="district" data-live-search="true" data-live-search-placeholder="search"
class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
<c:forEach items="${fn:split(region.configDistrict,',')}"
var="_district">
<option value="${_district }"
<c:if test="${_cfg.district==_district}">selected</c:if>>${_district }</option>
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('SSL_CERT_DISTRICT')}"
var="dict">
<option value="${dict.itemValue }"
<c:if test="${_cfg.district eq dict.itemValue}">selected</c:if>>${dict.itemValue }</option>
</c:forEach>
</select>
<input type="hidden" name="districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.district}"/>
@@ -168,7 +169,7 @@ $(function(){
<div for="district"></div>
</div>
</div>
</c:if>
<%-- </c:if> --%>
<!-- doLog -->
<div class="col-md-6 hidden">
<div class="form-group">

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

@@ -7,6 +7,8 @@
$(function(){
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
var action=$("input[name='action']:checked").val();
switchAction(action);
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#cfgFrom").validate({

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

@@ -19,6 +19,8 @@
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
var action=$("input[name='action']:checked").val();
switchAction(action);
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -191,7 +193,7 @@
</div>
</div>
<!-- dolog 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>

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

@@ -19,6 +19,8 @@
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
var action=$("input[name='action']:checked").val();
switchAction(action);
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -193,7 +195,7 @@
</div>
<!-- dolog 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/common/domainForm.jsp
View File

@@ -146,7 +146,7 @@
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit }">
<input class="form-control required number" range="[0,1]" type="text" name="ratelimit" value="${_cfg.ratelimit }">
</div>
<div for="ratelimit"></div>
</div>

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

@@ -399,7 +399,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
<input class="form-control required number" range="[0,1]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
</div>
<div for="ratelimit"></div>
</div>

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

@@ -15,6 +15,7 @@
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configRegionCode }">
<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }">
<input type="hidden" name="${cfgName}.configHex" value="${region.configHex }">
<%-- </c:if>
</c:forEach> --%>
@@ -186,12 +187,10 @@
<!-- isP2pHashCfg: P2PHash配置只能是十六进制字符 -->
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="1" class="required"
<c:if test="${isP2pHashCfg}">checked disabled</c:if>
><spring:message code="hex"/>
</label>
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="0" class="required"
<c:if test="${isP2pHashCfg}">disabled</c:if>
><spring:message code="not_hex"/>
</label>
</div>

38
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
View File

@@ -147,8 +147,8 @@ var switchKeyringType=function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="cfgType"/></label>
<div class="col-md-6">
<input type="radio" name="cfgType" value="ip" <c:if test="${_cfg.cfgType == 'ip' || empty _cfg.cfgType}">checked="checked"</c:if>> <spring:message code="ip"/> <spring:message code="monit"/>
<input type="radio" name="cfgType" value="domain" <c:if test="${_cfg.cfgType == 'domain' }">checked="checked"</c:if>><spring:message code="domain"/> <spring:message code="monit"/>
<input type="radio" name="cfgType" value="ip" <c:if test="${_cfg.cfgType == 'ip' || empty _cfg.cfgType}">checked="checked"</c:if>> <spring:message code="ip"/> <spring:message code="monitor"/>
<input type="radio" name="cfgType" value="domain" <c:if test="${_cfg.cfgType == 'domain' }">checked="checked"</c:if>><spring:message code="domain"/> <spring:message code="monitor"/>
</div>
<div for="action"></div>
</div>
@@ -242,39 +242,35 @@ var switchKeyringType=function(){
<div for="expireAfter"></div>
</div>
</div>
<c:if test="${!isAdd }">
<div class="col-md-6 <c:if test="${isAdd }">hidden</c:if>">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="certificate_subject"/></label>
<div class="col-md-6">
<label style="padding-top:7px">${_cfg.subject}</label>
</div>
</div>
</div>
</div>
<div class="row <c:if test="${isAdd }">hidden</c:if>">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="issuer"/></label>
<label class="control-label col-md-3"><spring:message code="certificate_subject"/></label>
<div class="col-md-6">
<label class="">${_cfg.issuer}</label>
</div>
</div>
</div>
</c:if>
</div>
<c:if test="${!isAdd }">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="subject"/></label>
<div class="col-md-6">
<label class="">${_cfg.subject}</label>
<label style="padding-top:7px">${_cfg.subject}</label>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="VALID"/></label>
<label class="control-label col-md-3"><spring:message code="certificate_validity"/></label>
<fmt:formatDate var="notBeforeTime" value="${_cfg.notBeforeTime }" pattern="yyyy-MM-dd HH:ss:mm"/>
<fmt:formatDate var="notAfterTime" value="${_cfg.notAfterTime }" pattern="yyyy-MM-dd HH:ss:mm"/>
<label class=" col-md-6">${notBeforeTime }-${notAfterTime }</label>
<label class=" col-md-6" style="padding-top:7px">${notBeforeTime }-${notAfterTime }</label>
</div>
</div>
</div>
</div>
</c:if>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">

10
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
View File

@@ -263,9 +263,9 @@
<th><spring:message code="public_key_file"/></th>
<th><spring:message code="expire_after"/></th>
<th><spring:message code="issuer"/></th>
<th><spring:message code="subject"/></th>
<th><spring:message code="notBeforeTime"/></th>
<th><spring:message code="notAfterTime"/></th>
<th><spring:message code="certificate_subject"/></th>
<th><spring:message code="not_before_time"/></th>
<th><spring:message code="not_after_time"/></th>
<th><spring:message code="is_audit"/></th>
<%-- <th><spring:message code="whether_area_block"/></th> --%>
<th><spring:message code="letter"/></th>
@@ -289,8 +289,8 @@
<input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}">
</td>
<td>
<c:if test="${cfg.cfgType eq 'ip'}"><spring:message code="ip"/> <spring:message code="monit"/> </c:if>
<c:if test="${cfg.cfgType eq 'domain'}"><spring:message code="domain"/> <spring:message code="monit"/></c:if>
<c:if test="${cfg.cfgType eq 'ip'}"><spring:message code="ip"/> <spring:message code="monitor"/> </c:if>
<c:if test="${cfg.cfgType eq 'domain'}"><spring:message code="domain"/> <spring:message code="monitor"/></c:if>
</td>
<td>${cfg.cfgDesc }</td>
<td>

186
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp Normal file
View File

@@ -0,0 +1,186 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title><spring:message code="${cfgName}"></spring:message></title>
<script type="text/javascript">
$(function(){
if('${fn:length(serviceList)}'>1){
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
}
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
});
$("#ipCfgFrom").validate({
errorPlacement: function(error,element){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
loading('<spring:message code="onloading"/>');
form.submit();
},
errorContainer: "#messageBox"
});
});
</script>
</head>
<body>
<div class="page-content">
<h3 class="page-title">
<spring:message code="${cfgName}"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>
<c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
</div>
</div>
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form id="ipCfgFrom" action="${ctx}${urlPrefix}/saveOrUpdate" method="post" class="form-horizontal">
<div class="form-body row">
<input name="cfgName" type="hidden" value="${cfgName}"/>
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" name="isAreaEffective" value="0">
<c:if test="${fn:length(serviceList)==1}">
<c:forEach items="${serviceList}" var="service">
<input type="hidden" name="action" serviceId="${service.serviceId }" protocolId="${service.protocolId }" regionCode="${service.regionCode}" value="${service.action }">
<input type="hidden" id="protocolId" name="protocolId" value="${service.protocolId}">
<input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
</c:forEach>
</c:if>
<c:if test="${fn:length(serviceList)>1}">
<input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
</c:if>
<!-- 配置域类型 -->
<c:forEach items="${regionList}" var="region">
<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType}">
<input type="hidden" id="cfgType${region.configRegionCode}" name="cfgType" value="${region.configRegionValue}">
<input type="hidden" id="cfgRegionCode${region.configRegionCode}" name="cfgRegionCode"
isMaat="${region.isMaat}"
serviceType="${region.configServiceType}"
ipPortShow="${region.configIpPortShow}"
ipType="${region.configIpType}"
ipPattern="${region.configIpPattern}"
portPattern="${region.configPortPattern}"
direction="${region.configDirection}"
protocol="${region.configProtocol}"
regionType="${region.regionType}"
value="${region.configRegionCode}">
</c:forEach>
<div class="form-body">
<!-- desc and action -->
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
</div>
</div>
<c:if test="${fn:length(serviceList)>1}">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="action"/></label>
<div class="col-md-6">
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
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">
<c:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</c:if>
</label>
</c:forEach>
</div>
<div for="action"></div>
</div>
</div>
</c:if>
</div>
<%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %>
<div class="row ipmulitiplex">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
<div class="col-md-6">
<select id="dnsStrategyId" name="dnsStrategyId" class="selectpicker show-tick form-control required">
<option value="" <c:if test="${empty _cfg.dnsStrategyId }">selected</c:if>><spring:message code="select"/></option>
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.dnsStrategyId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
</select>
</div>
<div for="dnsStrategyId"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ir_type"/></label>
<div class="col-md-6">
<select name="irType" class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="irTypeC">
<option value="${irTypeC.itemCode}" <c:if test="${_cfg.irType==irTypeC.itemCode}">selected</c:if>><spring:message code="${irTypeC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="irType"></div>
</div>
</div>
</div>
<div class="row ratelimit hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit}">
</div>
<div for="ratelimit"></div>
</div>
</div>
</div>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div>
<div class="form-actions">
<div class="row">
<div class="col-md-6">
<div class="row">
<div class="col-md-offset-3 col-md-8">
<button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
<button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
</div>
</div>
</div>
<div class="col-md-6"> </div>
</div>
</div>
</form>
<!-- END FORM-->
</div>
</div>
</div>
</div>
</div>
</body>
</html>

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

@@ -28,8 +28,7 @@
$("a[for='httpReqCfg']").parent().addClass("active");
$("a[for='httpResCfg']").parent().removeClass("active");
$(".httpResCfg").addClass("hidden").addClass("disabled");
$(".httpReqCfg").removeClass("hidden").removeClass(
"disabled");
$(".httpReqCfg").removeClass("hidden").removeClass("disabled");
}
if($("#httpResCfgNum").val()>0){
$("a[for='httpResCfg']").parent().addClass("active");
@@ -74,7 +73,7 @@
//代表所有业务都隐藏了，提示必须增加一种业务数据
if(!$(".httpReqCfg").hasClass("hidden")){
console.log($(".httpReqCfg").find(".boxSolid").length);
console.log($(".httpReqCfg").find(".boxSolid.hidden"));
console.log($(".httpReqCfg").find(".boxSolid.hidden").length);
if($(".httpReqCfg").find(".boxSolid").length==$(".httpReqCfg").find(".boxSolid.hidden").length){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;

6
src/main/webapp/WEB-INF/views/sys/dictList.jsp
View File

@@ -109,7 +109,7 @@
html+="<td colspan='3'>";
html+="<table class='table table-bordered table-condensed'>";
html+="<thead>";
html+="<th><spring:message code="mark"/></th><th><spring:message code="value"/></th><th><spring:message code="describe"/></th><th><spring:message code="is_useable"/></th><th><spring:message code="is_maintain"/></th>";
html+="<th><spring:message code="mark"/></th><th><spring:message code="value"/></th><th><spring:message code="desc"/></th><th><spring:message code="is_useable"/></th><th><spring:message code="is_maintain"/></th>";
html+="</thead>";
html+="<tbody>";
for(i=0;i<data.dictItemList.length;i++){
@@ -158,7 +158,7 @@
html+="</tr>";
html+="<tr>";
html+="<th><spring:message code="describe"/>：";
html+="<th><spring:message code="desc"/>：";
html+="</th>";
html+="<td colspan='3'>"+data.remark;
html+="</td>";
@@ -281,7 +281,7 @@
<th class="sort-column module_name" width="15%"><spring:message code="module_name"/></th>
<th class="sort-column mark" width="20%"><spring:message code="dict_mark"/></th>
<th class="sort-column create_time" width="15%"><spring:message code="create_time"/></th>
<th width="17%"><spring:message code="describe"/></th>
<th width="17%"><spring:message code="desc"/></th>
<th width="18%"><spring:message code="edit_record"/></th>
<shiro:hasPermission name="sys:dict:edit">
<th width="15%"><spring:message code="operation"/></th>

27
src/main/webapp/static/global/scripts/common.js
View File

@@ -8,6 +8,7 @@ $(function(){
$("input[name$='isCaseSenstive']").on("change",function(){
setIsHexBin(this);
});
setHexCaseSenstive();
$("a[name=viewLogInfo]>i").on("click",function(){
var html = "<div class='logInfo'>";
$(this).parents("tr").find("td").each(function(index,element){
@@ -606,7 +607,6 @@ var addHexCheck=function(obj,isHexbin){
//与表达式时，只允许为子串匹配
var setDefaultMatchMethod=function (obj){
var exprType = $(obj).val();
console.log($(obj).parents(".row").parent(".row"));
if(exprType == 1){
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option").removeAttr("selected");
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option[value=0]").attr("selected","selected");
@@ -1291,6 +1291,31 @@ var validateInvisibleCharTag=function(){
}
return true;
}
var setHexCaseSenstive=function(){
$("input[name$='configHex']").each(function(){
var configHex=$(this).val();
var configNamePrefix=$(this).attr("name").split("configHex")[0]; ;
if(configHex != ''){
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=1]").parent().addClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=0]").parent().addClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=0]").parent().addClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=1]").parent().addClass("hidden");
if(configHex.indexOf("0")>-1){//非十六进制大小写不敏感
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=0]").parent().removeClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=0]").parent().removeClass("hidden");
}
if(configHex.indexOf("1")>-1){//十六进制大小写不敏感
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=1]").parent().removeClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=0]").parent().removeClass("hidden");
}
if(configHex.indexOf("2")>-1){//非十六进制大小写敏感
$(this).parent().find("input[name='"+configNamePrefix+"isHex'][value=0]").parent().removeClass("hidden");
$(this).parent().find("input[name='"+configNamePrefix+"isCaseSenstive'][value=1]").parent().removeClass("hidden");
}
}
});
}
/**
* ip默认选项处理
*/