成长路径

Merge branch 'zcwy0815-llf' into 104-master
# Conflicts: # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
2025-12-09 10:56:50 +08:00 · 2024-12-17 18:50:14 +08:00 · 2024-09-12 18:35:31 +08:00 · 2024-09-12 18:32:59 +08:00 · 2024-09-12 14:35:13 +08:00 · 2024-09-10 15:32:54 +08:00
41 changed files with 667 additions and 260 deletions
--- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java
+++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java
@@ -20,7 +20,7 @@ import com.xboe.common.utils.StringUtil;
 public class ElasticsearchConfig {
 	
 	@Value("${xboe.elasticsearch.server.ip}")
-	private String esIp="127.0.0.1";
+	private String esIp="10.251.88.214";
 	
 	@Value("${xboe.elasticsearch.server.port}")
 	private int esPort=9200;
--- a/servers/boe-server-all/pom.xml
+++ b/servers/boe-server-all/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -16,38 +16,38 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>2021.0.5</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
-        <nacos-client.version>2.2.0</nacos-client.version>
+		<spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
+		<nacos-client.version>2.2.0</nacos-client.version>
 	</properties>
 	<dependencies>
 		<!-- 引入Cloud -->
-	     <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <version>${spring-cloud-alibaba.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba.nacos</groupId>
-                    <artifactId>nacos-client</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>${nacos-client.version}</version>
-        </dependency>
-        <!-- end -->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+			<version>${spring-cloud-alibaba.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.alibaba.nacos</groupId>
+					<artifactId>nacos-client</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.nacos</groupId>
+			<artifactId>nacos-client</artifactId>
+			<version>${nacos-client.version}</version>
+		</dependency>
+		<!-- end -->
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
 			<version>4.0.1</version>
 		</dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.8.16</version>
-        </dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>5.8.16</version>
+		</dependency>
 		<dependency>
 			<groupId>com.xboe</groupId>
 			<artifactId>xboe-api</artifactId>
@@ -58,7 +58,7 @@
 			<artifactId>xboe-module-scorm</artifactId>
 			<version>1.0.0</version>
 		</dependency>
-		 <dependency>
+		<dependency>
 			<groupId>com.xboe</groupId>
 			<artifactId>xboe-core</artifactId>
 			<version>1.0.0</version>
@@ -84,7 +84,6 @@
 			<artifactId>xboe-module-es</artifactId>
 			<version>1.0.0</version>
 		</dependency>
-
 		<dependency>
 			<groupId>it.sauronsoftware</groupId>
 			<artifactId>jave</artifactId>
@@ -93,9 +92,9 @@
 			<systemPath>${project.basedir}/src/main/resources/libs/jave-1.0.2.jar</systemPath>
 		</dependency>
 		<dependency>
-		    <groupId>com.auth0</groupId>
-		    <artifactId>java-jwt</artifactId>
-		    <version>3.18.3</version>
+			<groupId>com.auth0</groupId>
+			<artifactId>java-jwt</artifactId>
+			<version>3.18.3</version>
 		</dependency>
 		<!--
 		<dependency>
@@ -110,8 +109,8 @@
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
 		<dependency>
-		    <groupId>commons-codec</groupId>
-		    <artifactId>commons-codec</artifactId>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
 		</dependency>

 		<dependency>
@@ -130,10 +129,10 @@
 			<groupId>org.springframework.session</groupId>
 			<artifactId>spring-session-data-redis</artifactId>
 		</dependency>
-		 <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
@@ -185,13 +184,13 @@
 		</dependency>

 		<!-- aspose -->
-        <dependency>
-            <groupId>com.aspose</groupId>
-            <artifactId>slides</artifactId>
-            <version>15.9.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/aspose/aspose.slides-15.9.0.jar</systemPath>
-        </dependency>
+		<dependency>
+			<groupId>com.aspose</groupId>
+			<artifactId>slides</artifactId>
+			<version>15.9.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/src/main/resources/aspose/aspose.slides-15.9.0.jar</systemPath>
+		</dependency>
 		<dependency>
 			<groupId>com.aspose</groupId>
 			<artifactId>words</artifactId>
@@ -214,20 +213,20 @@
 			<version>3.0.3</version>
 		</dependency>
 		<dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <version>7.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>7.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-client</artifactId>
-            <version>7.9.0</version>
-        </dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>elasticsearch-rest-high-level-client</artifactId>
+			<version>7.9.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>7.9.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>elasticsearch-rest-client</artifactId>
+			<version>7.9.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.retry</groupId>
 			<artifactId>spring-retry</artifactId>
@@ -236,32 +235,32 @@
 	</dependencies>
 	<build>
 		<resources>
-	       <resource>
-	          <filtering>true</filtering>
-	          <directory>src/main/resources</directory>
-	          <includes>
-	              <include>application-${profileActive}.properties</include>
-	              <include>application.properties</include>
-	          </includes>
-	        </resource>
-	         <resource>
-	          <filtering>false</filtering>
-	          <directory>src/main/resources</directory>
-	          <excludes>
-	              <exclude>*.properties</exclude>
-	          </excludes>
-	        </resource>
-	    </resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>application-${profileActive}.properties</include>
+					<include>application.properties</include>
+				</includes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+				<excludes>
+					<exclude>*.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <!-- <version>3.8.0</version> -->
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<!-- <version>3.8.0</version> -->
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -272,8 +271,8 @@
 							<artifactId>lombok</artifactId>
 						</exclude>
 					</excludes>
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
+					<includeSystemScope>true</includeSystemScope>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
@@ -296,12 +295,12 @@
 				<profileActive>test</profileActive>
 			</properties>
 		</profile>
-        <profile>
-            <id>test135</id>
-            <properties>
-                <profileActive>test135</profileActive>
-            </properties>
-        </profile>
+		<profile>
+			<id>test135</id>
+			<properties>
+				<profileActive>test135</profileActive>
+			</properties>
+		</profile>
 		<profile>
 			<id>dev</id>
 			<properties>
--- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
@@ -4,24 +4,23 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.lang.Opt;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.nacos.shaded.com.google.gson.*;
 import com.xboe.api.vo.*;
 import com.xboe.module.course.vo.StudyCourseVo;
 import com.xboe.module.course.vo.TeacherInfoVo;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.dict.entity.DictDto;
+import com.xboe.module.exam.entity.AloneExam;
 import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.system.user.dao.UserDao;
-import com.xboe.system.user.entity.User;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
+import java.time.LocalDateTime;
+import java.util.*;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -66,6 +65,10 @@ public class ThirdApi {

    @Value("${manageApi.editExam}")
    private String editExam;
+
+    @Value("${coursesuilt.syncExamScoreToCourseSuite}")
+    private String syncExamScoreToCourseSuite;
+
    //获取例外人员的id
    public  List<String> getUserId(){
        String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=316&type=1").execute() //prod 316
@@ -234,5 +237,21 @@ public class ThirdApi {

    }

+    public void syncExamScoreToCourseSuite(AloneExam aloneExam,String token) {
+        Gson gson = new GsonBuilder()
+                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
+                .create();

+        String json = gson.toJson(aloneExam);
+        String resp = HttpRequest.post(syncExamScoreToCourseSuite)
+                .body(json)
+                .header("token", token)
+                .execute()
+                .body();
+
+        if (StringUtils.isBlank(resp)){
+            return;
+        }
+        JSONUtil.toBean(resp, SyncExamScoreBean.class).success();
+    }
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/CheckExamBandingBean.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/CheckExamBandingBean.java
@@ -0,0 +1,31 @@
+package com.xboe.api.vo;
+
+import cn.hutool.json.JSONUtil;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Data
+@Slf4j
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CheckExamBandingBean {
+
+    private boolean show;
+    private String version;
+    private int code;
+    private String msg;
+    private Object data;
+    private boolean success;
+
+    public CheckExamBandingBean success() {
+        if (this.code!=200) {
+            log.error("获取绑定关系失败----{}", JSONUtil.toJsonPrettyStr(this));
+            return null;
+        }
+        return this;
+    }
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/GetUserIdByWorkNumResult.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/GetUserIdByWorkNumResult.java
@@ -0,0 +1,40 @@
+package com.xboe.api.vo;
+
+import cn.hutool.json.JSONUtil;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+import java.util.HashMap;
+
+/**
+ * Auto-generated: 2022-12-10 14:3:18
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@Data
+@Slf4j
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class GetUserIdByWorkNumResult {
+
+    private String error;
+    private String message;
+    private String permissions;
+    private HashMap<String,String> result;
+    private int status;
+    private Date timestamp;
+
+    public GetUserIdByWorkNumResult success() {
+        if (this.status != 200) {
+            log.error("获取用户ID列表失败----{}", JSONUtil.toJsonPrettyStr(this));
+            return null;
+        }
+        return this;
+    }
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/LocalDateTimeSerializer.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/LocalDateTimeSerializer.java
@@ -0,0 +1,19 @@
+package com.xboe.api.vo;
+
+import com.alibaba.nacos.shaded.com.google.gson.JsonElement;
+import com.alibaba.nacos.shaded.com.google.gson.JsonPrimitive;
+import com.alibaba.nacos.shaded.com.google.gson.JsonSerializationContext;
+import com.alibaba.nacos.shaded.com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class LocalDateTimeSerializer implements JsonSerializer<LocalDateTime> {
+    private  final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    @Override
+    public JsonElement serialize(LocalDateTime src, Type typeOfSrc, JsonSerializationContext context) {
+        return new JsonPrimitive(formatter.format(src));
+    }
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/SyncExamScoreBean.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/SyncExamScoreBean.java
@@ -0,0 +1,31 @@
+package com.xboe.api.vo;
+
+import cn.hutool.json.JSONUtil;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Data
+@Slf4j
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SyncExamScoreBean {
+
+    private boolean show;
+    private String version;
+    private int code;
+    private String msg;
+    private Object data;
+    private boolean success;
+
+    public SyncExamScoreBean success() {
+        if (this.code!=200) {
+            log.error("同步考试到boe库失败----{}", JSONUtil.toJsonPrettyStr(this));
+            return null;
+        }
+        return this;
+    }
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java
@@ -133,4 +133,6 @@ public interface CacheName {
     * 字典缓存key
     * */
    String KEY_DICT="dict";
+
+    String STUDY_KEY = "StudyKey:";
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
@@ -9,12 +9,7 @@ import javax.servlet.http.HttpServletResponse;

 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;

 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
@@ -1164,5 +1159,11 @@ public class CourseManageApi extends ApiBaseController{
 		return success(courses);
 	}

+	@GetMapping("/getCourseCoverUrl")
+	public JsonResponse<Map<String, String>> getCourseCoverUrl(@RequestParam String courseIds){
+		Map<String, String> courseUrlMap = courseService.getCourseCoverUrl(courseIds);
+		return success(courseUrlMap);
+	}
+

 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
@@ -1,21 +1,33 @@
 package com.xboe.module.course.api;

+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;

 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;

 import com.xboe.api.ThirdApi;
-import com.xboe.api.vo.AuditList;
-import com.xboe.api.vo.AuditListParam;
-import com.xboe.api.vo.UserDynamic;
-import com.xboe.api.vo.UserdynamicParam;
-import com.xboe.common.OrderCondition;
-import com.xboe.core.JsonResponseStatus;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.module.course.entity.*;
 import com.xboe.module.course.vo.TeacherVo;
-import com.xboe.module.usergroup.entity.UserGroupItem;
+import com.xboe.school.study.dao.StudyCourseDao;
+import com.xboe.school.study.entity.StudyHomeWork;
+import com.xboe.school.study.service.IStudyHomeWorkService;
+import com.xboe.school.study.service.IStudyService;
+import com.xboe.system.user.entity.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -34,11 +46,6 @@ import com.xboe.core.api.ApiBaseController;
 import com.xboe.module.course.dto.CourseQueryDto;
 import com.xboe.module.course.dto.CourseTeacherDto;
 import com.xboe.module.course.dto.RankingDto;
-import com.xboe.module.course.entity.Course;
-import com.xboe.module.course.entity.CourseContent;
-import com.xboe.module.course.entity.CourseCrowd;
-import com.xboe.module.course.entity.CourseSection;
-import com.xboe.module.course.entity.CourseTeacher;
 import com.xboe.module.course.service.ICourseContentService;
 import com.xboe.module.course.service.ICourseSectionService;
 import com.xboe.module.course.service.ICourseService;
@@ -67,19 +74,19 @@ public class CoursePortalApi extends ApiBaseController{

 	@Resource
 	private ICourseService courseService;
-	
+
 	@Resource
 	private ITeacherService teacherService;
-	
+
 	@Resource
 	private ICourseContentService contentService;
-	
+
 	@Resource
 	private ICourseSectionService sectionService;

 	@Resource
 	private ICourseTeacherService courseTeacherService;
-	
+
 	@Autowired
 	private IUserGroupService userGroupService;

@@ -89,6 +96,15 @@ public class CoursePortalApi extends ApiBaseController{
 	@Resource
 	private ThirdApi thirdApi;

+	@Autowired
+	IStudyHomeWorkService shomeworkService;
+
+	@Autowired
+	IStudyService studyService;
+
+	@Autowired
+	StudyCourseDao studyCourseDao;
+
 	@Autowired
 	StringRedisTemplate redisTemplate;

@@ -108,9 +124,9 @@ public class CoursePortalApi extends ApiBaseController{
 		Map<String,Object> list=courseService.findImages(cids);
 		return success(list);
 	}
-	
+
 	/**
-	* 人气榜
+	 * 人气榜
 	 * */
 	@PostMapping("/ranking")
 	public JsonResponse<List<RankingDto>> Ranking(Integer type,Integer time){
@@ -136,7 +152,7 @@ public class CoursePortalApi extends ApiBaseController{
 		return success(rankingDtos);
 	}

-	
+
 	/**
 	 * 查询列表，数量，类型，最新，最热
 	 * @param num
@@ -162,7 +178,7 @@ public class CoursePortalApi extends ApiBaseController{
 		}
 		dto.setDevice(device);
 		try {
-			
+
 			List<Course> list=courseService.findList(num, dto);
 			return success(list);
 		}catch(Exception e) {
@@ -170,10 +186,10 @@ public class CoursePortalApi extends ApiBaseController{
 			return error("查询课程列表失败",e.getMessage());
 		}
 	}
-	
+
 	@PostMapping("/pagelist-new")
 	public JsonResponse<PageList<Course>> findNewPage(Pagination pager,CourseQueryDto dto){
-		
+
 		//只是查询已发布的

 		dto.setPublish(true);
@@ -195,9 +211,9 @@ public class CoursePortalApi extends ApiBaseController{
 				}
 			}
 		}
-		
+
 		return success(coursePageList);
-		
+
 	}

 	/**
@@ -208,7 +224,7 @@ public class CoursePortalApi extends ApiBaseController{
 	 */
 	@PostMapping("/pagelist")
 	public JsonResponse<PageList<Course>> findPage(Pagination pager,CourseQueryDto dto){
-		
+
 		//只是查询已发布的

 		dto.setPublish(true);
@@ -229,11 +245,11 @@ public class CoursePortalApi extends ApiBaseController{
 				}
 			}
 		}
-		
+
 		return success(coursePageList);
-		
+
 	}
-	
+
 	/**
 	 * 获取详细信息
 	 * @param id
@@ -244,19 +260,19 @@ public class CoursePortalApi extends ApiBaseController{
 		if(StringUtils.isBlank(id)) {
 			return badRequest("参数错误，未指定课程");
 		}
-		
+
 		//当前对于课程不增加浏览量，课程的意义并不是看过
 //		if(addView==null) {
 //			addView=false;
 //		}
-		
+
 		Map<String,Object> rs=new HashMap<String,Object>();
 		Course course=courseService.getAddView(id);
 		if(course==null || course.getDeleted()){
 			return badRequest("课程不存在或已被删除");
 		}
 		rs.put("course",course);
-		
+
 		List<CourseCrowd> courseCrowdList = courseService.findCrowdByCourseId(id);
 		if(crowd!=null && crowd) {
 			rs.put("crowds",courseCrowdList);
@@ -299,7 +315,7 @@ public class CoursePortalApi extends ApiBaseController{
 		List<CourseContent> cclist=contentService.getByCourseId(id);
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
-		
+

 		//获取教师的介绍信息,因为一门课程 的教师不会太多，所以这里简单直接遍历查询，后续再优化
 		for(CourseTeacher ct : teachers) {
@@ -319,7 +335,7 @@ public class CoursePortalApi extends ApiBaseController{
 					}
 				}
 			}
-			
+
 		}

 		rs.put("isCrowd",pass);
@@ -328,7 +344,7 @@ public class CoursePortalApi extends ApiBaseController{
 		rs.put("teachers",teachers);
 		//查询课程
 		return success(rs);
-		
+
 	}
 	private void getTeacherInfo(String token, List<String> teacherIds) {
 		List<TeacherVo> teacherInfo = thirdApi.getTeacherInfo(teacherIds, token);
@@ -347,7 +363,102 @@ public class CoursePortalApi extends ApiBaseController{
 		}

 	}
+	//作业导出
+	@GetMapping("/export")
+	public JsonResponse<String> export(String courseName,String courseId,String contentId,String name,Integer status) throws IOException {
+		Map<String, String>map=new HashMap<>();
+		List<String> userIds = studyCourseDao.findList(FieldFilters.eq("courseId", courseId)).stream().filter(Objects::nonNull).map(StudyCourse::getAid).collect(Collectors.toList());
+		if (userIds.isEmpty()){
+			return error("查询不到用户");
+		}
+		List<User>user=studyService.getUserNo(userIds);
+		try {//筛选出的人员
+			List<StudyCourseItem> list = studyService.getList(courseId, contentId, name, status);
+			if(list.isEmpty()){
+				return success("暂无数据");
+			}
+			for (StudyCourseItem s : list) {
+				List<StudyHomeWork> studyHomeWorks = shomeworkService.getByStudyIdAndContentId(s.getStudyId(), contentId).stream().filter(e-> !Objects.equals(e.getFilePath(), "")).filter(e->e.getFilePath()!=null).collect(Collectors.toList());
+				if(studyHomeWorks.isEmpty()){
+					return success("暂无数据");
+				}
+				studyHomeWorks.forEach(e->{
+					user.forEach(u->{
+						if(u.getId().equals(s.getAid())){
+							//取后缀
+							int dotIndex = e.getFilePath().lastIndexOf('.'); // 查找最后一个'.'的位置
+							String extension = e.getFilePath().substring(dotIndex);
+							map.put(u.getName()+"-"+u.getUserNo()+extension,"/home/www/elearning/upload"+e.getFilePath());
+						}
+					});
+				});
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException("导出异常"+e.getMessage());
+		}
+		long totalFileSize = map.values().stream()
+				.mapToLong(path -> new File(path).length())
+				.sum();
+		// 检查文件总大小是否超过 2GB
+		if (totalFileSize > 2L * 1024 * 1024 * 1024) {
+			return success("您要下载的作业过大,请分批下载或联系管理员!");
+		}

+//		String encodedFilename = URLEncoder.encode(courseName+"【作业】.zip")
+//				.replace("+", "%20") // 空格替换为"%20"
+//				.replace("%2F", "/"); // 解决斜杠问题
+//		StringBuilder contentDispositionValue = new StringBuilder();
+//		contentDispositionValue.append("attachment; filename=\"")
+//				.append(encodedFilename)
+//				.append("\"")
+//				.append("; filename*=utf-8''")
+//				.append(encodedFilename);
+//
+//        // 设置响应类型和Content-Disposition头
+//		response.setContentType("application/zip");
+
+		// 创建一个临时文件用于存储ZIP文件
+		File tempZipFile = new File("/home/www/elearning/upload/temp.zip");
+
+		try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(tempZipFile))) {
+			for (Map.Entry<String, String> e : map.entrySet()) {
+				File fileToZip = new File(e.getValue());
+				// 添加 ZIP 条目
+				ZipEntry entry = new ZipEntry(e.getKey());
+				entry.setSize(fileToZip.length());
+
+				zos.putNextEntry(entry);
+
+				try (FileInputStream fis = new FileInputStream(fileToZip)) {
+					byte[] buffer = new byte[4096];
+					int len;
+					while ((len = fis.read(buffer)) > 0) {
+						zos.write(buffer, 0, len);
+					}
+				}
+
+				zos.closeEntry();
+			}
+		}
+		// 将临时文件移动到指定位置
+		Path source = tempZipFile.toPath();
+		//生成uuid
+		String uuid = UUID.randomUUID().toString();
+		Path destination = Paths.get("/home/www/elearning/upload/saveZip/" + uuid + ".zip");
+
+		// 删除目标文件如果已存在
+		if (Files.exists(destination)) {
+			Files.delete(destination);
+		}
+
+		// 移动文件
+		Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+
+		// 返回文件路径给前端
+		String filePath = destination.toAbsolutePath().toString();
+		return success(filePath);
+	}
 	@GetMapping("/detail-study")
 	public JsonResponse<List<CourseStudyVo>> detailStudy(String courseId, String aid){
 		if(StringUtil.isBlank(courseId)){
@@ -392,7 +503,7 @@ public class CoursePortalApi extends ApiBaseController{
 									cv.setStatus(9);
 								}
 							}
-						//音视频
+							//音视频
 						}else{
 							cv.setStatus(study.getStatus());

--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
@@ -83,8 +83,13 @@ public class CourseContent extends BaseEntity {
     * */
    @Column(name = "duration")
    private Integer duration;
-    
-    
+
+    /**
+     * 视频播放进度
+     * */
+    @Column(name = "progress_video")
+    private Float progressVideo;
+
    /**用于学习时的状态显示，非存储字段*/
    @Transient
    private Integer status;
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java
@@ -82,4 +82,7 @@ public interface ICourseContentService{
 	 * @return
 	 */
 	CourseAssess getAssess(String ccid);
+
+	void updateProcessVideo(String contentId, String courseId, Float processVideo);
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
@@ -340,9 +340,8 @@ public interface ICourseService {
     * */
    List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);

-
-
-
-
-
+    /**
+     * 获取课程封面
+     * */
+    Map<String, String> getCourseCoverUrl(String courseIds);
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
@@ -1,5 +1,7 @@
 package com.xboe.module.course.service.impl;

+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.List;

 import javax.annotation.Resource;
@@ -141,6 +143,17 @@ public class CourseContentServiceImpl implements ICourseContentService {
 		return assess;
 	}

+	@Override
+	@Transactional
+	public void updateProcessVideo(String id, String courseId, Float progressVideo) {
+		// 处理 processVideo 为 null 的情况
+		if (progressVideo == null) {
+			progressVideo = 0.00f;
+		}
+		String sql = "UPDATE boe_course_content SET progress_video = "+ progressVideo+" WHERE id = "+ id+" AND course_id = "+ courseId+" ";
+		ccDao.sqlUpdate(sql);
+	}
+
 	@Override
 	@Transactional
 	public void updateName(String id, String name) {
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
@@ -1979,5 +1979,16 @@ public class CourseServiceImpl implements ICourseService {
        return courseDao.findListByHql("Select new Course(id,studys,score) from Course where id in(?1)", ids);
    }

+	@Override
+	public Map<String, String> getCourseCoverUrl(String courseIds) {
+		List<String> courseIdList = Arrays.asList(courseIds.split(","));
+		List<Course> courseList = courseDao.findList(FieldFilters.in("id", courseIdList));
+		Map<String, String> coverUrlMap = courseList.stream()
+				.filter(course -> StringUtils.isNotBlank(course.getCoverImg()))
+				.collect(Collectors.toMap(Course::getId, Course::getCoverImg));
+
+		return coverUrlMap;
+	}
+

 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java
@@ -14,15 +14,11 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import com.xboe.module.exam.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.dao.DuplicateKeyException;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;

 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -41,9 +37,6 @@ import com.xboe.core.cache.IXaskCache;
 import com.xboe.core.cache.XaskCacheProvider;
 import com.xboe.core.exception.XaskException;
 import com.xboe.module.exam.dto.AloneExamExportDto;
-import com.xboe.module.exam.entity.AloneExam;
-import com.xboe.module.exam.entity.AloneExamAnswer;
-import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.module.exam.service.IAloneExamService;
 import com.xboe.module.exam.service.IExamPaperService;
 import com.xboe.module.exam.service.IExamTestService;
@@ -553,6 +546,7 @@ public class AloneExamApi extends ApiBaseController {
        	//转化成百分数
        	//answer.setScore(this.calculateScore(detail));
            service.submit(answer,scoreType);
+            service.syncExamScoreToCourseSuite(answer, request);
            return success(map);
        } catch (Exception e) {
            log.error("提交答卷错误", e);
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
@@ -166,12 +166,12 @@ public class ExamQuestionApi extends ApiBaseController {
                return badRequest("请上传正确的试题文件");
            }
            //获取表头
-            Row row = sheetAt.getRow(1);
+            Row row = sheetAt.getRow(2);
            //从第二行开始获取数据
            List<ExamQuestion> examQuestions1 = new ArrayList<>();
            QuestionDto questionDto = new QuestionDto();

-            for (int i=2;i<sheetAt.getPhysicalNumberOfRows();i++) {
+            for (int i=3;i<sheetAt.getPhysicalNumberOfRows();i++) {
                //获取每一行

                Row row1 = sheetAt.getRow(i);
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java
@@ -3,14 +3,12 @@ package com.xboe.module.exam.api;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

+import cn.hutool.core.collection.CollectionUtil;
 import com.xboe.api.ThirdApi;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import org.hibernate.exception.ConstraintViolationException;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+

 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
@@ -23,6 +21,8 @@ import com.xboe.module.exam.service.IExamTestService;

 import lombok.extern.slf4j.Slf4j;

+import java.util.List;
+
 /**
 * 考试
 * */
@@ -33,8 +33,10 @@ public class ExamTestApi extends ApiBaseController {
 	
    @Resource
    private IExamTestService examTestService;
+
    @Resource
-    ThirdApi thirdApi;
+    private ThirdApi thirdApi;
+
    /**
     *查询考试，分页，搜索,资源归属，状态
     **/
@@ -183,4 +185,21 @@ public class ExamTestApi extends ApiBaseController {
            return error("上下级失败",e.getMessage());
        }
    }
+
+    /**
+     * 引用关系移除
+     * */
+    @PostMapping("/removeRel")
+    public JsonResponse<Boolean> removeRel(@RequestParam List<String> ids){
+        if(CollectionUtil.isEmpty(ids)){
+            return badRequest("参数异常");
+        }
+        try {
+            examTestService.removeRel(ids);
+            return success(true);
+        } catch (Exception e) {
+            log.error("引用关系移除异常",e);
+            return error("引用关系移除异常",e.getMessage());
+        }
+    }
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExam.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExam.java
@@ -65,6 +65,7 @@ public class AloneExam extends IdBaseEntity {
    private String ucode;
    
    /**关联类型*/
+    /**关联类型 新增关联类型14，代表成长路径图*/
    @Column(name = "ref_type", length = 30)
    private String refType;
    
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
@@ -28,7 +28,7 @@ public class ExamTest extends BaseEntity {
    /**
    * 考试名称
     * */
-    @Column(name = "test_name",nullable = false,length = 50)
+    @Column(name = "test_name",length = 50)
    private String testName;
    
    /**
@@ -46,7 +46,7 @@ public class ExamTest extends BaseEntity {
    /**
    * 考试时长    分钟
     * */
-    @Column(name = "test_duration",nullable = false)
+    @Column(name = "test_duration")
    private Integer testDuration;
    /**
     * 显示解析
@@ -107,13 +107,13 @@ public class ExamTest extends BaseEntity {
    /**
     * 考试的类型
     * */
-    @Column(name = "test_type",nullable = false)
+    @Column(name = "test_type")
    private Integer testType;
    
    /**
     * 发布状态 ，是否已发布
     */
-    @Column(name = "published",length = 1,nullable = false)
+    @Column(name = "published",length = 1)
    private Boolean published;
    /**
     * 发布时间
@@ -154,7 +154,7 @@ public class ExamTest extends BaseEntity {
    /**
     * 范围，1表独立使用，2表课程内部
     * */
-    @Column(name = "range_type",nullable = false)
+    @Column(name = "range_type")
    private Integer rangeType;

    /**
@@ -178,4 +178,14 @@ public class ExamTest extends BaseEntity {
    
    @Transient
    private String paperName;
+
+    /** 关联类型，1、项目 2、学习路径图 3、面授课 14、成长路径图 */
+    @Column(name = "ref_type")
+    private Integer refType;
+
+    @Column(name = "ref_id")
+    private String refId;
+
+    @Column(name = "ref_status")
+    private Integer refStatus;
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java
@@ -10,6 +10,7 @@ import com.xboe.module.exam.dto.TestUserQuery;
 import com.xboe.module.exam.entity.AloneExam;
 import com.xboe.module.exam.entity.AloneExamAnswer;
 import com.xboe.module.exam.vo.AloneExamQuery;
+import javax.servlet.http.HttpServletRequest;

 /**
 * 独立考试的处理。此信息无删除操作，更新也只是更新answerJson字段
@@ -92,10 +93,18 @@ public interface IAloneExamService {

 	/**
 	 * 提交考试
+	 *
 	 * @param aea
 	 */
-	void submit(AloneExamAnswer aea,Integer scoreType);
-	
+	void submit(AloneExamAnswer aea, Integer scoreType);
+
+	/**
+	 * 同步考试成绩
+	 * @param aea
+	 * @param request
+	 */
+	void syncExamScoreToCourseSuite(AloneExamAnswer aea, HttpServletRequest request);
+
 	/**
 	 * 更新答案
 	 * @param id
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IExamTestService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IExamTestService.java
@@ -3,6 +3,8 @@ package com.xboe.module.exam.service;
 import com.xboe.common.PageList;
 import com.xboe.module.exam.entity.ExamTest;

+import java.util.List;
+
 public interface IExamTestService {
    /**
     * 分页查，状态，搜索，资源归属
@@ -51,4 +53,5 @@ public interface IExamTestService {
     * */
    void enabled(String id,Boolean enabled);

+    void removeRel(List<String> ids);
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
@@ -1,17 +1,6 @@
 package com.xboe.module.exam.service.impl;

-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import com.xboe.api.ThirdApi;
 import com.xboe.common.OrderCondition;
 import com.xboe.common.PageList;
 import com.xboe.common.utils.StringUtil;
@@ -20,6 +9,7 @@ import com.xboe.core.orm.QueryBuilder;
 import com.xboe.core.orm.UpdateBuilder;
 import com.xboe.module.exam.dao.AloneExamAnswerDao;
 import com.xboe.module.exam.dao.AloneExamDao;
+import com.xboe.module.exam.dao.ExamTestDao;
 import com.xboe.module.exam.dto.TestUserAnswerDto;
 import com.xboe.module.exam.dto.TestUserDto;
 import com.xboe.module.exam.dto.TestUserQuery;
@@ -28,23 +18,47 @@ import com.xboe.module.exam.entity.AloneExamAnswer;
 import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.module.exam.service.IAloneExamService;
 import com.xboe.module.exam.vo.AloneExamQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;

@Service
 public class AloneExamServiceImpl implements IAloneExamService{

+	private static final Logger log = LoggerFactory.getLogger(AloneExamServiceImpl.class);
 	@Resource
 	AloneExamAnswerDao dao;
 	
 	@Resource
 	AloneExamDao aeDao;
+
+	@Autowired
+	private ThirdApi thirdApi;
+
 	
 	@Override
 	@Transactional
 	public void save(AloneExamAnswer aea){
 		dao.save(aea);
+		AloneExam ae=aeDao.findOne(FieldFilters.eq("aid", aea.getAid()),FieldFilters.eq("testId", aea.getTestId()));
+		int currentTimes = ae.getTimes() != null ? ae.getTimes() : 0;
 		//更新状态
 		aeDao.update(UpdateBuilder.from(AloneExam.class)
 				.addUpdateField("status", AloneExam.STATUS_NORMAL)
+				.addUpdateField("times", currentTimes+1)
 				.addFilter(FieldFilters.eq("aid", aea.getAid()))
 				.addFilter(FieldFilters.eq("testId", aea.getTestId()))
 				.addFilter(FieldFilters.eq("status",AloneExam.STATUS_NONE))
@@ -53,8 +67,8 @@ public class AloneExamServiceImpl implements IAloneExamService{
 	}

 	@Override
-	@Transactional
-	public void submit(AloneExamAnswer aea,Integer scoreType){
+	@Transactional(propagation = Propagation.REQUIRES_NEW)
+	public void submit(AloneExamAnswer aea, Integer scoreType){
 		//dao.update(aea);
 		aea.setStatus(AloneExamAnswer.STATUS_FINISH);
 		LocalDateTime now=LocalDateTime.now();
@@ -102,6 +116,27 @@ public class AloneExamServiceImpl implements IAloneExamService{
 //			}
 		}
 	}
+	@Override
+	public void syncExamScoreToCourseSuite(AloneExamAnswer aea, HttpServletRequest request) {
+		String token = request.getHeader("Xboe-Access-Token");
+		if (StringUtils.isEmpty(token)) {
+			token = request.getHeader("token");
+		}
+
+		String finalToken = token;
+		CompletableFuture.supplyAsync(() -> {
+			AloneExam aloneExam = aeDao.findOne(FieldFilters.eq("aid", aea.getAid()), FieldFilters.eq("testId", aea.getTestId()));
+			if (aloneExam.getRefType().equals("14")){
+				thirdApi.syncExamScoreToCourseSuite(aloneExam, finalToken);
+			}
+			return "完成结果";
+		}).exceptionally(ex -> {
+			log.error("异步操作中发生错误: " + ex.getMessage(), ex);
+			return "发生错误";
+		}).thenAccept(result -> {
+			log.info("同步考试成绩到课程项目完成：" + result);
+		});
+	}

 	@Override
 	@Transactional
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
@@ -95,7 +95,7 @@ public class ExamTestServiceImpl implements IExamTestService {

    @Override
    public Boolean has(String paperId) {
-    	ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId));
+    	ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId),FieldFilters.eq("deleted", false));
    	//String etId= (String)examTestDao.findField("id", FieldFilters.eq("paperId", paperId));
        if(et==null){
            return true;
@@ -122,4 +122,10 @@ public class ExamTestServiceImpl implements IExamTestService {
 		}
 		return null;
 	}
+
+    @Override
+    public void removeRel(List<String> ids) {
+        String idsStr = String.join(",", ids);
+        examTestDao.sqlUpdate("update boe_exam_test set ref_status=0 where id in (?1)",idsStr);
+    }
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
@@ -3,14 +3,13 @@ package com.xboe.school.study.api;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;

-import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
 import com.xboe.api.ThirdApi;
-import com.xboe.api.vo.*;
+import com.xboe.constants.CacheName;
 import com.xboe.module.course.vo.TeacherVo;
-import com.xboe.module.usergroup.entity.UserGroupItem;
 import com.xboe.module.usergroup.service.IUserGroupService;
+import com.xboe.school.study.dao.StudyCourseDao;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -324,17 +323,32 @@ public class StudyCourseApi extends ApiBaseController{
 		//检查是否已存在
 		StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
 		if(item!=null) {
-			//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
-			if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
-				studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
+			String studyKey = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + item.getCourseId()+":"+cuser.getAccountId()+":"+item.getContentId();
+			String studyKey2 = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + sci.getCourseId()+":"+cuser.getAccountId()+":"+sci.getContentId();
+			redisTemplate.opsForValue().set(studyKey,
+					String.valueOf(item.getProgress()), 2, TimeUnit.HOURS);
+			String progressStr = redisTemplate.opsForValue().get(studyKey2);
+			if (progressStr != null && !progressStr.isEmpty()) {
+				// 尝试将 Redis 中的字符串转换为整数
+				int redisProgress = Integer.parseInt(progressStr);
+				// 假设 item.getProgress() 返回的是 int 类型
+				int sciProgress = sci.getProgress();
+
+				if (redisProgress < sciProgress && redisProgress < 100) {
+					// 执行一些操作
+//					if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
+//					}
+					studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
+				}
 			}
 			//追加学习时长
 			studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
 			log.info("在线课学习记录"+allUserList);
 			return success(item.getId());
+			//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
 		}
-		
+
 		if(StringUtils.isBlank(sci.getCourseId())){
 			return error("无课程信息");
 		}
@@ -529,7 +543,7 @@ public class StudyCourseApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/study-video-time")
-	public JsonResponse<Boolean> study(String studyId,String itemId,Integer videoTime){
+	public JsonResponse<Boolean> study(String itemId,Integer videoTime,String contentId , String courseId,Float progressVideo){
 		
 		if(StringUtils.isBlank(itemId)){
 			return error("参数错误");
@@ -539,7 +553,10 @@ public class StudyCourseApi extends ApiBaseController{
 		}
 		//检查是否已存在
 		try {
-			studyService.updateLastTime(itemId,videoTime,getCurrent().getAccountId());
+			studyService.updateLastTime(itemId,videoTime, getCurrent().getAccountId());
+			if (contentId != null && courseId != null && progressVideo != null){
+				contentService.updateProcessVideo(contentId, courseId, progressVideo);
+			}
 			return success(true);
 		}catch(Exception e) {
 			log.error("记录最后学习时间错误",e);
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java
@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;

 import com.xboe.api.ThirdApi;
+import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,8 @@ import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping(value="/xboe/school/study/exam")
 public class StudyExamApi extends ApiBaseController{
+	@Autowired
+	StudyCourseDao scDao;

 	@Autowired
 	IStudyExamService sexamService;
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyHomeWorkService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyHomeWorkService.java
@@ -1,5 +1,6 @@
 package com.xboe.school.study.service;

+import java.util.Collection;
 import java.util.List;

 import com.xboe.school.study.entity.StudyHomeWork;
@@ -29,4 +30,6 @@ public interface IStudyHomeWorkService {
 	 * @return
 	 */
 	List<StudyHomeWork> getByStudyIdAndContentId(String studyId,String contentId);
+
+	List<StudyHomeWork>getByStudnetNameAndContentId(List<String> studentName, String contentId);
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
@@ -7,6 +7,7 @@ import com.xboe.common.PageList;
 import com.xboe.school.study.dto.StudyContentDto;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyTime;
+import com.xboe.system.user.entity.User;

 /**
 * 学习情况处理,比较综合一个处理类
@@ -95,4 +96,8 @@ public interface IStudyService {
 	 * @return
 	 */
 	PageList<StudyCourseItem> findItemPage(int pageIndex, int pageSize, String contentId, String courseId, String name, Integer status);
+
+    List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status);
+
+    List<User> getUserNo(List<String> userIds);
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
@@ -44,7 +44,7 @@ public class StudyAssessServiceImpl implements IStudyAssessService{
 			LocalDateTime ldt=LocalDateTime.now();
 			sci.setStudyId(assess.getStudyId());
 			sci.setContentId(assess.getContentId());
-			//sci.setContentName(homework.getContentName());
+			sci.setContentName("评估");
 			sci.setCourseId(assess.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(100);//直接设置为学习完成
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
@@ -82,7 +82,7 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			LocalDateTime ldt=LocalDateTime.now();
 			sci.setStudyId(exam.getStudyId());
 			sci.setContentId(exam.getContentId());
-			//sci.setContentName(homework.getContentName());
+			sci.setContentName("考试");
 			sci.setCourseId(exam.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(prog);//直接设置为学习完成
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
@@ -46,7 +46,7 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
 			LocalDateTime ldt=LocalDateTime.now();
 			sci.setStudyId(homework.getStudyId());
 			sci.setContentId(homework.getContentId());
-			//sci.setContentName(homework.getContentName());
+			sci.setContentName(homework.getHwName());
 			sci.setCourseId(homework.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(100);//直接设置为学习完成
@@ -67,7 +67,7 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
 			//只是保留一条作业记录，不再保存多条记录了
 			//dao.save(homework);
 			//设置id。然后进行悠
-			homework.setId(obj.toString());
+			homework.setId(homework.getStudyItemId());
 			dao.update(homework);
 		}
 	}
@@ -89,4 +89,9 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
 		return dao.findList(FieldFilters.eq("studyId", studyId),FieldFilters.eq("contentId", contentId));
 	}

+	@Override
+	public List<StudyHomeWork> getByStudnetNameAndContentId(List<String> studentName, String contentId) {
+		return dao.findList(FieldFilters.in("student_name", studentName),FieldFilters.eq("contentId", contentId));
+	}
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
@@ -1,6 +1,5 @@
 package com.xboe.school.study.service.impl;

-import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -8,12 +7,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import javax.annotation.Resource;
 import javax.transaction.Transactional;

 import com.xboe.module.article.entity.Article;
 import com.xboe.module.interaction.entity.Shares;
 import com.xboe.school.study.entity.StudyCourse;
+import com.xboe.system.user.entity.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -98,8 +97,12 @@ public class StudyServiceImpl implements IStudyService{
 		//sci.setProgress(100);//直接设置为学习完成
 		sci.setLastTime(ldt);
 		scItemDao.saveOrUpdate(sci);
-		
-		dto.setStudyItemId(sci.getId());
+		if (sci.getId() != null){
+			dto.setStudyItemId(sci.getId());
+		}else {
+			log.info("学习记录插入失败"+sci.getId());
+			throw new IllegalArgumentException("学习记录插入失败");
+		}
 		//检查是否全部学习完成
 		scDao.finishCheck(dto.getStudyId(),dto.getCourseId(),dto.getContentTotal(),token);
 		
@@ -182,7 +185,7 @@ public class StudyServiceImpl implements IStudyService{
 		if(StringUtils.isNotBlank(name)) {
 			query.addFilter(FieldFilters.eq("aname", name));
 		}
-		int pageIndex2 = pageIndex-1;
+		int pageIndex2 = (pageIndex-1)*10;
 		if(status!=null) {
 			if(status==3) {
 				query.addFilter(FieldFilters.eq("status", 2));
@@ -193,16 +196,16 @@ public class StudyServiceImpl implements IStudyService{
 			}else if (status == 1) {
 				String sql = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.content_id,0 as progress,1 as status from boe_study_course bsc " +
 						" left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" +
-						" where bsc.course_id = '"+courseId+"' and bsc.id not in(" +
+						" where bsc.course_id = '"+courseId+"' and bsc.aname like '%"+name+"%' and bsc.id not in(" +
 						" select item.study_id from boe_study_course_item item " +
-						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by item.study_id" +
+						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' and item.aname like '%"+name+"%' group by item.study_id" +
 						" ) group by bsc.id limit "+ pageIndex2+","+ pageSize+";";

 				String sql2 = "select count(*) as total from (select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.content_id,0 as progress,1 as status from boe_study_course bsc " +
 						" left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" +
-						" where bsc.course_id = '"+courseId+"' and bsc.id not in(" +
+						" where bsc.course_id = '"+courseId+"' and bsc.aname like '%"+name+"%' and bsc.id not in(" +
 						" select item.study_id from boe_study_course_item item " +
-						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by item.study_id" +
+						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' and item.aname like '%"+name+"%' group by item.study_id" +
 						" ) group by bsc.id) as total";
 				log.info("资源完成情况未开始sql"+sql);
 				List<Object[]> list = scDao.sqlFindList(sql);
@@ -224,46 +227,22 @@ public class StudyServiceImpl implements IStudyService{
 				return pageList;
 			}
 		}
-//		String sql = "select * from (select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.progress,item.status from boe_study_course bsc left join " +
-//				"boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-//				"where bsc.`status` in (2,9) and bsc.course_id = '"+ courseId+"' group by bsc.id " +
-//				" UNION ALL " +
-//				" select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,0 as progress,1 as status from boe_study_course bsc " +
-//				" LEFT JOIN boe_study_course_item item on item.course_id = bsc.course_id " +
-//				" where bsc.course_id = '"+courseId+"' and bsc.id not in (" +
-//				" select bsc.id from boe_study_course bsc " +
-//				" left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-//				" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" +
-//				" )group by bsc.id) a group by a.id limit "+ pageIndex+","+ pageSize+";";
-
-//		String sql2 = "select count(*) from (select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.progress,item.status from boe_study_course bsc left join " +
-//				"boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-//				"where bsc.`status` in (2,9) and bsc.course_id = '"+ courseId+"' group by bsc.id " +
-//				" UNION ALL " +
-//				" select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,0 as progress,1 as status from boe_study_course bsc " +
-//				" LEFT JOIN boe_study_course_item item on item.course_id = bsc.course_id " +
-//				" where bsc.course_id = '"+courseId+"' and bsc.id not in (" +
-//				" select bsc.id from boe_study_course bsc " +
-//				" left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-//				" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" +
-//				" )group by bsc.id) a group by a.id";
-
 		String sql = "select a.id, a.course_id, a.course_name, a.aname, " +
 				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
-				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +
+				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "' and aname like '%"+name+"%') a " +
 				"left join " +
 				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
 				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' group by bsc.id) b " +
+				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
 				"on a.course_id = b.course_id and a.id = b.id " +
 				"group by a.id limit "+ pageIndex2+","+ pageSize+";";
 		String sql2 = "select count(*) as total from (select a.id, a.course_id, a.course_name, a.aname, " +
 				"IFNULL(b.finish_time, 0) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
-				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +
+				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "' and aname like '%"+name+"%') a " +
 				"left join " +
 				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
 				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' group by bsc.id) b " +
+				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
 				"on a.course_id = b.course_id and a.id = b.id " +
 				"group by a.id) as total";
 		log.info("资源完成情况全部sql"+sql);
@@ -292,6 +271,39 @@ public class StudyServiceImpl implements IStudyService{
 		
 	}

+	@Override
+	public List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status) {
+
+		QueryBuilder query=QueryBuilder.from(StudyCourseItem.class);
+
+		OrderCondition	oc=OrderCondition.desc("id");
+		query.addOrder(oc);
+		if(StringUtils.isNotBlank(contentId)) {
+			query.addFilter(FieldFilters.eq("contentId",contentId));
+		}
+		if(StringUtils.isNotBlank(courseId)) {
+			query.addFilter(FieldFilters.eq("courseId",courseId));
+		}
+
+		if(status!=null) {
+			if(status==1) {
+				query.addFilter(FieldFilters.eq("progress", 0));
+			}else {
+				query.addFilter(FieldFilters.eq("progress",100));
+			}
+
+		}
+		if(StringUtils.isNotBlank(name)) {
+			query.addFilter(FieldFilters.eq("aname", name));
+		}
+		return scItemDao.findList(query.builder());
+	}
+
+	@Override
+	public List<User> getUserNo(List<String> userIds) {
+		return userDao.findList(FieldFilters.in("id", userIds));
+	}
+
 	@Override
 	@Transactional
 	public void updateProcess(String studyContentId,String studyId, String courseId,Integer total, Integer progress,String token) {
--- a/servers/boe-server-all/src/main/resources/application-pro.properties
+++ b/servers/boe-server-all/src/main/resources/application-pro.properties
@@ -1,9 +1,9 @@
 # cloud nacos config
-spring.cloud.nacos.discovery.server-addr=10.251.129.51:8848
+spring.cloud.nacos.discovery.server-addr=10.251.113.100:8848

 ## redis
 spring.redis.database=1
-spring.redis.host=10.251.129.122
+spring.redis.host=10.251.88.213
 spring.redis.password=qwert!W588
 spring.redis.port=6379

@@ -16,7 +16,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://10.251.129.129:8066/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 #spring.datasource.username=admin
 #spring.datasource.password=ocYMC>!{8G
-spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01

@@ -53,6 +53,7 @@ xboe.externalinterface.url.system=http://127.0.0.1:9091
 ## ?????????????
 xboe.old.base.url=https://u.boe.com

+
 ## ???????api??
 xboe.stat.base.url=http://127.0.0.1:9080
 xboe.server.userbasic.url=https://u.boe.com/userbasic
@@ -63,7 +64,7 @@ jasypt.encryptor.algorithm=PBEWithMD5AndDES
 jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator

 # elasticsearch config
-xboe.elasticsearch.server.ip=10.251.129.21
+xboe.elasticsearch.server.ip=10.251.88.218
 xboe.elasticsearch.server.port=9200
 xboe.elasticsearch.server.user=
 xboe.elasticsearch.server.password=
--- a/servers/boe-server-all/src/main/resources/application.properties
+++ b/servers/boe-server-all/src/main/resources/application.properties
@@ -56,7 +56,7 @@ logging.config=classpath:log/logback-@profileActive@.xml
 # config.id.generator.datacenter.num=1

 #boe.domain=https://pretest.zcwytd.com
-boe.domain=https://u.boe.com
+boe.domain=http://127.0.0.1
 #boe.domain=http://localhost:30001
 orgTree.orgTreeList=${boe.domain}/userbasic/org/list
 # ????id????????????
@@ -73,5 +73,6 @@ infrasApi.dict=${boe.domain}/infrasApi/dict/list
 manageApi.stu.offcourse=${boe.domain}/manageApi/stu/offcourse/getOffCourseId
 manageApi.editExam=${boe.domain}/manageApi/admin/project/editExam
 #获取离职教师id
-userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfo
-coursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus
+userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfocoursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus
+coursesuilt.checkBanding=${boe.domain}/manageApi/stu/task/exam/checkBanding
+coursesuilt.syncExamScoreToCourseSuite=${boe.domain}/manageApi/stu/task/exam/syncExamScoreToCourseSuite
--- a/servers/boe-server-basic/src/main/resources/application-pro.properties
+++ b/servers/boe-server-basic/src/main/resources/application-pro.properties
@@ -1,6 +1,6 @@
 ## redis
 spring.redis.database=3
-spring.redis.host=10.251.129.122
+spring.redis.host=10.251.88.213
 spring.redis.password=qwert!W588
 spring.redis.port=6379

@@ -14,7 +14,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # 当前数据库 basic 对应的数据库
 spring.datasource.db1.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.88.216:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.db1.username=admin
 spring.datasource.db1.password=boeRds01

@@ -23,7 +23,7 @@ spring.datasource.db1.password=boeRds01
 # 主数据库 all 对应的数据库
 spring.datasource.db2.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.db2.username=admin
 spring.datasource.db2.password=boeRds01

@@ -48,6 +48,7 @@ xboe.upload.file.http_path=https://u.boe.com/upload
 ## 新系统的内部地址，可以不通过nginx调用
 xboe.inner.data.sync.baseurl=http://127.0.0.1:9090

+
 #加密盐
 #jasypt.encryptor.password=jasypt
 jasypt.encryptor.algorithm=PBEWithMD5AndDES
--- a/servers/boe-server-course/src/main/resources/application-pro.properties
+++ b/servers/boe-server-course/src/main/resources/application-pro.properties
@@ -1,15 +1,15 @@
 ## redis
 spring.redis.database=2
-spring.redis.host=127.0.0.1
-spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
+spring.redis.host=10.251.88.214
+spring.redis.password=qwert!W588
 spring.redis.port=6379

 ## datasource config
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
-spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
+spring.datasource.url=jdbc:mysql:/10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=admin
+spring.datasource.password=boeRds01

 logging.level.org.hibernate.SQL=ERROR
 # logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
--- a/servers/boe-server-old/src/main/resources/application-pro.properties
+++ b/servers/boe-server-old/src/main/resources/application-pro.properties
@@ -1,6 +1,6 @@
 ## redis
 spring.redis.database=2
-spring.redis.host=127.0.0.1
+spring.redis.host=10.251.88.214
 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
 spring.redis.port=6379

@@ -8,7 +8,7 @@ spring.redis.port=6379
 spring.jpa.hibernate.ddl-auto=none
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)

--- a/servers/boe-server-task/src/main/resources/application-pro.properties
+++ b/servers/boe-server-task/src/main/resources/application-pro.properties
@@ -1,16 +1,16 @@
 ## redis
 spring.redis.database=2
-spring.redis.host=127.0.0.1
+spring.redis.host=10.251.88.214
 spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
 spring.redis.port=6379

 # cloud nacos config
-spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848
+spring.cloud.nacos.discovery.server-addr=10.251.113.100:8848

 ## datasource config
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)

@@ -33,7 +33,6 @@ xboe.upload.file.http_path=http://localhost:9090/cdn/upload

 ## 外部接口调用地址 旧系统机构及用户数据接口
 xboe.externalinterface.url.system=http://localhost:9091
-
 #加密盐
 #jasypt.encryptor.password=jasypt
 jasypt.encryptor.algorithm=PBEWithMD5AndDES
--- a/servers/modify-221027/src/main/resources/application-pro.properties
+++ b/servers/modify-221027/src/main/resources/application-pro.properties
@@ -7,7 +7,7 @@ spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # 当前数据库 basic 对应的数据库
-spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01

--- a/servers/modify-user/src/main/resources/application-pro.properties
+++ b/servers/modify-user/src/main/resources/application-pro.properties
@@ -7,7 +7,7 @@ spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # 当前数据库 basic 对应的数据库
-spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01

--- a/servers/org-user-sync/src/main/resources/application-pro.properties
+++ b/servers/org-user-sync/src/main/resources/application-pro.properties
@@ -1,4 +1,3 @@
-
 # datasource config
 # basic数据库
 spring.jpa.hibernate.ddl-auto=none
@@ -9,7 +8,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # 原数据库 old 对应的数据库
 spring.datasource.db1.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.129.126:3306/elearninglms?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.88.216:3306/elearninglms?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.db1.username=admin
 spring.datasource.db1.password=boeRds01

@@ -18,7 +17,7 @@ spring.datasource.db1.password=boeRds01
 # 新主数据库 all 对应的数据库
 spring.datasource.db2.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.db2.username=admin
 spring.datasource.db2.password=boeRds01
Author	SHA1	Message	Date
yang	0dcd78ea6e	成长路径	2024-12-17 18:50:14 +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
joshen	e52d9b682b	Update application-pro.properties	2024-08-20 10:52:07 +08:00
nisen	cf64f0406f	Merge branch 'zcwy0815-llf' into master-0705	2024-08-15 20:20:14 +08:00
zhaolongfei	df3b0b95c1	处理study接口，studyitemid返回值为空的问题	2024-08-15 20:19:27 +08:00
nisen	f5ff666c07	Merge branch 'zcwy0815-llf' into master-0705	2024-08-15 19:57:23 +08:00
zhaolongfei	731e62c89f	处理study接口，studyitemid返回值为空的问题	2024-08-15 19:44:23 +08:00
zhaolongfei	7fe53c026e	处理study接口，studyitemid返回值为空的问题	2024-08-15 19:26:10 +08:00
zhaolongfei	6492e3b0dd	处理study接口，studyitemid返回值为空的问题	2024-08-15 19:18:28 +08:00
zhaolongfei	30aab6eab4	处理study接口，studyitemid返回值为空的问题	2024-08-15 19:03:11 +08:00
670788339	61754d3852	放开redis	2024-08-15 16:26:47 +08:00
670788339	a26ee1c707	放开注释	2024-08-15 15:42:45 +08:00
670788339	1f0060c4dc	放开注释	2024-08-15 15:27:41 +08:00
670788339	6b0050286c	放开注释	2024-08-15 15:19:59 +08:00
670788339	2b07029aca	注释	2024-08-15 12:09:40 +08:00
670788339	d2d7fab96c	注释	2024-08-15 12:03:05 +08:00
670788339	be3bae969c	study接口加redis过滤	2024-08-15 11:35:02 +08:00
670788339	8e1b7519ef	study接口加redis过滤	2024-08-15 11:31:17 +08:00
670788339	bddb11caf8	study接口加redis过滤	2024-08-15 10:53:26 +08:00
joshen	436eedd570	Update ElasticsearchConfig.java	2024-08-14 09:33:26 +08:00
joshen	345e28fdee	Update application-pro.properties	2024-08-13 21:49:29 +08:00
joshen	312c85d92c	Update application-pro.properties	2024-08-13 21:34:08 +08:00
joshen	a590cd19b1	Update application-pro.properties	2024-08-13 20:54:12 +08:00
joshen	58c5ab499a	Update application-pro.properties	2024-08-13 20:53:18 +08:00
joshen	a38cfc553f	Update application-pro.properties	2024-08-13 19:32:47 +08:00
joshen	56199f1480	Update application.properties	2024-08-13 19:31:56 +08:00
joshen	6d5fd5364d	Update application.properties	2024-08-13 19:28:18 +08:00
joshen	99792ccab6	Update application-pro.properties	2024-08-13 19:13:42 +08:00
joshen	78b36b6da0	Update application-pro.properties	2024-08-13 17:36:50 +08:00
joshen	f6a7bb77c0	Update application-pro.properties	2024-08-13 17:34:51 +08:00
joshen	dfb0825cfd	Update application.properties	2024-08-13 17:33:16 +08:00
joshen	ba8ef92700	Update application-pro.properties	2024-08-13 17:32:30 +08:00
joshen	56d064e533	Update application-pro.properties	2024-08-13 16:35:13 +08:00
joshen	654da73faf	Update application-pro.properties	2024-08-13 15:19:38 +08:00
joshen	627e87509f	Update application-pro.properties	2024-08-13 15:18:25 +08:00
joshen	2911ef8d46	Update application-pro.properties	2024-08-13 15:18:09 +08:00
joshen	b86ce744a7	Update application-pro.properties	2024-08-13 15:17:52 +08:00
joshen	c096c44a91	Update application-pro.properties	2024-08-13 15:17:22 +08:00
joshen	db84181523	Update application-pro.properties	2024-08-13 14:59:23 +08:00
joshen	b568285fed	Update application-pro.properties	2024-08-12 20:57:34 +08:00
joshen	e38be093f4	Update application-pro.properties	2024-08-12 20:00:29 +08:00
nisen	f0fe015561	Merge branch 'zcwy0731-llf' into master-0705	2024-08-06 17:52:08 +08:00
zhaolongfei	91bcec00ef	修复同步到item表没有名称问题	2024-08-06 14:42:05 +08:00
lu	27b863a6a4	作业导出修改名称	2024-08-06 10:43:17 +08:00
nisen	7a210ec701	Merge branch 'zcwy0731-llf' into master-0705	2024-08-05 19:03:09 +08:00
lu	484a7650dd	导出逻辑	2024-08-05 18:46:29 +08:00
zhaolongfei	6c616a1163	在线课作业重复提交报错修复	2024-08-05 15:12:54 +08:00
zhaolongfei	939325d5bd	在线课作业重复提交报错修复	2024-08-05 15:05:28 +08:00
lu	bcb453b2f4	导出判断	2024-08-05 13:57:18 +08:00
zhaolongfei	4eddbc8e8f	在线管理资源完成情况名称搜索修复	2024-08-05 11:21:14 +08:00
zhaolongfei	50bdd59a26	在线管理资源完成情况名称搜索修复	2024-08-05 11:11:12 +08:00
zhaolongfei	b85eb97bc1	在线管理资源完成情况名称搜索修复	2024-08-05 10:57:14 +08:00
zhaolongfei	28b58a73cf	在线管理资源完成情况名称搜索修复	2024-08-05 10:29:36 +08:00
zhaolongfei	b9adf4c45f	作业多次点击提交报错修复	2024-08-02 17:08:00 +08:00
lu	389dff8fbe	作业导出判空	2024-08-02 13:40:39 +08:00
zhaolongfei	49aab74463	作业多次点击提交报错修复	2024-08-02 13:19:08 +08:00
zhaolongfei	9f30910d04	作业多次点击提交报错修复	2024-08-02 11:32:14 +08:00
zhaolongfei	6658b8c04b	作业多次点击提交报错修复	2024-08-02 11:03:13 +08:00
zhaolongfei	19df4224a9	作业多次点击提交报错修复	2024-08-02 10:16:05 +08:00
zhaolongfei	95ddc9f5d5	作业多次点击提交报错修复	2024-08-02 09:36:36 +08:00
nisen	f3b6bb6fee	Merge branch 'zcwy0731-llf' into master-0705 # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java	2024-08-01 17:43:07 +08:00
lu	a9be34631a	作业导出名称修改	2024-08-01 16:30:11 +08:00
lu	7e3a3a5838	作业导出名称修改	2024-08-01 15:33:26 +08:00
zhaolongfei	64965f5ec6	考试管理删除不同步	2024-07-31 19:01:53 +08:00
zhaolongfei	a407ca2dad	考试管理删除不同步	2024-07-31 18:35:49 +08:00
lu	f79a159e22	作业导出增加返回值	2024-07-31 17:48:29 +08:00
lu	b9c4503aaa	作业导出判空	2024-07-31 16:55:01 +08:00
lu	860fb3f27c	提交作业路径修改	2024-07-31 11:55:01 +08:00
lu	294949f4e5	提交作业bug	2024-07-31 10:03:46 +08:00
nisen	16f1c2337b	Merge branch 'zcwy0716-llf' into master-0705	2024-07-30 15:46:41 +08:00
lu	9b8487b0ca	作业导出	2024-07-30 15:26:39 +08:00
zhaolongfei	bf476a23a0	在线管理状态完成情况	2024-07-30 14:05:06 +08:00
joshen	92a4e509ef	Merge branch 'master-0705' into 'master' Master 0705 See merge request !116	2024-07-30 11:58:33 +08:00
nisen	0f0edaf2cd	Merge branch 'zcwy0729-llf' into master-0705	2024-07-30 11:56:45 +08:00
lu	e508551043	作业导出bug	2024-07-30 11:53:53 +08:00
nisen	68d00e8c51	Merge branch 'zcwy0716-llf' into master-0705	2024-07-29 19:56:17 +08:00
zhaolongfei	41a542ea23	Merge remote-tracking branch 'java-servse-yx/zcwy0606-llf' into zcwy0729-llf # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java # servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java	2024-07-29 19:52:50 +08:00
zhaolongfei	fc98025a3a	视频暂存为空判断	2024-07-29 19:21:26 +08:00
lu	8dffbfda04	作业导出路径	2024-07-25 15:52:22 +08:00
lu	5387a90f3a	作业导出bug	2024-07-25 15:21:37 +08:00
lu	5116c1ebc5	作业导出bug	2024-07-25 14:54:06 +08:00
lu	29ca9d61f9	作业导出修改上传路径	2024-07-25 14:06:05 +08:00
lu	f901a2897f	作业导出	2024-07-25 11:20:20 +08:00
zhaolongfei	e2c697f860	修改bug	2024-06-19 16:43:08 +08:00
zhaolongfei	c6a785bb4f	添加视频暂存点	2024-06-19 13:55:54 +08:00
zhaolongfei	8567fa9ecc	content表添加processVideo字段,添加判断	2024-06-18 13:47:46 +08:00
zhaolongfei	359b66e48a	content表添加processVideo字段,添加判断	2024-06-18 13:31:39 +08:00
zhaolongfei	8125a6bd77	content表添加processVideo字段,添加判断	2024-06-18 11:12:08 +08:00
zhaolongfei	9b37e8a73d	content表添加processVideo字段,添加判断	2024-06-18 09:09:52 +08:00
zhaolongfei	2fa3378e94	content表添加processVideo字段	2024-06-17 16:16:29 +08:00
zhaolongfei	0b7784779f	item添加processVideo字段	2024-06-13 15:28:13 +08:00
zhaolongfei	e03118275d	修改项目下考试结束时间并未生效修复	2024-06-06 18:10:28 +08:00
zhaolongfei	1b1cb17861	Merge branch 'zcwy0525-llf' into zcwy0606-llf	2024-06-06 16:35:40 +08:00
zhaolongfei	a35c1faa49	学员在线删除失败的bug修复	2024-06-06 16:32:33 +08:00