Commit Graph

1070 Commits

Author SHA1 Message Date
jiangzhongxiang 9c7398c878 Merge branch 'dev' of http://git.trustie.net/Hjqreturn/training_project into dev 2019-09-29 08:36:09 +08:00
郑明仁 bf860277cd update 2019-09-28 11:22:45 +08:00
jiangzhongxiang ac0b99e8e5 Merge branch 'dev' of http://git.trustie.net/Hjqreturn/training_project into dev 2019-09-27 08:56:11 +08:00
jiangzhongxiang 4645187f81 Merge branch 'master' into dev 2019-09-27 07:16:01 +08:00
jiangzhongxiang b5134010aa Merge branch 'master' into dev 2019-09-26 18:12:17 +08:00
郑明仁 7612cf06f5 update git pull 2019-09-26 17:03:44 +08:00
郑明仁 bc1b0fc1cc 修改git pull 2019-09-26 16:40:03 +08:00
jiangzhongxiang ace8887ea1 jwt token 2019-09-26 16:10:19 +08:00
郑明仁 3de93f8f12 修改 2019-09-26 10:53:18 +08:00
jiangzhongxiang 127c594ea4 hgd配置添加 2019-09-25 16:19:41 +08:00
郑明仁 0bbd817a19 Merge branch 'service_port' into dev 2019-09-24 18:29:51 +08:00
郑明仁 950ecd730c 修改pull 2019-09-24 18:17:34 +08:00
郑明仁 c3c8ebddcf 修改gitpull 2019-09-24 17:30:20 +08:00
郑明仁 03ff447102 增加debug日志 2019-09-24 16:56:52 +08:00
郑明仁 fe4a26c227 增加debug日志 2019-09-24 15:29:59 +08:00
jiangzhongxiang 640e4ba318 git pull解决冲突 2019-09-24 14:46:07 +08:00
郑明仁 19763d2f2e 前端主动删除websshpod时只删除pod 2019-09-24 10:29:26 +08:00
郑明仁 beef7c892d update 2019-09-23 16:05:20 +08:00
郑明仁 428243332e 修改日志 2019-09-23 09:43:06 +08:00
郑明仁 3c94525e1a Merge branch 'dev' into service_port 2019-09-21 09:34:10 +08:00
郑明仁 c51334b234 修改为git凭证 2019-09-21 09:31:05 +08:00
郑明仁 4a56ddc164 Merge branch 'dev' of http://git.trustie.net/Hjqreturn/training_project into dev 2019-09-21 09:16:43 +08:00
郑明仁 54736033b0 增加git域名凭证设置 2019-09-21 09:16:35 +08:00
jiangzhongxiang 7b4c1cb2c8 git密码 2019-09-20 00:44:38 +08:00
郑明仁 f28c02ee10 修改端口分配判断 2019-09-18 15:52:42 +08:00
郑明仁 1f6c7c4000 测试日志 2019-09-18 15:33:14 +08:00
郑明仁 90c7831a00 评测端口bug修改 2019-09-18 15:18:07 +08:00
jiangzhongxiang 82c671b768 设置凭据优化 2019-09-18 09:10:25 +08:00
郑明仁 3ebfcc5c47 移除gitUrl用户密码拼接 2019-09-17 15:29:22 +08:00
郑明仁 498d533423 移除gitUrl用户密码拼接 2019-09-17 15:19:32 +08:00
郑明仁 e16b6b0d97 Merge branch 'dev' of http://git.trustie.net/Hjqreturn/training_project into dev 2019-09-17 15:14:56 +08:00
郑明仁 912343f222 git凭证设置 2019-09-17 15:14:48 +08:00
jiangzhongxiang 5dd4614dc0 Merge branch 'dev' of http://git.trustie.net/Hjqreturn/training_project into dev 2019-09-17 09:40:46 +08:00
jiangzhongxiang cf1d15d477 test result 2019-09-17 09:40:29 +08:00
郑明仁 4a6fb00f7d 增加创建pod失败错误日志 2019-09-16 15:24:39 +08:00
郑明仁 c255589421 修改removeTpmRemoteUrl日志打印判断 2019-09-16 11:14:51 +08:00
jiangzhongxiang fb7eab9d84 Merge branch 'dev' 2019-09-12 16:48:06 +08:00
郑明仁 7efca9a4a7 修改gitconfig 2019-09-12 10:58:14 +08:00
jiangzhongxiang bb730624bb Merge branch 'dev' 2019-09-11 20:09:18 +08:00
郑明仁 8bad80cf4b 修改gitconfig操作 2019-09-11 17:27:51 +08:00
郑明仁 b56f37aea9 切换环境 2019-09-11 17:04:23 +08:00
郑明仁 74d018bb52 切换环境 2019-09-11 16:41:01 +08:00
郑明仁 6c1348ca03 Merge branch 'dev' into set_git_config 2019-09-11 16:39:20 +08:00
郑明仁 7bc0c8a2ee 增加gitconfig修改 2019-09-11 16:30:49 +08:00
郑明仁 39d1ebf0d1 增加gitconfig修改 2019-09-11 16:22:41 +08:00
jiangzhongxiang 2b89ebd5ac 域名https 2019-09-11 16:14:44 +08:00
jiangzhongxiang 43b3b14f19 test-newweb.educoder.net 2019-09-11 16:01:17 +08:00
jiangzhongxiang ecb3f0ede7 vnc reset 2019-09-11 14:40:30 +08:00
jiangzhongxiang c53b211454 vnc reset 2019-09-11 14:03:59 +08:00
jiangzhongxiang 49d0197472 vnc reset 2019-09-11 13:44:25 +08:00