Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	README.md

README.md

@@ -190,7 +190,7 @@
 | IP      |  账号  |  密码  |  环境  |  资源  |
 | --------   | :----:  | :----: | :------:  | :------:  |
 | 10.10.100.40 |  centos  | mykey.key |  CentOS6, RabbitMQ, ELK, MongoDB, Nginx  | Cpu: 40, Mem: 128G, Disk: 600G |
-| 10.10.100.23 |  root  | 62cddbcc624b1b072d84117cc0e5a4db |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
+| 10.10.100.23 |  root  | 62cddbcc624b1b072d84117cc0e5a4db |  CentOS7, Docker, Redis  | Cpu: 40, Mem: 128G, Disk: 800G |
 | 10.10.100.24 |  root  | 4fd19c28ee472ef9ebc3c06de9277c1b |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
 | 10.10.100.25 |  root  | 61a12a65cd42ef77a52dfef8e436bacc |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
 | 10.10.100.26 |  root  | 8743e445c7a308edf4588b7997b21c73 |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |

frontend/saas-web/app/view/sys/account/EditWindow.js

@@ -97,6 +97,7 @@ Ext.define('saas.view.sys.account.EditWindow', {
         saas.util.BaseUtil.request({
             url: belong.reqUrl,
             params: _params,
+            timeout: 30000,
             method: 'POST',
             headers:{
                 'Access-Control-Allow-Origin': '*',