 jiangzhongxiang
|
6f9b9228a5
|
Merge branch 'master_git' into new_educoder_dev
|
2019-06-05 14:19:49 +08:00 |
|
jiangzhongxiang
|
c25658efa2
|
httpclient重用和 timeout加2边
|
2019-06-05 14:19:05 +08:00 |
|
jiangzhongxiang
|
00393f1f2e
|
educoder接口加 /api
|
2019-06-05 12:11:19 +08:00 |
|
jiangzhongxiang
|
761aa5a630
|
new_educoder_dev需要git权限
|
2019-06-05 11:19:32 +08:00 |
|
jiangzhongxiang
|
dd403ecc32
|
new_educoder_dev merge dev
|
2019-06-05 10:30:34 +08:00 |
|
jiangzhongxiang
|
c566faa22c
|
Merge branch 'dev' into master_git
|
2019-06-05 09:53:58 +08:00 |
|
jiangzhongxiang
|
a1230b80cf
|
Merge branch 'master_admin' into dev
|
2019-06-05 09:23:30 +08:00 |
|
jiangzhongxiang
|
2977ee135c
|
run status
|
2019-06-05 09:22:46 +08:00 |
|
jiangzhongxiang
|
908b264716
|
Merge branch 'master_admin' into dev
|
2019-06-05 09:18:27 +08:00 |
|
jiangzhongxiang
|
c1816b4ea5
|
拦截器暂时不启用
|
2019-06-05 09:16:17 +08:00 |
|
jiangzhongxiang
|
162614b4c1
|
bridgePodMapper.xml tpiID
|
2019-06-05 01:03:08 +08:00 |
|
jiangzhongxiang
|
be8d9eea4e
|
Merge branch 'master_admin' into dev
|
2019-06-05 00:55:37 +08:00 |
|
jiangzhongxiang
|
539cad3ec7
|
bridgePod 状态，排序
|
2019-06-05 00:54:07 +08:00 |
|
jiangzhongxiang
|
3b383085c8
|
git 服务器地址不加端口
|
2019-06-04 16:23:57 +08:00 |
|
jiangzhongxiang
|
e802ebdcd4
|
bridgePod评测状态
|
2019-06-04 15:55:46 +08:00 |
|
jiangzhongxiang
|
67fa721b14
|
新测试环境
|
2019-06-04 15:09:49 +08:00 |
|
jiangzhongxiang
|
805d5d613c
|
bridgepod 状态和排序
|
2019-06-04 15:03:44 +08:00 |
|
jiangzhongxiang
|
0ac96dc765
|
不拦截登录
|
2019-06-04 10:05:53 +08:00 |
|
jiangzhongxiang
|
b50a4dc802
|
权限拦截
|
2019-06-04 09:52:15 +08:00 |
|
jiangzhongxiang
|
c32c1e76ba
|
时间已经统一处理
|
2019-06-04 00:48:15 +08:00 |
|
jiangzhongxiang
|
941c38a351
|
Merge branch 'master_admin' into dev
|
2019-06-04 00:36:30 +08:00 |
|
jiangzhongxiang
|
36971847d2
|
日期统一处理
|
2019-06-04 00:32:36 +08:00 |
|
jiangzhongxiang
|
81d12d5f6a
|
不用
|
2019-06-03 18:00:18 +08:00 |
|
jiangzhongxiang
|
d0b14fdd87
|
分页
|
2019-06-03 17:53:20 +08:00 |
|
jiangzhongxiang
|
3ea3b70729
|
登录失败 -2
|
2019-06-03 15:51:49 +08:00 |
|
jiangzhongxiang
|
9db1d7fc47
|
异常返回200，登录失败,-2
|
2019-06-03 15:44:11 +08:00 |
|
jiangzhongxiang
|
b9d056090e
|
login 返回token
|
2019-06-03 15:17:11 +08:00 |
|
jiangzhongxiang
|
6549e49fb4
|
login api ok,no token
|
2019-06-03 13:44:03 +08:00 |
|
jiangzhongxiang
|
f8cd0ed6ae
|
admin fire_police
|
2019-06-03 10:11:47 +08:00 |
|
jiangzhongxiang
|
78974b72ee
|
git clone之后，git config
|
2019-06-01 18:00:57 +08:00 |
|
jiangzhongxiang
|
d7f2fe276a
|
--depth=1, 去掉--globall
|
2019-06-01 16:28:07 +08:00 |
|
jiangzhongxiang
|
5aea33e998
|
日志接口修改
|
2019-05-31 17:21:33 +08:00 |
 wangwei10061
|
c9cec71a77
|
Merge branch 'log'
|
2019-05-30 18:37:59 +08:00 |
|
jiangzhongxiang
|
f2a53c24c1
|
合并master_admin
|
2019-05-30 18:35:11 +08:00 |
|
jiangzhongxiang
|
c4fa9831b8
|
Merge branch 'master_admin' into dev
|
2019-05-30 18:06:09 +08:00 |
|
jiangzhongxiang
|
4f6e4f1935
|
LocalDateTime 格式转化
|
2019-05-30 17:23:03 +08:00 |
|
wangwei10061
|
c3f819b3db
|
修改vncPort，可配置
|
2019-05-30 16:58:44 +08:00 |
|
jiangzhongxiang
|
9d61c67360
|
PodQueryParam
|
2019-05-30 16:57:10 +08:00 |
|
jiangzhongxiang
|
4ba3a70f58
|
bridge pod executime
|
2019-05-30 16:43:00 +08:00 |
|
jiangzhongxiang
|
13de59a9ba
|
bridge pod ok
|
2019-05-30 16:39:29 +08:00 |
|
jiangzhongxiang
|
18f7554ca5
|
bridge pod信息全记录
|
2019-05-30 15:54:33 +08:00 |
|
wangwei10061
|
3155821383
|
新增VNC删除接口，getVNC接口可重复获取
|
2019-05-30 15:18:48 +08:00 |
|
wangwei10061
|
d74ceb7212
|
新增VNC删除接口
|
2019-05-30 13:01:10 +08:00 |
|
jiangzhongxiang
|
358b9192b2
|
apiserver ip访问
|
2019-05-30 12:32:08 +08:00 |
|
jiangzhongxiang
|
d8b77702bc
|
apiserver 使用ip
|
2019-05-30 12:19:42 +08:00 |
|
jiangzhongxiang
|
c6c4f1c8a9
|
BridgePodMapper.xml
|
2019-05-30 11:26:28 +08:00 |
|
jiangzhongxiang
|
12757b4a27
|
BridgePodMapper
|
2019-05-30 10:16:17 +08:00 |
|
wangwei10061
|
8cab744b9b
|
添加logstash
|
2019-05-30 09:26:25 +08:00 |
|
jiangzhongxiang
|
e8365af99e
|
bridge pod
|
2019-05-29 17:54:13 +08:00 |
|
jiangzhongxiang
|
78b186bd16
|
bridgePod
|
2019-05-29 17:06:34 +08:00 |