lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-05-20 17:41:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,728 Commits 36 Branches 628 Tags
ddc2137a461d6aebdb07e5aa5697b15ce1c8caaa
Commit Graph

61 Commits

Author SHA1 Message Date
Zexi Li
5e2760ef13 webconsole: append protocol params for each connParams 2019-03-21 17:55:27 +08:00
Yousong Zhou
8fe4f2ec98 treewide: group imports with goimports 
./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg}
 2019-03-13 10:46:12 +00:00
邱剑
c1f3ab0801 Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6e5aa39836dbe935294ee58cc4376aa0e0bce21b':
  避免多次编码后,qcloud不能解开url编码
 2019-03-04 21:22:09 +08:00
屈轩
2fa4d761e7 冲突解决 2019-03-04 21:21:14 +08:00
邱剑
66354e8cc4 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'bc37559720bce37130fda048f3dc36a3d9cb11cb':
  避免多次编码后,qcloud不能解开url编码
 2019-03-04 21:18:17 +08:00
屈轩
798b595dfb 避免多次编码后,qcloud不能解开url编码 2019-03-04 21:12:41 +08:00
邱剑
b3ddb964be Automatic merge from release/2.5.0 -> release/2.6.0 
* commit '6c6f80488f94083da56d6a60ca1f96d7231f653e':
  识别openstack protocol
 2019-02-21 15:27:09 +08:00
屈轩
f4cf4ab93d 识别openstack protocol 2019-02-21 15:25:01 +08:00
Zexi Li
d41df56a82 webconsole: support websocket proxy 2019-02-19 15:32:07 +08:00
Qiu Jian
f2e97ff272 Merge branch 'release/2.5.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.6.0-20190215 
Conflicts:
	pkg/compute/guestdrivers/esxi.go
	pkg/compute/guestdrivers/openstack.go
 2019-02-15 19:47:56 +08:00
屈轩
c9756aa6f0 添加参数，允许不直接登录虚拟机 2019-02-15 10:46:57 +08:00
Zexi Li
223c6d95a2 修复: webconsole 连接vnc设置 password 的虚拟机 2019-01-19 17:35:59 +08:00
屈轩
935cd5dcac 优先使用hypervisor接口 2019-01-02 17:38:59 +08:00
Rex Zhang
873acd9801 gofmt 2018-12-27 11:15:57 +08:00
Qiu Jian
dca4a1e478 update vendor & make compatible 2018-12-26 23:51:51 +08:00
Qiu Jian
88566645e0 add doc.go && make ParseOptions changes 
Conflicts:
	pkg/cloudcommon/options.go
	pkg/compute/service/service.go
	pkg/webconsole/service/service.go
	pkg/yunionconf/service/service.go
 2018-12-26 22:59:08 +08:00
Zexi Li
36e8bedd08 feature: 查看容器日志支持 --since 2018-12-26 15:46:25 +08:00
邱剑
f60937d42a Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '10b6e55453338bc282f7c3979f6d176e5c38c93e':
  关机后断开webconsole连接
 2018-12-25 15:42:20 +08:00
wanyaoqi
742a67b0f8 client session add context 2018-12-25 13:33:33 +08:00
屈轩
5f9cc3296a 关机后断开webconsole连接 2018-12-24 22:12:55 +08:00
Yousong Zhou
603e1be98c treewide: 重新组织cloudcommon options 
将cloudcommon.Options从cloudcommon.DBOptions中拿出来，并改名为CommonOptions
 2018-12-23 15:31:11 +00:00
Qiu Jian
a6b865e7a2 修正：1. sql.Rows使用后未关闭，导致占用db链接 2. 
服务启动后，调用AppDBInit方法设置db连接池上限，避免耗尽mysql连接
3.
app和workmanager增加db属性，用来标示该worker和app是否使用数据库，从而估计需要设置的数据库连接的上限
 2018-12-21 17:10:34 +08:00
