From c2c97f222c756ebaa8dc63799a5646a519e3d7f7 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Thu, 16 Aug 2018 16:41:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refer=E6=94=B9=E4=B8=BAreferer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/log/MmAvIpLog.java      | 11 +++++------
 src/main/java/com/nis/domain/log/MmAvUrlLog.java     | 10 +++++-----
 src/main/java/com/nis/domain/log/MmPicIpLog.java     | 10 +++++-----
 src/main/java/com/nis/domain/log/MmPicUrlLog.java    | 10 +++++-----
 .../java/com/nis/domain/log/MmSampleAudioLog.java    | 12 ++++++------
 src/main/java/com/nis/domain/log/MmSamplePicLog.java | 12 ++++++------
 .../java/com/nis/domain/log/MmSampleVideoLog.java    | 12 ++++++------
 src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp |  4 ++--
 .../webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp     |  4 ++--
 .../webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp     |  6 +++---
 .../webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp    |  4 ++--
 .../WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp  |  4 ++--
 .../WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp  |  4 ++--
 .../WEB-INF/views/log/ntc/mmSampleAudioList.jsp      |  4 ++--
 .../webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp |  4 ++--
 .../WEB-INF/views/log/ntc/mmSampleVideoList.jsp      |  4 ++--
 16 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/src/main/java/com/nis/domain/log/MmAvIpLog.java b/src/main/java/com/nis/domain/log/MmAvIpLog.java
