Merge pull request #2996 from normal-wls/v3622_merge_to_v36x

V3.6.22 merge to v3.6.x

.gitignore

@@ -104,3 +104,8 @@ webpack_cache
 static/dev
 static/images
 frontend/desktop/static
+gcloud/core/templates/core/base_vue.html
+static/bk_sops
+scripts/check_commit_message.py
+scripts/check_migrate/
+scripts/check_sensitive_info.sh

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.6.19
+version: 3.6.22
 category: 运维工具
 language_support: 中文
 desktop:

blueapps/account/sites/open/conf.py

@@ -15,35 +15,35 @@
 
 
 class ConfFixture(object):
-    BACKEND_TYPE = 'bk_token'
-    USER_BACKEND = 'bk_token.backends.TokenBackend'
-    LOGIN_REQUIRED_MIDDLEWARE = 'bk_token.middlewares.LoginRequiredMiddleware'
-    USER_MODEL = 'bk_token.models.UserProxy'
+    BACKEND_TYPE = "bk_token"
+    USER_BACKEND = "bk_token.backends.TokenBackend"
+    LOGIN_REQUIRED_MIDDLEWARE = "bk_token.middlewares.LoginRequiredMiddleware"
+    USER_MODEL = "bk_token.models.UserProxy"
 
     CONSOLE_LOGIN_URL = settings.BK_PAAS_HOST
-    LOGIN_URL = settings.BK_PAAS_HOST + '/login/'
-    LOGIN_PLAIN_URL = settings.BK_PAAS_HOST + '/login/'
-    VERIFY_URL = settings.BK_PAAS_INNER_HOST + '/login/accounts/is_login/'
-    USER_INFO_URL = settings.BK_PAAS_INNER_HOST + '/login/accounts/get_user/'
+    LOGIN_URL = settings.BK_PAAS_HOST + "/login/"
+    LOGIN_PLAIN_URL = settings.BK_PAAS_HOST + "/login/plain/"
+    VERIFY_URL = settings.BK_PAAS_INNER_HOST + "/login/accounts/is_login/"
+    USER_INFO_URL = settings.BK_PAAS_INNER_HOST + "/login/accounts/get_user/"
     HAS_PLAIN = False
     ADD_CROSS_PREFIX = False
     ADD_APP_CODE = True
 
-    IFRAME_HEIGHT = 490
-    IFRAME_WIDTH = 460
+    IFRAME_HEIGHT = 400
+    IFRAME_WIDTH = 400
 
-    WEIXIN_BACKEND_TYPE = 'null'
-    WEIXIN_MIDDLEWARE = 'null.NullMiddleware'
-    WEIXIN_BACKEND = 'null.NullBackend'
+    WEIXIN_BACKEND_TYPE = "null"
+    WEIXIN_MIDDLEWARE = "null.NullMiddleware"
+    WEIXIN_BACKEND = "null.NullBackend"
 
-    SMS_CLIENT_MODULE = 'cmsi'
-    SMS_CLIENT_FUNC = 'send_sms'
-    SMS_CLIENT_USER_ARGS_NAME = 'receiver__username'
-    SMS_CLIENT_CONTENT_ARGS_NAME = 'content'
+    SMS_CLIENT_MODULE = "cmsi"
+    SMS_CLIENT_FUNC = "send_sms"
+    SMS_CLIENT_USER_ARGS_NAME = "receiver__username"
+    SMS_CLIENT_CONTENT_ARGS_NAME = "content"
 
-    RIO_BACKEND_TYPE = 'null'
-    RIO_MIDDLEWARE = 'null.NullMiddleware'
-    RIO_BACKEND = 'null.NullBackend'
+    RIO_BACKEND_TYPE = "null"
+    RIO_MIDDLEWARE = "null.NullMiddleware"
+    RIO_BACKEND = "null.NullBackend"
 
