gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-30 06:11:38 +08:00
Code Issues Releases Wiki Activity
304 Commits 3 Branches 61 Tags
Commit Graph

304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiaochong0302
873b92d7e1 Merge branch 'xiaochong0302/I280IZ' of https://gitee.com/koogua/course-tencent-cloud into demo 
# Conflicts:
#	app/Services/OAuth/WeiXin.php
 2020-12-07 10:43:58 +08:00
xiaochong0302
fc6e9382a0 Merge remote-tracking branch 'gitee/xiaochong0302/I280IZ' into xiaochong0302/I280IZ 2020-12-07 10:40:20 +08:00
xiaochong0302
bf84732375 初步完成开放登录，待线上测试7 2020-12-07 10:39:51 +08:00
koogua
a4a9936054 !31 开放登录线上测试6 
* Merge branch 'demo' of gitee.com:koogua/course-tencent-cloud into xiao…
* 初步完成开放登录，待线上测试6
* 初步完成开放登录，待线上测试5
* 初步完成开放登录，待线上测试4
* 初步完成开放登录，待线上测试3
* 初步完成开放登录，待线上测试2
 2020-12-05 21:53:12 +08:00
koogua
5c48ed3a4c Merge branch 'demo' of gitee.com:koogua/course-tencent-cloud into xiaochong0302/I280IZ 2020-12-05 21:52:58 +08:00
xiaochong0302
4fa02f34bb 初步完成开放登录，待线上测试6 2020-12-05 21:49:45 +08:00
koogua
7399fcbb93 !30 开放登录线上测试5 
* 初步完成开放登录，待线上测试5
* 初步完成开放登录，待线上测试4
* 初步完成开放登录，待线上测试3
* 初步完成开放登录，待线上测试2
 2020-12-05 21:42:21 +08:00
koogua
013f213bfa !29 开放登录线上测试5 
* 初步完成开放登录，待线上测试5
* 初步完成开放登录，待线上测试4
* 初步完成开放登录，待线上测试3
* 初步完成开放登录，待线上测试2
 2020-12-05 21:36:11 +08:00
xiaochong0302
e232160d22 初步完成开放登录，待线上测试5 2020-12-05 21:34:56 +08:00
koogua
2e61830665 !28 开放登录线上测试4 
* 初步完成开放登录，待线上测试4
* 初步完成开放登录，待线上测试3
* 初步完成开放登录，待线上测试2
 2020-12-05 21:31:25 +08:00
xiaochong0302
5cf4bdfff0 初步完成开放登录，待线上测试4 2020-12-05 21:29:58 +08:00
koogua
6b42b3252c !27 开放登录线上测试3 
* 初步完成开放登录，待线上测试3
* 初步完成开放登录，待线上测试2
 2020-12-05 21:02:37 +08:00
xiaochong0302
3d115e78e7 初步完成开放登录，待线上测试3 2020-12-05 21:00:05 +08:00
koogua
ea7d4d648d !26 开放登录线上测试2 
* 初步完成开放登录，待线上测试2
 2020-12-05 19:52:26 +08:00
xiaochong0302
b0d467c619 初步完成开放登录，待线上测试2 2020-12-05 19:50:17 +08:00
koogua
a5fcbc92d8 !25 开放登录线上测试 
Merge pull request !25 from koogua/xiaochong0302/I280IZ
 2020-12-05 18:15:09 +08:00
xiaochong0302
eac442c0a0 初步完成开放登录，待线上测试 2020-12-05 18:12:11 +08:00
koogua
753f2203fa !24 修复添加课时后进入编辑页面500错误 
* 修复添加课时后进入编辑页面500错误
 2020-12-03 14:41:15 +08:00
koogua
f8e9299b51 !22 验证更新h5支付 
Merge pull request !22 from koogua/develop
 2020-12-02 21:24:19 +08:00
xiaochong0302
385016613b 更新H5支付方式 2020-12-02 21:23:04 +08:00
xiaochong0302
167dab9f3f Merge remote-tracking branch 'remotes/gitee/develop' into demo 
# Conflicts:
#	app/Http/Api/Services/Trade.php
#	app/Http/Home/Controllers/PublicController.php
 2020-12-02 15:19:23 +08:00
xiaochong0302
079cf5cec3 更新H5支付方式 2020-12-02 15:09:50 +08:00
koogua
7636a8af1c !20 验证更新h5支付 
* 更新H5支付方式
* Merge remote-tracking branch 'remotes/gitee/master' into develop
* !19 v1.2.0阶段性合并
* update app/Http/Admin/Controllers/UploadController.php.
* Merge branch 'develop' of https://gitee.com/koogua/course-tencent-cloud
* Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud
* add LICENSE.
* 删除文件 LICENSE
* !14 修正点击退款404
* !13 修正退款项目空白以及弹窗自适应
* !12 修正退款项目空白以及弹窗自适应
* Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud
* !9 修正插入数据不一致以及后台菜单参数类型报错
* !7 纠正迁移文件和代码实际使用字段不一致
* Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud
* !6 develop->master 1.1.0
 2020-12-02 11:01:00 +08:00