Qiu Jian
965e84ea36 update 2018-12-07 02:57:58 +08:00
Qiu Jian
c292a1e311 Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181203 
Conflicts:
	pkg/compute/models/storages.go
 2018-12-03 07:18:27 +08:00
wanyaoqi
ecc750107b fix conflict 2018-12-01 16:18:11 +08:00
TangBin
a543901e2f yunionconfig build error fix 2018-12-01 14:52:01 +08:00
Qiu Jian
bc02b3b433 1. 
取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred
2. 在应用启动时候，必须设置 SetServiceType，否则退出
 2018-11-30 23:00:11 +08:00
屈轩
45ddeaf084 补充腾讯云webconsole 2018-11-30 17:08:39 +08:00
邱剑
549fbbb6b1 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'f9899a6e59c7b3ab1ef9581e7fe4340da22225b1':
  忽略known_hosts影响
 2018-11-30 16:05:02 +08:00
屈轩
7caeab976c 忽略known_hosts影响 2018-11-30 16:04:08 +08:00
邱剑
84ca24fed0 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '70c2b8255796b292a3fe91788b6dc0486a24aec3':
  忽略known_hosts记录
 2018-11-30 15:48:50 +08:00
邱剑
70c2b82557 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'b51cb3a1cf8493cd3085b6268711d4d568d47e15':
  忽略known_hosts记录
 2018-11-30 15:48:50 +08:00
屈轩
0e68f6d486 冲突解决 2018-11-30 15:33:33 +08:00
屈轩
223c5aeb35 忽略known_hosts记录 2018-11-30 15:23:40 +08:00
Yousong Zhou
3213cf047a webconsole: 修正httperrors.GeneralServerError调用 2018-11-30 03:07:01 +00:00
Yousong Zhou
72761eb3ac webconsole: 改进protocol检查 2018-11-30 03:07:01 +00:00
Yousong Zhou
5d2ef3ab41 treewide: httperrors: 使用http.ResposneWriter时保留msg fmt 2018-11-28 07:39:55 +00:00
屈轩
8e9105d115 使用系统密钥 2018-11-17 12:15:31 +08:00
邱剑
b3221c24bf Merge pull request #513 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-webssh-xterm to release/2.3.0 
* commit '174d13274388df3697d5aa7a0bab03e491249b97':
  替换使用xterm-256color
 2018-11-15 20:15:30 +08:00
邱剑
5f9bd7faf8 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '609d0a997590c192151d85346c6a1a849c571cd9':
  替换使用xterm-256color
 2018-11-15 20:15:17 +08:00
屈轩
174d132743 替换使用xterm-256color 2018-11-15 20:12:44 +08:00
屈轩
7c15b8d2fb 替换使用xterm-256color 2018-11-15 20:10:59 +08:00
Qiu Jian
5a6b4832ea make webconsole ssl capable 2018-11-03 00:42:33 +08:00
李泽玺
2a7775dcf9 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '72b3e390960980ca665030b631b0ab7697e35d7b':
  设置sshpass默认安装路径
 2018-10-30 14:30:40 +08:00
屈轩
a3453a414c 设置sshpass默认安装路径 2018-10-30 14:29:46 +08:00
屈轩
24a6a47ebc 支持ssh秘钥尝试登陆 2018-10-29 23:23:56 +08:00
邱剑
46dc114e76 Merge pull request #376 in YUNIONIO/onecloud from ~QUXUAN/onecloud:release/2.2.0 to release/2.2.0 
* commit 'd525cea91689fcd47e68d836c1900bab1563a7bf':
  避免instance 缓存disk数据
 2018-10-29 22:37:29 +08:00
邱剑
ee9038e533 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit 'e5acfe5f989a96d2c67a092b7bd7d2935ca3fac5':
  避免ssh登陆失败
 2018-10-27 17:30:26 +08:00
屈轩
8cd89e90d4 避免ssh登陆失败 2018-10-27 15:39:47 +08:00
Zexi Li
aad9d13cca reuse appsrv.FetchEnv method 2018-10-25 12:14:37 +08:00