index f49bd59a5..8e2d79d94 100644
--- a/src/main/java/com/nis/domain/log/MmAvIpLog.java
+++ b/src/main/java/com/nis/domain/log/MmAvIpLog.java
@@ -4,7 +4,6 @@ import com.wordnik.swagger.annotations.ApiModelProperty;
 
 /**
  * @ClassName:MmAvIpLog
- * @Description:TODO(这里用一句话描述这个类的作用)
  * @author (zdx)
  * @date 2018年7月16日 下午2:54:23
  * @version V1.0
@@ -19,7 +18,7 @@ public class MmAvIpLog  extends BaseLogEntity<MmAvIpLog> {
     @ApiModelProperty(value="封堵现场片段路径", required=true)
     protected String logUri;
     @ApiModelProperty(value="入口页面", required=true)
-    protected String refer;
+    protected String referer;
     @ApiModelProperty(value="有害级别", required=true)
     protected Integer level;
     @ApiModelProperty(value="封堵类型", required=true)
@@ -44,11 +43,11 @@ public class MmAvIpLog  extends BaseLogEntity<MmAvIpLog> {
 	public void setLogUri(String logUri) {
 		this.logUri = logUri;
 	}
-	public String getRefer() {
-		return refer;
+	public String getReferer() {
+		return referer;
 	}
-	public void setRefer(String refer) {
-		this.refer = refer;
+	public void setReferer(String referer) {
+		this.referer = referer;
 	}
 	public Integer getLevel() {
 		return level;
diff --git a/src/main/java/com/nis/domain/log/MmAvUrlLog.java b/src/main/java/com/nis/domain/log/MmAvUrlLog.java
index 8876715d1..2398f630a 100644
--- a/src/main/java/com/nis/domain/log/MmAvUrlLog.java
+++ b/src/main/java/com/nis/domain/log/MmAvUrlLog.java
@@ -19,7 +19,7 @@ public class MmAvUrlLog  extends BaseLogEntity<MmAvUrlLog> {
     @ApiModelProperty(value="封堵现场片段路径", required=true)
     protected String logUri;
     @ApiModelProperty(value="入口页面", required=true)
-    protected String refer;
+    protected String referer;
     @ApiModelProperty(value="有害级别", required=true)
     protected Integer level;
     @ApiModelProperty(value="封堵类型", required=true)
@@ -44,11 +44,11 @@ public class MmAvUrlLog  extends BaseLogEntity<MmAvUrlLog> {
 	public void setLogUri(String logUri) {
 		this.logUri = logUri;
 	}
-	public String getRefer() {
-		return refer;
+	public String getReferer() {
+		return referer;
 	}
-	public void setRefer(String refer) {
-		this.refer = refer;
+	public void setReferer(String referer) {
+		this.referer = referer;
 	}
 	public Integer getLevel() {
 		return level;
diff --git a/src/main/java/com/nis/domain/log/MmPicIpLog.java b/src/main/java/com/nis/domain/log/MmPicIpLog.java
index b837c13e3..94b757eed 100644
--- a/src/main/java/com/nis/domain/log/MmPicIpLog.java
+++ b/src/main/java/com/nis/domain/log/MmPicIpLog.java
@@ -7,7 +7,7 @@ public class MmPicIpLog extends BaseLogEntity<MmPicIpLog> {
 	private String pid;// 节目ID
 	private String url;// 节目访问地址
 	private String logUri;// fd现场片段路径
-	private String refer;// 入口页面
+	private String referer;// 入口页面
 	private Integer level;// 有害级别
 	private Integer fdType;// fd类型
 	private String protocol;// 传输协议
@@ -30,11 +30,11 @@ public class MmPicIpLog extends BaseLogEntity<MmPicIpLog> {
 	public void setLogUri(String logUri) {
 		this.logUri = logUri;
 	}
-	public String getRefer() {
-		return refer;
+	public String getReferer() {
+		return referer;
 	}
-	public void setRefer(String refer) {
-		this.refer = refer;
+	public void setReferer(String referer) {
+		this.referer = referer;
 	}
 	public Integer getLevel() {
 		return level;
diff --git a/src/main/java/com/nis/domain/log/MmPicUrlLog.java b/src/main/java/com/nis/domain/log/MmPicUrlLog.java
index 03d27778f..4cd406cbd 100644
--- a/src/main/java/com/nis/domain/log/MmPicUrlLog.java
+++ b/src/main/java/com/nis/domain/log/MmPicUrlLog.java
@@ -7,7 +7,7 @@ public class MmPicUrlLog extends BaseLogEntity<MmPicUrlLog>{
 	private String pid;// 节目ID
 	private String url;// 节目访问地址
 	private String logUri;// fd现场片段路径
-	private String refer;// 入口页面
+	private String referer;// 入口页面
 	private Integer level;// 有害级别
 	private Integer fdType;// fd类型
 	private String protocol;// 传输协议
@@ -30,11 +30,11 @@ public class MmPicUrlLog extends BaseLogEntity<MmPicUrlLog>{
 	public void setLogUri(String logUri) {
 		this.logUri = logUri;
 	}
-	public String getRefer() {
-		return refer;
+	public String getReferer() {
+		return referer;
 	}
-	public void setRefer(String refer) {
-		this.refer = refer;
+	public void setReferer(String referer) {
+		this.referer = referer;
 	}
 	public Integer getLevel() {
 		return level;
diff --git a/src/main/java/com/nis/domain/log/MmSampleAudioLog.java b/src/main/java/com/nis/domain/log/MmSampleAudioLog.java
index 4a0ec40a2..daa512652 100644
--- a/src/main/java/com/nis/domain/log/MmSampleAudioLog.java
+++ b/src/main/java/com/nis/domain/log/MmSampleAudioLog.java
@@ -7,7 +7,7 @@ public class MmSampleAudioLog extends BaseLogEntity<MmSampleAudioLog>{
 	private String pid;// 节目ID
 	private String url;// 节目访问地址
 	private String logUri;// fd现场片段路径
-	private String refer;// 入口页面
+	private String referer;// 入口页面
 	private Integer level;// 有害级别
 	private Integer fdType;// fd类型
 	private String protocol;// 传输协议
@@ -30,11 +30,11 @@ public class MmSampleAudioLog extends BaseLogEntity<MmSampleAudioLog>{
 	public void setLogUri(String logUri) {
 		this.logUri = logUri;
 	}
-	public String getRefer() {
-		return refer;
+	public String getReferer() {
+		return referer;
 	}
-	public void setRefer(String refer) {
-		this.refer = refer;
+	public void setReferer(String referer) {
+		this.referer = referer;
 	}
 	public Integer getLevel() {
 		return level;
@@ -56,7 +56,7 @@ public class MmSampleAudioLog extends BaseLogEntity<MmSampleAudioLog>{
 	}
 	@Override
 	public String toString() {
-		return "MmSampleAudioLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level="
+		return "MmSampleAudioLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", referer=" + referer + ", level="
 				+ level + ", fdType=" + fdType + ", protocol=" + protocol + "]";
 	}
 }
diff --git a/src/main/java/com/nis/domain/log/MmSamplePicLog.java b/src/main/java/com/nis/domain/log/MmSamplePicLog.java
index c7034b300..734200c59 100644
--- a/src/main/java/com/nis/domain/log/MmSamplePicLog.java
+++ b/src/main/java/com/nis/domain/log/MmSamplePicLog.java
@@ -7,7 +7,7 @@ public class MmSamplePicLog extends BaseLogEntity<MmSamplePicLog>{
 	private String pid;// 节目ID
 	private String url;// 节目访问地址
 	private String logUri;// fd现场片段路径
-	private String refer;// 入口页面
+	private String referer;// 入口页面
 	private Integer level;// 有害级别
 	private Integer fdType;// fd类型
 	private String protocol;// 传输协议
@@ -29,11 +29,11 @@ public class MmSamplePicLog extends BaseLogEntity<MmSamplePicLog>{
 	public void setLogUri(String logUri) {
 		this.logUri = logUri;
 	}
-	public String getRefer() {
-		return refer;
+	public String getReferer() {
+		return referer;
 	}
-	public void setRefer(String refer) {
-		this.refer = refer;
+	public void setReferer(String referer) {
+		this.referer = referer;
 	}
 	public Integer getLevel() {
 		return level;
@@ -55,7 +55,7 @@ public class MmSamplePicLog extends BaseLogEntity<MmSamplePicLog>{
 	}
 	@Override
 	public String toString() {
-		return "MmSamplePicLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level="
+		return "MmSamplePicLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", referer=" + referer + ", level="
 				+ level + ", fdType=" + fdType + ", protocol=" + protocol + "]";
 	}
 	
diff --git a/src/main/java/com/nis/domain/log/MmSampleVideoLog.java b/src/main/java/com/nis/domain/log/MmSampleVideoLog.java
index 5146bd6d8..55b17cf4b 100644
--- a/src/main/java/com/nis/domain/log/MmSampleVideoLog.java
+++ b/src/main/java/com/nis/domain/log/MmSampleVideoLog.java
@@ -7,7 +7,7 @@ public class MmSampleVideoLog extends BaseLogEntity<MmSampleVideoLog>{
 	private String pid;// 节目ID
 	private String url;// 节目访问地址
 	private String logUri;// fd现场片段路径
-	private String refer;// 入口页面
+	private String referer;// 入口页面
 	private Integer level;// 有害级别
 	private Integer fdType;// fd类型
 	private String protocol;// 传输协议
@@ -29,11 +29,11 @@ public class MmSampleVideoLog extends BaseLogEntity<MmSampleVideoLog>{
 	public void setLogUri(String logUri) {
 		this.logUri = logUri;
 	}
-	public String getRefer() {
-		return refer;
+	public String getReferer() {
+		return referer;
 	}
-	public void setRefer(String refer) {
-		this.refer = refer;
+	public void setReferer(String referer) {
+		this.referer = referer;
 	}
 	public Integer getLevel() {
 		return level;
@@ -55,7 +55,7 @@ public class MmSampleVideoLog extends BaseLogEntity<MmSampleVideoLog>{
 	}
 	@Override
 	public String toString() {
-		return "MmSampleVideoLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level="
+		return "MmSampleVideoLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", referer=" + referer + ", level="
 				+ level + ", fdType=" + fdType + ", protocol=" + protocol + "]";
 	}
 	
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index 67cf9312e..3b30bde7d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
 									<th><spring:message code='log_uri'/></th>
-									<th><spring:message code='refer'/></th>
+									<th><spring:message code='referer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
 <%-- 									<th><spring:message code='av_protocol'/></th> --%>
@@ -234,7 +234,7 @@ $(document).ready(function(){
 										</c:if>	
 									</td>
 									<td>
-										${log.refer}
+										${log.referer}
 									</td>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index 645c7f063..2299571e2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
 									<th><spring:message code='log_uri'/></th>
-									<th><spring:message code='refer'/></th>
+									<th><spring:message code='referer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
 <%-- 									<th><spring:message code='av_protocol'/></th> --%>
@@ -234,7 +234,7 @@ $(document).ready(function(){
 										</c:if>	
 									</td>
 									<td>
-										${log.refer}
+										${log.referer}
 									</td>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index d33b8316c..8802b8294 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
 									<th><spring:message code='log_uri'/></th>
-									<th><spring:message code='refer'/></th>
+									<th><spring:message code='referer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
 								<%--<th><spring:message code='av_protocol'/></th> --%>
@@ -234,8 +234,8 @@ $(document).ready(function(){
 										</a>
 										</c:if>
 									</td>
-									<td title="${fns:escapeHtml(log.refer)}">
-										${fns:stringFormat(log.refer,30)}
+									<td title="${fns:escapeHtml(log.referer)}">
+										${fns:stringFormat(log.referer,30)}
 									</td>
 									<td>${log.level}</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 8ab1c2b23..087828989 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
 									<th><spring:message code='log_uri'/></th>
-									<th><spring:message code='refer'/></th>
+									<th><spring:message code='referer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
 									<%-- <th><spring:message code='av_protocol'/></th> --%>
@@ -235,7 +235,7 @@ $(document).ready(function(){
 										</c:if>
 									</td>
 									<td>
-										${log.refer}
+										${log.referer}
 									</td>
 									<td>${log.level}</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index 826db35ca..d8c1f4d5c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
 									<th><spring:message code='log_uri'/></th>
-									<th><spring:message code='refer'/></th>
+									<th><spring:message code='referer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
 									<%-- <th><spring:message code='av_protocol'/></th> --%>
@@ -236,7 +236,7 @@ $(document).ready(function(){
 										<%-- <c:if test="${fn:startsWith(log.logUri, \"http\")}">${log.logUri }</c:if>
 										<c:if test="${!fn:startsWith(log.logUri, \"http\")}">http://${log.logUri }</c:if>'>http://${log.logUri }</a> --%>
 									</td>
-									<td>${log.refer}</td>
+									<td>${log.referer}</td>
 									<td>${log.level}</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index 5c2d98440..9a521e33b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
 									<th><spring:message code='log_uri'/></th>
-									<th><spring:message code='refer'/></th>
+									<th><spring:message code='referer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
 									<%-- <th><spring:message code='av_protocol'/></th> --%>
@@ -233,7 +233,7 @@ $(document).ready(function(){
 										<%-- <c:if test="${fn:startsWith(log.logUri, \"http\")}">${log.logUri }</c:if>
 										<c:if test="${!fn:startsWith(log.logUri, \"http\")}">http://${log.logUri }</c:if>'>http://${log.logUri }</a> --%>
 									</td>
-									<td>${log.refer }</td>
+									<td>${log.referer }</td>
 									<td>${log.level }</td>
 									<!--0：动态黑名单FD；1：静态配置FD；2：首次分析命中 -->
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 79ffe4447..215649a7f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -226,7 +226,7 @@
 										<th><spring:message code='pid' /></th>
 										<th><spring:message code='access_url' /></th>
 										<th><spring:message code='log_uri' /></th>
-										<th><spring:message code='refer' /></th>
+										<th><spring:message code='referer' /></th>
 										<th><spring:message code='harm_level' /></th>
 										<th><spring:message code='fd_type' /></th>
 										<%-- <th><spring:message code='av_protocol' /></th> --%>
@@ -292,7 +292,7 @@
 										</a>
 										</c:if>	
 									</td>
-											<td>${log.refer }</td>
+											<td>${log.referer }</td>
 											<td>${log.level}</td>
 											<td><c:if test="${log.fdType eq 0 }">
 													<spring:message code="black_block_list" />
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index e00b5a96b..2158171a9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 									<th><spring:message code='pid' /></th>
 									<th><spring:message code='access_url' /></th>
 									<th><spring:message code='log_uri' /></th>
-									<th><spring:message code='refer' /></th>
+									<th><spring:message code='referer' /></th>
 									<th><spring:message code='harm_level' /></th>
 									<th><spring:message code='fd_type' /></th>
 									<%-- <th><spring:message code='av_protocol' /></th> --%>
@@ -234,7 +234,7 @@ $(document).ready(function(){
 												</a>
 												</c:if>	
 											</td>
-											<td>${log.refer }</td>
+											<td>${log.referer }</td>
 											<td>${log.level }</td>
 											<td>
 												<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list" /></c:if> 
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 9bb8af7ca..118a32d0a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 									<th><spring:message code='pid' /></th>
 									<th><spring:message code='access_url' /></th>
 									<th><spring:message code='log_uri' /></th>
-									<th><spring:message code='refer' /></th>
+									<th><spring:message code='referer' /></th>
 									<th><spring:message code='harm_level' /></th>
 									<th><spring:message code='fd_type' /></th>
 									<%-- <th><spring:message code='av_protocol' /></th> --%>
@@ -234,7 +234,7 @@ $(document).ready(function(){
 												</a>
 												</c:if>	
 											</td>
-											<td>${log.refer }</td>
+											<td>${log.referer }</td>
 											<td>${log.level}</td>
 											<td><c:if test="${log.fdType eq 0 }">
 													<spring:message code="black_block_list" />

From 27ff08ca412b1ed96e0775c22afd29090fb7616b Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Thu, 16 Aug 2018 16:45:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BB=A3=E7=A0=81refer=E4=B8=BArefe?=
 =?UTF-8?q?rer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties    | 5 ++---
 src/main/resources/messages/message_zh_CN.properties | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index b9dbebbab..b04d6d689 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -709,7 +709,7 @@ pid=Program Id
 log_uri=Log URI
 fd_type=Block Type
 access_url=Progam Access URL
-refer=Refer
+referer=Referer
 black_block_list=Active Block Black List
 static_cfg_block=Static Cfg Block
 first_hit=First Hit
@@ -738,7 +738,7 @@ policy_group_manage=Policy Group
 #===========policy_group_manage end  =============
 #=============about manipulation=========
 ip_Reuse_policy=IP Reuse Policy
-target_ip_protect=Target IP Protect
+target_ip_protect=Anti DDOS 
 ratelimit_config=Ratelimit
 ip_ratelimit=IP Ratelimit
 domain_ratelimit=Website Ratelimit
@@ -984,7 +984,6 @@ dest_ip_report=Dest IP Report
 isp_report=ISP Report
 #=============about report===================
 ip_multiplex_policy=IP Reuse Policy
-target_ip_protect=Anti DDOS 
 ip_multiplex_pool_config=IP Reuse Addr Pool
 letter=Official Letter
 show_more=Show More
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 724a32047..21a81eb1d 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -421,7 +421,7 @@ name_existed=\u7528\u6237\u540D\u5DF2\u5B58\u5728
 parent_org=\u4E0A\u7EA7\u673A\u6784
 is_useable=\u662F\u5426\u53EF\u7528
 address=\u8054\u7CFB\u5730\u5740
-nochange=\u6682\u65E0\u4FEE\u6539\u8BB0\u5F55!
+nochange=\u6682\u65E0\u4FEE\u6539\u8BB0\u5F55\!
 module_name=\u6A21\u5757\u540D\u79F0
 dict_mark=\u5B57\u5178\u6807\u8BC6
 run_state=\u8FD0\u884C\u72B6\u6001
@@ -708,7 +708,7 @@ pid=\u8282\u76EEID
 log_uri=\u5C01\u5835\u73B0\u573A\u7247\u6BB5\u8DEF\u5F84
 fd_type=\u5C01\u5835\u7C7B\u578B
 access_url=\u8282\u76EE\u8BBF\u95EE\u5730\u5740
-refer=\u5165\u53E3\u9875\u9762
+referer=\u5165\u53E3\u9875\u9762
 black_block_list=\u52A8\u6001\u9ED1\u540D\u5355
 static_cfg_block=\u9759\u6001\u914D\u7F6E
 first_hit=\u9996\u6B21\u5206\u6790\u547D\u4E2D
@@ -736,9 +736,8 @@ default_group=\u7F3A\u7701\u7EC4
 policy_group_manage=\u7B56\u7565\u5206\u7EC4
 #===========policy_group_manage end  =============
 #=============about manipulation=========
-ratelimit_config=\u9650\u6D41\u7BA1\u7406
-target_ip_protect=\u76EE\u6807IP\u9632\u62A4
 ratelimit_config=\u9650\u901F
+target_ip_protect=\u6297DDOS\u653B\u51FB 
 ip_ratelimit=IP\u9650\u6D41
 domain_ratelimit=\u57DF\u540D\u9650\u6D41
 ratelimit=\u9650\u901F\u6BD4\u4F8B
@@ -983,7 +982,6 @@ dest_ip_report=\u76EE\u7684\u56FD\u5BB6IP\u62A5\u8868
 isp_report=\u8FD0\u8425\u5546\u5C40\u70B9\u62A5\u8868
 #=============about report===================
 ip_multiplex_policy=IP\u590D\u7528\u7B56\u7565
-target_ip_protect=\u6297DDOS\u653B\u51FB 
 ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60
 letter=\u6765\u51FD
 show_more=\u5C55\u793A\u66F4\u591A

From 0cd9ca04883e9bc68b259da26957f82edb214b7d Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 16 Aug 2018 17:49:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?(1)=E4=BF=AE=E5=A4=8D=E6=8E=92=E9=99=A4ID?=
 =?UTF-8?q?=200=3D''=20(2)notAllowSelectRoot=E5=8F=82=E6=95=B0=E7=94=A8?=
 =?UTF-8?q?=E6=9D=A5=E5=A4=84=E7=90=86select=E9=80=89=E4=B8=AD=E9=A1=B9=20?=
 =?UTF-8?q?(3)app=EF=BC=8C=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86=E9=9A=A7=E9=81=93=E8=A1=8C=E4=B8=BA=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E4=B8=8D=E5=BE=97=E9=80=89=E6=8B=A9rootNode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/tags/sys/treeselect.tag    | 19 +++++++++++--------
 .../views/cfg/app/appPolicyCfgForm.jsp        |  4 ++--
 .../WEB-INF/views/cfg/basicprotocol/form.jsp  |  4 ++--
 .../views/cfg/encryptedtunnelbehav/form.jsp   |  4 ++--
 .../WEB-INF/views/sys/tagTreeselect.jsp       |  2 +-
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
index bc47cf5ed..294d2d9d5 100644
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -28,7 +28,7 @@
 <%@ attribute name="unCheckedPS" type="java.lang.String" required="false" description="复选框取消选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%>
 <div class="input-group">
 	<input id="${id}Id" name="${name}" class="${cssClass} singleClass" type="hidden" value="${value}" />
-	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="<spring:message code='${labelValue}'/>" data-msg-required="${dataMsgRequired}" placeholder="${value}"
+	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="<spring:message code='${empty value?"":labelValue}'/>" data-msg-required="${dataMsgRequired}" placeholder="${empty value?labelValue:value}"
 		class="${cssClass}" style="${cssStyle} background-color:transparent"/>
 		
 		<div class="input-group-btn">
@@ -49,7 +49,7 @@
 			ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"<spring:message code='ok'/>":"ok", "<spring:message code='clear'/>":"clear","<spring:message code='close'/>":true}, submit:function(v, h, f){
 				if (v == "ok"){
 					var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
-					var ids = [], names = [], nodes = [],types =[];
+					var ids = [], names = [], nodes = [];
 					if ("${checked}" == "true"){
 						nodes = tree.getCheckedNodes(true);
 					}else{
@@ -100,12 +100,17 @@
 						 
 						}//</c:if><c:if test="${!showParentName}">
 							names.push(nodes[i].name);
-						if(nodes[i].type){
-							types.push(nodes[i].type); 
-						}
+						//if(nodes[i].type){
+						//	types.push(nodes[i].type); 
+						//}
 						//</c:if><c:if test="${!checked}">
 						break; // 如果为非复选框选择，则返回第一个选择  </c:if>
 					}
+					
+					if((nodes.length==1)&&(nodes[0].level == 0)&&('true'=='${notAllowSelectRoot}')){
+						top.$.jBox.tip("<spring:message code='no_root'/>（"+nodes[0].name+"）<spring:message code='reselect'/>");
+						return false;
+					}
 					$("#${id}Id").val(ids.join(",").replace(/u_/ig,""));
 					//if(types.length>0){
 					//	$("#${id}Id").attr('cfgtype',types.join(","));
@@ -120,9 +125,7 @@
 					//$("#${id}Id").removeAttr('cfgtype');
 					$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
 					$("#${id}Name").val("");
-					if('${value}'){//如果值不存在，但是value却有值，将placeholder清空
-						$("#${id}Name").attr("placeholder","");
-					}
+					$("#${id}Name").attr("placeholder","");
                 }
 				if(typeof ${id}TreeselectCallBack == 'function'){
 					${id}TreeselectCallBack(v, h, f);
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 5e1d0bb12..99b918ecb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -201,8 +201,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 														 labelName="parent.specServiceName" 
 														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
-														 cssClass="form-control required"/>
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
+														notAllowSelectRoot="true" cssClass="form-control required"/>
 										            </div>
 										            <div for="parent.specServiceName"></div>
 										        </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
index 217a99c66..dd93fa071 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
@@ -153,8 +153,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 														 labelName="parent.specServiceName" 
 														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
-														 cssClass="form-control required"/>
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
+														notAllowSelectRoot="true" cssClass="form-control required"/>
 										            </div>
 										            <div for="parent.specServiceName"></div>
 										        </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
index d68a9267a..bee54a4ac 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
@@ -202,8 +202,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 														 labelName="parent.specServiceName" 
 														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
-														 cssClass="form-control required"/>
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
+														notAllowSelectRoot="true" cssClass="form-control required"/>
 										            </div>
 										            <div for="parent.specServiceName"></div>
 										        </div>
diff --git a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
index 026c03de2..079944d8a 100644
--- a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
@@ -89,7 +89,7 @@
 			for(var i=0; i<ids.length; i++) {
 				var node = tree.getNodeByParam("id", (type==3?"u_":"")+ids[i]);
 				//如果节点id与排除id相同，不被选中
-				if(node.id!="${extId}"){
+				if(node.id!=parseInt("${extId}")){
 					if("${checked}" == "true"){
 						try{tree.checkNode(node, true, true);}catch(e){}
 						tree.selectNode(node, false);