From a0d037be5164edde3fbcafd4099cab2c08470bc1 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Tue, 4 Sep 2018 11:42:48 +0800
Subject: [PATCH] =?UTF-8?q?1.Media=20Addr=E5=88=A0=E9=99=A4=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BF=AE=E6=94=B9=20=202.App=20byte/header=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/AvContentCfgService.java       | 16 ++++++++++++----
 .../WEB-INF/views/cfg/app/appByteCfgList.jsp     |  2 +-
 .../WEB-INF/views/cfg/app/appHeaderCfgList.jsp   |  2 +-
 .../views/cfg/intercept/interceptList.jsp        |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
index 807a9526b..7e3e73fc6 100644
--- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
@@ -747,8 +747,10 @@ public class AvContentCfgService extends BaseService{
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
 			BaseIpCfg entity = new BaseIpCfg();
+			entity.setCfgId(Long.parseLong(id));
+			BaseIpCfg ipCfg = this.getContIpCfgById(entity);// 获取CompileId
+			entity.setCompileId(ipCfg.getCompileId());
 			entity.setTableName("av_cont_ip_cfg");
-			entity.setCompileId(Integer.parseInt(id));
 			entity.setFunctionId(functionId);
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
@@ -1027,8 +1029,10 @@ public class AvContentCfgService extends BaseService{
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
 			BaseIpCfg entity = new BaseIpCfg();
+			entity.setCfgId(Long.parseLong(id));
+			BaseIpCfg picIpCfg = this.getPicIpCfgById(entity);// 获取CompileId
+			entity.setCompileId(picIpCfg.getCompileId());
 			entity.setTableName("av_pic_ip_cfg");
-			entity.setCompileId(Integer.parseInt(id));
 			entity.setFunctionId(functionId);
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
@@ -1283,8 +1287,10 @@ public class AvContentCfgService extends BaseService{
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
 			BaseStringCfg entity = new BaseStringCfg();
+			entity.setCfgId(Long.parseLong(id));
+			BaseStringCfg urlCfg = this.getContUrlCfgById(entity);// 获取CompileId
+			entity.setCompileId(urlCfg.getCompileId());
 			entity.setTableName("av_cont_url_cfg");
-			entity.setCompileId(Integer.parseInt(id));
 			entity.setFunctionId(functionId);
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
@@ -1528,8 +1534,10 @@ public class AvContentCfgService extends BaseService{
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
 			BaseStringCfg entity = new BaseStringCfg();
+			entity.setCfgId(Long.parseLong(id));
+			BaseStringCfg picUrlCfg = this.getPicUrlCfgById(entity);// 获取CompileId
+			entity.setCompileId(picUrlCfg.getCompileId());
 			entity.setTableName("av_pic_url_cfg");
-			entity.setCompileId(Integer.parseInt(id));
 			entity.setFunctionId(functionId);
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index b18429fc2..ae86714d6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -298,7 +298,7 @@
 									</td>
 								    <td>${cfg.cfgDesc }</td>
 								    <td>${cfg.appName }</td>
-								    <td>${cfg.bytes }</td>
+								    <td title="${cfg.bytes }">${fns:abbr(cfg.bytes,13)}</td>
 									<c:if test="${cfg.isHexbin==0 }">
 										<td><spring:message code="not_hex"/></td>
 										<td><spring:message code="case_insenstive"/></td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
index 4467ebca5..8fc042bba 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -96,7 +96,7 @@
                                          <div class="input-group-btn">
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
-												<form:option value="cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
+												<form:option value="cfgKeywords"><spring:message code="header"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 											</form:select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index cd8018f22..b69b36f39 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -481,7 +481,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<<%-- td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>