Commit Graph

579 Commits

Author SHA1 Message Date
jiangzhongxiang 3772c9601c ali配置加到master 2019-06-25 12:43:14 +08:00
jiangzhongxiang deae787779 记录创建pod耗时,移到并行任务之后,避免并发记漏 2019-06-24 13:57:26 +08:00
jiangzhongxiang 38e88ead2c 新测试版已经在controller里面添加了,push时不再加用户名和密码 2019-06-24 10:38:52 +08:00
jiangzhongxiang 8e6cdc2097 createPod time bugfixx 2019-06-24 10:13:49 +08:00
jiangzhongxiang d280f5c005 merge master 2019-06-22 11:02:05 +08:00
jiangzhongxiang bbc219a1df ip:8082 2019-06-21 11:32:49 +08:00
jiangzhongxiang 42f5b6c11d k8s 8082 2019-06-21 11:26:46 +08:00
jiangzhongxiang 27627db75d websocket加顺序,加tpiId 2019-06-21 11:11:37 +08:00
jiangzhongxiang 3b45d08751 创建pod失败 2019-06-20 12:24:05 +08:00
jiangzhongxiang 96aa4ff636 ErrImagePulll处理 2019-06-20 10:52:34 +08:00
jiangzhongxiang 85aaaf26df k8s 8082端口 2019-06-19 17:12:10 +08:00
jiangzhongxiang 9161365a9a bootstrapServersConfig=10.9.63.225:9092 2019-06-19 17:02:49 +08:00
jiangzhongxiang b4bc96f58e msg 2019-06-19 16:59:42 +08:00
jiangzhongxiang 307ec384f0 新测试环境kafka 2019-06-19 16:35:36 +08:00
jiangzhongxiang 887654e935 kafka ok 2019-06-19 14:04:19 +08:00
jiangzhongxiang 7cfe44a4f6 先去掉kafka consumer日志,太多 2019-06-19 10:39:04 +08:00
jiangzhongxiang 0b2c40c0f0 kafka consume bug fix 2019-06-19 10:29:31 +08:00
jiangzhongxiang 1b4f8c0b63 kafka恢复 2019-06-19 10:21:13 +08:00
jiangzhongxiang 75caa015ce kafka consumer 2019-06-19 09:51:56 +08:00
jiangzhongxiang 44008026c9 kafka 2019-06-18 15:39:03 +08:00
jiangzhongxiang 93c41e3a01 8080->8082 2019-06-18 14:00:37 +08:00
jiangzhongxiang 1f4f316ebb 删除接口加/webssh 2019-06-18 11:24:00 +08:00
jiangzhongxiang 1b94b7dc0c active和delete接口 2019-06-18 11:08:04 +08:00
jiangzhongxiang 59a010e86e kafka 2019-06-17 21:06:06 +08:00
jiangzhongxiang e41975c718 Merge branch 'master_admin' into dev 2019-06-17 09:56:18 +08:00
jiangzhongxiang cc927a0707 静态文件不拦截token 2019-06-17 09:54:39 +08:00
jiangzhongxiang af08f8c252 base64 \r\r\n解决 2019-06-15 18:35:47 +08:00
jiangzhongxiang 13e4d4361b \r\n不替换成\r\r\n 2019-06-15 17:57:09 +08:00
jiangzhongxiang 53ac565a28 换行测试 2019-06-15 11:18:26 +08:00
jiangzhongxiang b71db3fabe webssh 和 vnc pod加入bridgePod 2019-06-14 16:20:32 +08:00
jiangzhongxiang 318f4510f0 login接口不加tokenn 2019-06-14 15:53:59 +08:00
jiangzhongxiang 95bcdfe25e admin接口都加token 2019-06-14 15:49:59 +08:00
jiangzhongxiang 97a5a4edaf token 加到Urll 2019-06-14 15:15:11 +08:00
jiangzhongxiang 2104238908 bridge/admin 2019-06-14 13:51:32 +08:00
jiangzhongxiang e79c7c64cb 用户修改密码 2019-06-13 11:30:05 +08:00
jiangzhongxiang 2c94cc0f5a bridgeNode list 2019-06-06 17:08:28 +08:00
jiangzhongxiang d6eb35fd87 bridgeNode 2019-06-06 17:03:15 +08:00
jiangzhongxiang 753c4ea3cb Merge branch 'dev' into new_educoder_dev 2019-06-06 12:52:04 +08:00
jiangzhongxiang 275d967f1a 使用测试环境k8s 2019-06-06 12:51:39 +08:00
jiangzhongxiang f7df92af79 nodeList bug fix 2019-06-06 12:34:00 +08:00
jiangzhongxiang 3b003a1008 使用db testplus2bridge 2019-06-06 09:29:03 +08:00
jiangzhongxiang 540b9cfc0b Merge branch 'dev' into new_educoder_dev 2019-06-06 09:25:27 +08:00
jiangzhongxiang 91b2b1ff4f minusHours(1) 2019-06-05 18:25:46 +08:00
jiangzhongxiang f98c5a4e11 bridgePod delete_time 2019-06-05 18:19:49 +08:00
jiangzhongxiang 66a37d9a6e uid 2019-06-05 18:10:25 +08:00
jiangzhongxiang 075b21d8ee bridgePod delete_time 2019-06-05 18:08:22 +08:00
jiangzhongxiang 9a5e49361a bridge pod uid and delete_time 2019-06-05 17:51:14 +08:00
jiangzhongxiang a7a9726353 bridgePod uid and delete_time 2019-06-05 17:34:12 +08:00
jiangzhongxiang db1eefb846 client 重用 2019-06-05 15:38:04 +08:00
jiangzhongxiang 773937b753 client暂时不重用 2019-06-05 14:44:15 +08:00