gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://wangxin:QFDZ1534WxzN@git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
wangxin
2018-12-18 13:11:09 +06:00
parent 5e43e3f52e 560eb2d815
commit b58b710d47
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -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) {

3
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -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>

5
src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp
View File

@@ -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>

4
src/main/webapp/WEB-INF/views/home.jsp
View File

@@ -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>