-    BK_JWT_MIDDLEWARE = 'bk_jwt.middlewares.BkJwtLoginRequiredMiddleware'
-    BK_JWT_BACKEND = 'bk_jwt.backends.BkJwtBackend'
+    BK_JWT_MIDDLEWARE = "bk_jwt.middlewares.BkJwtLoginRequiredMiddleware"
+    BK_JWT_BACKEND = "bk_jwt.backends.BkJwtBackend"

config/default.py

@@ -147,7 +147,7 @@
 # Django模板中：<script src="/a.js?v="></script>
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
-STATIC_VERSION = "3.6.19"
+STATIC_VERSION = "3.6.22"
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
 

dev_log/3.6.18/v_xugzhou_202010171010.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "更换继续执行图标icon；去掉执行失败显示按钮操作逻辑"

dev_log/3.6.18/v_xugzhou_202011030955.yaml

@@ -0,0 +1,2 @@
+bugfix:
+  - "修复点击未执行的子流程节点时报错 问题"

dev_log/3.6.20/Atropos1999_202010291555.yaml

@@ -0,0 +1,2 @@
+minor:
+  - 集群分组选择器进行了修改，部分集群没有的属性会默认存储为空字符串，保证属性数量和集群数量一致

dev_log/3.6.20/fannluo0504_20201022.yaml

@@ -0,0 +1,3 @@
+improvement:
+    - "节点参数编辑面板和变量编辑面板支持点击遮罩确认是否保存"
+    - "节点参数配置面板标准插件说明样式调整"

dev_log/3.6.20/fannluo_202009251039.yaml

@@ -0,0 +1,2 @@
+feature:
+    - "标准插件表单项支持属性继承"

dev_log/3.6.20/fannluo_202010210959.yaml

@@ -0,0 +1,2 @@
+feature:
+    - "流程模板、任务列表表格增加创建时间列"

dev_log/3.6.20/fannluo_202010211008.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "去掉节点输出参数勾选后节点设为不可选并禁用的逻辑"

dev_log/3.6.20/fannluo_202010222035.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "资源筛选变量输出支持配置分隔符"

dev_log/3.6.20/fannluo_202010231429.yaml

@@ -0,0 +1,2 @@
+improvement: 
+    - "首页增加全部项目入口"

dev_log/3.6.20/fannluo_202010231536.yaml

@@ -0,0 +1,2 @@
+feature:
+    - "同一流程模板在多个浏览器tab打开时，点击编辑时给出提示"

dev_log/3.6.20/fannluo_202010231625.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "部分列表筛选接口名称搜索支持大小写参数修改"

dev_log/3.6.20/homholueng_202010271732.yaml

@@ -0,0 +1,2 @@
+feature:
+  - 增加 get_tasks_manual_intervention_state 接口

dev_log/3.6.20/normal-wls_202009290112.yaml

@@ -0,0 +1,2 @@
+feature:
+    - "增加 任务列表查询 和 任务变量修改 api接口"

dev_log/3.6.20/normal-wls_202010091414.yaml

@@ -0,0 +1,2 @@
+feature:
+    - "iam sdk 新增基于drf的支持"

dev_log/3.6.20/normal-wls_202010201700.yaml

@@ -0,0 +1,2 @@
+feature:
+    - "增加 职能化认领 api接口"

dev_log/3.6.20/normal-wls_202010211730.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "集群资源筛选变量支持生成每个主机到对应模块的映射关系"

dev_log/3.6.20/normal-wls_202010212130.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "集群资源筛选用户配置分隔符后端支持"

dev_log/3.6.20/normal-wls_202010232100.yaml

@@ -0,0 +1,2 @@
+feature:
+    - "新增 标准运维插件 execute_pre_process 数据预处理和校验函数钩子"

dev_log/3.6.20/normal-wls_202010281140.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "优化 get_template_list 接口，可按照名称关键字筛选模版"

dev_log/3.6.20/rykerli_202010241233.yaml

