Merge branch '250408-bugfix-shl' into release-20250328-master

# Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
增加面授课删除
2025-12-10 03:16:48 +08:00 · 2025-04-09 18:16:07 +08:00 · 2025-04-08 17:43:37 +08:00 · 2025-04-03 09:09:58 +08:00 · 2025-04-02 16:57:24 +08:00 · 2025-04-01 13:52:20 +08:00
47 changed files with 1058 additions and 592 deletions
--- a/servers/boe-server-all/pom.xml
+++ b/servers/boe-server-all/pom.xml
@@ -219,13 +219,13 @@
        <dependency>
            <groupId>org.elasticsearch</groupId>
            <artifactId>elasticsearch</artifactId>
-            <version>7.10.2</version> <!-- 请根据实际需求选择合适的版本 -->
+            <version>7.9.0</version> <!-- 请根据实际需求选择合适的版本 -->
        </dependency>

        <dependency>
            <groupId>org.elasticsearch.client</groupId>
            <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <version>7.10.2</version> <!-- 请根据实际需求选择合适的版本 -->
+            <version>7.9.0</version> <!-- 请根据实际需求选择合适的版本 -->
        </dependency>

        <dependency>
@@ -237,10 +237,9 @@
        <dependency>
            <groupId>com.xuxueli</groupId>
            <artifactId>xxl-job-core</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.0</version> <!-- 请根据实际需求选择版本 -->
        </dependency>

-
    </dependencies>
    <build>
        <plugins>
@@ -270,9 +269,9 @@
    </build>
    <profiles>
        <profile>
-            <id>pro</id>
+            <id>prod</id>
            <properties>
-                <profileActive>pro</profileActive>
+                <profileActive>prod</profileActive>
            </properties>
        </profile>
        <profile>
--- 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
@@ -8,9 +8,11 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.boe.feign.api.courseweb.entity.ExamTestDto;
 import com.boe.feign.api.courseweb.entity.ProjectStudyDto;
+import com.boe.feign.api.courseweb.remote.ExternalRemoteClient;
 import com.boe.feign.api.courseweb.remote.OffCourseRemoteClient;
 import com.boe.feign.api.courseweb.remote.ProjectAdminRemoteClient;
 import com.boe.feign.api.courseweb.remote.ProjectRemoteClient;
+import com.boe.feign.api.courseweb.reps.ExamStudyRecordParam;
 import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
 import com.boe.feign.api.infrastructure.entity.Dict;
 import com.boe.feign.api.infrastructure.remote.DictRemoteClient;
@@ -22,11 +24,11 @@ import com.boe.feign.api.usercenter.reps.AudienceMemberVo;
 import com.boe.feign.api.usercenter.reps.Response;
 import com.xboe.api.infrastructure.res.InfraResult;
 import com.xboe.api.vo.*;
+import com.xboe.module.course.dto.CourseParam;
+import com.xboe.module.course.dto.ScoreParam;
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
 import com.xboe.core.JsonResponse;
-import com.xboe.module.course.dto.CourseParam;
-import com.xboe.module.course.dto.ScoreParam;
 import com.xboe.module.course.vo.StudyCourseVo;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.dict.entity.DictDto;
