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

src/main/java/com/nis/web/controller/BaseController.java

@@ -1,5 +1,4 @@
 package com.nis.web.controller;
-
 import java.beans.PropertyEditorSupport;
 import java.io.IOException;
 import java.util.Date;

src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java

@@ -1,5 +1,4 @@
 package com.nis.web.controller.configuration;
-
 import java.util.Date;
 import java.util.List;
 
@@ -133,7 +132,7 @@ public class ComplexStringCfgController extends BaseController{
 			searchBean.setTableName(tableName);
 			ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean);
 			model.addAttribute("_cfg", cfg);
-			List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+			List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
 			model.addAttribute("requestInfos", requestInfos);
 			List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 			model.addAttribute("fls", fls);
@@ -152,7 +151,7 @@ public class ComplexStringCfgController extends BaseController{
 					searchBean.setTableName(tableName);
 					ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean);
 					model.addAttribute("_cfg", cfg);
-					List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+					List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
 					model.addAttribute("requestInfos", requestInfos);
 					List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 					model.addAttribute("fls", fls);

src/main/java/com/nis/web/controller/configuration/IpCfgController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -41,8 +42,9 @@ public class IpCfgController extends BaseController{
 	}
 	
 	@RequestMapping(value = {"list"})
-	public String ipCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) {
+	public String ipCfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", audit);
 		if(ipCfg!=null){
 			Integer serviceId=ipCfg.getServiceId();
 			logger.info("servcice id is "+serviceId);
@@ -131,6 +133,7 @@ public class IpCfgController extends BaseController{
 		
 		return "/cfg/ipCfgForm";
 	}
+	@RequiresPermissions("sys:cfg:edit")
 	@RequestMapping(value = {"updateForm"})
 	public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
@@ -144,7 +147,7 @@ public class IpCfgController extends BaseController{
 			BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean);
 			model.addAttribute("_cfg", ipCfg);
 			model.addAttribute("tableName", tableName);
-			List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+			List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
 			model.addAttribute("requestInfos", requestInfos);
 			List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 			model.addAttribute("fls", fls);
@@ -164,7 +167,7 @@ public class IpCfgController extends BaseController{
 					BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean);
 					model.addAttribute("_cfg", ipCfg);
 					model.addAttribute("tableName", tableName);
-					List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+					List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
 					model.addAttribute("requestInfos", requestInfos);
 					List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 					model.addAttribute("fls", fls);
@@ -319,6 +322,7 @@ public class IpCfgController extends BaseController{
 	 * @exception 
 	 * @since  1.0.0
 	 */
+	@RequiresPermissions("sys:cfg:edit")
 	@RequestMapping(value = {"deleteCfg"})
 	public String deleteIpCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) {
 			model.addAttribute("cfgName", cfgName);

src/main/java/com/nis/web/controller/configuration/NumCfgController.java

@@ -1,5 +1,4 @@
 package com.nis.web.controller.configuration;
-
 import java.util.Date;
 import java.util.List;
 
@@ -109,7 +108,7 @@ public class NumCfgController extends BaseController{
 				searchBean.setCfgId(cfgId);
 				NumBoundaryCfg cfg=numCfgService.getNumCfgById(searchBean);
 				model.addAttribute("_cfg", cfg);
-				List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+				List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
 				model.addAttribute("requestInfos", requestInfos);
 				List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 				model.addAttribute("fls", fls);

src/main/java/com/nis/web/controller/configuration/StringCfgController.java

@@ -1,5 +1,4 @@
 package com.nis.web.controller.configuration;
-
 import java.util.Date;
 import java.util.List;
 
@@ -133,7 +132,7 @@ public class StringCfgController extends BaseController{
 			searchBean.setTableName(tableName);
 			BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean);
 			model.addAttribute("_cfg", stringCfg);
-			List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+			List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
 			model.addAttribute("requestInfos", requestInfos);
 			List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 			model.addAttribute("fls", fls);
@@ -152,7 +151,7 @@ public class StringCfgController extends BaseController{
 					searchBean.setTableName(tableName);
 					BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean);
 					model.addAttribute("_cfg", stringCfg);
-					List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
+					List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
 					model.addAttribute("requestInfos", requestInfos);
 					List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 					model.addAttribute("fls", fls);

src/main/webapp/WEB-INF/include/form/basicInfo.jsp

@@ -6,7 +6,7 @@
    <div class="col-md-6">
        <div class="form-group">
            <label class="control-label col-md-3">来函</label>
-           <div class="col-md-8">
+           <div class="col-md-6">
                <select name="requestId" data-live-search="true" data-live-search-placeholder="搜索" class="selectpicker form-control" title="--请选择--">
                	<c:forEach items="${requestInfos}" var="requestInfo">
                		<option value="${requestInfo.id}"
@@ -15,13 +15,14 @@
                	</c:forEach>
                </select>
            </div>
+           <div for="requestId"></div>
        </div>
    </div>
    <!--/span-->
    <div class="col-md-6">
        <div class="form-group">
            <label class="control-label col-md-3">分类</label>
-           <div class="col-md-8">
+           <div class="col-md-6">
            	 <select name="classify" multiple class="selectpicker form-control" title="--请选择--">
                	<c:forEach items="${fls}" var="fl">
                		<c:choose>
@@ -55,7 +56,7 @@
      <div class="col-md-6">
          <div class="form-group">
              <label class="control-label col-md-3">性质</label>
-             <div class="col-md-8">
+             <div class="col-md-6">
                 <select name="attribute" multiple class="selectpicker form-control" title="--请选择--">
                		<c:forEach items="${xzs}" var="xz">
 	               		<c:choose>
@@ -79,7 +80,7 @@
      <div class="col-md-6">
          <div class="form-group">
              <label class="control-label col-md-3">标签</label>
-             <div class="col-md-8">
+             <div class="col-md-6">
                 <select name="lable" multiple class="selectpicker form-control" title="--请选择--">
                		<c:forEach items="${lables}" var="lable">
 	               		<c:choose>
@@ -108,7 +109,7 @@
      <div class="col-md-6">
          <div class="form-group">
              <label class="control-label col-md-3">生效范围</label>
-             <div class="col-md-8">
+             <div class="col-md-6">
                  <select class="form-control">
                      <option>Country 1</option>
                      <option>Country 2</option>

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

@@ -10,6 +10,7 @@
             </div>
         </div>
     </div>
+    
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3">匹配区域</label>

src/main/webapp/WEB-INF/include/form/ipInfo.jsp

@@ -5,21 +5,23 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">配置描述</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
-                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+                <input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
+            <div for="cfgDesc"></div>
         </div>
     </div>
     <div class="col-md-6">
-        <div class="form-group ">
+        <div class="form-group">
             <label class="control-label col-md-3">ip类型</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	 <select name="ipType" class="selectpicker show-tick form-control" title="--请选择--">
                    <option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
                    <option value="6" <c:if test="${_cfg.ipType==6}">selected</c:if>>V6</option>
                  </select>
                  <!--  <input class="form-control" type="text"  value="${_cfg.ipType}">-->
             </div>
+            <div for="ipType"></div>
         </div>
     </div>
 </div>
@@ -27,17 +29,19 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">源IP地址</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="srcIp" value="${_cfg.srcIp}">
             </div>
+            <div for="srcIp"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3">源地址掩码</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="srcIpMask" value="${_cfg.srcIpMask}">
             </div>
+            <div for="srcIpMask"></div>
         </div>
     </div>
 </div>
@@ -45,17 +49,19 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">源端口</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="srcPort" value="${_cfg.srcPort}">
             </div>
+            <div for="srcPort"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3">源端口掩码</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="srcPortMask" value="${_cfg.srcPortMask}">
             </div>
+            <div for="srcPortMask"></div>
         </div>
     </div>
 </div>
@@ -63,17 +69,19 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">目的IP地址</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="dstIp" value="${_cfg.dstIp}">
             </div>
+            <div for="dstIp"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3">目的地址掩码</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="dstIpMask" value="${_cfg.dstIpMask}">
             </div>
+            <div for="dstIpMask"></div>
         </div>
     </div>
 </div>
@@ -81,17 +89,19 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">目的端口</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="dstPort" value="${_cfg.dstPort}">
             </div>
+            <div for="dstPort"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3">目的端口掩码</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="dstPortMask" value="${_cfg.dstPortMask}">
             </div>
+            <div for="dstPortMask"></div>
         </div>
     </div>
 </div>
@@ -99,19 +109,20 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">方向</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<select name="direction" class="selectpicker show-tick form-control" title="--请选择--">
                    <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>>0</option>
                    <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>>1</option>
                  </select>
                 <%-- <input class="form-control" type="text" name="direction" value="${_cfg.direction}"> --%>
             </div>
+            <div for="direction"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3">协议</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<select name="protocol" class="selectpicker show-tick form-control" title="--请选择--">
                    <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
                    <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
@@ -119,6 +130,7 @@
                 </select>
                 <%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
             </div>
+            <div for="protocol"></div>
         </div>
     </div>
 </div>
@@ -126,15 +138,15 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">协议ID</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="protocolId" value="${_cfg.protocolId}" readonly="readonly">
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">管控类型</label>
+            <label class="control-label col-md-3">管控类型</div>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	 <select name="action" class="selectpicker select2 form-control" readonly="readonly">
             	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
             	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
@@ -152,7 +164,7 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">是否区域管控</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
@@ -165,14 +177,16 @@
             	</label>
                 <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
             </div>
+            <div for="isAreaEffective"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3">区域生效id</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>
+            <div for="areaEffectiveIds"></div>
         </div>
     </div>
 </div>

src/main/webapp/WEB-INF/include/form/stringInfo.jsp

@@ -61,7 +61,7 @@
             <label class="control-label col-md-3">表达式类型</label>
             <div class="col-md-8">
             	<label class="radio-inline">
-            		<input type="radio" name="exprType " value="1"
+            		<input type="radio" name="exprType" value="1"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
             		>与表达式
             	</label>

src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp

@@ -5,6 +5,20 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+	<c:otherwise>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:otherwise>
+</c:choose>
 <script type="text/javascript">
 $(function(){
 	$("#save").on("click",function(){
@@ -60,6 +74,106 @@ $(function(){
 				$("input[name='dstIp']").val("::");
 			}
 		}
+	}); 		
+	$("#ipCfgFrom").validate({
+		rules: {
+			cfgDesc: {
+				required: true,
+			},
+			ipType: {
+				required: true,
+			},
+			srcIp: {
+				required: true,
+			},
+			srcIpMask: {
+				required: true,
+			},
+			srcPort: {
+				required: true,
+			},
+			srcPortMask: {
+				required: true,
+			},
+			dstIp: {
+				required: true,
+			},
+			dstIpMask: {
+				required: true,
+			},
+			dstPort: {
+				required: true,
+			},
+			dstPortMask: {
+				required: true,
+			},
+			direction: {
+				required: true,
+			},
+			protocol: {
+				required: true,
+			},
+			isAreaEffective: {
+				required: true,
+			},
+			requestId: {
+				required: true,
+			}
+			
+			
+		},
+		messages: {
+			cfgDesc: {
+				required: '<spring:message code="required"/>',
+			},
+			ipType: {
+				required: '<spring:message code="required"/>',
+			},
+			srcIp: {
+				required: '<spring:message code="required"/>',
+			},
+			srcIpMask: {
+				required: '<spring:message code="required"/>',
+			},
+			srcPort: {
+				required: '<spring:message code="required"/>',
+			},
+			srcPortMask: {
+				required: '<spring:message code="required"/>',
+			},
+			dstIp: {
+				required: '<spring:message code="required"/>',
+			},
+			dstIpMask: {
+				required: '<spring:message code="required"/>',
+			},
+			dstPort: {
+				required: '<spring:message code="required"/>',
+			},
+			dstPortMask: {
+				required: '<spring:message code="required"/>',
+			},
+			direction: {
+				required: '<spring:message code="required"/>',
+			},
+			protocol: {
+				required: '<spring:message code="required"/>',
+			},
+			isAreaEffective: {
+				required: '<spring:message code="required"/>',
+			},
+			requestId: {
+				required: '<spring:message code="required"/>',
+			}
+		},
+		errorPlacement: function(error,element){
+			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+		},
+		submitHandler: function(form){
+			//loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox",
 	});
 });
 </script>