From 9bed38f4e8700f1992681f1ff37fce2a7c4926e9 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui>
Date: Tue, 18 Dec 2018 15:00:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=AF=94=E8=BE=83=E5=90=8E=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/TrafficStatisticsInfoController.java        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
index 4ff850e4b..e8e002ddd 100644
--- a/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
@@ -548,16 +548,12 @@ public class TrafficStatisticsInfoController extends BaseController {
 					if(o1!=null&&o2==null){
 						return -1;
 					}
-					if(o1==null&&o2==null){
+					if(o1==o2&&o1==null){
 						return 0;
 					}
 					Map m1=(Map)o1;
 					Map m2=(Map)o2;
-					if((Double)m1.get("byteCount")==(Double)m2.get("byteCount")){
-						return 0;
-					}
-					int result=((Double)m1.get("byteCount")-(Double)m2.get("byteCount"))>0?-1:1;
-					return result;
+					return -((Double)m1.get("byteCount")).compareTo((Double)m2.get("byteCount"));
 				}
 			});
 		} catch (Exception e) {

From 560eb2d815f65dc43be757e5d19564f751c1c142 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Tue, 18 Dec 2018 13:09:22 +0600
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BF=E5=86=92IP?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E5=B1=9E=E6=80=A7=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E8=8F=9C=E5=8D=95=E7=9A=84=E5=AD=97=E6=95=B0=E6=88=AA?=
 =?UTF-8?q?=E5=8F=96=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp     | 3 +--
 .../webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp   | 5 +++--
 src/main/webapp/WEB-INF/views/home.jsp                       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index 7d9302717..d10904252 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -701,9 +701,8 @@
 													<div class="col-md-6">
 														<select name="userRegion1"
 														class="selectpicker show-tick form-control required">
-															<option value="" ><spring:message code="selected"/></option>
 															<c:forEach items="${fns:getDictList('SPOOFING_IP_TYPE')}" var="spoofingIp">
-																<option value="${spoofingIp.itemCode}" <c:if test="${_cfg.userRegion1==spoofingIp.itemCode || _cfg.userRegion1==null}">selected</c:if>><spring:message code="${spoofingIp.itemValue}"/></option>
+																<option value="${spoofingIp.itemCode}" <c:if test="${_cfg.userRegion1==spoofingIp.itemCode}">selected</c:if>><spring:message code="${spoofingIp.itemValue}"/></option>
 															</c:forEach>
 														</select>
 													</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp
index fe68ca6d2..89d184c8c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp
@@ -133,7 +133,8 @@ $(function(){
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
 								            <div class="col-md-6">
 								            	 <select name="ipType" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+								            	 	<option value="4">IPv4</option>
+								                   <%-- <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
 														<option value="${ipTypeC.itemCode}" 
 																<c:if test="${_cfg.ipType==ipTypeC.itemCode }">
 																	selected
@@ -141,7 +142,7 @@ $(function(){
 																>
 														<spring:message code="${ipTypeC.itemValue}"/>
 														</option>
-							               			</c:forEach>
+							               			</c:forEach> --%>
 								                 </select>
 								            </div>
 								            <div for="ipType"></div>
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 4d55a13e9..b4ee08349 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -298,7 +298,7 @@ background:#3d3d3d;
 					  						data-original-title="<spring:message code="${menu.code}"/>" class="tooltips" data-placement="right">
 							  				<%-- ${menu.name } --%><%-- <spring:message code="${menu.code}"></spring:message> --%>
 							  				<c:set var="menuName" ><spring:message code='${menu.code}'/></c:set>
-							  				${fns:abbr(menuName,15)}
+							  				${fns:abbr(menuName,50) }
 							  				<i class="fa fa-angle-down"></i>
 						  				</a>
 						  				
@@ -326,7 +326,7 @@ background:#3d3d3d;
 					  					<a href="javascript:;" id="${menu.id}" data-original-title="<spring:message code="${menu.code}"/>" class="tooltips" data-placement="bottom">
 							  				<%-- ${menu.name } --%><%-- <spring:message code="${menu.code}"></spring:message> --%>
 							  				<c:set var="menuName" ><spring:message code='${menu.code}'/></c:set>
-							  				${fns:abbr(menuName,15)}
+							  				${fns:abbr(menuName,50) }
 						  				</a>
 					  				</c:otherwise>
 					  			</c:choose>