@@ -73,6 +75,8 @@ public class ThirdApi {

    @Resource
    private ProjectRemoteClient projectRemoteClient;
+    @Resource
+    ExternalRemoteClient externalRemoteClient;

    @Resource
    private DictRemoteClient dictRemoteClient;
@@ -92,8 +96,8 @@ public class ThirdApi {
    private String syncCourseStudent;
    @Value("${coursesuilt.syncOnLineScore}")
    private String syncOnLineScore;
-    @Value("${coursesuilt.updateOnLineStatus}")
-    private String updateOnLineStatus;
+    @Value("${coursesuilt.updateOnLineStatua}")
+    private String updateOnLineStatua;


    //获取例外人员的id
@@ -262,11 +266,19 @@ public class ThirdApi {
    }

    public List<StudyCourse> getStudyCourseList(String studyId, String courseId, String token) {
+        log.info(" 1  studyId = "+ studyId + " ,courseId = " + courseId );
+        if ( studyId == null || courseId == null ){
+            log.error(" 在线课学习记录 参数不能为空 ");
+            return new ArrayList<>();
+        }
        StudyCourseVo studyCourseVo = new StudyCourseVo();
        studyCourseVo.setStudyId(studyId);
        studyCourseVo.setCourseId(courseId);
        ProjectStudyDto projectStudyDto = new ProjectStudyDto();
-        BeanUtil.copyProperties(studyCourseVo, studyCourseVo);
+//        BeanUtil.copyProperties(studyCourseVo, studyCourseVo);
+        projectStudyDto.setStudyId(Long.parseLong(studyId));
+        projectStudyDto.setCourseId(Long.parseLong(courseId));
+        log.info(" 12 在线课学习记录 studyId = "+ projectStudyDto.getStudyId() + " ,courseId = " + projectStudyDto.getCourseId() );
        projectRemoteClient.updateStudyStatus(projectStudyDto);
        return new ArrayList<>();
    }
@@ -376,10 +388,14 @@ public class ThirdApi {
                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
        log.info("syncOnLineScore = " + resp);
    }
-    public void updateOnLineStatus(CourseParam param, String token){
+    public void updateOnLineStatua(CourseParam param, String token){
        String resp = Optional.ofNullable(
-                HttpRequest.post(updateOnLineStatus).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
+                HttpRequest.post(updateOnLineStatua).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
        log.info("updateOrSaveCourse = " + resp);
    }
+
+    public void syncExamStudyRecord(ExamStudyRecordParam param) {
+        externalRemoteClient.syncExamStudyRecord(param);
+    }
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/config/ConditionException.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/config/ConditionException.java
@@ -1,25 +0,0 @@
-package com.xboe.config;
-
-public class ConditionException extends RuntimeException{
-    private Integer code;
-    private String message;
-
-
-    public ConditionException(Integer code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public ConditionException(String message) {
-        this(600, message);
-    }
-
-    public Integer getCode() {
-        return this.code;
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
-    }
-}
--- a/servers/boe-server-all/src/main/java/com/xboe/config/JwtUtils.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/config/JwtUtils.java
@@ -1,63 +0,0 @@
-package com.xboe.config;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.xboe.common.utils.Sha256Mac;
-import org.apache.commons.codec.binary.Base64;
-
-import java.util.Map;
-
-/**
- * Jwt工具类
- *
- * @author ruoyi
- */
-public class JwtUtils {
-
-    public static final String secretKey = "JDF_BOE";
-
-    /**
-     * 从数据声明生成令牌
-     *
-     * @param claims 数据声明
-     * @return 令牌
-     */
-    public static String createToken(Map<String, Object> claims) {
-        JSONObject header = new JSONObject();
-        header.put("alg", "HS256");
-        header.put("type", "token");
-        String payload64 = Base64.encodeBase64String(JSON.toJSONString(claims).getBytes());
-        String header64 = Base64.encodeBase64String(header.toString().getBytes());
-        String sign = Sha256Mac.sha256_mac(header64 + payload64, secretKey);
-        return header64 + "." + payload64 + "." + sign;
-    }
-
-    /**
-     * 从令牌中获取数据声明
-     *
-     * @param token 令牌
-     * @return 数据声明
-     */
-    public static Map<String, Object> parseToken(String token) throws ConditionException {
-        String[] tokens = token.split("\\.");
-        if (tokens.length != 3) {
-            throw new ConditionException("token不合法 : " + token);
-        }
-        String payload = new String(Base64.decodeBase64(tokens[1]));
-        String sign = Sha256Mac.sha256_mac(tokens[0] + tokens[1], secretKey);
-        if (sign.equals(tokens[2])) {
-            JSONObject jsonObject = JSON.parseObject(payload);
-            long exp = jsonObject.getLong("exp");
-            long now = System.currentTimeMillis() / 1000;
-            if (now > exp) {
-                throw new ConditionException("token过期 : " + token);
-            }
-            Map<String, Object> map = JSON.parseObject(payload, new TypeReference<Map<String, Object>>() {
-            });
-            return map;
-        } else {
-            throw new ConditionException("token错误 : " + token);
-        }
-    }
-
-}
--- a/servers/boe-server-all/src/main/java/com/xboe/config/WebConfig.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/config/WebConfig.java
@@ -1,6 +1,5 @@
 package com.xboe.config;

-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -8,9 +7,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

 import java.util.List;
@@ -20,6 +21,15 @@ public class WebConfig implements WebMvcConfigurer {

    private static final Logger logger = LoggerFactory.getLogger(WebConfig.class);

+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.favorParameter(true)
+                .defaultContentType(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML)
+                .parameterName("mediaType")
+                .mediaType("json", MediaType.APPLICATION_JSON)
+                .mediaType("xml", MediaType.APPLICATION_XML);
+    }
+
    //结果处理器
    @Bean
    public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter(ObjectMapper objectMapper) {
@@ -30,9 +40,10 @@ public class WebConfig implements WebMvcConfigurer {
    public ObjectMapper objectMapper() {
        ObjectMapper mapper = new ObjectMapper();
        mapper.registerModule(new JavaTimeModule());
-        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY,true);
+        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
        return mapper;
    }
+
    /**
     * 在默认的消息转换器基础上添加或移除某些转换器
     * 保证StringHttpMessageConverter在FastJsonHttpMessageConverter前被调用
--- 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
@@ -22,8 +22,6 @@ public interface CacheName {
     */
    String NAME_USER = "user";

-    String NAME_INFO = "userInfo";
-
    /**
     * 用户名缓存KEY前缀
     */
--- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
@@ -122,13 +122,20 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 	            //这里应该是单独的线程去处理
 	        	user.setId(getNodeText(result.get("userId")));//最新接口变化，id改成userId
 	        	String band=getNodeText(result.get("bandCode"));
-	        	if(StringUtils.isNotBlank(band) && band.length()>4) {
-	        		String bandNum=band.substring(4);
-	        		user.setBandLevel(Integer.valueOf(bandNum));
-	        	}else {
-	        		user.setBandLevel(0);
-	        	}
-	        	user.setAvatar(getNodeText(result.get("avatar")));
+				try {
+					if(StringUtils.isNotBlank(band) && band.length()>4 && band.contains("band")) {
+						String bandNum=band.substring(4);
+						user.setBandLevel(Integer.valueOf(bandNum));
+					}else if (StringUtils.isNotBlank(band) && band.length()>4 && band.contains("Level")) {
+						String bandNum=band.substring(5);
+						user.setBandLevel(Integer.valueOf(bandNum));
+					}else {
+						user.setBandLevel(0);
+					}
+				} catch (NumberFormatException e) {
+					user.setBandLevel(0);
+				}
+				user.setAvatar(getNodeText(result.get("avatar")));
 	        	user.setCode(getNodeText(result.get("userNo")));
 	        	
 	        	if(StringUtils.isBlank(user.getCode())) {
--- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java
@@ -2,11 +2,16 @@ package com.xboe.data.service.impl;

 import java.time.LocalDateTime;

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

 import com.boe.feign.api.serverall.entity.UserData;
+import com.xboe.constants.CacheName;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.retry.annotation.Recover;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
@@ -39,6 +44,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
    @Autowired
    TeacherDao teacherDao;

+    @Resource
+    private CacheManager cacheManager;
+

    @Override
    @Transactional
@@ -59,6 +67,8 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
                a.setDeleted(user.getDeleted());
            }
            a.setLoginName(user.getCode());
+            a.setMobile(user.getMobile());
+            a.setEmail(user.getEmail());
            log.info("更新账号code");
            accountDao.update(a);
        } else {
@@ -71,14 +81,18 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
            a.setRegTime(LocalDateTime.now());
            a.setSysId(user.getKid());
            a.setStatus(1);
+            a.setMobile(user.getMobile());
+            a.setEmail(user.getEmail());
            accountDao.save(a);
            log.info("账号不存在，新添加账号【" + user.getId() + "】");
        }
+
        if (u != null) {
            //更新部分用户字段
            u.setDepartId(user.getDepartId());
            u.setDepartName(user.getDepartName());
            u.setName(user.getName());
+            u.setMobileNo(user.getMobile());
            //2022-12-8 去掉用户类型的更新，因为返回的数据都是学员，
            //u.setUserType(user.getUserType());
            if (user.getLearningDuration() > 0) { //不大于0才会更新
@@ -106,9 +120,17 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
            } else {
                u.setShowHome(true);//band16以下，及其它无bandLevel的信息
            }
+            u.setMobileNo(user.getMobile());
            userDao.save(u);
            log.info("添加新用户");
        }
+
+        Cache cache = cacheManager.getCache(CacheName.NAME_USER);
+        if(cache != null) {
+            cache.evict(CacheName.KEY_ACCOUNT + user.getId());
+            cache.evict(CacheName.KEY_USER + user.getId());
+        }
+
        //对机构的判断，不为空时才会处理，为空时不处理
        if (StringUtils.isNotBlank(user.getDepartId())) {
            org = orgDao.get(user.getDepartId());
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
@@ -140,6 +140,9 @@ public class CasesApi extends ApiBaseController {
            List<Cases> cases = views.getList();
            if (CollUtil.isNotEmpty(cases)) {
                for (Cases c : cases) {
+                    if ("null".equals(c.getSummary())) {
+                        c.setSummary(null);
+                    }
                    StringBuffer stringBuffer = new StringBuffer();
                    List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", c.getId()));
                    if (caseId != null && !caseId.isEmpty()) {
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java
@@ -359,7 +359,7 @@ public class CourseAuditApi  extends ApiBaseController{
 				String token = request.getHeader("Xboe-Access-Token");
 				CourseParam param = new CourseParam();
 				param.setId(courseId);
-				thirdApi.updateOnLineStatus(param,token);
+				thirdApi.updateOnLineStatua(param,token);
 			}
 			return success(true);
 		} catch (Exception e) {
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
@@ -285,9 +285,9 @@ public class CourseFullTextApi  extends ApiBaseController{
 		paras.setTypes(dto.getTypes());//多个分类的情况
 		//用户的companyId
 		paras.setCompanyId(dto.getCompanyId());
-//		if(StringUtils.isNotBlank(dto.getAudiences())) {
-//			paras.setAudiences(dto.getAudiences().split(","));
-//		}
+		if(StringUtils.isNotBlank(dto.getAudiences())) {
+			paras.setAudiences(dto.getAudiences().split(","));
+		}
 		if(StringUtils.isNotBlank(userIds)) {
 			paras.setSysCreateAids(userIds.split(","));
 		}
--- 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
@@ -314,8 +314,10 @@ public class CoursePortalApi extends ApiBaseController{
 			User user = userService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
+				ct.setSupplier(t.getSupplier());
+				ct.setTeacherType(t.getTeacherType());
 				if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
-					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());
@@ -327,13 +329,15 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
+					if(user!=null){
+						teacherCourseDto.setUserNo(user.getUserNo());
+					}
 					teacherCourseDtos.add(teacherCourseDto);
 				}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 					List<String> list=new ArrayList<>();
 					list.add(ct.getTeacherId());
 					getTeacherInfo(request.getHeader("Xboe-Access-Token"),list);
-					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());
@@ -345,7 +349,9 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
+					if(user!=null){
+						teacherCourseDto.setUserNo(user.getUserNo());
+					}
 					teacherCourseDtos.add(teacherCourseDto);
 				}
 			}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseWareApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseWareApi.java
@@ -1,20 +1,16 @@
 package com.xboe.module.course.api;

-import java.util.*;
+import java.util.Base64;
+import java.util.HashSet;
+import java.util.Set;

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

-import cn.hutool.json.JSONUtil;
-import com.xboe.constants.CacheName;
-import com.xboe.data.outside.IOutSideDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -37,18 +33,13 @@ import com.xboe.module.course.service.ICourseFileService;
 public class CourseWareApi extends ApiBaseController {

 	private String cookieName = "PLAYSIGN_TIME";
-	@Autowired
-	IOutSideDataService outsideDataService;
+
 	@Resource
 	private ICourseFileService courseFileService;

 	@Resource
 	private XFileUploader fileUploader;

-
-	@Resource
-	RedisTemplate<String, Object> redisTemplate;
-
 	private static Set<String> allowUrlSet = new HashSet<String>();

 	static {
@@ -59,7 +50,7 @@ public class CourseWareApi extends ApiBaseController {

 	/**
 	 * 资源地址的加密，返回加密后的地址
-	 *
+	 * 
 	 * @param request
 	 * @param response
 	 * @param cfid     资源地址的id
@@ -94,22 +85,25 @@ public class CourseWareApi extends ApiBaseController {

 	/**
 	 * 获取资源，在header中保存
-	 *
+	 * 
 	 * @param request
 	 * @param response
+	 * @param cfid
+	 * @param cf
 	 * @throws Exception
 	 */
 	@GetMapping("/resource")
-	public JsonResponse<String> getVideo(HttpServletRequest request, HttpServletResponse response, String sign,
-										 @CookieValue(name = "token",required = false)String token
-	) throws Exception {
+	public JsonResponse<String> getVideo(HttpServletRequest request, HttpServletResponse response, String sign) throws Exception {

 		if (StringUtils.isBlank(sign)) {
 			return badRequest("非法请求");
+			// return;
 		}
+
 		String httpReferer = request.getHeader("referer");
 		if (StringUtils.isBlank(httpReferer)) {
 			return badRequest("非法请求");
+			// return "非法请求";
 		}

 		boolean has=false;
@@ -121,37 +115,21 @@ public class CourseWareApi extends ApiBaseController {

 		if(!has) {
 			return badRequest("页面不存在");
+			//return "非法请求";
 		}
-//		String token = request.getHeader("Xboe-Access-Token");
-//		if (StringUtils.isEmpty(token)) {
-//			token = request.getHeader("token");
-//		}
-//		读取cookies中的时间
-//		String cookieTime = getSignTimeCookie(request);
-//		if (StringUtils.isBlank(cookieTime)) {
-//			return badRequest("不支持的请求");
-//		}
-		String userInfo = CacheName.NAME_INFO + ":"+ token;
-		log.info("请求头里的token值：:"+token);
-		log.info("从 Redis 获取的userInfo:"+userInfo);
-		Object o = redisTemplate.opsForValue().get(userInfo);
-		if (o == null) {
-			log.error("从 Redis 获取的值为 null ,", userInfo);
-			return badRequest("token验证错误");
+
+		//读取cookies中的时间
+		String cookieTime = getSignTimeCookie(request);
+		if (StringUtils.isBlank(cookieTime)) {
+			return badRequest("不支持的请求");
+			// return;
 		}
-		// 将对象转换为字符串
-		String userNoStr = o.toString();
-		// 检查字符串是否为空或空白
-		if (StringUtils.isBlank(userNoStr)) {
-			log.error("从 Redis 获取的值为空或空白,", userInfo);
-			return badRequest("token验证错误");
-		}
-		HashMap bean = JSONUtil.toBean(userNoStr, HashMap.class);
-		Object userNo = bean.get("userNo");
+
 		byte[] signBytes = Base64.getDecoder().decode(sign);
 		// byte[] signBytes = RSAUtil.decryptBase64(sign);
 		byte[] signDecryt = RSAUtil.decryptByPrivateKey(ConfigSecretKey.TEMP_PRIVATESTR, signBytes);
 		String signStr = new String(signDecryt);
+		// System.out.println("解密后的字符串："+signStr);
 		// 第一个/前端是时间
 		int index = signStr.indexOf("/");
 		if (index <= 0) {
@@ -161,15 +139,8 @@ public class CourseWareApi extends ApiBaseController {
 		}

 		String time = signStr.substring(0, signStr.indexOf("/"));// 时间字符中，long
-		String[] split = signStr.split("/");
 		String cfid = signStr.substring(index+1);// 文件路径
-		log.info("解密后的字符串:"+signStr);

-		log.info("workNum工号对比:"+split[2]);
-		log.info("userNo工号对比:"+userNo);
-		if (!split[2].equals(userNo)){
-			return badRequest("token验证失效");
-		}
 //		if (!time.equals(cookieTime)) {
 //			log.info("请求头时间和解析后的时间对比:"+"解析时间:"+time+"    请求头时间："+cookieTime);
 //			log.info("解密后的字符串的时间拼接:"+signStr);
@@ -201,7 +172,7 @@ public class CourseWareApi extends ApiBaseController {

 	/**
 	 * 读取cookies值
-	 *
+	 * 
 	 * @param request
 	 * @return
 	 */
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseFileDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseFileDao.java
@@ -10,8 +10,6 @@ import com.xboe.core.orm.BaseDao;
 import com.xboe.core.orm.IFieldFilter;
 import com.xboe.module.course.entity.CourseFile;

-import javax.transaction.Transactional;
-

@Repository
 public class CourseFileDao extends BaseDao<CourseFile> {
@@ -23,5 +21,4 @@ public class CourseFileDao extends BaseDao<CourseFile> {
        PageList<CourseFile> page = this.getGenericDao().findPage(pageIndex, pageSize, getEntityClass(), filters,order);
        return page;
    }
-
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java
@@ -49,4 +49,12 @@ public class CourseTeacher extends IdBaseEntity {
    @Transient
    private String code;

+    /**供应商*/
+    @Transient
+    private String supplier;
+
+    /**讲师类型 1 内部讲师  2外部讲师*/
+    @Transient
+    private Integer teacherType;
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseFileService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseFileService.java
@@ -54,6 +54,4 @@ public interface ICourseFileService {
     * @param deleted
     */
    void delete(String id,boolean deleted);
-
-//    void updateDuration(String contentRefId, Integer duration);
 }
--- 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
@@ -341,8 +341,6 @@ public interface ICourseService {
    List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);


-
-
-
-
+    List<Course> findByIds(List<String> courseIds);
+    void deletedStudyResourceBatchByCourseIdAndType(String courseId,Integer courseType);
 }
--- 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
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.xboe.common.OrderCondition;
-import com.xboe.common.PageList;
 import com.xboe.core.cache.IXaskCache;
 import com.xboe.core.cache.XaskCacheProvider;
 import com.xboe.core.orm.FieldFilters;
@@ -15,9 +14,11 @@ import com.xboe.core.orm.UpdateBuilder;
 import com.xboe.module.course.dao.*;
 import com.xboe.module.course.dto.CourseContentDto;
 import com.xboe.module.course.dto.SortItem;
-import com.xboe.module.course.entity.*;
+import com.xboe.module.course.entity.CourseAssess;
+import com.xboe.module.course.entity.CourseContent;
+import com.xboe.module.course.entity.CourseExam;
+import com.xboe.module.course.entity.CourseHomeWork;
 import com.xboe.module.course.service.ICourseContentService;
-import com.xboe.module.course.service.ICourseFileService;
 import com.xboe.module.exam.dao.ExamPaperDao;
 import com.xboe.module.exam.vo.TestQuestionVo;
 import com.xboe.standard.enums.BoedxContentType;
@@ -56,8 +57,7 @@ public class CourseContentServiceImpl implements ICourseContentService {

    @Resource
    private ExamPaperDao examPaperDao;
-	@Resource
-	private ICourseFileService courseFileService;
+

 	@Override
 	@Transactional
@@ -83,7 +83,6 @@ public class CourseContentServiceImpl implements ICourseContentService {
 			ccDao.save(cc);
 		}else {
 			ccDao.update(cc);
-//			courseFileService.updateDuration(cc.getContentRefId(),cc.getDuration());
 			cc.setSysVersion(ccDao.getVersion(cc.getId()));
 		}
 		//添加或保存其它信息
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseFileServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseFileServiceImpl.java
@@ -98,14 +98,4 @@ public class CourseFileServiceImpl implements ICourseFileService {
 	public CourseFile get(String id) {
 		return courseFileDao.get(id);
 	}
-
-
-//	@Override
-//	public void updateDuration(String contentRefId,Integer duration) {
-//		if (duration == null) {
-//			duration = 0;
-//		}
-//		String sql = "UPDATE boe_course_file SET duration = "+ duration+" WHERE id = "+ contentRefId+" ";
-//		courseFileDao.sqlUpdate(sql);
-//	}
 }
--- 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
@@ -1,5 +1,6 @@
 package com.xboe.module.course.service.impl;

+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -14,11 +15,17 @@ import java.util.stream.Stream;
 import javax.annotation.Resource;
 import javax.management.Query;

+import cn.hutool.core.collection.CollectionUtil;
 import com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.hibernate.mapping.IdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -115,6 +122,9 @@ public class CourseServiceImpl implements ICourseService {
    @Autowired(required = false)
    private IEventDataSender eventSender;

+    @Resource
+    RestHighLevelClient restHighLevelClient;
+

  
    /**
@@ -448,6 +458,7 @@ public class CourseServiceImpl implements ICourseService {
        List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
        PageList<Course> rs = new PageList<>();
        rs.setCount(listByFilters2.size());
+        rs.setPageSize(pageSize);
        rs.setList(paginate);
        return rs;
    }
@@ -480,7 +491,7 @@ public class CourseServiceImpl implements ICourseService {
        String sql = "SELECT DISTINCT\n" +
                "rt.course_id\n" +
                "FROM\n" +
-                "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
+                "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
                "\n" +
                "WHERE\n" +
                "\n" +
@@ -503,7 +514,7 @@ public class CourseServiceImpl implements ICourseService {
        String sql = "SELECT DISTINCT\n" +
                "pt.course_id\n" +
                "FROM\n" +
-                "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
+                "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
                "\n" +
                "WHERE\n" +
                "\n" +
@@ -560,8 +571,8 @@ public class CourseServiceImpl implements ICourseService {
        String sql = "SELECT DISTINCT\n" +
                "\tc.id \n" +
                "FROM\n" +
-                "\tboe.student s\n" +
-                "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" +
+                "\tboe_new.student s\n" +
+                "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" +
                "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" +
                "WHERE\n" +
                "\ts.type = 14 \n" +
@@ -853,12 +864,14 @@ public class CourseServiceImpl implements ICourseService {
                    log.error("未配置事件消息发送的实现");
                }
            }
+
+            // 删除ES数据
+            deletedStudyResourceBatchByCourseIdAndType(id,c.getType());
        } else {
            //彻底删除，课件设置为无课程状态
            courseDao.setDeleted(id);
        }
        //记录删除日志信息
-
    }

    @Override
@@ -1567,6 +1580,13 @@ public class CourseServiceImpl implements ICourseService {
        return list;
    }

+    @Override
+    public List<Course> findByIds(List<String> courseIds) {
+        QueryBuilder query = QueryBuilder.from(Course.class);
+        query.addFilter(FieldFilters.in("id", courseIds));
+        return courseDao.findList(query.builder());
+    }
+

    @Override
    public int countWaitAudit(String aid) {
@@ -1978,5 +1998,17 @@ public class CourseServiceImpl implements ICourseService {
        return courseDao.findListByHql("Select new Course(id,studys,score) from Course where id in(?1)", ids);
    }

-
+    @Override
+    public void deletedStudyResourceBatchByCourseIdAndType(String courseId, Integer courseType) {
+        DeleteByQueryRequest request = new DeleteByQueryRequest("new_study_resource");
+        BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
+        boolQueryBuilder.must(QueryBuilders.matchQuery("courseId", courseId));
+        boolQueryBuilder.must(QueryBuilders.matchQuery("courseType", courseType));
+        request.setQuery(boolQueryBuilder);
+        try {
+            restHighLevelClient.deleteByQuery(request, RequestOptions.DEFAULT);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }
--- 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
@@ -8,6 +8,8 @@ import java.util.Map;

 import javax.annotation.Resource;

+import com.boe.feign.api.courseweb.reps.ExamStudyRecordParam;
+import com.xboe.api.ThirdApi;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,7 +39,10 @@ public class AloneExamServiceImpl implements IAloneExamService{
 	
 	@Resource
 	AloneExamDao aeDao;
-	
+	@Resource
+	private ThirdApi thirdApi;
+
+
 	@Override
 	@Transactional
 	public void save(AloneExamAnswer aea){
@@ -101,7 +106,18 @@ public class AloneExamServiceImpl implements IAloneExamService{
 //				//这种情况汶是不存在的
 //			}
 		}
-	}
+
+        try {
+            ExamStudyRecordParam param = new ExamStudyRecordParam();
+            param.setTestId(aea.getTestId());
+            param.setAid(aea.getAid());
+            thirdApi.syncExamStudyRecord(param);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+
+    }

 	@Override
 	@Transactional
--- a/servers/boe-server-all/src/main/java/com/xboe/module/filecloud/api/XFileBaseApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/filecloud/api/XFileBaseApi.java
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;

 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java
@@ -43,12 +43,7 @@ public class PhpOnlineStudyRecordScheduledTasks {
    @Resource
    RestHighLevelClient restHighLevelClient;

-    /**
-     * 定时同步PHP数据库数据到es中，计划定时20分钟执行一次。具体实现是，
-     * 第一步，查询最近半小时内完成任一课件的课程学习，获取的信息有课程ID，学员ID，学习状态、学习进度。
-     * 第二步，根据上述得到的课程ID，学员ID，查询es中的未完成的记录。
-     * 第三步，比对两者学习进度，如果不一致，以数据库学习记录为准，修改ES
-     */
+    // todo 定时、分批、数据库名
    @XxlJob("phpOnlineStudyRecordSyncEsTask")
    public List<String> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {

@@ -106,9 +101,6 @@ public class PhpOnlineStudyRecordScheduledTasks {
            // 获取ES中的数据
            List<CourseStudyDto> esDataList = getEsData(batch);

-            if (CollUtil.isEmpty(esDataList)){
-                continue;
-            }

            // 更新ES数据
            List<CourseStudyDto> toBeUpdatedEs = esDataList.stream()
@@ -138,13 +130,12 @@ public class PhpOnlineStudyRecordScheduledTasks {
            }

            // 调用批量更新方法
-            toBeUpdatedEs(toBeUpdatedEs);
+//            toBeUpdatedEs(toBeUpdatedEs, indexName);
        }
        return tempResultList;
    }

    private List<CourseStudyDto> getEsData(List<PhpOnlineDto> finishedCourseList) throws IOException {
-        log.info("待处理的数据：{}", finishedCourseList);
        SearchRequest searchRequest = new SearchRequest("new_study_resource");
        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();

@@ -160,13 +151,11 @@ public class PhpOnlineStudyRecordScheduledTasks {
            );
        }

-        if (!boolQuery.hasClauses()) {
-            return null;
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(boolQuery).timeout(new TimeValue(60, TimeUnit.SECONDS));
+        searchRequest.source(sourceBuilder);
+        if (boolQuery.hasClauses()) {
+            sourceBuilder.query(boolQuery);
        }
-        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder()
-                .query(boolQuery)
-                .timeout(new TimeValue(60, TimeUnit.SECONDS))
-                .size(finishedCourseList.size() + 10);
        searchRequest.source(sourceBuilder);

        SearchResponse response = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
@@ -186,7 +175,7 @@ public class PhpOnlineStudyRecordScheduledTasks {
        return courseStudyDtoList;
    }

-    private void toBeUpdatedEs(List<CourseStudyDto> toBeUpdatedEsData) {
+    private void toBeUpdatedEs(List<CourseStudyDto> toBeUpdatedEsData, String indexName) {
        if (CollUtil.isEmpty(toBeUpdatedEsData)) {
            return;
        }
@@ -197,7 +186,7 @@ public class PhpOnlineStudyRecordScheduledTasks {
            docMap.put("progress", courseStudyDto.getProgress());

            // 创建更新请求，并传入单一的docMap
-            UpdateRequest updateRequest = new UpdateRequest("new_study_resource", courseStudyDto.getId())
+            UpdateRequest updateRequest = new UpdateRequest(indexName, courseStudyDto.getId())
                    .doc(docMap, XContentType.JSON);

            // 将请求添加到批量请求中
@@ -219,11 +208,7 @@ public class PhpOnlineStudyRecordScheduledTasks {
        }
    }

-    /**
-     * 第一步，查询最近报名的学习，获取的信息有课程ID，学员ID，学习状态、学习进度。
-     * 第二步，根据上述得到的课程ID，学员ID，查询es中的未完成的记录。
-     * 第三步，比对两者学习进度，如果不一致，以数据库学习记录为准，修改ES。
-     */
+
    public List<String> phpOnlineStudyRecordSyncEsOfFull(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {

        log.info("开始同步PHP学习记录到ES");
--- 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
@@ -1,9 +1,14 @@
 package com.xboe.school.study.api;

+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;

+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
 import com.xboe.api.ThirdApi;
 import com.xboe.constants.CacheName;
@@ -204,6 +209,8 @@ public class StudyCourseApi extends ApiBaseController{
 			Teacher t = teacherService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
+				ct.setSupplier(t.getSupplier());
+				ct.setTeacherType(t.getTeacherType());
 			}
 			if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 				List<String>list=new ArrayList<>();
@@ -212,11 +219,11 @@ public class StudyCourseApi extends ApiBaseController{
 				redisTemplate.opsForValue().set(teacherVo.get(0).getTeacherId(), teacherVo.get(0).getStatus());
 				//设置过期时间为1天
 				redisTemplate.expire(teacherVo.get(0).getTeacherId(), 24 * 60 * 60, TimeUnit.SECONDS);
-				if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+				if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
 					ct.setTeacherName("BOE教师");
 				}
 			}
-			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
 				ct.setTeacherName("BOE教师");
 			}
 		}
@@ -251,6 +258,49 @@ public class StudyCourseApi extends ApiBaseController{
 			rs.put("progress", sc.getProgress());
 			//查询上次学习的是什么资源。查询用户的学习情况
 			List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
+			// 和内容匹配，根据内容的视频时长，计算学习进度
+			if(CollectionUtil.isNotEmpty(items) && CollectionUtil.isNotEmpty(cclist)){
+				// 根据ID转换map
+				Map<String, CourseContent> contentMap = cclist.stream().collect(Collectors.toMap(CourseContent::getId, Function.identity()));
+				for (StudyCourseItem item : items) {
+					CourseContent content = contentMap.get(item.getContentId());
+					if(null == content){
+						continue;
+					}
+
+					if(null==item.getLastStudyTime()
+							|| item.getLastStudyTime()<=0
+							|| null==content.getDuration()
+							|| content.getDuration()<=0){
+						continue;
+					}
+
+					// 查询redis上面的key，并解析value获取到lastStudyTime
+					String lastActive = redisTemplate.opsForValue().get("studyContentId:" + item.getId() + ":last_active");
+					if (StringUtil.isNotBlank(lastActive)) {
+						String[] parts = lastActive.split("&");
+						if (parts.length == 2) {
+							int lastStudyTimeRedis = Integer.parseInt(parts[0]);
+							log.info("study-video-time-redis获取---lastStudyTimeRedis = " + lastStudyTimeRedis);
+							if(lastStudyTimeRedis>0){
+								item.setLastStudyTime(lastStudyTimeRedis);
+							}
+						}
+					}
+
+					BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime());
+					BigDecimal duration = new BigDecimal(content.getDuration());
+					BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP);
+					if(progress.compareTo(BigDecimal.ZERO) < 0){
+						progress = BigDecimal.ZERO;
+					}else if(progress.compareTo(BigDecimal.ONE) > 0){
+						progress = BigDecimal.ONE;
+					}
+
+					item.setProgressVideo(progress);
+				}
+			}
+
 			rs.put("contentStudys",items);//学习的内容
 		}
 		
@@ -343,6 +393,8 @@ public class StudyCourseApi extends ApiBaseController{
 			}
 			//追加学习时长
 			studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
+
+			log.info(" 1 在线课学习记录 sci.getStudyId() = "+ sci.getStudyId() + " , sci.getCourseId() = " + sci.getCourseId() );
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
 			log.info("在线课学习记录"+allUserList);
 			return success(item.getId());
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java
@@ -3,9 +3,16 @@ package com.xboe.school.study.api;
 import java.io.IOException;
 import java.time.ZoneOffset;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;

+import cn.hutool.core.collection.CollectionUtil;
+import com.xboe.module.course.entity.Course;
+import com.xboe.module.course.service.ICourseService;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,6 +49,15 @@ public class StudyCourseESApi extends ApiBaseController{
 	@Autowired
 	IStudyCourseService service;

+	@Autowired
+	ICourseService courseService;
+
+	@Value("${xboe.upload.file.http_path}")
+	private String httpPath;
+
+	@Value("${xboe.image.course.default}")
+	private String defaultCourseImage;
+
 	@Resource
 	private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;

@@ -54,13 +70,61 @@ public class StudyCourseESApi extends ApiBaseController{
 		try {
 			dto.setAccountId(getCurrent().getAccountId());
 			PageList<CourseStudyDto> rs=search.search(page.getStartRow(),page.getPageSize(), dto);
+
+			handleCourseImage(rs);
+
 			return success(rs);
 		}catch(Exception e) {
 			log.error("查询报名学习ES失败",e);
 			return error("查询失败",e.getMessage());
 		}
 	}
-	
+
+	private void handleCourseImage(PageList<CourseStudyDto> rs) {
+		if (rs == null || CollectionUtil.isEmpty(rs.getList())) {
+			return;
+		}
+
+		List<String> emptyImageCourseIds = Lists.newArrayList();
+		for(CourseStudyDto courseStudyDto : rs.getList()) {
+			if(StringUtils.isBlank(courseStudyDto.getCourseImage())) {
+				// 过滤课程类型
+				if(courseStudyDto.getCourseType()==10
+					|| courseStudyDto.getCourseType()==20){
+					emptyImageCourseIds.add(courseStudyDto.getCourseId());
+				}else{
+					log.warn("课程图片为空，课程id为：{}，课程类型:{}",courseStudyDto.getCourseId(),courseStudyDto.getCourseType());
+				}
+			}
+		}
+
+		if(CollectionUtil.isEmpty(emptyImageCourseIds)){
+			return;
+		}
+
+		List<Course> courseList = courseService.findByIds(emptyImageCourseIds);
+		if(CollectionUtil.isNotEmpty(courseList)){
+			// courseList转换成map
+			Map<String, Course> courseMap = courseList.stream().collect(Collectors.toMap(Course::getId, course -> course));
+
+			// 赋值ES图片
+			for(CourseStudyDto courseStudyDto : rs.getList()) {
+				if(emptyImageCourseIds.contains(courseStudyDto.getCourseId())) {
+					Course currentCourse = courseMap.get(courseStudyDto.getCourseId());
+					if(null!=currentCourse){
+						if(StringUtils.isNotBlank(currentCourse.getCoverImg())){
+							// 拼接域名
+							courseStudyDto.setCourseImage(httpPath + currentCourse.getCoverImg());
+						}else{
+							// 赋值默认图片
+							courseStudyDto.setCourseImage(defaultCourseImage);
+						}
+					}
+				}
+			}
+		}
+	}
+
 	@RequestMapping(value="/list-by-ids",method = {RequestMethod.POST})
 	public JsonResponse<List<StudyCourse>> search(@RequestBody List<String> ids){
 		if(ids.isEmpty()) {
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseTask.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseTask.java
@@ -0,0 +1,106 @@
+package com.xboe.school.study.api;
+
+import com.xboe.school.study.service.IStudyService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.core.Cursor;
+import org.springframework.data.redis.core.ScanOptions;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author by lyc
+ * @date 2025/3/3
+ */
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class StudyCourseTask {
+
+    private final IStudyService studyService;
+    private final StringRedisTemplate redisTemplate;
+
+    /**
+     * 定时任务
+     * 获取redis 中学习结束的数据更新入库
+     * */
+    @XxlJob("saveStudyCourseItemLastTime")
+    public void saveStudyCourseItemLastTime() {
+        // 1. 定义匹配模式（匹配所有目标key）
+        final String KEY_PATTERN = "studyContentId:*:last_active";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+        // 2. 使用SCAN安全遍历（避免阻塞）
+        ScanOptions options = ScanOptions.scanOptions()
+            .match(KEY_PATTERN)
+            .count(100) // 分页大小
+            .build();
+
+        try (RedisConnection connection = Objects.requireNonNull(redisTemplate.getConnectionFactory()).getConnection()) {
+            Cursor<byte[]> cursor = connection.scan(options);
+            // 3. 遍历处理符合条件的key
+            while (cursor.hasNext()) {
+                String redisKey = new String(cursor.next());
+                // 4. 获取剩余TTL（秒）
+                Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
+
+                // 5. 过滤条件：剩余时间 >= 29天23小时30分钟（转换为秒）
+                // 总需时间 = (30天 - 30分钟) = 29天23小时30分钟 = 2590200秒
+                // 5分钟 300秒 || 2592000 - 300 = 2591700
+                if (ttl <= 2590200) {
+                    try {
+                        // 6. 提取studyContentId
+                        String[] parts = redisKey.split(":");
+                        if (parts.length < 2) continue;
+                        String studyContentId = parts[1];
+
+                        // 7. 获取存储的时间点（示例逻辑）
+                        String redisValue = redisTemplate.opsForValue().get(redisKey);
+                        if (redisValue == null) continue;
+                        String[] partValues = redisValue.split("&");
+                        int lastStudyTime = Integer.parseInt(partValues[0]);
+                        LocalDateTime timestamp = null;
+                        if (partValues.length >= 2){
+                            timestamp = LocalDateTime.parse(partValues[1], formatter);
+                        }
+
+                        // 8. 更新数据库（调用已有服务方法）
+                        studyService.updateStudyCourseItemLastTime(studyContentId, lastStudyTime, timestamp);
+
+                        // 9. 删除Redis键（原子操作）
+                        redisTemplate.delete(redisKey);
+
+                        log.info("处理成功 key: {}, lastStudyTime: {}", redisKey, lastStudyTime);
+                    } catch (Exception e) {
+                        log.error("处理失败 key: {}", redisKey, e);
+                    }
+                }
+
+            }
+            cursor.close();
+        } catch (Exception e) {
+            log.error("定时任务执行异常", e);
+        }
+
+      /*  // 新增日志逻辑
+        if (ttl <= 172800) {
+            studyService.saveCourseExpireLog(
+                    studyContentId,
+                    lastStudyTime,
+                    redisKey,
+                    ttl,
+                    "system_job"
+            );
+        }*/
+
+    }
+
+
+
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/PhpOnlineCourseDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/PhpOnlineCourseDao.java
@@ -95,20 +95,20 @@ public class PhpOnlineCourseDao extends BaseDao<PhpOnlineDto> {
            userBasicDataBase = "userbasic";
        }

-        List<String> userIdOfPhpList = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList());
-        List<Object[]> objectList2 = this.sqlFindList("select kid,user_id from " + userBasicDataBase + ".user_account where kid in (?1) and deleted=0 and account_status = 0", userIdOfPhpList);
+        List<String> userIds = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList());
+        List<Object[]> objectList2 = this.sqlFindList("select kid,user_id from " + userBasicDataBase + ".user_account where kid in (?1) and deleted=0 and account_status = 0", userIds);

        if (CollUtil.isEmpty(objectList1)) {
            log.info("新系统用户数据不存在");
            return null;
        }

-        Map<Object, Object> kidAndUserIdMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
+        Map<Object, Object> userIdToKidMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));

        // 设置新系统用户ID
        recentLearnRecordList = recentLearnRecordList.stream()
                .map(phpOnlineDto -> {
-                    Object userIdOfJavaObj = kidAndUserIdMap.get(phpOnlineDto.getUserIdOfPhp());
+                    Object userIdOfJavaObj = userIdToKidMap.get(phpOnlineDto.getUserIdOfPhp());
                    if (userIdOfJavaObj != null) {
                        phpOnlineDto.setUserIdOfJava(userIdOfJavaObj.toString());
                    }
@@ -209,6 +209,7 @@ public class PhpOnlineCourseDao extends BaseDao<PhpOnlineDto> {
        }

        // 拼接获取所有新系统用户id，这里不选择与上面的联表查询，有效率问题
+
        String userBasicDataBase;
        if (activeProfile.equals("pro")) {
            userBasicDataBase = "user_basic";
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java
@@ -1,10 +1,12 @@
 package com.xboe.school.study.entity;

+import java.math.BigDecimal;
 import java.time.LocalDateTime;

 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
@@ -128,5 +130,12 @@ public class StudyCourseItem extends IdEntity {
     */
    @Column(name = "status",length=1)
    private Integer status;
-    
+
+    /**
+     * 视频播放进度
+     * */
+//    @Column(name = "progress_video")
+    @Transient
+    private BigDecimal progressVideo;
+
 }
--- 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
@@ -1,5 +1,6 @@
 package com.xboe.school.study.service;

+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;

@@ -7,7 +8,6 @@ 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;

 /**
 * 学习情况处理,比较综合一个处理类
@@ -35,11 +35,12 @@ public interface IStudyService {
 	
 	/**
 	 * 更新最后的学习时间，及学习时间点
+	 *
 	 * @param studyContentId
 	 * @param lastStudyTime
 	 * @param aid
 	 */
-	void updateLastTime(String studyContentId,int lastStudyTime,String aid);
+	void updateLastTime(String studyContentId, int lastStudyTime, String aid);

 	/**
 	 * 资源学习记录
@@ -99,4 +100,5 @@ public interface IStudyService {

    List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status);

+	void updateStudyCourseItemLastTime(String studyContentId, int lastStudyTime, LocalDateTime timestamp);
 }
--- 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,5 +1,6 @@
 package com.xboe.school.study.service.impl;

+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -9,12 +10,9 @@ import java.util.Map;

 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.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;

 import com.xboe.common.OrderCondition;
@@ -51,7 +49,10 @@ public class StudyServiceImpl implements IStudyService{
 	
 	@Autowired
 	UserDao userDao;
-	
+	@Autowired
+	StringRedisTemplate redisTemplate;
+
+
 	@Override
 	public StudyCourseItem checkHas(String studyId,String contentId) {
 		List<StudyCourseItem> items = scItemDao.findList(FieldFilters.eq("studyId", studyId),FieldFilters.eq("contentId", contentId));
@@ -324,8 +325,26 @@ public class StudyServiceImpl implements IStudyService{

 	// 更新 前端传输已学习时长
 	@Override
-	@Transactional
 	public void updateLastTime(String studyContentId, int lastStudyTime,String aid) {
+		LocalDateTime now = LocalDateTime.now();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+		String value = lastStudyTime + "&" + now.format(formatter); // 使用ISO8601时间格式
+		log.info("-study-video-time-----value = " + value);
+		// 20250303 优化 多次更新改一次更新
+		// 更新Redis中的最后活跃时间（带30秒过期）
+		redisTemplate.opsForValue().set(
+				"studyContentId:" + studyContentId + ":last_active",
+				value,
+				Duration.ofSeconds(2592000)
+		);
+		log.info("-study-video-time-redis保存---value = " + value);
+//		Duration.ofDays(30)  也就是 2592000秒
+	}
+
+	@Override
+	@Transactional
+	public void updateStudyCourseItemLastTime(String studyContentId, int lastStudyTime,LocalDateTime timestamp) {
+		log.info("-study-video-time-定时---studyContentId = " + studyContentId + ",lastStudyTime = " + lastStudyTime + ", timestamp = " + timestamp);
 		// 更新最后的学习时间点
 		LocalDateTime now=LocalDateTime.now();
 		UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class);
@@ -333,9 +352,9 @@ public class StudyServiceImpl implements IStudyService{
 		//只记录时间长的时候的处理
 		update.addFilter(FieldFilters.lt("lastStudyTime", lastStudyTime));
 		update.addUpdateField("lastStudyTime", lastStudyTime);
-		update.addUpdateField("lastTime", now);
+		update.addUpdateField("lastTime", timestamp==null ? now : timestamp);
 		scItemDao.update(update.builder());
-		//增加用户的学习时长,在api中调用
+		log.info("-study-video-time-mysql保存---studyContentId = " + studyContentId);
 	}

 	@Override
--- a/servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java
@@ -1,6 +1,9 @@
 package com.xboe.system.api;

-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -11,11 +14,6 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-import com.xboe.core.SysConstant;
-import com.xboe.standard.BaseConstant;
-import com.xboe.system.assist.entity.XUploadResultDto;
-import it.sauronsoftware.jave.Encoder;
-import it.sauronsoftware.jave.MultimediaInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -117,23 +115,8 @@ public class SysUploaderApi  extends ApiBaseController{
 //				ex.printStackTrace();
 				log.error("处理失败",ex);
 			}
-			Long ls = 0L;
-			XUploadResultDto dto=new XUploadResultDto();
-			String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath();
-			try {
-				Encoder encoder = new Encoder();
-				MultimediaInfo m = encoder.getInfo(new File(fileFullPath));
-				ls = m.getDuration() / 1000;//秒
-			}catch (Exception e){
-				e.printStackTrace();
-				log.error("读取视频时长错误");
-			}
-			dto.setDuration(ls);
-			dto.setDisplayName(xur.getDisplayName());
-			dto.setFilePath(xur.getFilePath());
-			dto.setFileType(xur.getFileType());
-			dto.setHttpPath(xur.getHttpPath());
-			return wrap(dto);
+			
+			return wrap(xur);

 		} catch (Exception e) {
 			log.error("upload file error ",e);
--- a/servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java
@@ -1,9 +0,0 @@
-package com.xboe.system.assist.entity;
-
-import com.xboe.core.upload.XUploadResult;
-import lombok.Data;
-
-@Data
-public class XUploadResultDto extends XUploadResult {
-    private Long duration;
-}
--- a/servers/boe-server-all/src/main/resources/application-dev.yml
+++ b/servers/boe-server-all/src/main/resources/application-dev.yml
@@ -1,159 +1,105 @@
+boe:
+  domain: http://192.168.0.253
 spring:
-  # application.yml
  servlet:
    multipart:
-      max-file-size: 500MB
-      max-request-size: 500MB
-  redis:
-    database: 1
-    host: 192.168.0.101
-    password: boe@123
-    port: 6379
-    lettuce:
-      pool:
-        max-active: 8
-        min-idle: 0
-        max-idle: 30
-        max-wait: 10000ms
-        shutdown-timeout: 100ms
-  jpa:
-    database: MYSQL
-    properties:
-      hibernate:
-        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
-        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
-    show-sql: true
-    hibernate:
-      ddl-auto: update
-  datasource:
-    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-    username: root
-    password: boe#1234A
+      max-file-size: 1000MB
+      max-request-size: 1000MB
  web:
    resources:
-      static-locations: file:E:/Projects/BOE/10/static
-server:
-  port: 9090
-  servlet:
-    multipart:
-      max-file-size: 500MB
-      max-request-size: 500MB
-    session:
-      timeout: 30m
-    encoding:
-      charset: UTF-8
-      enabled: true
-      force: true
-  tomcat:
-    uri-encoding: UTF-8
-    servlet:
-    multipart:
-      maxFileSize: 1024MB
-      maxRequestSize: 1024MB
-  mvc:
-    static-path-pattern: /cdn/**
-
-#logging.level.org.hibernate.SQL=DEBUG
-#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
-#logging.config=classpath:log/logback-@profileActive@.xml
-
-# logging:
-#   config: classpath:log/logback-${spring.profiles.active}.xml
-#   level:
-#     org:
-#       hibernate:
-#         SQL: DEBUG
-#         type:
-#           descriptor:
-#             sql:
-#               BasicBinder: TRACE
-
-xcaching:
-  specs:
-    favorites:
-      timeout: 10s
-    praises:
-      timeout: 10s
-    shares:
-      timeout: 10s
-
+      static-locations: file:E:/Projects/BOE/java/static
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.0.253:8848
+      config:
+        server-addr: 192.168.0.253:8848
+  redis:
+    database: 1
+    host: 192.168.0.253
+    password: boe@123
+    port: 6379
+  jpa:
+    hibernate:
+      ddl-auto: none
+  datasource:
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: boe#1234A
+    type: com.zaxxer.hikari.HikariDataSource
+    hikari:
+      auto-commit: true
+      minimum-idle: 5
+      idle-timeout: 60000
+      connection-timeout: 30000
+      max-lifetime: 1800000
+      maximum-pool-size: 20
+logging:
+  level:
+    org:
+      hibernate:
+        SQL: ERROR
+  config: classpath:log/logback-@profileActive@.xml
 xboe:
  api:
    cross_filter: true
-  local:
-    dev: true
  upload:
    file:
-      temp_path: D:/Projects/BOE/10/static/temp
+      temp_path: /tmp
      save_path: /home/www/elearning/upload
-      http_path: http://127.0.0.1/upload
+      http_path: http://192.168.0.253/upload
  externalinterface:
    url:
-      system: http://localhost:9091
+      system: http://127.0.0.1:9091
  old:
    base:
-      url: http://192.168.0.101
-  server:
-    userbasic:
-      url: http://192.168.0.101/userbasic
+      url: http://192.168.0.253
  stat:
    base:
      url: http://127.0.0.1:9080
+  server:
+    userbasic:
+      url: http://192.168.0.253/userbasic
  elasticsearch:
    server:
-      ip: 192.168.0.101
+      ip: 192.168.0.253
      port: 9200
      user:
      password:
  email:
-    url: http://192.168.0.101/api/b1/email/send
+    url: http://192.168.0.253/api/b1/email/send
    from: boeu_learning@boe.com.cn
    user:
    security:
-
-jasypt:
-  encryptor:
-    algorithm: PBEWithMD5AndDES
-    iv-generator-classname: org.jasypt.iv.NoIvGenerator
-
-boe:
-  domain: http://127.0.0.1
-
-ok:
-  http:
-    connect-timeout: 30
-    read-timeout: 30
-    write-timeout: 30
-    max-idle-connections: 200
-    keep-alive-duration: 300
-
-
-
-orgTree:
-  orgTreeList: ${boe.domain}/userbasic/org/list
-  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
-
-userBasic:
-  searchUserList: ${boe.domain}/userbasic/user/list
-  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
-  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
-
-audience:
-  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
-  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
-
-statApi:
-  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
-
-infrasApi:
-  dict: ${boe.domain}/infrasApi/dict/list
-
-manageApi:
-  stu:
-    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
-  editExam: ${boe.domain}/manageApi/admin/project/editExam
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
-coursesuilt:
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+  jasypt:
+    encryptor:
+      algorithm: PBEWithMD5AndDES
+      iv-generator-classname: org.jasypt.iv.NoIvGenerator
+  image:
+    course:
+      default: http://192.168.0.253/pc/images/bgimg/course.png
+xxl:
+  job:
+    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
+    admin:
+      addresses: http://192.168.0.253/jobAdmin
+    executor:
+      appname: java-servers-job-api
+      port: 9995
+      address:
+      ip:
+      logpath: /var/log/xxl-job/dw/
+      logretentiondays: 30
+aop-log-record:
+  #是否开启日志记录
+  enabled: true
+  #不进行拦截的包或者类
+  excludeClassNames:
+  activemq:
+    broker-url: tcp://192.168.0.253:61616
+    user: admin
+    password: admin
+  elasticsearch:
+    host: 192.168.0.253
+    port: 9200
--- a/servers/boe-server-all/src/main/resources/application-pre.yml
+++ b/servers/boe-server-all/src/main/resources/application-pre.yml
@@ -0,0 +1,183 @@
+spring:
+  # application.yml
+  servlet:
+    multipart:
+      max-file-size: 1000MB
+      max-request-size: 1000MB
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.251.129.51:8848
+      config:
+        server-addr: 10.251.129.51:8848
+  redis:
+    database: 1
+    host: 10.251.129.122
+    password: qwert!W588
+    port: 6379
+    lettuce:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 30
+        max-wait: 10000ms
+        shutdown-timeout: 100ms
+  jpa:
+    database: MYSQL
+    properties:
+      hibernate:
+        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
+        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+  datasource:
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: admin
+    password: boeRds01
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/10/static
+server:
+  port: 9090
+  tomcat:
+    uri-encoding: UTF-8
+    servlet:
+    multipart:
+      maxFileSize: 1024MB
+      maxRequestSize: 1024MB
+  mvc:
+    static-path-pattern: /cdn/**
+
+#logging.level.org.hibernate.SQL=DEBUG
+#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+#logging.config=classpath:log/logback-@profileActive@.xml
+
+# logging:
+#   config: classpath:log/logback-${spring.profiles.active}.xml
+#   level:
+#     org:
+#       hibernate:
+#         SQL: DEBUG
+#         type:
+#           descriptor:
+#             sql:
+#               BasicBinder: TRACE
+
+xcaching:
+  specs:
+    favorites:
+      timeout: 10s
+    praises:
+      timeout: 10s
+    shares:
+      timeout: 10s
+
+xboe:
+  api:
+    cross_filter: true
+  local:
+    dev: true
+  upload:
+    file:
+      temp_path: /tmp
+      save_path: /home/www/elearning/upload
+      http_path: http://10.251.132.75/upload
+  externalinterface:
+    url:
+      system: http://localhost:9091
+  old:
+    base:
+      url: http://10.251.132.75
+  server:
+    userbasic:
+      url: http://10.251.132.75/userbasic
+  stat:
+    base:
+      url: http://10.251.132.75:9080
+  elasticsearch:
+    server:
+      ip: 10.251.129.21
+      port: 9200
+      user:
+      password:
+  email:
+    url: http://10.251.132.75/api/b1/email/send
+    from: boeu_learning@boe.com.cn
+    user:
+    security:
+  image:
+    course:
+      default: http://10.251.132.75/pc/images/bgimg/course.png
+jasypt:
+  encryptor:
+    algorithm: PBEWithMD5AndDES
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+
+boe:
+  domain: http://10.251.132.75
+
+ok:
+  http:
+    connect-timeout: 30
+    read-timeout: 30
+    write-timeout: 30
+    max-idle-connections: 200
+    keep-alive-duration: 300
+
+
+
+orgTree:
+  orgTreeList: ${boe.domain}/userbasic/org/list
+  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
+
+userBasic:
+  searchUserList: ${boe.domain}/userbasic/user/list
+  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
+  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
+
+audience:
+  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
+  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
+
+statApi:
+  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
+
+infrasApi:
+  dict: ${boe.domain}/infrasApi/dict/list
+
+manageApi:
+  stu:
+    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
+  editExam: ${boe.domain}/manageApi/admin/project/editExam
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+coursesuilt:
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+
+xxl:
+  job:
+    admin:
+      addresses: http://10.251.132.75/jobAdmin
+    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
+    executor:
+      appname: java-servers-job-api
+      port: 9995
+      address:
+      ip:
+      logpath: /var/log/xxl-job/system/
+      logretentiondays: 30
+
+aop-log-record:
+  #是否开启日志记录
+  enabled: true
+  #不进行拦截的包或者类
+  excludeClassNames:
+  activemq:
+    broker-url: tcp://10.251.129.51:61616
+    user: admin
+    password: admin
+  elasticsearch:
+    host: 10.251.129.21
+    port: 9200
--- a/servers/boe-server-all/src/main/resources/application-prod.yml
+++ b/servers/boe-server-all/src/main/resources/application-prod.yml
@@ -0,0 +1,103 @@
+spring:
+  servlet:
+    multipart:
+      max-file-size: 1000MB
+      max-request-size: 1000MB
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/java/static
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.251.113.100:8848
+      config:
+        server-addr: 10.251.113.100:8848
+  redis:
+    database: 1
+    host: 10.251.88.213
+    password: qwert!W588
+    port: 6379
+  jpa:
+    hibernate:
+      ddl-auto: none
+  datasource:
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: admin
+    password: boeRds01
+    type: com.zaxxer.hikari.HikariDataSource
+    hikari:
+      auto-commit: true
+      minimum-idle: 5
+      idle-timeout: 60000
+      connection-timeout: 30000
+      max-lifetime: 1800000
+      maximum-pool-size: 20
+logging:
+  level:
+    org:
+      hibernate:
+        SQL: ERROR
+  config: classpath:log/logback-@profileActive@.xml
+xboe:
+  api:
+    cross_filter: true
+  upload:
+    file:
+      temp_path: /tmp
+      save_path: /home/www/elearning/upload
+      http_path: https://u.boe.com/upload
+  externalinterface:
+    url:
+      system: http://127.0.0.1:9091
+  old:
+    base:
+      url: https://u.boe.com
+  stat:
+    base:
+      url: http://127.0.0.1:9080
+  server:
+    userbasic:
+      url: https://u.boe.com/userbasic
+  elasticsearch:
+    server:
+      ip: 10.251.88.218
+      port: 9200
+      user:
+      password:
+  email:
+    url: https://u.boe.com/api/b1/email/send
+    from: boeu_learning@boe.com.cn
+    user:
+    security:
+  jasypt:
+    encryptor:
+      algorithm: PBEWithMD5AndDES
+      iv-generator-classname: org.jasypt.iv.NoIvGenerator
+  image:
+    course:
+      default: https://u.boe.com/pc/images/bgimg/course.png
+xxl:
+  job:
+    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
+    admin:
+      addresses: http://u.boe.com/jobAdmin
+    executor:
+      appname: java-servers-job-api
+      port: 9995
+      address:
+      ip:
+      logpath: /var/log/xxl-job/dw/
+      logretentiondays: 30
+aop-log-record:
+  #是否开启日志记录
+  enabled: true
+  #不进行拦截的包或者类
+  excludeClassNames:
+  activemq:
+    broker-url: tcp://10.251.113.100:61616
+    user: admin
+    password: admin
+  elasticsearch:
+    host: 10.251.88.218
+    port: 9200
--- a/servers/boe-server-all/src/main/resources/application-test.yml
+++ b/servers/boe-server-all/src/main/resources/application-test.yml
@@ -2,11 +2,17 @@ spring:
  # application.yml
  servlet:
    multipart:
-      max-file-size: 500MB
-      max-request-size: 500MB
+      max-file-size: 1000MB
+      max-request-size: 1000MB
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.251.186.27:8848
+      config:
+        server-addr: 10.251.186.27:8848
  redis:
    database: 1
-    host: 10.251.186.27
+    host: 10.251.160.38
    password: qwert!W577
    port: 6379
    lettuce:
@@ -36,16 +42,6 @@ spring:
      static-locations: file:E:/Projects/BOE/10/static
 server:
  port: 9090
-  servlet:
-    multipart:
-      max-file-size: 500MB
-      max-request-size: 500MB
-    session:
-      timeout: 30m
-    encoding:
-      charset: UTF-8
-      enabled: true
-      force: true
  tomcat:
    uri-encoding: UTF-8
    servlet:
@@ -86,40 +82,42 @@ xboe:
    dev: true
  upload:
    file:
-      temp_path: /Projects/BOE/10/static/temp
+      temp_path: /tmp
      save_path: /home/www/elearning/upload
-      http_path: http://127.0.0.1/upload
+      http_path: https://u-pre.boe.com/upload
  externalinterface:
    url:
      system: http://localhost:9091
  old:
    base:
-      url: http://localhost
+      url: http://10.251.186.27
  server:
    userbasic:
-      url: http://localhost/userbasic
+      url: http://10.251.186.27/userbasic
  stat:
    base:
-      url: http://localhost:9080
+      url: http://10.251.186.27:9080
  elasticsearch:
    server:
      ip: 10.251.129.25
      port: 9200
-      user:
-      password:
+      user: elastic
+      password: Boe@es123
  email:
-    url: http://localhost/api/b1/email/send
+    url: http://10.251.186.27/api/b1/email/send
    from: boeu_learning@boe.com.cn
    user:
    security:
-
+  image:
+    course:
+      default: https://u-pre.boe.com/pc/images/bgimg/course.png
 jasypt:
  encryptor:
    algorithm: PBEWithMD5AndDES
    iv-generator-classname: org.jasypt.iv.NoIvGenerator

 boe:
-  domain: http://127.0.0.1
+  domain: http://10.251.186.27

 ok:
  http:
@@ -156,4 +154,32 @@ manageApi:
  editExam: ${boe.domain}/manageApi/admin/project/editExam
  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
 coursesuilt:
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+
+xxl:
+  job:
+    admin:
+      addresses: http://10.251.186.27/jobAdmin
+    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
+    executor:
+      appname: java-servers-job-api
+      port: 9995
+      address:
+      ip:
+      logpath: /var/log/xxl-job/system/
+      logretentiondays: 30
+
+aop-log-record:
+  #是否开启日志记录
+  enabled: true
+  #不进行拦截的包或者类
+  excludeClassNames:
+  activemq:
+    broker-url: tcp://10.251.129.25:61616
+    user: admin
+    password: admin
+  elasticsearch:
+    host: 10.251.129.25
+    port: 9200
+    user: elastic
+    password: Boe@es123
--- a/servers/boe-server-all/src/main/resources/application.yml
+++ b/servers/boe-server-all/src/main/resources/application.yml
@@ -1,41 +1,35 @@
 spring:
-  # application.yml
-  servlet:
-    multipart:
-      max-file-size: 500MB
-      max-request-size: 500MB
+  profiles:
+    active: dev
+  application:
+    name: boe-server-all
  redis:
-    database: 1
-    host: 10.251.186.27
-    password: qwert!W577
-    port: 6379
    lettuce:
      pool:
        max-active: 8
        min-idle: 0
        max-idle: 30
        max-wait: 10000ms
-        shutdown-timeout: 100ms
+      shutdown-timeout: 100ms
+  jackson:
+    time-zone: GMT+8
+  mvc:
+    static-path-pattern: /cdn/**
  jpa:
    database: MYSQL
+    show-sql: false
    properties:
      hibernate:
        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
-    show-sql: true
-    hibernate:
-      ddl-auto: update
-  datasource:
-    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.251.160.40:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-    username: admin
-    password: boeRds01
-  web:
-    resources:
-      static-locations: file:E:/Projects/BOE/10/static
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+logging:
+  config: classpath:log/logback-${spring.profiles.active}.xml
 server:
  port: 9090
+  tomcat:
+    uri-encoding: UTF-8
  servlet:
    multipart:
      max-file-size: 500MB
@@ -46,80 +40,6 @@ server:
      charset: UTF-8
      enabled: true
      force: true
-  tomcat:
-    uri-encoding: UTF-8
-    servlet:
-    multipart:
-      maxFileSize: 1024MB
-      maxRequestSize: 1024MB
-  mvc:
-    static-path-pattern: /cdn/**
-
-#logging.level.org.hibernate.SQL=DEBUG
-#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
-#logging.config=classpath:log/logback-@profileActive@.xml
-
-# logging:
-#   config: classpath:log/logback-${spring.profiles.active}.xml
-#   level:
-#     org:
-#       hibernate:
-#         SQL: DEBUG
-#         type:
-#           descriptor:
-#             sql:
-#               BasicBinder: TRACE
-
-xcaching:
-  specs:
-    favorites:
-      timeout: 10s
-    praises:
-      timeout: 10s
-    shares:
-      timeout: 10s
-
-xboe:
-  api:
-    cross_filter: true
-  local:
-    dev: true
-  upload:
-    file:
-      temp_path: /Projects/BOE/10/static/temp
-      save_path: /home/www/elearning/upload
-      http_path: http://127.0.0.1/upload
-  externalinterface:
-    url:
-      system: http://localhost:9091
-  old:
-    base:
-      url: http://localhost
-  server:
-    userbasic:
-      url: http://localhost/userbasic
-  stat:
-    base:
-      url: http://localhost:9080
-  elasticsearch:
-    server:
-      ip: 10.251.129.25
-      port: 9200
-      user:
-      password:
-  email:
-    url: http://localhost/api/b1/email/send
-    from: boeu_learning@boe.com.cn
-    user:
-    security:
-
-jasypt:
-  encryptor:
-    algorithm: PBEWithMD5AndDES
-    iv-generator-classname: org.jasypt.iv.NoIvGenerator
-
-boe:
-  domain: http://127.0.0.1

 ok:
  http:
@@ -128,32 +48,29 @@ ok:
    write-timeout: 30
    max-idle-connections: 200
    keep-alive-duration: 300
-
-
-
+boe:
+  domain: http://127.0.0.1
 orgTree:
  orgTreeList: ${boe.domain}/userbasic/org/list
  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
-
 userBasic:
  searchUserList: ${boe.domain}/userbasic/user/list
-  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
-
+  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
 audience:
  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
-
 statApi:
  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
-
 infrasApi:
  dict: ${boe.domain}/infrasApi/dict/list
-
 manageApi:
  stu:
    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
  editExam: ${boe.domain}/manageApi/admin/project/editExam
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
 coursesuilt:
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+  updateOrSaveCourse: ${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse
+  syncCourseStudent: ${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent
+  syncOnLineScore: ${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore
+  updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua
--- a/servers/boe-server-all/src/main/resources/bootstrap.yml
+++ b/servers/boe-server-all/src/main/resources/bootstrap.yml
@@ -1,24 +0,0 @@
-spring:
-  application:
-    name: boe-server-all
-#  profiles:
-#    active: test
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 10.251.186.27:8848
-      config:
-        server-addr: 10.251.186.27:8848
-#        file-extension: yaml
-#        namespace: fd5741ee-c2aa-4002-a9b0-43a11436d35c
-#        name: boe-server-all
-#        group: SERVER_GROUP
-#        extension-configs:
-#          - data-id: redis0.yaml
-#            group: COMMON_GROUP
-#            refresh: true
-
-#        shared-configs:
-#          - data-id: redis0.yaml
-#            group: COMMON_GROUP
-#            refresh: true
--- a/servers/boe-server-all/src/main/resources/log/logback-pre.xml
+++ b/servers/boe-server-all/src/main/resources/log/logback-pre.xml
@@ -52,4 +52,7 @@
        <appender-ref ref="debug"/>
        <appender-ref ref="error"/>
    </root>
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
 </configuration>
--- a/servers/boe-server-all/src/main/resources/log/logback-pro.xml
+++ b/servers/boe-server-all/src/main/resources/log/logback-pro.xml
@@ -50,6 +50,7 @@
    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
    <root level="INFO">
        <appender-ref ref="info"/>
+        <appender-ref ref="console"/>
       <!-- <appender-ref ref="error"/> --> 
    </root>
 </configuration>
--- a/servers/boe-server-all/src/main/resources/log/logback-prod.xml
+++ b/servers/boe-server-all/src/main/resources/log/logback-prod.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+    <property name="log.path" value="/home/logs/${spring.application.name}"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file debug output -->
+    <appender name="info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file error output -->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
+
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="INFO">
+        <appender-ref ref="info"/>
+<!--        <appender-ref ref="console"/>-->
+       <!-- <appender-ref ref="error"/> --> 
+    </root>
+</configuration>
--- a/servers/boe-server-all/src/main/resources/log/logback-test.xml
+++ b/servers/boe-server-all/src/main/resources/log/logback-test.xml
@@ -51,5 +51,6 @@
    <root level="INFO">
        <appender-ref ref="debug"/>
        <appender-ref ref="error"/>
+        <appender-ref ref="console"/>
    </root>
 </configuration>
--- a/servers/boe-server-basic/pom.xml
+++ b/servers/boe-server-basic/pom.xml
@@ -98,7 +98,7 @@
                <filtering>true</filtering>
                <directory>src/main/resources</directory>
                <includes>
-                    <include>application-${profileActive}.yml</include>
+                    <include>application-*.yml</include>
                    <include>application.yml</include>
                </includes>
            </resource>
@@ -136,9 +136,9 @@
    </build>
    <profiles>
        <profile>
-            <id>pro</id>
+            <id>prod</id>
            <properties>
-                <profileActive>pro</profileActive>
+                <profileActive>prod</profileActive>
            </properties>
        </profile>
        <profile>
--- a/servers/boe-server-basic/src/main/resources/application-dev.yml
+++ b/servers/boe-server-basic/src/main/resources/application-dev.yml
@@ -1,13 +1,13 @@
-# application-dev.yml
+# application-pro.yml
 spring:
  redis:
-    database: 2
-    port: 6379
-    host: 192.168.0.101
+    database: 1
+    host: 192.168.0.253
    password: boe@123
+    port: 6379
  jpa:
    hibernate:
-      ddl-auto: none
+      ddl-auto: update
    open-in-view: false
    properties:
      hibernate:
@@ -16,41 +16,46 @@ spring:
    driverClassName: com.mysql.jdbc.Driver
    db1:
      driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
      username: root
      password: boe#1234A
    db2:
      driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
      username: root
      password: boe#1234A
-    web:
-      resources:
-        static-locations: file:E:/Projects/BOE/java/static
+
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/java/static

 logging:
  level:
    org:
      hibernate:
-        SQL: DEBUG
-        type:
-          descriptor:
-            sql:
-              BasicBinder: TRACE
+        SQL: ERROR
+        # type:
+        #   descriptor:
+        #     sql:
+        #       BasicBinder: TRACE
  config: classpath:log/logback-dev.xml

+
+
 xboe:
+  api:
+    cross_filter: true
  upload:
    file:
-      temp_path: E:/Projects/BOE/java/static/temp
-      save_path: E:/Projects/BOE/java/static/upload
-      http_path: http://localhost:9090/upload
+      temp_path: /tmp
+      save_path: /home/www/elearning/upload
+      http_path: http://192.168.0.253/upload
  inner:
    data:
      sync:
-        baseurl: http://localhost:9090
+        baseurl: http://127.0.0.1:9090

 jasypt:
  encryptor:
    algorithm: PBEWithMD5AndDES
-    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
--- a/servers/boe-server-basic/src/main/resources/application-prod.yml
+++ b/servers/boe-server-basic/src/main/resources/application-prod.yml
@@ -1,9 +1,7 @@
 # application-pro.yml
 spring:
-  profiles:
-    active: pro
  redis:
-    database: 3
+    database: 1
    host: 10.251.88.213
    password: qwert!W588
    port: 6379
--- a/servers/boe-server-basic/src/main/resources/application.yml
+++ b/servers/boe-server-basic/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 # application.yml
 spring:
  profiles:
-    active: @profileActive@
+    active: dev
  application:
    name: boe-server-basic
  jackson:
@@ -62,4 +62,4 @@ ok:

 # 设置logback.xml位置
 logging:
-  config: classpath:log/logback-@profileActive@.xml
+  config: classpath:log/logback-${spring.profiles.active}.xml
--- a/servers/boe-server-basic/src/main/resources/log/logback-prod.xml
+++ b/servers/boe-server-basic/src/main/resources/log/logback-prod.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+    <property name="log.path" value="/home/logs/${spring.application.name}"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file debug output -->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file error output -->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
+
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="WARN">
+        <appender-ref ref="debug"/>
+        <appender-ref ref="error"/>
+    </root>
+</configuration>
Author	SHA1	Message	Date
joshen	4fff780970	Merge branch '250408-bugfix-shl' into release-20250328-master # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java	2025-04-09 18:16:07 +08:00
sunhonglai	47813ea565	增加面授课删除	2025-04-08 17:43:37 +08:00
670788339	5aa62de3cb	@Transient	2025-04-03 09:09:58 +08:00
joshen	a309bc1ddf	Merge branch '250331-bugfix-shl-newmaster' into release-20250328-master	2025-04-02 16:57:24 +08:00
sunhonglai	6af4cdfc75	修改测试环境配置	2025-04-01 13:52:20 +08:00
sunhonglai	2a2759768b	修改个人中心我的报名图片不显示问题	2025-04-01 12:42:32 +08:00
sunhonglai	74bcec72bc	修改学习时长取值	2025-04-01 09:59:59 +08:00
sunhonglai	b8c171bf86	Merge branch '250331-bugfix-shl-newmaster' into 250331-bugfix-shl # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java	2025-04-01 09:51:14 +08:00
sunhonglai	175e7f6c28	查询课程和修改课程学习上报进度，增加视频播放进度的处理	2025-04-01 08:32:41 +08:00
sunhonglai	5705bb8529	查询课程和修改课程学习上报进度，增加视频播放进度的处理	2025-03-31 13:14:14 +08:00
sunhonglai	87e5dd81f8	查询课程和修改课程学习上报进度，增加视频播放进度的处理	2025-03-31 11:27:13 +08:00
joshen	9924769bc8	Merge remote-tracking branch 'yx/master-20250227-lyc' into release-20250328-master	2025-03-29 12:38:10 +08:00
670788339	d4964ca7f1	日志	2025-03-29 12:22:11 +08:00
670788339	efdfa6f00c	study-video-time 最后修改时间调整	2025-03-29 10:51:08 +08:00
joshen	ceb30f7f1d	Merge remote-tracking branch 'yx/master-20250227-lyc' into release-20250328-master # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java	2025-03-28 15:32:27 +08:00
joshen	60d891edcf	Merge remote-tracking branch 'yx/250324-casebugfix-zsh'	2025-03-26 16:54:25 +08:00
emcchui	b9f00f2602	SZX-927：学员端-个人设置-手机号未同步到	2025-03-25 08:47:19 +08:00
emcchui	77884d3e7e	SZX-927：学员端-个人设置-手机号未同步到	2025-03-25 08:39:48 +08:00
emcchui	3a9a8d86af	SZX-927：学员端-个人设置-手机号未同步到	2025-03-24 18:10:41 +08:00
emcchui	3a139925c9	SZX-927：学员端-个人设置-手机号未同步到	2025-03-24 17:41:22 +08:00
emcchui	fdc0c7959e	SZX-927：学员端-个人设置-手机号未同步到	2025-03-24 16:27:50 +08:00
sunhonglai	a1352ec813	修改后端返回分页结果	2025-03-24 09:23:06 +08:00
670788339	c9db78ea94	在线课-外部讲师补充	2025-03-21 09:42:02 +08:00
670788339	f33de0c326	在线课-外部讲师	2025-03-20 20:57:49 +08:00
670788339	4be72391ad	在线课-外部讲师报错添加讲师类型	2025-03-20 17:37:04 +08:00
670788339	500fb090fb	在线课-外部讲师报错添加讲师类型	2025-03-19 13:17:06 +08:00
670788339	ee95435d01	在线课-外部讲师报错添加供应商	2025-03-19 13:08:54 +08:00
670788339	76f0d1933a	在线课-外部讲师报错	2025-03-19 11:56:48 +08:00
670788339	3d9b26982c	在线课-外部讲师报错	2025-03-18 11:49:53 +08:00
emcchui	a65fa797cc	dev	2025-03-16 13:29:06 +08:00
emcchui	feba3237ab	dev	2025-03-16 13:27:05 +08:00
670788339	58d6f49006	考试提交调用加catch	2025-03-13 10:03:21 +08:00
670788339	c8ffdd561f	考试提交调用course项目同步	2025-03-10 16:03:10 +08:00
670788339	98611edcaa	考试提交调用course项目同步	2025-03-10 16:02:19 +08:00
670788339	8aea21bde7	参数转换	2025-03-10 14:32:21 +08:00
670788339	a79f6b43b2	日志	2025-03-10 14:22:03 +08:00
670788339	81ea19f0f3	study-video-time redis优化	2025-03-03 17:49:49 +08:00
670788339	2919fceef1	boenewlogin band处理	2025-02-25 17:35:47 +08:00
670788339	f7dcda551d	登录异常处理	2025-02-22 13:12:31 +08:00
hui	cdf5d2a052	修复生产案例显示null的问题	2025-01-21 18:08:33 +08:00
joshen	ba45fc53d9	test	2025-01-18 15:48:30 +08:00
joshen	5272e15449	test	2025-01-18 14:30:47 +08:00
joshen	d1fe0dc37f	test	2025-01-18 14:25:03 +08:00
joshen	c886f05309	log	2025-01-17 22:06:48 +08:00
joshen	046886521d	log	2025-01-17 21:11:30 +08:00
joshen	25e9043bea	log	2025-01-17 21:07:38 +08:00
joshen	6d3a9955af	log	2025-01-17 21:03:12 +08:00
joshen	2651d256a6	log	2025-01-17 11:06:17 +08:00
hui	c3f58b25a2	上传文件返回格式为application/json	2025-01-14 17:27:11 +08:00
hui	87eeea4874	上传文件返回格式为application/json	2025-01-14 17:09:30 +08:00
hui	14d1a2e385	pre配置	2025-01-14 11:24:04 +08:00
hui	ee5df32588	pre配置	2025-01-12 13:50:02 +08:00
hui	3109b6faf7	生产配置	2025-01-12 13:21:52 +08:00
hui	d374c8213d	生产配置	2025-01-12 13:17:51 +08:00
hui	799be39142	生产配置	2025-01-12 11:02:06 +08:00
hui	1f02bb419a	生产配置	2025-01-12 10:07:49 +08:00
hui	412e8cd362	多环境	2025-01-10 09:33:59 +08:00
hui	fc1515f018	多环境	2025-01-10 09:26:55 +08:00
hui	b9ec978267	多环境	2025-01-09 15:44:53 +08:00
joshen	29229ba3ed	xxjob	2025-01-09 15:11:06 +08:00
joshen	1bc8c0ef01	合并生产	2025-01-08 17:20:09 +08:00
joshen	8d94810c08	合并生产	2025-01-08 17:10:37 +08:00
hui	c0b80b6ee5	多环境	2025-01-08 16:16:47 +08:00
hui	7345528c68	架构升级修正	2025-01-07 19:17:45 +08:00
hui	65b8deab27	Merge remote-tracking branch 'origin/20241118-upframework' into prod-250107-from104-master-teacher-1202 # Conflicts: # servers/boe-server-all/pom.xml # servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java # servers/boe-server-all/src/main/resources/application-pro.properties # servers/boe-server-all/src/main/resources/application-test.properties # servers/boe-server-all/src/main/resources/application.properties	2025-01-07 18:35:18 +08:00
joshen	be0386f2d1	Merge remote-tracking branch 'yx/zxwy-esSync' into master-teacher-1202	2024-12-17 19:57:35 +08:00
joshen	b092cd3889	Merge branch 'yx1101-teacher-l' into master-teacher-1202	2024-12-12 19:11:33 +08:00