Commit Graph

3 Commits

Author SHA1 Message Date
wangxin
80dde7d6a0 (1)asn no放入eCache中
(2)导入验证采用多线程验证,优化验证速度
(3)asn ip导入方式调整(未采用多线程,因为redis承受不了)
(4)asn ip列表展示速度优化
(5)导入方式重写:采用csv模式,限制采用xlsx格式,加载80万数据不会内存溢出.
2018-11-11 19:36:53 +08:00
duandongmei
3e1d14602e Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	excel导入提示信息补全,单个字典数据不需要导入
	去掉是否表达式的导入,根据关键词单个和多个区分
2018-10-23 14:14:08 +08:00
duandongmei
85d127c000 字符串类导入模板定义 2018-10-18 10:13:34 +08:00