gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-26 20:52:44 +08:00
Code Issues Releases Wiki Activity
506 Commits 3 Branches 61 Tags
Commit Graph

140 Commits

Author SHA1 Message Date
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
9d4225f663 整理migration 2021-03-03 17:29:27 +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
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
41dc730651 去除beforeCreate方法中的status状态 2021-02-15 21:38:54 +08:00
koogua
879333adab 去除beforeCreate方法中的status状态 2021-02-15 21:37:32 +08:00
koogua
d4939f9c61 Merge branch 'koogua/v1.2.6-preview' into demo 2021-02-14 21:43:23 +08:00
koogua
122b4adfa8 v1.2.6预览版01 2021-02-14 21:41:38 +08:00
winzer
9ed2753cef 修正合并错误 2021-02-13 21:55:04 +08:00
winzer
f24eef065b 修正合并错误 2021-02-13 20:51:08 +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
7f7636b953 增加原始价格，市场价改名为优惠价 2021-02-13 18:33:57 +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
4f3b2ea322 增加原始价格，市场价改名为优惠价 2021-02-03 13:09:38 +08:00
xiaochong0302
26deccc36b 增加限制共享帐号功能 2021-01-02 14:36:07 +08:00
xiaochong0302
aef87543ff 增加限制共享帐号功能 2021-01-02 14:35:14 +08:00
xiaochong0302
281ec37970 更新课程综合评分算法 2020-12-31 12:32:22 +08:00
xiaochong0302
67c7a44a17 更新课程综合评分算法 2020-12-31 12:29:53 +08:00
xiaochong0302
0642d430ff 增加课程推荐 2020-12-28 13:06:53 +08:00
xiaochong0302
906e458ed0 增加课程推荐 2020-12-28 13:04:40 +08:00
xiaochong0302
6104c9a9bd 公众号互动通知 2020-12-20 17:34:41 +08:00
xiaochong0302
69b0997a15 修复角色routes字段填充问题 
(cherry picked from commit 99cfb9bc9ba31f4312d74b0b5ca2216b49c517c9)
 2020-12-20 17:34:30 +08:00
xiaochong0302
30fb586d0b 公众号互动通知 2020-12-20 17:28:13 +08:00
xiaochong0302
4a46a42cba 修复角色routes字段填充问题 
(cherry picked from commit 99cfb9bc9ba31f4312d74b0b5ca2216b49c517c9)
 2020-12-20 17:25:41 +08:00
xiaochong0302
6f955bff84 修复没有生成MaxImGroupId的问题,增加课程默认群主的逻辑 2020-12-14 16:56:14 +08:00
xiaochong0302
62f4d35480 修复没有生成MaxImGroupId的问题,增加课程默认群主的逻辑 2020-12-14 16:53:42 +08:00
xiaochong0302
d60d748c28 公众号功能基本框架 2020-12-12 17:20:27 +08:00
koogua
dd99631f6e !33 开放登录阶段性合并 
* Merge remote-tracking branch 'gitee/xiaochong0302/I280IZ' into xiaocho…
* 初步完成开放登录，待线上测试7
* Merge branch 'demo' of gitee.com:koogua/course-tencent-cloud into xiao…
* 初步完成开放登录，待线上测试6
* !30 开放登录线上测试5
* !29 开放登录线上测试5
* 初步完成开放登录，待线上测试5
* !28 开放登录线上测试4
* 初步完成开放登录，待线上测试4
* !27 开放登录线上测试3
* 初步完成开放登录，待线上测试3
* !26 开放登录线上测试2
* 初步完成开放登录，待线上测试2
* !25 开放登录线上测试
* 初步完成开放登录，待线上测试
* !22 验证更新h5支付
* Merge remote-tracking branch 'remotes/gitee/develop' into demo
* !20 验证更新h5支付
* Merge branch 'develop' of https://gitee.com/koogua/course-tencent-clou…
* !16 v1.2.0阶段性合并
* 删除调试断点代码
* 删除重复的signature方法
* Merge branch 'develop' of https://gitee.com/koogua/course-tencent-clou…
* demo后台增加统计
* !5 更新版本号1.1.0
* !4 v1.1.0版本develop->demo
* Merge branch 'develop' into demo
* 1.增加changelog.md
* Merge branch 'develop' into demo
* Merge branch 'develop' into demo
* Merge branch 'develop' into demo
* !1 精简优化代码
* Merge branch 'develop' into demo
* 合并修改
 2020-12-07 11:02:13 +08:00
xiaochong0302
f980964ba8 修复编辑器图片上传，增加上传文件身份认证，markdown内容解析 2020-11-26 21:45:52 +08:00
xiaochong0302
ac352683dd 删除api验证,app应用管理 2020-11-23 21:10:41 +08:00
koogua
cbc2e5762a !11 阶段性合并 
* 根据app需要作出相应调整
* 路由增加命名name,增加app应用管理
* 完成基本API,增加h5和小程序支付定义
 2020-11-10 10:25:16 +08:00
xiaochong0302
cc1c663917 Merge branch 'koogua/I1XFCF' of https://gitee.com/koogua/course-tencent-cloud into develop 
 Conflicts:
	db/migrations/schema.php
 2020-10-08 16:09:13 +08:00
koogua
6cd3fb6d6c !2 后台运营统计合并 
* 修复hash中前一日统计没有更新的问题
* 增加后台运营统计
 2020-10-08 10:07:49 +08:00
xiaochong0302
ebb2c36f9f 后台学习资料部分完成 2020-10-07 18:45:50 +08:00
xiaochong0302
88684c4d71 1.增加changelog.md 
2.修复后台学习记录客户端枚举值
 2020-09-30 17:32:22 +08:00
xiaochong0302
d75885e3ca 优化直播部分代码 2020-09-27 17:51:14 +08:00
xiaochong0302
c89164cb05 优化代码 2020-09-26 18:14:35 +08:00
xiaochong0302
8f6c3eb3e5 新增课时资源结构 2020-09-22 19:31:44 +08:00
xiaochong0302
cddbc08c0b 优化命名 2020-09-17 21:29:29 +08:00
xiaochong0302
502fbe9583 优化代码，测试微信支付 2020-09-13 18:19:20 +08:00
xiaochong0302
d9016669e3 优化代码 2020-09-12 19:57:28 +08:00
xiaochong0302
295b27c567 整理代码 2020-09-07 21:06:43 +08:00