Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
This commit is contained in:
wangxin
@@ -29,8 +29,6 @@ import com.nis.web.security.UserUtils;
|
||||
@RequestMapping("${adminPath}/systemService")
|
||||
public class SystemServiceController extends BaseController {
|
||||
|
||||
//TODO 异常处理
|
||||
|
||||
@ModelAttribute
|
||||
public SystemServiceInfo get(Long id) {
|
||||
if (!StringUtil.isEmpty(id)){
|
||||
@@ -119,9 +117,14 @@ public class SystemServiceController extends BaseController {
|
||||
@RequestMapping(value = "delete")
|
||||
public String delete(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) {
|
||||
systemServiceService.deleteService(systemServiceInfo);
|
||||
Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 1), systemServiceInfo);
|
||||
model.addAttribute("page", page);
|
||||
addMessage(model, "删除成功");
|
||||
try {
|
||||
Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 1), systemServiceInfo);
|
||||
model.addAttribute("page", page);
|
||||
addMessage(model, "删除成功");
|
||||
} catch (Exception e) {
|
||||
addMessage(model, "删除失败：" + e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
return "/systemService/list";
|
||||
}
|
||||
|
||||
|
||||
@@ -87,7 +87,9 @@ trmp_ip_monitor=trmp ip monitor
|
||||
examine_manage=examine manage
|
||||
audit_manage=audit manage
|
||||
log_search=log search
|
||||
|
||||
sysService_manage=system service manage
|
||||
service_manage=service type manage
|
||||
system_service_manage=system service type manage
|
||||
#============menu end======================
|
||||
|
||||
#============yewu begin======================
|
||||
@@ -140,4 +142,35 @@ date_list=Date List
|
||||
confirm_message=Are you sure?
|
||||
fill_loginName=Please fill in the loginName
|
||||
fill_loginPassWord=Please fill in the passWord
|
||||
#==========message end=====================
|
||||
#==========message end=====================
|
||||
|
||||
#==========yewuliexingguanli begin=====================
|
||||
act=action
|
||||
block=block
|
||||
monitor=monitor
|
||||
block_white_list=block white list
|
||||
monitor_white_list=monitor white list
|
||||
block_monitor_white_list=block monitor white list
|
||||
grey_list=grey list
|
||||
type=type
|
||||
single_domain=single domain
|
||||
multi_domain=multi domain
|
||||
special_service=special service
|
||||
service_name=service name
|
||||
service_id=service ID
|
||||
repeat=repeat
|
||||
enter_error=enter a error
|
||||
single_service_message=single domain services can only associate one table
|
||||
special_service_message=special services can only associate one table
|
||||
table_name=table name
|
||||
table_type=table type
|
||||
string=string
|
||||
number=number
|
||||
strong_string=strong string
|
||||
table_des=table_describe
|
||||
detail=detail
|
||||
datebase_table=datebase table
|
||||
fill_all=fill in all
|
||||
describe=describe
|
||||
back=back
|
||||
#==========yewuliexingguanli end=====================
|
||||
@@ -87,7 +87,9 @@ trmp_ip_monitor=trmp ip monitor
|
||||
examine_manage=examine manage
|
||||
audit_manage=audit manage
|
||||
log_search=log search
|
||||
|
||||
sysService_manage=system service manage
|
||||
service_manage=service type manage
|
||||
system_service_manage=system service type manage
|
||||
#============menu end======================
|
||||
|
||||
#============yewu begin======================
|
||||
@@ -140,4 +142,35 @@ date_list=Date List
|
||||
confirm_message=Are you sure?
|
||||
fill_loginName=Please fill in the loginName
|
||||
fill_loginPassWord=Please fill in the passWord
|
||||
#==========message end=====================
|
||||
#==========message end=====================
|
||||
|
||||
#==========yewuliexingguanli begin=====================
|
||||
act=action
|
||||
block=block
|
||||
monitor=monitor
|
||||
block_white_list=block white list
|
||||
monitor_white_list=monitor white list
|
||||
block_monitor_white_list=block monitor white list
|
||||
grey_list=grey list
|
||||
type=type
|
||||
single_domain=single domain
|
||||
multi_domain=multi domain
|
||||
special_service=special service
|
||||
service_name=service name
|
||||
service_id=service ID
|
||||
repeat=repeat
|
||||
enter_error=enter a error
|
||||
single_service_message=single domain services can only associate one table
|
||||
special_service_message=special services can only associate one table
|
||||
table_name=table name
|
||||
table_type=table type
|
||||
string=string
|
||||
number=number
|
||||
strong_string=strong string
|
||||
table_des=table_describe
|
||||
detail=detail
|
||||
datebase_table=datebase table
|
||||
fill_all=fill in all
|
||||
describe=describe
|
||||
back=back
|
||||
#==========yewuliexingguanli end=====================
|
||||
@@ -87,7 +87,9 @@ audit_manage=\u5ba1\u8ba1\u7ba1\u7406
|
||||
log_search=\u65e5\u5fd7\u68c0\u7d22
|
||||
text_control=\u6587\u672c\u5e38\u89c4\u7ba1\u63a7
|
||||
text_monitor=\u6587\u672c\u5e38\u89c4\u76d1\u6d4b
|
||||
|
||||
sysService_manage=\u7cfb\u7edf\u4e1a\u52a1\u7ba1\u7406
|
||||
service_manage=\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
|
||||
system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
|
||||
#==========menu end=====================
|
||||
|
||||
#==========yewu zidian begin=====================
|
||||
@@ -139,4 +141,35 @@ confirm_message=\u786e\u5b9a\u5417\uff1f
|
||||
fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7
|
||||
fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801
|
||||
|
||||
#==========message end=====================
|
||||
#==========message end=====================
|
||||
|
||||
#==========yewuliexingguanli begin=====================
|
||||
act=\u52a8\u4f5c
|
||||
block=\u963b\u65ad
|
||||
monitor=\u76d1\u6d4b
|
||||
block_white_list=\u5c01\u5835\u767d\u540d\u5355
|
||||
monitor_white_list=\u76d1\u6d4b\u767d\u540d\u5355
|
||||
block_monitor_white_list=\u5c01\u5835\u76d1\u6d4b\u767d\u540d\u5355
|
||||
grey_list=\u7070\u540d\u5355
|
||||
type=\u7c7b\u578b
|
||||
single_domain=\u5355\u57df
|
||||
multi_domain=\u591a\u57df
|
||||
special_service=\u7279\u5b9a\u670d\u52a1
|
||||
service_name=\u4e1a\u52a1\u540d\u79f0
|
||||
service_id=\u4e1a\u52a1ID
|
||||
repeat=\u91cd\u590d
|
||||
enter_error=\u8f93\u5165\u9519\u8bef
|
||||
single_service_message=\u5355\u57df\u4e1a\u52a1\u53ea\u80fd\u5173\u8054\u4e00\u4e2a\u8868
|
||||
special_service_message=\u7279\u5b9a\u670d\u52a1\u53ea\u80fd\u5173\u8054\u4e00\u4e2a\u8868
|
||||
table_name=\u8868\u540d
|
||||
table_type=\u8868\u7c7b\u578b
|
||||
string=\u5b57\u7b26\u4e32
|
||||
number=\u6570\u503c
|
||||
strong_string=\u589e\u5f3a\u5b57\u7b26\u4e32
|
||||
table_des=\u8868\u63cf\u8ff0
|
||||
detail=\u8be6\u60c5
|
||||
datebase_table=\u6570\u636e\u5e93\u8868
|
||||
fill_all=\u8bf7\u586b\u5199\u6240\u6709\u5b57\u6bb5
|
||||
describe=\u63cf\u8ff0
|
||||
back=\u8fd4\u56de
|
||||
#==========yewuliexingguanli end=====================
|
||||
@@ -8,6 +8,7 @@
|
||||
<body>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
top.window.scrollTo(0, 0);
|
||||
$("#inputForm").validate({
|
||||
rules: {
|
||||
'serviceName':{
|
||||
@@ -29,20 +30,20 @@
|
||||
},
|
||||
messages: {
|
||||
'serviceName':{
|
||||
required:'必填项'
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'serviceId':{
|
||||
required:'必填项',
|
||||
remote:'重复的serviceId'
|
||||
required:'<spring:message code="required"/>',
|
||||
remote:'<spring:message code="repeat"/>'+'serviceId'
|
||||
},
|
||||
'action':{
|
||||
required:'必填项'
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'serviceType':{
|
||||
required:'必填项'
|
||||
required:'<spring:message code="required"/>'
|
||||
},
|
||||
'serviceDesc':{
|
||||
required:'必填项'
|
||||
required:'<spring:message code="required"/>'
|
||||
}
|
||||
},
|
||||
submitHandler: function(form){
|
||||
@@ -57,7 +58,7 @@
|
||||
}
|
||||
}
|
||||
if (flag) {
|
||||
loading('正在提交，请稍等...');
|
||||
loading('LOADING...');
|
||||
$("[disabled=disabled]").attr("disabled", false);
|
||||
form.submit();
|
||||
} else {
|
||||
@@ -67,7 +68,7 @@
|
||||
},
|
||||
errorContainer: "#messageBox",
|
||||
errorPlacement: function(error, element) {
|
||||
$("#messageBox").text("输入有误，请先更正。");
|
||||
$("#messageBox").text("<spring:message code='enter_error'/>");
|
||||
if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
|
||||
error.appendTo(element.parent().parent());
|
||||
} else {
|
||||
@@ -91,7 +92,7 @@
|
||||
$("#addBtn").attr("disabled", true);
|
||||
} else if ($(obj).val() == '1') {
|
||||
if ($(".table-list").length > 1) {
|
||||
alert("单域业务只能关联一个表");
|
||||
alert('<spring:message code="single_service_message"/>');
|
||||
$(obj).val(v);
|
||||
} else if ($(".table-list").length == 1) {
|
||||
$("#addBtn").attr("disabled", true);
|
||||
@@ -102,7 +103,7 @@
|
||||
$("#addBtn").attr("disabled", false);
|
||||
} else if ($(obj).val() == '3') {
|
||||
if ($(".table-list").length > 1) {
|
||||
alert("特定服务只能关联一个表");
|
||||
alert('<spring:message code="special_service_message"/>');
|
||||
$(obj).val(v);
|
||||
} else if ($(".table-list").length == 1) {
|
||||
$("#addBtn").attr("disabled", true);
|
||||
@@ -156,25 +157,29 @@
|
||||
'<div>' +
|
||||
'<input type="hidden" name="sciId" value="0"/>' +
|
||||
'<input type="hidden" name="sciIsValid" value="1"/>' +
|
||||
'<span class="child-label"><font color="red">*</font>表名:</span> ' +
|
||||
'<span class="child-label col-md-2"><font color="red">*</font>'+'<spring:message code="table_name"/>'+':</span> ' +
|
||||
'<span><input class="child-required form-control child-input" name="tableName"/></span> ' +
|
||||
'<span class="child-label"><font color="red">*</font>表类型:</span> ' +
|
||||
'</div>' +
|
||||
'<div>' +
|
||||
'<span class="child-label col-md-2"><font color="red">*</font>'+'<spring:message code="table_type"/>'+':</span> ' +
|
||||
'<span> ' +
|
||||
'<select class="child-required" name="tableType" onchange="autoServiceId()"> ' +
|
||||
'<option value="">请选择</option>' +
|
||||
'<select class="child-required child-input" name="tableType" onchange="autoServiceId()"> ' +
|
||||
'<option value="">'+'<spring:message code="select"/>'+'</option>' +
|
||||
'<option value="1">IP</option>' +
|
||||
'<option value="2">字符串</option>' +
|
||||
'<option value="3">数值</option>' +
|
||||
'<option value="4">增强字符串</option>' +
|
||||
'<option value="2">'+'<spring:message code="string"/>'+'</option>' +
|
||||
'<option value="3">'+'<spring:message code="number"/>'+'</option>' +
|
||||
'<option value="4">'+'<spring:message code="strong_string"/>'+'</option>' +
|
||||
'</select>' +
|
||||
'</span> ' +
|
||||
'<span class="child-label"><font color="red">*</font>MAAT表名:</span> ' +
|
||||
'</div>' +
|
||||
'<div>' +
|
||||
'<span class="child-label col-md-2"><font color="red">*</font>MAAT '+'<spring:message code="table_name"/>'+':</span> ' +
|
||||
'<span><input class="child-required form-control child-input" name="maatTable"/></span>' +
|
||||
'</div>' +
|
||||
'<div>' +
|
||||
'<span class="child-label"><font color="red">*</font>表描述:</span> ' +
|
||||
'<span><input class="child-required form-control child-input-desc" name="tableDesc"/></span>' +
|
||||
'<button type="button" class="btn btn-danger del-button" onclick="del2(this)">删除</button>' +
|
||||
'<span class="child-label col-md-2"><font color="red">*</font>'+'<spring:message code="table_des"/>'+':</span> ' +
|
||||
'<span><input class="child-required form-control child-input" name="tableDesc"/></span>' +
|
||||
'<button type="button" class="btn btn-danger del-button" onclick="del2(this)">'+'<spring:message code="delete"/>'+'</button>' +
|
||||
'</div>' +
|
||||
'</div>'
|
||||
);
|
||||
@@ -200,11 +205,11 @@
|
||||
|
||||
<div class="page-content">
|
||||
<div class="theme-panel hidden-xs hidden-sm">
|
||||
<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button>
|
||||
<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
|
||||
</div>
|
||||
|
||||
<h3 class="page-title">
|
||||
系统业务管理
|
||||
<spring:message code="sysService_manage"/>
|
||||
</h3>
|
||||
|
||||
<div class="row">
|
||||
@@ -212,7 +217,7 @@
|
||||
<div class="portlet box blue">
|
||||
<div class="portlet-title">
|
||||
<div class="caption">
|
||||
<i class="fa fa-gift"></i>详情</div>
|
||||
<i class="fa fa-gift"></i><spring:message code="add"/></div>
|
||||
</div>
|
||||
|
||||
<div class="portlet-body form">
|
||||
@@ -224,46 +229,46 @@
|
||||
<sys:message content="${message}"/>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label"><font color="red">*</font>业务名称:</label>
|
||||
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="service_name"/>:</label>
|
||||
<div class="col-md-4">
|
||||
<form:input path="serviceName" htmlEscape="false" maxlength="30" class="required form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label"><font color="red">*</font>动作:</label>
|
||||
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="act"/>:</label>
|
||||
<div class="col-md-4">
|
||||
<form:select id="action" path="action" class="required form-control" onchange="autoServiceId()">
|
||||
<form:option value="">请选择</form:option>
|
||||
<form:option value="1">阻断</form:option>
|
||||
<form:option value="2">监测</form:option>
|
||||
<form:option value="5">封堵白名单</form:option>
|
||||
<form:option value="6">监测白名单</form:option>
|
||||
<form:option value="7">封堵监测白名单</form:option>
|
||||
<form:option value="8">灰名单</form:option>
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<form:option value="1"><spring:message code="block"/></form:option>
|
||||
<form:option value="2"><spring:message code="monitor"/></form:option>
|
||||
<form:option value="5"><spring:message code="block_white_list"/></form:option>
|
||||
<form:option value="6"><spring:message code="monitor_white_list"/></form:option>
|
||||
<form:option value="7"><spring:message code="block_monitor_white_list"/></form:option>
|
||||
<form:option value="8"><spring:message code="grey_list"/></form:option>
|
||||
</form:select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label"><font color="red">*</font>类型:</label>
|
||||
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="type"/>:</label>
|
||||
<div class="col-md-4">
|
||||
<form:select id="serviceType" path="serviceType" class="required form-control" onclick="now=this.value" onchange="changeType(now, this)">
|
||||
<form:option value="">请选择</form:option>
|
||||
<form:option value="1">单域</form:option>
|
||||
<form:option value="2">多域</form:option>
|
||||
<form:option value="3">特定服务</form:option>
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<form:option value="1"><spring:message code="single_domain"/></form:option>
|
||||
<form:option value="2"><spring:message code="multi_domain"/></form:option>
|
||||
<form:option value="3"><spring:message code="special_service"/></form:option>
|
||||
</form:select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label">数据库表:</label>
|
||||
<label class="col-md-3 control-label"><spring:message code="datebase_table"/>:</label>
|
||||
<div class="col-md-8" id="datatables">
|
||||
<shiro:hasPermission name="system:service:edit">
|
||||
<div>
|
||||
<button id="addBtn" type="button" class="btn btn-default" onclick="addDatatable()">增加</button>
|
||||
<label for="childTableFlag" class="error" style="display:none">有未填项</label>
|
||||
<button id="addBtn" type="button" class="btn btn-default" onclick="addDatatable()"><spring:message code="add"/></button>
|
||||
<label for="childTableFlag" class="error" style="display:none"><spring:message code="fill_all"/></label>
|
||||
</div>
|
||||
</shiro:hasPermission>
|
||||
<c:forEach items="${systemServiceInfo.serviceConfigInfoList }" var="serviceConfigInfo">
|
||||
@@ -272,28 +277,30 @@
|
||||
<input type="hidden" name="sciId" value="${serviceConfigInfo.id }"/>
|
||||
<input type="hidden" name="sciIsValid" value="1"/>
|
||||
|
||||
<span class="child-label"><font color="red">*</font>表名:</span>
|
||||
<span class="child-label col-md-2"><font color="red">*</font><spring:message code="table_name"/>:</span>
|
||||
<span><input class="child-required form-control child-input" name="tableName" value="${serviceConfigInfo.tableName }"/></span>
|
||||
|
||||
<span class="child-label"><font color="red">*</font>表类型:</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="child-label col-md-2"><font color="red">*</font><spring:message code="table_type"/>:</span>
|
||||
<span>
|
||||
<select class="child-required" name="tableType">
|
||||
<option value="">请选择</option>
|
||||
<select class="child-required child-input" name="tableType">
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<option value="1" <c:if test="${serviceConfigInfo.tableType eq 1}">selected="selected"</c:if>>IP</option>
|
||||
<option value="2" <c:if test="${serviceConfigInfo.tableType eq 2}">selected="selected"</c:if>>字符串</option>
|
||||
<option value="3" <c:if test="${serviceConfigInfo.tableType eq 3}">selected="selected"</c:if>>数值</option>
|
||||
<option value="4" <c:if test="${serviceConfigInfo.tableType eq 4}">selected="selected"</c:if>>增强字符串</option>
|
||||
<option value="2" <c:if test="${serviceConfigInfo.tableType eq 2}">selected="selected"</c:if>><spring:message code="string"/></option>
|
||||
<option value="3" <c:if test="${serviceConfigInfo.tableType eq 3}">selected="selected"</c:if>><spring:message code="number"/></option>
|
||||
<option value="4" <c:if test="${serviceConfigInfo.tableType eq 4}">selected="selected"</c:if>><spring:message code="strong_string"/></option>
|
||||
</select>
|
||||
</span>
|
||||
|
||||
<span class="child-label"><font color="red">*</font>MAAT表名:</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="child-label col-md-2"><font color="red">*</font>MAAT <spring:message code="table_name"/>:</span>
|
||||
<span><input class="child-required form-control child-input" name="maatTable" value="${serviceConfigInfo.maatTable }"/></span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="child-label"><font color="red">*</font>表描述:</span>
|
||||
<span><input class="child-required form-control child-input-desc" name="tableDesc" value="${serviceConfigInfo.tableDesc }"/></span>
|
||||
<span class="child-label col-md-2"><font color="red">*</font><spring:message code="table_des"/>:</span>
|
||||
<span><input class="child-required form-control child-input" name="tableDesc" value="${serviceConfigInfo.tableDesc }"/></span>
|
||||
|
||||
<button type="button" class="btn btn-danger del-button" onclick="del(this)">删除</button>
|
||||
<button type="button" class="btn btn-danger del-button" onclick="del(this)"><spring:message code="delete"/></button>
|
||||
</div>
|
||||
</div>
|
||||
</c:forEach>
|
||||
@@ -301,14 +308,14 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label"><font color="red">*</font>业务ID:</label>
|
||||
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="service_id"/>:</label>
|
||||
<div class="col-md-4">
|
||||
<input id="serviceIdInput" class="required form-control" name="serviceId" value="${systemServiceInfo.serviceId }" readonly="readonly">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label"><font color="red">*</font>描述:</label>
|
||||
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="describe"/>:</label>
|
||||
<div class="col-md-4">
|
||||
<form:textarea path="serviceDesc" htmlEscape="false" class="required form-control"/>
|
||||
</div>
|
||||
|
||||
@@ -18,7 +18,7 @@ function page(n,s){
|
||||
|
||||
function deleteService(id) {
|
||||
if (id) {
|
||||
if (confirm("确认删除?")) {
|
||||
if (confirm("<spring:message code='confirm_message'/>")) {
|
||||
$("#serviceId").val(id);
|
||||
$("#searchForm").attr("action","${ctx}/systemService/delete");
|
||||
$("#searchForm").submit();
|
||||
@@ -30,12 +30,12 @@ function deleteService(id) {
|
||||
<div class="theme-panel hidden-xs hidden-sm">
|
||||
<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/systemService/list'"><spring:message code="refresh"></spring:message></button>
|
||||
<shiro:hasPermission name="system:service:view">
|
||||
<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/systemService/systemServiceform'">新增</button>
|
||||
<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/systemService/systemServiceform'"><spring:message code="add"></spring:message></button>
|
||||
</shiro:hasPermission>
|
||||
</div>
|
||||
|
||||
<h3 class="page-title">
|
||||
系统业务管理
|
||||
<spring:message code="sysService_manage"></spring:message>
|
||||
</h3>
|
||||
|
||||
<div class="row">
|
||||
@@ -43,7 +43,7 @@ function deleteService(id) {
|
||||
<div class="portlet box blue">
|
||||
<div class="portlet-title">
|
||||
<div class="caption">
|
||||
<i class="fa fa-cogs"></i>列表
|
||||
<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -56,35 +56,35 @@ function deleteService(id) {
|
||||
<div class="row search-table">
|
||||
<div class="col-md-12">
|
||||
<span class="search-item" class="input-small">
|
||||
<span>动作 :</span>
|
||||
<span><spring:message code="act"/> :</span>
|
||||
<form:select path="action">
|
||||
<form:option value="">请选择</form:option>
|
||||
<form:option value="1">阻断</form:option>
|
||||
<form:option value="2">监测</form:option>
|
||||
<form:option value="5">封堵白名单</form:option>
|
||||
<form:option value="6">监测白名单</form:option>
|
||||
<form:option value="7">封堵监测白名单</form:option>
|
||||
<form:option value="8">灰名单</form:option>
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<form:option value="1"><spring:message code="block"/></form:option>
|
||||
<form:option value="2"><spring:message code="monitor"/></form:option>
|
||||
<form:option value="5"><spring:message code="block_white_list"/></form:option>
|
||||
<form:option value="6"><spring:message code="monitor"/></form:option>
|
||||
<form:option value="7"><spring:message code="block_monitor_white_list"/></form:option>
|
||||
<form:option value="8"><spring:message code="grey_list"/></form:option>
|
||||
</form:select>
|
||||
</span>
|
||||
|
||||
<span class="search-item" class="input-small">
|
||||
<span>类型 :</span>
|
||||
<span><spring:message code="type"/> :</span>
|
||||
<form:select path="serviceType">
|
||||
<form:option value="">请选择</form:option>
|
||||
<form:option value="1">单域</form:option>
|
||||
<form:option value="2">多域</form:option>
|
||||
<form:option value="3">特定服务</form:option>
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<form:option value="1"><spring:message code="single_domain"/></form:option>
|
||||
<form:option value="2"><spring:message code="multi_domain"/></form:option>
|
||||
<form:option value="3"><spring:message code="special_service"/></form:option>
|
||||
</form:select>
|
||||
</span>
|
||||
|
||||
<span class="search-item">
|
||||
<span>业务名称 :</span>
|
||||
<span><spring:message code="service_name"/> :</span>
|
||||
<form:input path="serviceName" htmlEscape="false" class="input-small"/>
|
||||
</span>
|
||||
|
||||
<span class="search-item">
|
||||
<span>业务ID :</span>
|
||||
<span><spring:message code="service_id"/> :</span>
|
||||
<form:input path="serviceId" htmlEscape="false" class="input-small"/>
|
||||
</span>
|
||||
|
||||
@@ -101,14 +101,14 @@ function deleteService(id) {
|
||||
<table class="table table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>业务名称</th>
|
||||
<th style="width:8%">业务ID</th>
|
||||
<th>动作</th>
|
||||
<th>类型</th>
|
||||
<th><spring:message code="service_name"/></th>
|
||||
<th style="width:8%"><spring:message code="service_id"/></th>
|
||||
<th><spring:message code="act"/></th>
|
||||
<th><spring:message code="type"/></th>
|
||||
<th><spring:message code="creator_id"></spring:message></th>
|
||||
<th style="width:15%"><spring:message code="create_time"></spring:message></th>
|
||||
<th><spring:message code="desc"></spring:message></th>
|
||||
<th>操作</th>
|
||||
<th><spring:message code="operation"/></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -117,17 +117,17 @@ function deleteService(id) {
|
||||
<td>${ssi.serviceName }</td>
|
||||
<td>${ssi.serviceId }</td>
|
||||
<td>
|
||||
<c:if test="${1 eq ssi.action }">阻断</c:if>
|
||||
<c:if test="${2 eq ssi.action }">监测</c:if>
|
||||
<c:if test="${5 eq ssi.action }">封堵白名单</c:if>
|
||||
<c:if test="${6 eq ssi.action }">监测白名单</c:if>
|
||||
<c:if test="${7 eq ssi.action }">封堵监测白名单</c:if>
|
||||
<c:if test="${8 eq ssi.action }">灰名单</c:if>
|
||||
<c:if test="${1 eq ssi.action }"><spring:message code="block"/></c:if>
|
||||
<c:if test="${2 eq ssi.action }"><spring:message code="monitor"/></c:if>
|
||||
<c:if test="${5 eq ssi.action }"><spring:message code="block_white_list"/></c:if>
|
||||
<c:if test="${6 eq ssi.action }"><spring:message code="monitor_white_list"/></c:if>
|
||||
<c:if test="${7 eq ssi.action }"><spring:message code="block_monitor_white_list"/></c:if>
|
||||
<c:if test="${8 eq ssi.action }"><spring:message code="grey_list"/></c:if>
|
||||
</td>
|
||||
<td>
|
||||
<c:if test="${1 eq ssi.serviceType }">单域</c:if>
|
||||
<c:if test="${2 eq ssi.serviceType }">多域</c:if>
|
||||
<c:if test="${3 eq ssi.serviceType }">特定服务</c:if>
|
||||
<c:if test="${1 eq ssi.serviceType }"><spring:message code="single_domain"/></c:if>
|
||||
<c:if test="${2 eq ssi.serviceType }"><spring:message code="multi_domain"/></c:if>
|
||||
<c:if test="${3 eq ssi.serviceType }"><spring:message code="special_service"/></c:if>
|
||||
</td>
|
||||
<td>${ssi.creator.loginId }</td>
|
||||
<td><fmt:formatDate value="${ssi.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
|
||||
@@ -20,12 +20,7 @@ select, input {
|
||||
|
||||
/* form */
|
||||
.child-input {
|
||||
width: 160px !important;
|
||||
display: inline !important;
|
||||
margin: 6px 5px 6px 5px;
|
||||
}
|
||||
.child-input-desc {
|
||||
width: 320px !important;
|
||||
width: 50% !important;
|
||||
display: inline !important;
|
||||
margin: 6px 5px 6px 5px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user