Browse Source

perf: 下载 ip 数据库

pull/8278/head
ibuler 3 years ago committed by Jiangjie.Bai
parent
commit
0a04f0f351
  1. 10
      apps/common/utils/file.py
  2. 17
      jms

10
apps/common/utils/file.py

@ -1,6 +1,8 @@
import os import os
import csv import csv
import pyzipper import pyzipper
import requests
def create_csv_file(filename, headers, rows, ): def create_csv_file(filename, headers, rows, ):
@ -18,3 +20,11 @@ def encrypt_and_compress_zip_file(filename, secret_password, encrypted_filenames
for encrypted_filename in encrypted_filenames: for encrypted_filename in encrypted_filenames:
with open(encrypted_filename, 'rb') as f: with open(encrypted_filename, 'rb') as f:
zf.writestr(os.path.basename(encrypted_filename), f.read()) zf.writestr(os.path.basename(encrypted_filename), f.read())
def download_file(src, path):
with requests.get(src, stream=True) as r:
r.raise_for_status()
with open(path, 'wb') as f:
for chunk in r.iter_content(chunk_size=8192):
f.write(chunk)

17
jms

@ -8,6 +8,7 @@ import time
import argparse import argparse
import sys import sys
import django import django
import requests
from django.core import management from django.core import management
from django.db.utils import OperationalError from django.db.utils import OperationalError
@ -33,6 +34,7 @@ except ImportError as e:
try: try:
from jumpserver.const import CONFIG from jumpserver.const import CONFIG
from common.utils.file import download_file
except ImportError as e: except ImportError as e:
print("Import error: {}".format(e)) print("Import error: {}".format(e))
print("Could not find config file, `cp config_example.yml config.yml`") print("Could not find config file, `cp config_example.yml config.yml`")
@ -105,6 +107,20 @@ def compile_i18n_file():
logging.info("Compile i18n files done") logging.info("Compile i18n files done")
def download_ip_db():
db_base_dir = os.path.join(APP_DIR, 'common', 'utils', 'ip')
db_path_url_mapper = {
('geoip', 'GeoLite2-City.mmdb'): 'https://jms-pkg.oss-cn-beijing.aliyuncs.com/ip/GeoLite2-City.mmdb',
('ipip', 'ipipfree.ipdb'): 'https://jms-pkg.oss-cn-beijing.aliyuncs.com/ip/ipipfree.ipdb'
}
for p, src in db_path_url_mapper.items():
path = os.path.join(db_base_dir, *p)
if os.path.isfile(path) and os.path.getsize(path) > 1000:
continue
print("Download ip db: {}".format(path))
download_file(src, path)
def upgrade_db(): def upgrade_db():
collect_static() collect_static()
perform_db_migrate() perform_db_migrate()
@ -114,6 +130,7 @@ def prepare():
check_database_connection() check_database_connection()
upgrade_db() upgrade_db()
expire_caches() expire_caches()
download_ip_db()
def start_services(): def start_services():

Loading…
Cancel
Save