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

ASN定时计算v4和v6的IP个数；

Browse Source 
界面展示ASNIPv4和v6数

Conflicts:
	src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java
	src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml
	src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
	src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
This commit is contained in:
duandongmei
2019-01-26 19:41:58 +06:00
parent 5c63f85483
commit 0a76ce337a
15 changed files with 1018 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
View File

@@ -263,6 +263,8 @@
<th class="sort-column r.country"><spring:message code="country"/></th>
<th class="sort-column r.detail"><spring:message code="detail"/></th>
<th class="sort-column r.asn_id"><spring:message code="asn_no"/></th>
<th ><spring:message code="v4_num"/></th>
<th ><spring:message code="v6_num"/></th>
<th class="sort-column r.is_valid"><spring:message code="is_issued"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -293,6 +295,11 @@
</a>
</td>
<td>${cfg.asnId}</td>
<c:forEach items="${fns:getASNIPNum(cfg.userRegion1)}" var="num" >
<td>
${num}
</td>
</c:forEach>
<td>
<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>

7
src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
View File

@@ -289,6 +289,8 @@
<th class="sort-column r.country"><spring:message code="country"/></th>
<th class="sort-column r.detail"><spring:message code="detail"/></th>
<th class="sort-column r.user_region1" column="userregion1" ><spring:message code="asn_no"/></th>
<th ><spring:message code="v4_num"/></th>
<th ><spring:message code="v6_num"/></th>
<th column="ip_type" ><spring:message code="ip_type"/></th>
<th column="IP" ><spring:message code="IP"/></th>
<%-- <th><spring:message code="port"/></th> --%>
@@ -322,6 +324,11 @@
<td>${cfg.country }</td>
<td>${cfg.detail }</td>
<td>${cfg.userRegion1}</td>
<c:forEach items="${fns:getASNIPNum(cfg.userRegion1)}" var="num" >
<td>
${num}
</td>
</c:forEach>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>