1
0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-28 05:11:39 +08:00

126 Commits

Author SHA1 Message Date
koogua
9025a84536 Merge branch 'koogua/v1.3.7' into demo 2021-06-13 15:51:22 +08:00
koogua
0336a54911 1.源文件增加版权信息
2.群组状态和课程协同
2021-06-13 15:49:47 +08:00
koogua
1d2f1dd266 1.更改模块继承基类
2.升级layui到2.6.8
3.升级腾讯云播放器
4.点播增加外链支持
2021-06-12 12:34:40 +08:00
koogua
aec585d0b7 Merge branch 'koogua/v1.3.6' into demo
# Conflicts:
#	app/Models/Role.php
2021-06-01 12:48:52 +08:00
koogua
92c2225d47 v1.3.6阶段提交 2021-06-01 12:44:15 +08:00
koogua
f77d9b475d Merge branch 'koogua/1.3.4-fixed' into demo 2021-05-13 18:45:50 +08:00
koogua
1a15ad58c9 阶段提交 2021-05-13 17:50:39 +08:00
koogua
38b2fecbe9 Merge branch 'koogua/v1.3.4' into demo
# Conflicts:
#	scheduler.php
2021-05-12 20:46:27 +08:00
koogua
661034f3c1 阶段提交 2021-05-10 21:35:07 +08:00
koogua
caa34d2675 v1.3.4阶段提交 2021-05-07 19:34:31 +08:00
koogua
f0f32fbb7c Merge branch 'koogua/I3NB2Q' into demo 2021-04-28 20:43:21 +08:00
koogua
f05ad4bb67 v1.3.3 preview 2021-04-28 20:40:18 +08:00
koogua
eec153edbe Merge branch 'koogua/v1.3.1' into demo 2021-04-10 18:41:38 +08:00
koogua
0f673dff3f 增加开启和关闭站点终端命令 2021-04-10 16:05:13 +08:00
koogua
a03dc6d626 Merge branch 'koogua/v1.3.1' into demo 2021-04-10 12:24:18 +08:00
koogua
c5ef9a2b2d 专栏阶段性提交2 2021-04-09 17:35:31 +08:00
koogua
2310c1d3ca Merge branch 'koogua/I3CC5N' into demo 2021-03-26 15:15:59 +08:00
koogua
6c86f914cc 增加面授模型,重构群组成员管理 2021-03-26 15:15:37 +08:00
koogua
13324d2cc1 Merge branch 'koogua/I2EJHG' into demo 2021-03-20 16:06:22 +08:00
koogua
47e03cd82b 优化 2021-03-20 15:59:24 +08:00
koogua
88bdab6936 秒杀功能+优化 2021-03-18 20:12:27 +08:00
koogua
f1aaaacdaf Merge branch 'koogua/I3A937' into demo 2021-03-07 15:34:25 +08:00
koogua
d7d47e6c8f 增加手续费逻辑 2021-03-06 18:28:21 +08:00
koogua
2451aa3c00 更新演示帐号 2021-03-05 18:59:35 +08:00
koogua
599e54f745 Merge branch 'koogua/I399X5' into demo
# Conflicts:
#	app/Services/Auth/Api.php
#	app/Services/Auth/Home.php
2021-03-03 18:07:51 +08:00
koogua
6b75756d97 Merge branch 'koogua/I399X5' into develop 2021-03-03 17:53:31 +08:00
koogua
1ebe649236 Merge branch 'koogua/hotfix-user-cache' into demo 2021-03-03 11:34:35 +08:00
koogua
cb09e62649 1.修正购买vip时没有设置vip=1的错误
2.getCurrentUser,getLoginUser增加缓存选项
2021-03-03 11:33:48 +08:00
koogua
86c66baece 整理通知相关以及deleted字段相关 2021-03-02 19:57:57 +08:00
koogua
a091ff541e Merge branch 'koogua/v1.2.7' into demo 2021-02-26 15:22:21 +08:00
koogua
156b28b79e 查漏补缺 2021-02-25 20:57:39 +08:00
koogua
90581c4119 Merge branch 'koogua/dingtalk-notice' into demo
# Conflicts:
#	scheduler.php
2021-02-23 20:29:26 +08:00
koogua
1e1fed67fb Merge branch 'koogua/dingtalk-notice' into develop 2021-02-23 20:27:19 +08:00
koogua
0f1d009d7f 增加重置演示帐号计划任务 2021-02-23 17:05:00 +08:00
koogua
c4f218ea84 dingtalk通知阶段提交 2021-02-22 11:40:16 +08:00
koogua
7acfaf17a9 dingtalk通知阶段提交 2021-02-22 11:38:19 +08:00
koogua
d798a5b609 dingtalk通知阶段提交 2021-02-22 11:31:21 +08:00
koogua
6abca790bc 修复file_transcode 2021-02-18 21:20:23 +08:00
koogua
30515a2663 去除退款延迟 2021-02-15 21:13:01 +08:00
koogua
bb38d90d53 去除退款延迟 2021-02-15 21:12:03 +08:00
winzer
62964bbd95 Merge branch 'winzer/I2EJH8' into demo
# Conflicts:
#	app/Console/Tasks/CleanLogTask.php
#	app/Console/Tasks/DeliverTask.php
#	app/Console/Tasks/NoticeTask.php
#	app/Http/Admin/Services/AuthNode.php
#	app/Http/Admin/Services/Setting.php
#	app/Http/Api/Services/Account.php
#	app/Library/Utils/Lock.php
#	app/Listeners/Trade.php
#	app/Listeners/User.php
#	app/Models/Course.php
#	app/Models/Online.php
#	app/Models/UserSession.php
#	app/Models/UserToken.php
#	app/Services/Auth/Api.php
#	app/Services/Auth/Home.php
2021-02-13 19:09:30 +08:00
winzer
8eef6035a8 阶段性提交积分机制-0213 2021-02-13 18:21:42 +08:00
winzer
f47091991d 阶段性提交积分机制-0204 2021-02-04 15:39:53 +08:00
winzer
76d83713ca v1.2.5阶段新合并 2021-01-21 17:39:37 +08:00
winzer
e902c0c80f v1.2.5阶段新合并 2021-01-21 17:38:55 +08:00
xiaochong0302
197e4a62af 增加公众号自定义菜单 2021-01-07 15:15:27 +08:00
xiaochong0302
610247f0ca 优化task查询 2021-01-07 15:15:26 +08:00
xiaochong0302
0902fa35a7 增加公众号自定义菜单 2021-01-07 15:10:43 +08:00
xiaochong0302
b45cfa2279 优化task查询 2021-01-07 15:10:42 +08:00
xiaochong0302
26deccc36b 增加限制共享帐号功能 2021-01-02 14:36:07 +08:00