1.优化ip2region地址查询

2.增加ISP字段
3.移除ip2location地址查询
This commit is contained in:
Jing Ling
2020-08-23 17:13:13 +08:00
parent 119eef93d7
commit d2c0d467ea
6 changed files with 25 additions and 42 deletions
+4 -4
View File
@@ -284,8 +284,8 @@ class Module(object):
'cidr': None,
'asn': None,
'org': None,
'ip2region': None,
'ip2location': None,
'addr': None,
'isp': None,
'resolver': None,
'module': self.module,
'source': self.source,
@@ -335,8 +335,8 @@ class Module(object):
'cidr': info.get('cidr'),
'asn': info.get('asn'),
'org': info.get('org'),
'ip2region': info.get('ip2region'),
'ip2location': info.get('ip2location'),
'addr': info.get('addr'),
'isp': info.get('isp'),
'resolver': info.get('resolver'),
'module': self.module,
'source': self.source,