Commit Graph

1396 Commits

Author SHA1 Message Date
nisen
81a1a88eab Merge branch 'zcwy0912-llf' into 104-master 2024-09-18 11:00:13 +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
zhaolongfei
29a17efd44 多余代码删除 2024-09-10 15:32:54 +08:00
joshen
f8257a1806 Update application-pro.properties 2024-09-08 13:31:10 +08:00
joshen
2986344fd5 Update application-pro.properties 2024-09-08 13:29:40 +08:00
joshen
056d15e5fa Update application-pro.properties 2024-09-08 13:27:40 +08:00
joshen
d2043da062 Update application-pro.properties 2024-09-08 13:25:25 +08:00
nisen
af6c232d49 Merge remote-tracking branch '121/master' into 104-master 2024-09-05 15:00:02 +08:00
nisen
18bb8a434a Merge branch 'master-0705' into 121-master 2024-09-05 14:57:17 +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
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
zhaolongfei
24ae3c0ec6 在线课考试添加任务计算,暂时注释redis 2024-08-23 19:27:31 +08:00
zhaolongfei
fffa12344a 在线课考试添加任务计算,回退 2024-08-23 18:54:38 +08:00
nisen
52a58a6c6f Merge branch 'zcwy0823-llf' into master-0705 2024-08-23 18:45:46 +08:00
zhaolongfei
a4b034752d 在线课考试添加任务计算 2024-08-23 18:45:10 +08:00
nisen
23e63062e9 Merge branch 'zcwy0823-llf' into master-0705 2024-08-23 18:30:42 +08:00
zhaolongfei
06415d58ac 在线课考试添加任务计算 2024-08-23 18:30:05 +08:00
nisen
3fc8ce614d Merge branch 'zcwy0823-llf' into master-0705 2024-08-23 18:00:57 +08:00
zhaolongfei
bebe36d39e 在线课考试添加任务计算 2024-08-23 18:00:26 +08:00
nisen
d4af5ba8d5 Merge branch 'zcwy0823-llf' into master-0705 2024-08-23 17:59:12 +08:00
zhaolongfei
d42d1b2e83 处理study接口,添加接口访问限制次数 2024-08-23 17:55:53 +08:00
zhaolongfei
616594af9e 处理study接口,添加接口访问限制次数 2024-08-21 14:00:35 +08:00
zhaolongfei
4ff47085b8 处理study接口,添加接口访问限制次数 2024-08-21 10:22:27 +08:00
zhaolongfei
b7e8c43b5f 处理study接口,添加接口访问限制次数 2024-08-21 10:22:08 +08:00
joshen
2440b6ca50 Update application-pro.properties 2024-08-20 18:41:17 +08:00
joshen
9591e60ac4 Update application-pro.properties 2024-08-20 10:54:48 +08:00
joshen
363dba845f Update application-pro.properties 2024-08-20 10:53:44 +08:00
joshen
6220f212d2 Update application-pro.properties 2024-08-20 10:53:13 +08:00
joshen
5ed277e918 Update application-pro.properties 2024-08-20 10:52:42 +08:00