上传文件返回格式为application/json

# 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

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>

servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java

@@ -22,11 +22,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;
@@ -92,8 +92,8 @@ public class ThirdApi {
     private String syncCourseStudent;
     @Value("${coursesuilt.syncOnLineScore}")
     private String syncOnLineScore;
-    @Value("${coursesuilt.updateOnLineStatus}")
+    @Value("${coursesuilt.updateOnLineStatua}")
-    private String updateOnLineStatus;
+    private String updateOnLineStatua;
 
 
     //获取例外人员的id
@@ -376,9 +376,9 @@ 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);
     }

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;
-    }
-}

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);
-        }
-    }
-
-}

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) {
@@ -33,6 +43,7 @@ public class WebConfig implements WebMvcConfigurer {
         mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
         return mapper;
     }
+
     /**
      * 在默认的消息转换器基础上添加或移除某些转换器
      * 保证StringHttpMessageConverter在FastJsonHttpMessageConverter前被调用

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前缀
      */

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) {

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())) {
+		if(StringUtils.isNotBlank(dto.getAudiences())) {
-//			paras.setAudiences(dto.getAudiences().split(","));
+			paras.setAudiences(dto.getAudiences().split(","));
-//		}
+		}
 		if(StringUtils.isNotBlank(userIds)) {
 			paras.setSysCreateAids(userIds.split(","));
 		}

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 {
@@ -97,19 +88,22 @@ public class CourseWareApi extends ApiBaseController {
 	 * 
 	 * @param request
 	 * @param response
+	 * @param cfid
+	 * @param cf
 	 * @throws Exception
 	 */
 	@GetMapping("/resource")
-	public JsonResponse<String> getVideo(HttpServletRequest request, HttpServletResponse response, String sign,
+	public JsonResponse<String> getVideo(HttpServletRequest request, HttpServletResponse response, String sign) throws Exception {
-										 @CookieValue(name = "token",required = false)String token
-	) 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);
+		String cookieTime = getSignTimeCookie(request);
-//		if (StringUtils.isBlank(cookieTime)) {
+		if (StringUtils.isBlank(cookieTime)) {
-//			return badRequest("不支持的请求");
+			return badRequest("不支持的请求");
-//		}
+			// return;
-		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验证错误");
 		}
-		// 将对象转换为字符串
+
-		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);

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;
     }
-
 }

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);
 }

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()));
 		}
 		//添加或保存其它信息

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);
-//	}
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -480,7 +480,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 +503,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 +560,8 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "\tc.id \n" +
                 "FROM\n" +
-                "\tboe.student s\n" +
+                "\tboe_new.student s\n" +
-                "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\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" +

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;

servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java

@@ -43,12 +43,7 @@ public class PhpOnlineStudyRecordScheduledTasks {
     @Resource
     RestHighLevelClient restHighLevelClient;
 
-    /**
+    // todo 定时、分批、数据库名
-     * 定时同步PHP数据库数据到es中，计划定时20分钟执行一次。具体实现是，
-     * 第一步，查询最近半小时内完成任一课件的课程学习，获取的信息有课程ID，学员ID，学习状态、学习进度。
-     * 第二步，根据上述得到的课程ID，学员ID，查询es中的未完成的记录。
-     * 第三步，比对两者学习进度，如果不一致，以数据库学习记录为准，修改ES
-     */
     @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()) {
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(boolQuery).timeout(new TimeValue(60, TimeUnit.SECONDS));
-            return null;
+        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");

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<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", userIdOfPhpList);
+        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";

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();
+			return wrap(xur);
-			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);
 
 		} catch (Exception e) {
 			log.error("upload file error ",e);

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;
-}

servers/boe-server-all/src/main/resources/application-pre.yml

@@ -2,12 +2,18 @@ spring:
   # application.yml
   servlet:
     multipart:
-      max-file-size: 500MB
+      max-file-size: 1000MB
-      max-request-size: 500MB
+      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.186.27
+    host: 10.251.129.122
-    password: qwert!W577
+    password: qwert!W588
     port: 6379
     lettuce:
       pool:
@@ -28,7 +34,7 @@ spring:
       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
+    url: jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
     username: admin
     password: boeRds01
   web:
@@ -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,29 +82,29 @@ 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: http://10.251.132.75/upload
   externalinterface:
     url:
       system: http://localhost:9091
   old:
     base:
-      url: http://localhost
+      url: http://10.251.132.75
   server:
     userbasic:
-      url: http://localhost/userbasic
+      url: http://10.251.132.75/userbasic
   stat:
     base:
-      url: http://localhost:9080
+      url: http://10.251.132.75:9080
   elasticsearch:
     server:
-      ip: 10.251.129.25
+      ip: 10.251.129.21
       port: 9200
       user:
       password:
   email:
-    url: http://localhost/api/b1/email/send
+    url: http://10.251.132.75/api/b1/email/send
     from: boeu_learning@boe.com.cn
     user:
     security:
@@ -119,7 +115,7 @@ jasypt:
     iv-generator-classname: org.jasypt.iv.NoIvGenerator
 
 boe:
-  domain: http://127.0.0.1
+  domain: http://10.251.132.75
 
 ok:
   http:
@@ -157,3 +153,29 @@ manageApi:
   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

servers/boe-server-all/src/main/resources/application-prod.yml

@@ -0,0 +1,100 @@
+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
+xxl:
+  job:
+    admin:
+      addresses: http://u.boe.com/jobAdmin
+      accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
+    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

servers/boe-server-all/src/main/resources/application.yml

@@ -1,14 +1,9 @@
 spring:
-  # application.yml
+  profiles:
-  servlet:
+    active: dev
-    multipart:
+  application:
-      max-file-size: 500MB
+    name: boe-server-all
-      max-request-size: 500MB
   redis:
-    database: 1
-    host: 10.251.186.27
-    password: qwert!W577
-    port: 6379
     lettuce:
       pool:
         max-active: 8
@@ -16,26 +11,25 @@ spring:
         max-idle: 30
         max-wait: 10000ms
       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
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-    hibernate:
+logging:
-      ddl-auto: update
+  config: classpath:log/logback-${spring.profiles.active}.xml
-  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
 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
+  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

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

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>

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>

servers/boe-server-basic/pom.xml

@@ -136,9 +136,9 @@
     </build>
     <profiles>
         <profile>
-            <id>pro</id>
+            <id>prod</id>
             <properties>
-                <profileActive>pro</profileActive>
+                <profileActive>prod</profileActive>
             </properties>
         </profile>
         <profile>