diff --git a/README.md b/README.md index affb374..1c4fb89 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ - 服务树 -![1](docs/images/0.png "首页展示") +![服务树](docs/images/0.png "首页展示") [查看更多展示](docs/screenshot.md) @@ -83,6 +83,6 @@ docker-compose up -d --- -_**欢迎关注我们的公众号,点击联系我们,加入微信、qq运维群(336164978),获得更多产品、行业相关资讯**_ +_**欢迎关注我们的公众号,点击联系我们,加入微信、QQ群(336164978),获得更多产品、行业相关资讯**_ -![公众号](docs/images/qrcode_for_gzh.jpg) +![公众号: 维易科技OneOps](docs/images/qrcode_for_gzh.jpg) diff --git a/cmdb-api/Pipfile b/cmdb-api/Pipfile index 3402e75..f036be2 100644 --- a/cmdb-api/Pipfile +++ b/cmdb-api/Pipfile @@ -24,7 +24,7 @@ supervisor = "==4.0.3" Flask-Login = "==0.4.1" Flask-Bcrypt = "==0.7.1" Flask-Cors = ">=3.0.8" -python-ldap = "==3.2.0" +python-ldap = "==3.4.0" pycryptodome = "==3.12.0" # Caching Flask-Caching = ">=1.0.0" @@ -39,13 +39,11 @@ kombu = "==4.4.0" # common setting Flask-APScheduler = "==1.12.4" timeout-decorator = "==0.5.0" -numpy = "==1.18.5" -pandas = "==1.3.2" WTForms = "==3.0.0" email-validator = "==1.3.1" treelib = "==1.6.1" flasgger = "==0.9.5" -Pillow = "==8.3.2" +Pillow = "==9.2.0" # other six = "==1.12.0" bs4 = ">=0.0.1" diff --git a/cmdb-api/api/app.py b/cmdb-api/api/app.py index be828fe..c29aabb 100644 --- a/cmdb-api/api/app.py +++ b/cmdb-api/api/app.py @@ -158,10 +158,8 @@ def register_error_handlers(app): error_code = getattr(error, "code", 500) if not str(error_code).isdigit(): error_code = 400 - if error_code != 500: - return make_response(jsonify(message=str(error)), error_code) - else: - return make_response(jsonify(message=traceback.format_exc(-1)), error_code) + + return make_response(jsonify(message=str(error)), error_code) for errcode in app.config.get("ERROR_CODES") or [400, 401, 403, 404, 405, 500, 502]: app.errorhandler(errcode)(render_error) diff --git a/cmdb-api/requirements.txt b/cmdb-api/requirements.txt index 39b32cb..63750c2 100644 --- a/cmdb-api/requirements.txt +++ b/cmdb-api/requirements.txt @@ -47,9 +47,7 @@ meld3==2.0.1 mistune==3.0.1 more-itertools==5.0.0 msgpack-python==0.5.6 -numpy==1.18.5 -pandas==1.3.2 -Pillow==8.3.2 +Pillow==9.2.0 pkgutil_resolve_name==1.3.10 pyasn1==0.5.0 pyasn1-modules==0.3.0 @@ -58,7 +56,7 @@ PyJWT==2.4.0 PyMySQL==0.9.3 python-dateutil==2.8.2 python-dotenv==1.0.0 -python-ldap==3.2.0 +python-ldap==3.4.0 pytz==2023.3 PyYAML==6.0 redis==3.2.1