Commit Graph

1473 Commits

Author SHA1 Message Date
zhaolongfei
9d3bbcbf3a Merge branch 'zcwy1108-llf' into dev1107-121 2024-11-11 10:49:43 +08:00
zhaolongfei
05dc7b984f 注释代码 2024-11-11 10:49:04 +08:00
zhaolongfei
32fcc830de Merge branch 'zcwy1108-llf' into dev1107-121 2024-11-10 20:32:48 +08:00
zhaolongfei
d0e5f8c329 编辑视频时长的时候直接修改文件时长 2024-11-10 20:31:47 +08:00
zhaolongfei
9c5941fd6b Merge branch 'zcwy1108-llf' into dev1107-121
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
#	servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java
2024-11-10 19:31:56 +08:00
zhaolongfei
2c94b09199 在线课上传视频失败修改 2024-11-10 19:25:08 +08:00
zhaolongfei
e5c8dbabed 无目录无权限不能报名 2024-11-10 14:00:11 +08:00
zhaolongfei
d147a5f861 添加日志 2024-11-08 19:35:12 +08:00
zhaolongfei
e9995753c7 添加日志 2024-11-08 19:34:36 +08:00
zhaolongfei
e59aab127f 添加日志 2024-11-08 19:21:47 +08:00
zhaolongfei
ede76f74e8 添加日志 2024-11-08 19:13:41 +08:00
zhaolongfei
f28d120688 添加日志 2024-11-08 19:01:56 +08:00
zhaolongfei
425a1edf01 添加日志 2024-11-08 18:45:14 +08:00
zhaolongfei
cb9e94ce5e 视频进行工号验证 2024-11-08 17:32:55 +08:00
nisen
16df953a86 Merge remote-tracking branch 'yx/zcwy1030-llf' into dev1107 2024-11-08 17:13:34 +08:00
zhaolongfei
af0c26294d 视频进行工号验证 2024-11-08 17:12:01 +08:00
zhaolongfei
a3aad61ac8 讲师审批添加讲师工号 2024-11-08 15:04:12 +08:00
zhaolongfei
485b110613 Merge branch 'zcwy1021-llf' into dev1107 2024-11-08 13:54:16 +08:00
zhaolongfei
15fcfdcc2b 配置测试es的ip地址 2024-11-08 11:01:59 +08:00
zhaolongfei
f54eae0cec 配置测试es的ip地址 2024-11-08 09:00:32 +08:00
zhaolongfei
2d0b79878b 配置测试环境 2024-11-07 17:48:40 +08:00
Wangxxz
ae75aedff9 受众传参判空 2024-11-07 09:47:01 +08:00
zhaolongfei
00deb3f825 无目录有权限就报名 2024-11-06 17:10:21 +08:00
zhaolongfei
76a10ec726 无目录有权限就报名 2024-11-06 16:02:30 +08:00
zhaolongfei
87adf2aca5 在线视频播放时进行token和工号验证 2024-11-06 09:03:06 +08:00
zhaolongfei
b6f188389d 无目录的在线课无权限情况下不能报名 2024-11-05 18:12:54 +08:00
zhaolongfei
f61f344f60 无目录的在线课无权限情况下不能报名 2024-11-05 17:50:32 +08:00
zhaolongfei
2a214530f6 去除无用类 2024-11-04 15:38:17 +08:00
zhaolongfei
05656669ca 教师审批添加教师工号 2024-11-04 15:37:49 +08:00
zhaolongfei
5905fd6db8 视频上传添加视频时长 2024-11-01 17:39:00 +08:00
zhaolongfei
ddd35b4731 视频上传添加视频时长 2024-11-01 17:25:03 +08:00
zhaolongfei
5af8ca335c 视频上传添加视频回退 2024-11-01 16:28:25 +08:00
zhaolongfei
cd029d43c1 视频上传添加视频为0时的错误信息 2024-11-01 15:13:18 +08:00
nisen
5b691c5bb8 Merge branch 'master' into yx-master 2024-11-01 10:46:34 +08:00
yang
b0f01c6300 取消定时任务 2024-10-27 18:08:39 +08:00
nisen
e51d4dd8cb 视频请求头解析时间对比注释 2024-10-24 19:29:42 +08:00
zhaolongfei
ea1cda25bd 删除报名信息添加日志 2024-10-24 16:22:51 +08:00
zhaolongfei
3d3e660e68 在线课多目录重复学习记录问题修复 2024-10-22 16:49:23 +08:00
zhaolongfei
b509b783a1 视频解析添加日志 2024-10-21 14:04:52 +08:00
Wangxxz
bbda82b8f5 还原-讲师管理-查询讲师时加启用条件判断 2024-10-20 14:25:48 +08:00
Wangxxz
fec28f5baf 讲师管理-查询讲师时加启用条件判断 2024-10-20 14:24:04 +08:00
nisen
469145d25c Merge remote-tracking branch 'yx/master-0930' 2024-10-09 18:53:40 +08:00
yang
25d8594a2b 案例,bug 2024-10-09 18:52:23 +08:00
nisen
3001c25590 Merge remote-tracking branch '104/master' 2024-10-09 17:48:11 +08:00
nisen
95b63155cd Merge branch 'zcwy0927-yang-random' 2024-10-09 17:46:52 +08:00
yang
85517dcd57 随机选题,bug 2024-10-09 14:57:56 +08:00
nisen
0e897b5f14 Merge remote-tracking branch 'yx/master-0930' into 104-master 2024-10-08 20:18:33 +08:00
yang
39e336d044 案例bug修复 2024-10-08 20:17:08 +08:00
yang
9da0eae4c0 考试随机选题 2024-10-08 19:27:46 +08:00
yang
74a36d72a1 作业导出,考试随机选题 2024-10-08 17:40:28 +08:00