gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-27 21:10:24 +08:00
Code Issues Releases Wiki Activity
823 Commits 3 Branches 61 Tags
Commit Graph

823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
koogua
60bc468065 Merge branch 'koogua/I399X5' into demo 2021-03-03 19:46:51 +08:00
koogua
dffa813b0a 修复登录通知问题 2021-03-03 19:46:23 +08:00
koogua
75f32b0b12 Merge branch 'koogua/I399X5' into demo 2021-03-03 19:26:40 +08:00
koogua
a6d6806629 Merge branch 'koogua/I399X5' into develop 2021-03-03 19:26:03 +08:00
koogua
4ce06d9a23 修复商品发货通知参数问题 2021-03-03 19:24:59 +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
9d4225f663 整理migration 2021-03-03 17:29:27 +08:00
koogua
c0eb16f850 Merge branch 'koogua/hotfix-user-cache' 2021-03-03 11:34:56 +08:00
koogua
1ebe649236 Merge branch 'koogua/hotfix-user-cache' into demo 2021-03-03 11:34:35 +08:00
koogua
cb09e62649 １．修正购买vip时没有设置vip=1的错误 
２．getCurrentUser,getLoginUser增加缓存选项
 2021-03-03 11:33:48 +08:00
koogua
da1d35399d 整理通知相关以及deleted字段相关 2021-03-03 10:25:05 +08:00
koogua
3838d95dc4 整理通知相关以及deleted字段相关 2021-03-02 20:14:47 +08:00
koogua
86c66baece 整理通知相关以及deleted字段相关 2021-03-02 19:57:57 +08:00
koogua
7dec651548 后台敏感数据过滤优化 2021-02-27 14:59:40 +08:00
koogua
08b0cd0c71 Merge branch 'develop' v1.2.7 2021-02-26 19:19:17 +08:00
koogua
92a9dfb7af Merge branch 'develop' of https://github.com/xiaochong0302/course-tencent-cloud into develop 2021-02-26 15:34:48 +08:00
koogua
a091ff541e Merge branch 'koogua/v1.2.7' into demo 2021-02-26 15:22:21 +08:00
koogua
55401cf451 版本发布信息改用ajax异步获取 2021-02-26 15:06:38 +08:00
koogua
ab3e04c8a2 Merge branch 'koogua/v1.2.7' of https://gitee.com/koogua/course-tencent-cloud into koogua/v1.2.7 2021-02-26 11:23:35 +08:00
koogua
e576cdefe1 前台首页部件显示增加非空判断，后台角色管理要不可编辑 2021-02-26 11:08:52 +08:00
koogua
7f3717094e 前台首页部件显示增加非空判断 2021-02-26 10:35:43 +08:00
koogua
156b28b79e 查漏补缺 2021-02-25 20:57:39 +08:00
koogua
2a0a039da6 合并dingtalk 2021-02-23 20:36:37 +08:00
koogua
603ece55ce 合并dingtalk 2021-02-23 20:35:37 +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
1196b5138b 替换layui-verify为lay-verify 2021-02-23 15:38:10 +08:00
koogua
054bccadfb 替换layui-verify为lay-verify 2021-02-23 15:37:55 +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
jacky huang
cb8684fbe0
Merge branch 'master' into develop 2021-02-18 21:43:29 +08:00
koogua
c4f1adb27f Merge branch 'develop' 
# Conflicts:
#	app/Models/Course.php
#	db/migrations/schema.php
v1.2.6 		2021-02-18 21:24:31 +08:00
koogua
6abca790bc 修复file_transcode 2021-02-18 21:20:23 +08:00
koogua
50a5414b13 修复file_transcode 2021-02-16 16:48:39 +08:00
koogua
179f27c20a 修复file_transcode 2021-02-16 16:47:26 +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
30515a2663 去除退款延迟 2021-02-15 21:13:01 +08:00
koogua
bb38d90d53 去除退款延迟 2021-02-15 21:12:03 +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
3e2f80e648 积分机制阶段合并 2021-02-13 19:14:57 +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
bc48169ff9 更新价格验证 
(cherry picked from commit 3d286baf91e1c6130ebb1db7831d4bb01c8b06e8)
 2021-02-13 18:35:04 +08:00
winzer
7f7636b953 增加原始价格，市场价改名为优惠价 2021-02-13 18:33:57 +08:00