xiaochong0302
698b6028c2 更新H5支付方式 2020-12-02 10:58:09 +08:00
xiaochong0302
0217ae162d Merge remote-tracking branch 'remotes/gitee/master' into develop 2020-12-01 10:03:37 +08:00
koogua
ba6894fcd0 !19 v1.2.0阶段性合并 
* 增加微信H5支付需要的Referer头信息
 2020-12-01 09:58:10 +08:00
xiaochong0302
7ceee5d26e Merge branch 'develop' of https://gitee.com/koogua/course-tencent-cloud into demo 
# Conflicts:
#	app/Http/Api/Controllers/ChapterController.php
 2020-11-28 17:47:14 +08:00
xiaochong0302
bddb37ae7f 增加微信H5支付需要的Referer头信息 2020-11-28 17:31:45 +08:00
koogua
c22c2690d6 update app/Http/Admin/Controllers/UploadController.php. 
去除重复的signatureAction方法
v1.2.0 		2020-11-27 10:29:20 +08:00
xiaochong0302
befaccd085 Merge branch 'develop' of https://gitee.com/koogua/course-tencent-cloud 
# Conflicts:
#	CHANGELOG.md
#	LICENSE
#	app/Http/Home/Controllers/ChapterController.php
#	app/Http/Home/Controllers/PublicController.php
#	app/Library/AppInfo.php
#	app/Models/Client.php
#	app/Services/Logic/Chapter/BasicInfo.php
 2020-11-27 09:47:09 +08:00
xiaochong0302
9536ff75ca Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud 2020-11-27 09:41:31 +08:00
koogua
4cae5ece11 !16 v1.2.0阶段性合并 
* 更换README.md中的简书图床为gitee本地
* 修复编辑器图片上传，增加上传文件身份认证，markdown内容解析
* 移除Mobile模块，修复API请求章节信息权限问题
 2020-11-27 09:38:54 +08:00
xiaochong0302
a6a6475f85 更换README.md中的简书图床为gitee本地 2020-11-27 09:34:56 +08:00
xiaochong0302
f980964ba8 修复编辑器图片上传，增加上传文件身份认证，markdown内容解析 2020-11-26 21:45:52 +08:00
koogua
ec21a4e6a2 add LICENSE. 2020-11-26 14:29:51 +08:00
koogua
4596011678 删除文件 LICENSE 2020-11-26 14:29:29 +08:00
xiaochong0302
b716dcfa28 Merge remote-tracking branch 'github/develop' into develop 2020-11-24 21:00:50 +08:00
xiaochong0302
c2abc741ed 移除Mobile模块，修复API请求章节信息权限问题 2020-11-24 21:00:29 +08:00
xiaochong0302
c8b96ec4ac 移除Mobile模块，修复API请求章节信息权限问题 2020-11-24 20:47:05 +08:00
xiaochong0302
a2a8e5c810 删除调试断点代码 2020-11-23 21:55:58 +08:00
xiaochong0302
e03dcb89fa 删除重复的signature方法 2020-11-23 21:50:37 +08:00
xiaochong0302
6fa30310dd Merge branch 'develop' of https://gitee.com/koogua/course-tencent-cloud into demo 
# Conflicts:
#	CHANGELOG.md
#	app/Http/Home/Controllers/ChapterController.php
#	app/Library/AppInfo.php
#	app/Services/Logic/Chapter/BasicInfo.php
 2020-11-23 21:28:30 +08:00
xiaochong0302
9e3cd93599 Merge remote-tracking branch 'github/develop' into develop 2020-11-23 21:16:03 +08:00
xiaochong0302
ac352683dd 删除api验证,app应用管理 2020-11-23 21:10:41 +08:00
xiaochong0302
27b3dc1935 删除api验证,app应用管理 2020-11-23 21:05:14 +08:00
xiaochong0302
70886569d1 优化代码 2020-11-19 21:26:01 +08:00
xiaochong0302
10c43d0ab3 调整直播部分结构 2020-11-15 18:26:35 +08:00
xiaochong0302
a59ab3c6d8 优化点播直播部分代码 2020-11-12 20:50:01 +08:00
xiaochong0302
3ce6897de1 优化点播直播部分代码 2020-11-11 20:39:49 +08:00
xiaochong0302
f4dda5a58c 修复退款项目空白，以及弹窗高度自适应，取消退款内部错误 2020-11-10 16:21:11 +08:00