diff --git a/app.yml b/app.yml index 28e95e687..82d8790ea 100644 --- a/app.yml +++ b/app.yml @@ -6,7 +6,7 @@ is_use_celery: True author: 蓝鲸智云 introduction: 标准运维是通过一套成熟稳定的任务调度引擎,把在多系统间的工作整合到一个流程,助力运维实现跨系统调度自动化的SaaS应用。 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process. -version: 3.33.5 +version: 3.33.6 category: 运维工具 language_support: 中文 desktop: diff --git a/app_desc.yaml b/app_desc.yaml index 19bf0db7c..b9cc5eb2f 100644 --- a/app_desc.yaml +++ b/app_desc.yaml @@ -1,5 +1,5 @@ spec_version: 2 -app_version: "3.33.5" +app_version: "3.33.6" app: region: default bk_app_code: bk_sops diff --git a/config/default.py b/config/default.py index 2812fdf25..34435ffd7 100644 --- a/config/default.py +++ b/config/default.py @@ -214,7 +214,7 @@ # mako模板中: # 如果静态资源修改了以后,上线前改这个版本号即可 -STATIC_VERSION = "3.33.5" +STATIC_VERSION = "3.33.6" DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S") STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")] diff --git a/requirements.txt b/requirements.txt index 112c06216..4bd5ba816 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ # Base Django==3.2.25 -PyMySQL==0.6.7 -mysqlclient==2.0.3 +pymysql==1.0.2 requests==2.27.1 httplib2==0.19.0 Mako==1.1.4 @@ -59,7 +58,7 @@ importlib-metadata==3.7.3 protobuf==3.19.4 # blueapps -blueapps[opentelemetry,bkcrypto]==4.13.1 +blueapps[opentelemetry,bkcrypto]==4.14.0 whitenoise==5.2.0 raven==6.5.0 python-json-logger==2.0.1 diff --git a/settings.py b/settings.py index 628d6203d..b4df5117f 100644 --- a/settings.py +++ b/settings.py @@ -17,24 +17,27 @@ import os +import pymysql + +pymysql.install_as_MySQLdb() + # V3判断环境的环境变量为BKPAAS_ENVIRONMENT -if 'BKPAAS_ENVIRONMENT' in os.environ: - ENVIRONMENT = os.getenv('BKPAAS_ENVIRONMENT', 'dev') +if "BKPAAS_ENVIRONMENT" in os.environ: + ENVIRONMENT = os.getenv("BKPAAS_ENVIRONMENT", "dev") # V2判断环境的环境变量为BK_ENV else: - PAAS_V2_ENVIRONMENT = os.environ.get('BK_ENV', 'development') + PAAS_V2_ENVIRONMENT = os.environ.get("BK_ENV", "development") ENVIRONMENT = { - 'development': 'dev', - 'testing': 'stag', - 'production': 'prod', + "development": "dev", + "testing": "stag", + "production": "prod", }.get(PAAS_V2_ENVIRONMENT) -DJANGO_CONF_MODULE = 'config.{env}'.format(env=ENVIRONMENT) +DJANGO_CONF_MODULE = "config.{env}".format(env=ENVIRONMENT) try: - _module = __import__(DJANGO_CONF_MODULE, globals(), locals(), ['*']) + _module = __import__(DJANGO_CONF_MODULE, globals(), locals(), ["*"]) except ImportError as e: - raise ImportError("Could not import config '%s' (Is it on sys.path?): %s" - % (DJANGO_CONF_MODULE, e)) + raise ImportError("Could not import config '%s' (Is it on sys.path?): %s" % (DJANGO_CONF_MODULE, e)) for _setting in dir(_module): if _setting == _setting.upper():