Commit Graph

10465 Commits

Author SHA1 Message Date
JunzhouLiu
d7038989ee 增加服务器资源约束配置。 2020-12-14 15:36:06 +08:00
JunzhouLiu
a2100cff95 增加服务器资源约束配置。 2020-12-14 15:36:06 +08:00
JunzhouLiu
dc1233a82a 增加服务器资源约束配置。 2020-12-14 15:36:06 +08:00
Junzhou Liu
41732b7d1d Merge pull request #1 from lxk0301/master
Master
2020-12-14 15:13:52 +08:00
Junzhou Liu
1d300fb978 Merge pull request #1 from lxk0301/master
Master
2020-12-14 15:13:52 +08:00
Junzhou Liu
df72ea9c05 Merge pull request #1 from lxk0301/master
Master
2020-12-14 15:13:52 +08:00
Junzhou Liu
6708233ef3 Merge pull request #1 from lxk0301/master
Master
2020-12-14 15:13:52 +08:00
Junzhou Liu
6bb6df6acf Merge pull request #1 from lxk0301/master
Master
2020-12-14 15:13:52 +08:00
any
c1a5028f2f Merge remote-tracking branch 'upstream/master' 2020-12-14 11:54:09 +08:00
anonymous
8f38fc27f1 Merge remote-tracking branch 'upstream/master' 2020-12-14 11:54:09 +08:00
anonymous
6ed9d15e43 Merge remote-tracking branch 'upstream/master' 2020-12-14 11:54:09 +08:00
any
143d6a35cf Merge remote-tracking branch 'upstream/master' 2020-12-14 11:54:09 +08:00
EvineDeng
423e33a060 Merge remote-tracking branch 'upstream/master' 2020-12-14 11:54:09 +08:00
lxk0301
4b6479a490 fix 2020-12-14 11:29:06 +08:00
lxk0301
29b35fffe6 fix 2020-12-14 11:29:06 +08:00
lxk0301
dda72f453f fix 2020-12-14 11:29:06 +08:00
lxk0301
f6de373ca3 fix 2020-12-14 11:29:06 +08:00
lxk0301
b8900efb69 fix 2020-12-14 11:29:06 +08:00
any
9124c23355 Merge remote-tracking branch 'upstream/master' 2020-12-14 10:54:18 +08:00
anonymous
7d791f059e Merge remote-tracking branch 'upstream/master' 2020-12-14 10:54:18 +08:00
anonymous
f440a9168c Merge remote-tracking branch 'upstream/master' 2020-12-14 10:54:18 +08:00
any
d1820259ae Merge remote-tracking branch 'upstream/master' 2020-12-14 10:54:18 +08:00
EvineDeng
ae13a3edcb Merge remote-tracking branch 'upstream/master' 2020-12-14 10:54:18 +08:00
lxk0301
66d2a86beb jd_joy.js宠汪汪参加赛跑级别可设置不同账号参加不同的级别,如若想设置不同账号参加不同类别的比赛则用&区分即可(如:2&10&50) 2020-12-14 10:43:45 +08:00
lxk0301
64711c4a24 jd_joy.js宠汪汪参加赛跑级别可设置不同账号参加不同的级别,如若想设置不同账号参加不同类别的比赛则用&区分即可(如:2&10&50) 2020-12-14 10:43:45 +08:00
lxk0301
e64fcd499c jd_joy.js宠汪汪参加赛跑级别可设置不同账号参加不同的级别,如若想设置不同账号参加不同类别的比赛则用&区分即可(如:2&10&50) 2020-12-14 10:43:45 +08:00
lxk0301
6b68135ad3 jd_joy.js宠汪汪参加赛跑级别可设置不同账号参加不同的级别,如若想设置不同账号参加不同类别的比赛则用&区分即可(如:2&10&50) 2020-12-14 10:43:45 +08:00
lxk0301
192118835d jd_joy.js宠汪汪参加赛跑级别可设置不同账号参加不同的级别,如若想设置不同账号参加不同类别的比赛则用&区分即可(如:2&10&50) 2020-12-14 10:43:45 +08:00
any
c9e79deab0 Merge remote-tracking branch 'upstream/master' 2020-12-14 09:54:03 +08:00
anonymous
36ecc28e86 Merge remote-tracking branch 'upstream/master' 2020-12-14 09:54:03 +08:00
anonymous
7b83b5c646 Merge remote-tracking branch 'upstream/master' 2020-12-14 09:54:03 +08:00
any
25512b3741 Merge remote-tracking branch 'upstream/master' 2020-12-14 09:54:03 +08:00
EvineDeng
adc4487a0d Merge remote-tracking branch 'upstream/master' 2020-12-14 09:54:03 +08:00
lxk0301
ac19c81eac 迁移已过期的短期活动至activity文件夹。删除task订阅以及docker里面已过期活动 2020-12-14 09:26:49 +08:00
lxk0301
0356816930 迁移已过期的短期活动至activity文件夹。删除task订阅以及docker里面已过期活动 2020-12-14 09:26:49 +08:00
lxk0301
e5c821acdd 迁移已过期的短期活动至activity文件夹。删除task订阅以及docker里面已过期活动 2020-12-14 09:26:49 +08:00
lxk0301
f0145411fd 迁移已过期的短期活动至activity文件夹。删除task订阅以及docker里面已过期活动 2020-12-14 09:26:49 +08:00
lxk0301
7127cef3bc 迁移已过期的短期活动至activity文件夹。删除task订阅以及docker里面已过期活动 2020-12-14 09:26:49 +08:00
any
e53946a841 删除Docker的PUBG游戏盛典活动定时任务 2020-12-14 09:04:06 +08:00
anonymous
dab89bba8f 删除Docker的PUBG游戏盛典活动定时任务 2020-12-14 09:04:06 +08:00
anonymous
20f3d4296a 删除Docker的PUBG游戏盛典活动定时任务 2020-12-14 09:04:06 +08:00
any
e32a5298eb 删除Docker的PUBG游戏盛典活动定时任务 2020-12-14 09:04:06 +08:00
EvineDeng
fad12a5924 删除Docker的PUBG游戏盛典活动定时任务 2020-12-14 09:04:06 +08:00
lxk0301
7c4a6996ab Merge pull request #322 from EvineDeng/master
去除过期的定时任务
2020-12-13 23:27:57 +08:00
lxk0301
efd1c9d0e7 Merge pull request #322 from EvineDeng/master
去除过期的定时任务
2020-12-13 23:27:57 +08:00
lxk0301
42bbf42967 Merge pull request #322 from EvineDeng/master
去除过期的定时任务
2020-12-13 23:27:57 +08:00
lxk0301
d9db91ba49 Merge pull request #322 from EvineDeng/master
去除过期的定时任务
2020-12-13 23:27:57 +08:00
lxk0301
6d0c334aa2 Merge pull request #322 from EvineDeng/master
去除过期的定时任务
2020-12-13 23:27:57 +08:00
lxk0301
42c4ce729d Merge pull request #318 from DoveBoy/master
迁移活动脚本
2020-12-13 23:25:19 +08:00
lxk0301
6a1853cd73 Merge pull request #318 from DoveBoy/master
迁移活动脚本
2020-12-13 23:25:19 +08:00