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

(1)asn no放入eCache中

Browse Source 
(2)导入验证采用多线程验证，优化验证速度
(3)asn ip导入方式调整(未采用多线程，因为redis承受不了)
(4)asn ip列表展示速度优化
(5)导入方式重写:采用csv模式，限制采用xlsx格式，加载80万数据不会内存溢出.
This commit is contained in:
wangxin
2018-11-11 19:36:53 +08:00
parent 40bcfea683
commit 80dde7d6a0
53 changed files with 4831 additions and 2996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/cache/ehcache-local.xml vendored
View File

@@ -27,5 +27,6 @@
<!-- 简单页面缓存
<cache name="SimplePageCachingFilter" maxEntriesLocalHeap="100" eternal="false" overflowToDisk="true"
timeToIdleSeconds="120" timeToLiveSeconds="120" memoryStoreEvictionPolicy="LFU"/> -->
<!-- asn no缓存 -->
<cache name="asnNoCache" maxEntriesLocalHeap="10000" eternal="false" timeToIdleSeconds="0" timeToLiveSeconds="6000" overflowToDisk="true"/>
</ehcache>

3
src/main/resources/cache/ehcache-rmi.xml vendored
View File

@@ -55,5 +55,6 @@
properties="replicateAsynchronously=true, replicatePuts=true, replicateUpdates=true,
replicateUpdatesViaCopy=false, replicateRemovals=true "/>
</cache> -->
<!-- asn no缓存 -->
<cache name="asnNoCache" maxEntriesLocalHeap="10000" eternal="false" timeToIdleSeconds="0" timeToLiveSeconds="6000" overflowToDisk="true"/>
</ehcache>

6
src/main/resources/nis.properties
View File

@@ -545,4 +545,8 @@ cert_validate_success_info=Successful
ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$
#\u57df\u540d\u9a8c\u8bc1\u6b63\u5219
domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$
domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$
#IP复用maat json中的ip region单次send 最大个数
maat_json_send_size=2000
#导入验证的线程数量
mulity_thread_size=5

2
src/main/resources/spring-mvc.xml
View File

@@ -247,7 +247,7 @@
<bean id="multipartResolver"
class="com.nis.interceptor.MultipartFileIntercepter" >
<property name="defaultEncoding" value="utf-8"></property>
<property name="maxUploadSize" value="5242880"></property><!-- 5*1024*1024 -->
<property name="maxUploadSize" value="20917520"></property><!-- 5*1024*1024 -->
</bean>
<bean