@@ -0,0 +1,2 @@
+minor:
+  - 根据模板创建集群插件批量创建集群扩展

dev_log/3.6.20/spacesun_202010291800.yaml

@@ -0,0 +1,2 @@
+feature:
+      - "服务状态修改-插件实现"

dev_log/3.6.20/spacesun_202010291809.yaml

@@ -0,0 +1,2 @@
+feature:
+      - "新增CMDB-批量修改集群属性（支持进行单行扩展）"

dev_log/3.6.21/Atropos1999_202011061148.yaml

@@ -0,0 +1,2 @@
+bugfix:
+    - "集群分组选择器添加变量 _pipeline_var_str_value"

dev_log/3.6.21/fannluo_202011022005.yaml

@@ -0,0 +1,2 @@
+bugfix:
+    - "全局变量编辑点击遮罩关闭时未检测默认值变更修复"

dev_log/3.6.21/gangh_202011091149.yaml

@@ -0,0 +1,2 @@
+feature:
+    - 新增CMDB-批量修改主机所属模块插件

dev_log/3.6.22/fannluo_202011101741.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - '全局导航右侧快速入口优化'

dev_log/3.6.22/fannluo_202011101755.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "导航右侧增加问题反馈入口"

dev_log/3.6.22/fannluo_202011112154.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "标准插件异步请求错误提示默认展示两行"

dev_log/3.6.22/normal-wls_202011111758.yaml

@@ -0,0 +1,2 @@
+improvement:
+    - "get_tasks_status api 接口新增 任务类型/状态/删除信息 & 文档同步"

docs/apidoc/en/claim_functionalization_task.md

@@ -0,0 +1,64 @@
+### Functional description
+
+claim a functionalization task
+
+#### General Parameters
+
+|   Field         |  Type       | Required |  Description    |
+|-----------------|-------------|---------|------------------|
+|   bk_app_code   |   string    |   YES    |  APP ID |
+|   bk_app_secret |   string    |   YES    |  APP Secret(APP TOKEN), which can be got via BlueKing Developer Center -> Click APP ID -> Basic Info |
+|   bk_token      |   string    |   NO     |  Current user login token, bk_token or bk_username must be valid, bk_token can be got by Cookie      |
+|   bk_username   |   string    |   NO     |  Current user username, APP in the white list, can use this field to specify the current user        |
+
+#### Interface Parameters
+
+| Field          |  Type       | Required   |  Description             |
+|---------------|------------|--------|------------------|
+|   task_id     |   string     |   YES   |  task ID |
+|   bk_biz_id   |   string     |   YES   |  business ID |
+|   constants   |   dict       |   NO    |  global variables，details are described below |
+|   name        |   string     |   NO    |  new name of the task |
+|   scope       |   string     |   NO    |  bk_biz_id scope. default value is 'cmdb_biz' and bk_sops will find a project which relate cmdb business id equal to bk_biz_id. otherwise, bk_sops will find a project which id equal to bk_biz_id when scope value is 'project'|
+
+#### constants KEY
+
+constant KEY, the format is like ${key}
+
+#### constants VALUE
+
+constant value
+
+### Request Parameters Example
+
+```
+{
+    "bk_app_code": "esb_test",
+    "bk_app_secret": "xxx",
+    "bk_token": "xxx",
+    "bk_biz_id": "2",
+    "task_id": "8",
+    "constants": {
+        "${bk_timing}": "100"
+    }
+}
+```
+
+### Return Result Example
+
+```
+{
+    "data": "success",
+    "result": true,
+    "code": 0
+}
+```
+
+### Return Result Description
+
+| Field      | Type      | Description      |
+|-----------|----------|-----------|
+|  result   |    bool    |      true or false, indicate success or failure              |
+|  data     |    string  |      data returned when result is true, "success"            |
+|  code     |    int     |      status code                                             |
+|  message  |    string  |      error message returned when result is false             |