xbase-util 0.1.5__tar.gz → 0.1.6__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. {xbase_util-0.1.5 → xbase_util-0.1.6}/PKG-INFO +1 -1
  2. {xbase_util-0.1.5 → xbase_util-0.1.6}/setup.py +1 -1
  3. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/esreq.py +4 -4
  4. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util.egg-info/PKG-INFO +1 -1
  5. {xbase_util-0.1.5 → xbase_util-0.1.6}/README.md +0 -0
  6. {xbase_util-0.1.5 → xbase_util-0.1.6}/setup.cfg +0 -0
  7. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/__init__.py +0 -0
  8. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/__init__.py +0 -0
  9. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/bean/ConfigBean.py +0 -0
  10. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/bean/CurrentConfigBean.py +0 -0
  11. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/bean/FlowBean.py +0 -0
  12. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/bean/TaskTemplateBean.py +0 -0
  13. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/bean/__init__.py +0 -0
  14. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/dao/ConfigDao.py +0 -0
  15. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/dao/CurrentConfigDao.py +0 -0
  16. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/dao/FlowDao.py +0 -0
  17. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/dao/TaskTemplateDao.py +0 -0
  18. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/dao/__init__.py +0 -0
  19. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/db/initsqlite3.py +0 -0
  20. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/es_db_util.py +0 -0
  21. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/geo_util.py +0 -0
  22. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/handle_features_util.py +0 -0
  23. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/pcap_util.py +0 -0
  24. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/xbase_constant.py +0 -0
  25. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/xbase_util.py +0 -0
  26. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util.egg-info/SOURCES.txt +0 -0
  27. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util.egg-info/dependency_links.txt +0 -0
  28. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util.egg-info/not-zip-safe +0 -0
  29. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util.egg-info/top_level.txt +0 -0
  30. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util_assets/GeoLite2-City.mmdb +0 -0
  31. {xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util_assets/arkimeparse.js +0 -0
{xbase_util-0.1.5 → xbase_util-0.1.6}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xbase_util
3
- Version: 0.1.5
3
+ Version: 0.1.6
4
4
  Summary: 网络安全基础工具
5
5
  Home-page: https://gitee.com/jimonik/xbase_util.git
6
6
  Author: xyt
{xbase_util-0.1.5 → xbase_util-0.1.6}/setup.py RENAMED
@@ -3,7 +3,7 @@ from distutils.core import setup
3
3
  from setuptools import find_packages
4
4
 
5
5
  setup(name="xbase_util",
6
- version="0.1.5",
6
+ version="0.1.6",
7
7
  description="网络安全基础工具",
8
8
  long_description="包含提取，预测，训练的基础工具",
9
9
  author="xyt",
{xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util/esreq.py RENAMED
@@ -2,7 +2,7 @@ import requests
2
2
 
3
3
 
4
4
  class EsReq:
5
- def __init__(self, url,timeout=120):
5
+ def __init__(self, url, timeout=120):
6
6
  self.es_url = url
7
7
  self.timeout = timeout
8
8
  print("初始化自定义es请求类")
@@ -10,11 +10,11 @@ class EsReq:
10
10
  def clear_all_scroll(self):
11
11
  return requests.delete(self.es_url + "/_search/scroll", timeout=self.timeout, json={'scroll_id': '_all'})
12
12
 
13
- def search(self, body, scroll):
14
- requests.post(self.es_url + "/_search/scroll", data=body, timeout=self.timeout, json={'scroll_id': scroll})
13
+ def search(self, body):
14
+ return requests.post(self.es_url + "/_search", timeout=self.timeout, json=body)
15
15
 
16
16
  def start_scroll(self, exp, scroll):
17
- return requests.post(self.es_url + "/_search/scroll", timeout=self.timeout,
17
+ return requests.post(self.es_url + f"/_search?scroll={scroll}", timeout=self.timeout,
18
18
  json=exp)
19
19
 
20
20
  def scroll_by_id(self, scroll_id, scroll):
{xbase_util-0.1.5 → xbase_util-0.1.6}/xbase_util.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: xbase-util
3
- Version: 0.1.5
3
+ Version: 0.1.6
4
4
  Summary: 网络安全基础工具
5
5
  Home-page: https://gitee.com/jimonik/xbase_util.git
6
6
  Author: xyt
{xbase_util-0.1.5 → xbase_util-0.1.6}/README.md RENAMED
File without changes
{xbase_util-0.1.5 → xbase_util-0.1.6}/setup.cfg RENAMED
File without changes