From 85e813a5d722a783742d490bc634bf946259ceed Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Fri, 24 Aug 2018 12:15:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3APP=E7=AD=96=E7=95=A5Subscr?=
 =?UTF-8?q?ibeId=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=202.APP=E7=89=B9?=
 =?UTF-8?q?=E5=BE=81dolog=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/domain/configuration/AppPolicyCfg.java  |  6 +++---
 .../ntc/FileTransferCfgController.java          |  1 +
 .../service/configuration/AppCfgService.java    |  4 ++--
 .../WEB-INF/views/cfg/app/appByteCfgForm.jsp    | 17 ++++-------------
 .../WEB-INF/views/cfg/app/appDomainCfgForm.jsp  | 17 ++++-------------
 .../WEB-INF/views/cfg/app/appHeaderCfgForm.jsp  | 17 ++++-------------
 .../WEB-INF/views/cfg/app/appHttpCfgForm.jsp    | 17 ++++-------------
 .../WEB-INF/views/cfg/app/appIpCfgForm.jsp      | 17 ++++-------------
 .../WEB-INF/views/cfg/app/appPolicyCfgForm.jsp  |  9 +++------
 .../WEB-INF/views/cfg/app/appSslCfgForm.jsp     |  9 ++++++---
 10 files changed, 35 insertions(+), 79 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
index da27c0bfe..bc6895c44 100644
--- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
@@ -69,17 +69,17 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 	@Expose
 	@ExcelField(title="expression_type")
 	@SerializedName("exprType")
-	private Integer exprType ;
+	protected Integer exprType ;
 
 	@Expose
 	@ExcelField(title="match_method")
 	@SerializedName("matchMethod")
-	private Integer matchMethod ;
+	protected Integer matchMethod ;
 
 	@Expose
 	@ExcelField(title="whether_hexbinary")
 	@SerializedName("isHexbin")
-	private Integer isHexbin;
+	protected Integer isHexbin;
 	
 	private List<IpPortCfg> ipPortList;
 	private IpPortCfg ipPort;
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
index 0f116ffde..42e621c49 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
@@ -246,6 +246,7 @@ public class FileTransferCfgController  extends BaseController{
 				fileMap.put("checksum", md5);
 				result = ConfigServiceUtil.getFileDigest(null, uploadFile, JsonMapper.toJsonString(fileMap));
 				if((result.getData().getRawLen() == null) || (result.getData().getDigest() == null)) {
+					logger.info("文件摘要信息获取有误！");
 					throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+null);
 				}
 				logger.info("获取文件摘要响应信息："+result);
diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
index 855a73635..0388674ea 100644
--- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -238,7 +238,7 @@ public class AppCfgService extends BaseService {
 				for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
 					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
 					entity.setCfgKeywords(cfg.getCfgKeywords());
-					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType","exprType","matchMethod","isHexbin"});
 					stringcfgDao.saveSubscribeIdCfg(cfg);
 					}
 				}
@@ -1410,7 +1410,7 @@ public class AppCfgService extends BaseService {
 			if(entity.getNtcSubscribeIdCfgList()!=null&&entity.getNtcSubscribeIdCfgList().size()>0){
 				NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
 				BeanUtils.copyProperties(entity, ntcSubscribeIdCfg, new String[]{"cfgId"});
-				stringcfgDao.deleteSubscribeIdCfg(ntcSubscribeIdCfg);
+				stringcfgDao.updateSubscribeIdCfg(ntcSubscribeIdCfg);
 			}
 			//保存区域IP信息
 			if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
index c821be4ff..facf44d90 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -142,22 +142,13 @@ $(function(){
 											<div for="bytes"></div>
 										</div>
 									</div>
-									<div class="col-md-6">
+									<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:if test="${dict.itemCode eq 0}">
+												<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+											</c:if>
 										</c:forEach>
 									</div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index 77cd82995..9b8659eb9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -142,22 +142,13 @@ $(function(){
 											<div for="domain"></div>
 										</div>
 									</div>
-									<div class="col-md-6">
+									<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:if test="${dict.itemCode eq 0}">
+												<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+											</c:if>
 										</c:forEach>
 									</div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
index 3eea1c739..c9c845482 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
@@ -171,22 +171,13 @@ $(function(){
 										</div>
 									</c:if>
 									<!-- doLog -->
-									<div class="col-md-6">
+									<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:if test="${dict.itemCode eq 0}">
+													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</c:if>
 											</c:forEach>
 										</div>
 									</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index 95ec2f585..fc3a2a519 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -170,22 +170,13 @@ $(function(){
 											</div>
 										</div>
 									</c:if>
-									<div class="col-md-6">
+									<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:if test="${dict.itemCode eq 0}">
+													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</c:if>
 											</c:forEach>
 										</div>
 									</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
index a57657c74..7f981a974 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
@@ -185,23 +185,14 @@ $(function(){
 								</div>
 							</div>
 							<!-- doLog -->
-							<div class="row">
+							<div class="row hidden">
 								<div class="col-md-6">
 									<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:if test="${dict.itemCode eq 0}">
+												<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+											</c:if>
 										</c:forEach>
 									</div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index f2be11aac..283fe2e40 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -155,7 +155,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 </script>
 </head>
 <body>
-
+<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 <div class="page-content">
 	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
 	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
@@ -180,11 +181,7 @@ var delContent = function(contentClassName, addBtnClassName) {
                        	<input type="hidden" name="compileId" value="${_cfg.compileId}">
                        	<input type="hidden" name="functionId" value="${_cfg.functionId}">
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-                       <%-- 	<input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}"> --%>
-                       	<%-- <input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}"> --%>
-                       	<input type="hidden" id="exprType" name="exprType" value="0">
-                       	<input type="hidden" id="matchMethod" name="matchMethod" value="0">
-                       	<input type="hidden" id="isHexbin" name="isHexbin" value="0">
+                       
                           <div class="form-body">
                           <!-- desc and action -->
                              
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
index 32b90cdcd..62e1df904 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
@@ -170,11 +170,14 @@ $(function(){
 										</div>
 									</c:if>
 									<!-- doLog -->
-									<div class="col-md-6">
+									<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:if test="${dict.itemCode eq 0}">
+													<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+												</c:if>
+												<%-- <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}"/>
@@ -185,7 +188,7 @@ $(function(){
 															<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
 														</label>
 													</c:otherwise>
-												</c:choose>
+												</c:choose> --%>
 											</c:forEach>
 										</div>
 									</div>