Minor merge master (#147)

* bugfix: 修复在 API 中调用 ESB 获取用户信息异常的问题
* docs: 版本号更新为 3.3.12

app.yml

@@ -4,7 +4,7 @@ app_name: 标准运维
 is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
-version: 3.3.11
+version: 3.3.12
 category: 运维工具
 language_support: 中文
 desktop:

docs/release.md

@@ -270,4 +270,8 @@
     - 修复获取任务流程状态接口 API 返回的节点名与实际节点名不符的问题
 
 # 3.3.11
-#todo
+- bug fix
+    - 修复在 API 中调用 ESB 获取用户信息异常的问题
+
+# 3.3.12
+- todo

gcloud/core/api_adapter/sites/open/user_info.py

@@ -15,7 +15,7 @@
 
 
 def get_user_info(request):
-    client = settings.ESB_GET_CLIENT_BY_REQUEST(request)
+    client = settings.ESB_GET_CLIENT_BY_USER(request.user.username)
     auth = getattr(client, settings.ESB_AUTH_COMPONENT_SYSTEM)
     _get_user_info = getattr(auth, settings.ESB_AUTH_GET_USER_INFO)
     user_info = _get_user_info({})

readme.md

@@ -2,7 +2,7 @@
 ![](docs/resource/img/bk_sops.png)
 ---
 [![license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/Tencent/bk-sops/blob/master/LICENSE)
-[![Release](https://img.shields.io/badge/release-3.3.11-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases)
+[![Release](https://img.shields.io/badge/release-3.3.12-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases)
 [![travis-ci](https://travis-ci.com/Tencent/bk-sops.svg?branch=master)](https://travis-ci.com/Tencent/bk-sops)
 [![Coverage Status](https://codecov.io/gh/Tencent/bk-sops/branch/master/graph/badge.svg)](https://codecov.io/gh/Tencent/bk-sops)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-sops/pulls)

readme_en.md

@@ -2,7 +2,7 @@
 ![](docs/resource/img/bk_sops.png)
 ---
 [![license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/Tencent/bk-sops/blob/master/LICENSE)
-[![Release](https://img.shields.io/badge/release-3.3.11-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases)
+[![Release](https://img.shields.io/badge/release-3.3.12-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases)
 [![travis-ci](https://travis-ci.com/Tencent/bk-sops.svg?branch=master)](https://travis-ci.com/Tencent/bk-sops)
 [![Coverage Status](https://codecov.io/gh/Tencent/bk-sops/branch/master/graph/badge.svg)](https://codecov.io/gh/Tencent/bk-sops)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-sops/pulls)