diff --git a/cmdb-api/Pipfile b/cmdb-api/Pipfile index c0a1723..1bdd92e 100644 --- a/cmdb-api/Pipfile +++ b/cmdb-api/Pipfile @@ -41,6 +41,7 @@ toposort = ">=1.5" requests = ">=2.22.0" PyJWT = ">=1.7.1" elasticsearch = "==7.0.4" +future = "==0.18.2" [dev-packages] # Testing diff --git a/cmdb-api/api/lib/http_cli.py b/cmdb-api/api/lib/http_cli.py index ba290dc..f0e9174 100644 --- a/cmdb-api/api/lib/http_cli.py +++ b/cmdb-api/api/lib/http_cli.py @@ -12,7 +12,7 @@ from future.moves.urllib.parse import urlparse def build_api_key(path, params): - g.user is not None or abort(403, "您得登陆才能进行该操作") + g.user is not None or abort(403, "You have to login to do this") key = g.user.key secret = g.user.secret values = "".join([str(params[k]) for k in sorted(params.keys()) diff --git a/cmdb-api/requirements.txt b/cmdb-api/requirements.txt index c9f59d0..6a11784 100644 --- a/cmdb-api/requirements.txt +++ b/cmdb-api/requirements.txt @@ -1,38 +1,39 @@ -i https://mirrors.aliyun.com/pypi/simple # Flask -Flask==1.0.3 -Werkzeug==0.15.4 -click>=5.0 +Flask == 1.0.3 +Werkzeug == 0.15.4 +click >= 5.0 # Api -Flask-RESTful ==0.3.7 +Flask-RESTful == 0.3.7 # Database -Flask-SQLAlchemy ==2.4.0 -SQLAlchemy ==1.3.5 -PyMySQL ==0.9.3 -redis ==3.2.1 +Flask-SQLAlchemy == 2.4.0 +SQLAlchemy == 1.3.5 +PyMySQL == 0.9.3 +redis == 3.2.1 # Migrations Flask-Migrate == 2.5.2 # Deployment -gevent ==1.4.0 +gevent == 1.4.0 gunicorn == 19.5.0 -supervisor ==4.0.3 +supervisor == 4.0.3 # Auth -Flask-Login ==0.4.1 -Flask-Bcrypt ==0.7.1 -Flask-Cors>=3.0.8 +Flask-Login == 0.4.1 +Flask-Bcrypt == 0.7.1 +Flask-Cors >= 3.0.8 # Caching -Flask-Caching>=1.0.0 +Flask-Caching >= 1.0.0 # Environment variable parsing -environs ==4.2.0 -marshmallow ==2.20.2 +environs == 4.2.0 +marshmallow == 2.20.2 # async tasks -celery ==4.3.0 -more-itertools ==5.0.0 -kombu ==4.4.0 +celery == 4.3.0 +more-itertools == 5.0.0 +kombu == 4.4.0 # other -six ==1.12.0 -bs4>=0.0.1 -toposort>=1.5 -requests>=2.22.0 -PyJWT>=1.7.1 -elasticsearch ==7.0.4 +six == 1.12.0 +bs4 >= 0.0.1 +toposort >= 1.5 +requests >= 2.22.0 +PyJWT >= 1.7.1 +elasticsearch == 7.0.4 +future == 0.18.2