TencentBlueKing · pagezz-canway · Apr 22, 2019 · Apr 2, 2019 · Apr 3, 2019 · Apr 3, 2019
diff --git a/.gitignore b/.gitignore
@@ -87,7 +87,15 @@ ENV/
 # PyCharm project settings
 .idea
 
-.vscode/launch.json
 
+# Frontend project lib file
 static/pipeline/node_modules/
 node_modules/
+webpack_cache
+
+# OS generate file
+.DS_Store
+
+
+# Editor setting file
+.vscode/
diff --git a/app.yml b/app.yml
@@ -4,7 +4,7 @@ app_name: 标准运维
 is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
-version: 3.3.9
+version: 3.3.13
 category: 运维工具
 language_support: 中文
 desktop:

diff --git a/blueapps/account/components/bk_token/models.py b/blueapps/account/components/bk_token/models.py
@@ -1,4 +1,3 @@
-# -*- coding=utf-8 -*-
 # -*- coding: utf-8 -*-
 """
 Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community

diff --git a/blueapps/patch/settings_open_saas.py b/blueapps/patch/settings_open_saas.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 # -*- coding: utf-8 -*-
 """
 Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community

diff --git a/blueapps/patch/settings_paas_services.py b/blueapps/patch/settings_paas_services.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 # -*- coding: utf-8 -*-
 """
 Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community

diff --git a/blueapps/template/context_processors.py b/blueapps/template/context_processors.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 # -*- coding: utf-8 -*-
 """
 Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community

diff --git a/config/default.py b/config/default.py
@@ -57,7 +57,7 @@
     'gcloud.periodictask',
     'pipeline',
     'pipeline.component_framework',
-    'pipeline.variables',
+    'pipeline.variable_framework',
     'pipeline.engine',
     'pipeline.log',
     'pipeline.contrib.statistics',

diff --git a/config/prod.py b/config/prod.py
@@ -31,11 +31,11 @@
 
 
 # 正式环境数据库可以在这里配置
-# 默认 default 请不要修改，如果使用了外部数据库，请联系【蓝鲸助手】授权
-# DATABASES.update(
+# USE FOLLOWING SQL TO CREATE THE DATABASE NAMED APP_CODE
+# SQL: CREATE DATABASE `bk_sops` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+# DATABASES = (
 #     {
-#         # 外部数据库授权，请联系 【蓝鲸助手】
-#         'external_db': {
+#         'default': {
 #             'ENGINE': 'django.db.backends.mysql',
 #             'NAME': '',  # 外部数据库名
 #             'USER': '',  # 外部数据库用户

diff --git a/config/stag.py b/config/stag.py
@@ -31,11 +31,11 @@
 
 
 # 预发布环境数据库可以在这里配置
-# 默认 default 请不要修改，如果使用了外部数据库，请联系【蓝鲸助手】授权
-# DATABASES.update(
+# USE FOLLOWING SQL TO CREATE THE DATABASE NAMED APP_CODE
+# SQL: CREATE DATABASE `bk_sops` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+# DATABASES = (
 #     {
-#         # 外部数据库授权，请联系 【蓝鲸助手】
-#         'external_db': {
+#         'default': {
 #             'ENGINE': 'django.db.backends.mysql',
 #             'NAME': '',  # 外部数据库名
 #             'USER': '',  # 外部数据库用户

diff --git a/config/urls_custom.py b/config/urls_custom.py
@@ -26,6 +26,7 @@
     url(r'^function/', include('gcloud.contrib.function.urls')),
     url(r'^audit/', include('gcloud.contrib.audit.urls')),
     url(r'^pipeline/', include('pipeline_plugins.components.urls')),
+    url(r'^pipeline/', include('pipeline_plugins.variables.urls')),
     url(r'^analysis/', include('gcloud.contrib.analysis.urls')),
     url(r'^periodictask/', include('gcloud.periodictask.urls')),
 ]
diff --git a/django_signal_valve/admin.py b/django_signal_valve/admin.py
@@ -1,4 +1,3 @@
-# -*- coding:utf-8 -*-
 # -*- coding: utf-8 -*-
 """
 Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community