Commit Graph

1163 Commits

Author SHA1 Message Date
yang
002542accc Merge branch 'refs/heads/zcwy-0724-wjw-online' into zcwy0923-wjwyyk-online
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
2024-09-27 15:28:39 +08:00
yang
df770d22d5 作业导出,计算时长 2024-09-27 14:59:15 +08:00
yang
638aa9ee93 作业导出,计算时长 2024-09-27 14:24:01 +08:00
yang
f9b8761951 作业导出,分数设置 2024-09-27 11:19:18 +08:00
yang
ea2c6edc9f 作业导出,最高分、与作业完成时间 2024-09-27 10:50:17 +08:00
yang
7db1a03379 作业导出,考试 2024-09-26 20:37:21 +08:00
yang
fd3afef917 作业导出,模糊搜索 2024-09-24 15:04:45 +08:00
yang
b1ef78aae2 作业导出,优化导包 2024-09-24 14:59:04 +08:00
yang
f5ac7519e4 在线导出 2024-09-23 19:01:35 +08:00
yang
6f2236f3be 作业导出,token 2024-09-23 18:13:16 +08:00
yang
66e4e73dd2 作业导出,bug修复 2024-09-20 15:29:55 +08:00
nisen
6a04082245 Merge remote-tracking branch '104/master' into 104-master 2024-09-18 11:00:56 +08:00
nisen
81a1a88eab Merge branch 'zcwy0912-llf' into 104-master 2024-09-18 11:00:13 +08:00
nisen
1dfdc9277d Merge branch 'zcwy-0913-yang-case' 2024-09-14 13:51:27 +08:00
yang
7c840d2bfc 案例萃取,案例标签 2024-09-14 13:49:22 +08:00
nisen
48e2adad7f Merge branch 'zcwy-0913-yang-case' 2024-09-14 13:26:46 +08:00
yang
e04735ee44 案例萃取,最佳时间 2024-09-14 13:25:02 +08:00
yang
c2de2a433b 案例萃取,类型修改 2024-09-14 13:15:21 +08:00
nisen
cb0e784d5e Merge branch 'zcwy-0913-yang-case' 2024-09-14 13:04:00 +08:00
yang
e6feea6dbf 案例萃取,类型修改 2024-09-14 12:52:37 +08:00
nisen
012f987de0 案例萃取,暂时注释代码 2024-09-14 12:33:31 +08:00
yang
3cbef3e3f7 案例萃取 2024-09-14 10:48:00 +08:00
zhaolongfei
2e2edbbf57 试题管理模板修改 2024-09-13 16:02:26 +08:00
zhaolongfei
beba553faa 试题管理模板修改 2024-09-13 15:08:45 +08:00
nisen
403e72ec5f Merge branch 'zcwy0815-llf' into 104-master
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
2024-09-12 18:35:31 +08:00
nisen
9136f338da Merge branch 'zcwy0912-llf' into 104-master 2024-09-12 18:32:59 +08:00
zhaolongfei
120a4f45fc 试题管理模板修改 2024-09-12 14:35:13 +08:00
lu
2c967cef0a 作业导出500 2024-09-10 17:10:48 +08:00
zhaolongfei
29a17efd44 多余代码删除 2024-09-10 15:32:54 +08:00
joshen
d2043da062 Update application-pro.properties 2024-09-08 13:25:25 +08:00
nisen
aa32e9136c 104-master代碼回退 2024-09-05 11:09:43 +08:00
zhaolongfei
903a1369f5 多余代码删除 2024-09-04 16:48:12 +08:00
zhaolongfei
0fcd4568ec 802bug修复 2024-09-04 16:35:33 +08:00
lu
45fce7927d 作业导出修改名称 2024-09-03 11:21:37 +08:00
nisen
22ebe90c08 Merge branch 'zcwy-0724' 2024-09-02 11:47:58 +08:00
lu
5070be0620 作业导出确保目录存在 2024-09-02 11:39:05 +08:00
nisen
0dc58db106 Merge branch 'zcwy-0724'
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
2024-08-30 15:14:58 +08:00
nisen
749a6b69e7 Merge remote-tracking branch 'yx/code-review-0827-yang' 2024-08-29 19:00:20 +08:00
yang
6dadd80372 代码审计-spring 2024-08-29 16:48:54 +08:00
yang
04a4f528bf 代码审计-tomcat 2024-08-29 16:18:24 +08:00
nisen
4fa0215373 Merge branch 'shenji-0828-llf' into 104-master 2024-08-29 15:26:17 +08:00
yang
f7cd9f8469 代码审计-spring、snakeyaml 2024-08-29 15:15:05 +08:00
zhaolongfei
163425cad2 审计漏洞 2024-08-29 14:56:32 +08:00
zhaolongfei
3735c38001 删除考试根据名称条件筛选 2024-08-29 14:56:05 +08:00
yang
1021f0bd43 代码审计-spring 2024-08-28 15:00:21 +08:00
nisen
1fd0c32f97 Merge remote-tracking branch 'yx/code-review-0827-yang' 2024-08-27 21:48:55 +08:00
yang
0d0b45f017 代码审计-Commons Text、tomcat 2024-08-27 21:14:52 +08:00
nisen
2ae3d99f21 Merge branch 'zcwy0823-llf' into master-0705 2024-08-23 19:44:02 +08:00
zhaolongfei
89573debef 在线课考试添加任务计算,redis放开 2024-08-23 19:43:18 +08:00
nisen
457597eabc Merge branch 'zcwy0823-llf' into master-0705 2024-08-23 19:28:25 +08:00