视频进行工号验证

servers/boe-server-all/pom.xml

@@ -205,7 +205,11 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/src/main/resources/aspose/aspose-cells-java-18.11.jar</systemPath>
 		</dependency>
-
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>2.0.17.graal</version>
+        </dependency>
 		<!--加密配置文件-->
 		<dependency>
 			<groupId>com.github.ulisesbocchio</groupId>
@@ -232,14 +236,7 @@
 			<artifactId>spring-retry</artifactId>
 			<version>1.3.1</version>
 		</dependency>
-
+    </dependencies>
-		<dependency>
-			<groupId>com.xuxueli</groupId>
-			<artifactId>xxl-job-core</artifactId>
-			<version>2.3.0</version>
-		</dependency>
-
-	</dependencies>
 	<build>
 		<resources>
 			<resource>

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

@@ -1,40 +0,0 @@
-package com.xboe;
-
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class XxlJobConfig {
-
-    @Value("${xxl.job.admin.addresses}")
-    private String adminAddresses;
-    @Value("${xxl.job.executor.appname}")
-    private String appName;
-    @Value("${xxl.job.executor.ip}")
-    private String ip;
-    @Value("${xxl.job.executor.port}")
-    private int port;
-    @Value("${xxl.job.accessToken}")
-    private String accessToken;
-    @Value("${xxl.job.executor.logpath}")
-    private String logPath;
-    @Value("${xxl.job.executor.logretentiondays}")
-    private int logRetentionDays;
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        // 创建 XxlJobSpringExecutor 执行器
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-        xxlJobSpringExecutor.setAppname(appName);
-        xxlJobSpringExecutor.setIp(ip);
-        xxlJobSpringExecutor.setPort(port);
-        xxlJobSpringExecutor.setAccessToken(accessToken);
-        xxlJobSpringExecutor.setLogPath(logPath);
-        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-        // 返回
-        return xxlJobSpringExecutor;
-    }
-}

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

@@ -5,8 +5,6 @@ import cn.hutool.core.lang.Opt;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
 import com.xboe.api.vo.*;
-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.TeacherInfoVo;
 import com.xboe.module.course.vo.TeacherVo;
@@ -74,16 +72,6 @@ public class ThirdApi {
     @Value("${userBasic.getUserBasicInfo}")
     private String getUserBasicInfo;
 
-    @Value("${coursesuilt.updateOrSaveCourse}")
-    private String updateOrSaveCourse;
-    @Value("${coursesuilt.syncCourseStudent}")
-    private String syncCourseStudent;
-    @Value("${coursesuilt.syncOnLineScore}")
-    private String syncOnLineScore;
-    @Value("${coursesuilt.updateOnLineStatua}")
-    private String updateOnLineStatua;
-
-
     //获取例外人员的id
     public  List<String> getUserId(){
         String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=316&type=1").execute() //prod 316
@@ -314,31 +302,4 @@ public class ThirdApi {
         return basicInfos;
 
     }
-
-    public void updateOrSaveCourse(CourseParam param, String token){
-        log.info("---------------准备同步在线课到讲师管理完毕 ------- param " + param);
-        String resp = Optional.ofNullable(
-                HttpRequest.post(updateOrSaveCourse).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
-                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
-        log.info("updateOrSaveCourse = " + resp);
-    }
-    public void syncCourseStudent(Long courseId, String token){
-        String resp = Optional.ofNullable(
-                HttpRequest.post(syncCourseStudent).body(JSONUtil.toJsonStr(courseId)).header("token", token).execute()
-                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
-        log.info("syncCourseStudent = " + resp);
-    }
-
-    public void syncOnLineScore(ScoreParam param, String token) {
-        String resp = Optional.ofNullable(
-                HttpRequest.post(syncOnLineScore).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
-                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
-        log.info("syncOnLineScore = " + resp);
-    }
-    public void updateOnLineStatua(CourseParam param, String token){
-        String resp = Optional.ofNullable(
-                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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,63 @@
+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/constants/CacheName.java

@@ -22,6 +22,8 @@ public interface CacheName {
      */
     String NAME_USER = "user";
 
+    String NAME_INFO = "userInfo";
+
     /**
      * 用户名缓存KEY前缀
      */

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CaseScheduledTasks.java

@@ -1,7 +1,6 @@
 package com.xboe.module.boecase.api;
 
 import com.xboe.module.boecase.service.ICasesService;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -17,7 +16,6 @@ public class CaseScheduledTasks {
      * 每月的第一天的1:00执行
      */
 //    @Scheduled(cron = "0 0 1 1 * ?")
-    @XxlJob("refreshViewsRankOfMajor")
     public void refreshViewsRankOfMajor() {
         casesService.refreshViewsRankOfMajor();
     }
@@ -25,8 +23,7 @@ public class CaseScheduledTasks {
     /**
      * 季初第一天两点执行，cron表达式设置为每个季度的第一个月的第一天的特定时间。每个季度的第一个月是1月、4月、7月和10月：
      */
-//    @Scheduled(cron = "0 0 2 1 1,4,7,10 ?")
+    @Scheduled(cron = "0 0 2 1 1,4,7,10 ?")
-    @XxlJob("refreshLastQuarterStatistics")
     public void refreshLastQuarterStatistics() {
         casesService.refreshLastQuarterStatistics();
     }

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java

@@ -5,10 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
-import com.xboe.api.ThirdApi;
-import com.xboe.module.course.dto.CourseParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -58,10 +55,7 @@ public class CourseAuditApi  extends ApiBaseController{
 	
 	@Resource
 	private ICourseContentService ccontentService;
-	@Resource
+	
-	private ThirdApi thirdApi;
-
-
 	/**
 	 * 教师需要审核的课程
 	 * @param pager
@@ -321,7 +315,7 @@ public class CourseAuditApi  extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/hrbp-submit-audit")
-	public JsonResponse<Boolean> hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark, HttpServletRequest request){
+	public JsonResponse<Boolean> hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark){
 		if(StringUtils.isBlank(auditId)){
 			return badRequest("参数错误");
 		}
@@ -353,14 +347,6 @@ public class CourseAuditApi  extends ApiBaseController{
 		try {
 			CurrentUser cu=getCurrent();
 			service.hrbpSubmitAudit(auditId, courseId,open, pass,cu.getAccountId(),cu.getName(), remark);
-
-			if (pass){
-				//修改在线课开课状态=已开课
-				String token = request.getHeader("Xboe-Access-Token");
-				CourseParam param = new CourseParam();
-				param.setId(courseId);
-				thirdApi.updateOnLineStatua(param,token);
-			}
 			return success(true);
 		} catch (Exception e) {
 			log.error("HRBP审核提交处理错误",e);
@@ -392,8 +378,7 @@ public class CourseAuditApi  extends ApiBaseController{
 	 */
 	@PostMapping("/submit-publish")
 	@AutoLog(module = "课程",action = "默认管理员提交发布",info = "")
-	public JsonResponse<Boolean> submitAndPublish(@RequestBody CourseFullDto dto, HttpServletRequest request){
+	public JsonResponse<Boolean> submitAndPublish(@RequestBody CourseFullDto dto){
-		log.info("---------------提交并直接发布，用于默认管理直接操作 -------");
 		if(dto.getCourse()==null){
 			return badRequest("无课程信息");
 		}
@@ -417,22 +402,12 @@ public class CourseAuditApi  extends ApiBaseController{
 		if(StringUtils.isBlank(dto.getCourse().getOrgId())) {
 			return badRequest("请选择资源归属");
 		}
-		String token = request.getHeader("Xboe-Access-Token");
-
 		CurrentUser cuser=getCurrent();
 		dto.getCourse().setStatus(Course.STATUS_AUDIT_FINISH);//设置为审核通过状态
 		dto.getCourse().setEnabled(true);//设置启用状态问题
 		dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
 		try {
-
 			courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName());
-			log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
-			CourseParam param = new CourseParam();
-			param.setId(dto.getCourse().getId());
-			param.setOrgId(dto.getCourse().getOrgId());
-			param.setOrgName(dto.getCourse().getOrgName());
-			thirdApi.updateOrSaveCourse(param,token);
-			log.info("---------------在线课同步到讲师管理完毕 -------");
 			return success(true);
 		} catch (Exception e) {
 			log.error("默认管理员提交直接发布处理失败",e);

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java

@@ -7,8 +7,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xboe.api.ThirdApi;
-import com.xboe.module.course.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +26,11 @@ import com.xboe.data.dto.UserOrgIds;
 import com.xboe.data.outside.IOutSideDataService;
 import com.xboe.data.service.IDataUserSyncService;
 import com.xboe.module.assistance.service.IEmailService;
+import com.xboe.module.course.dto.CourseExportDto;
+import com.xboe.module.course.dto.CourseFullDto;
+import com.xboe.module.course.dto.CourseQueryDto;
+import com.xboe.module.course.dto.CourseTeacherAndCourse;
+import com.xboe.module.course.dto.CourseTeacherExportDto;
 import com.xboe.module.course.entity.Course;
 import com.xboe.module.course.entity.CourseContent;
 import com.xboe.module.course.entity.CourseCrowd;
@@ -97,8 +100,7 @@ public class CourseManageApi extends ApiBaseController{
 	
 	@Autowired
     IDataUserSyncService userSyncService;
-	@Resource
+	
-	private ThirdApi thirdApi;
 	
 //	@PostMapping("/test")
 //	public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
@@ -269,7 +271,7 @@ public class CourseManageApi extends ApiBaseController{
 	 */
 	@PostMapping("/save")
 	@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
-	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto, HttpServletRequest request){
+	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto){
 		if(dto.getCourse()==null){
 			return badRequest("无课程信息");
 		}
@@ -300,14 +302,7 @@ public class CourseManageApi extends ApiBaseController{
 				dto.getCourse().setStatus(Course.STATUS_NONE);
 				courseService.update(dto);
 			}
-			String token = request.getHeader("Xboe-Access-Token");
+			
-			log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
-			CourseParam param = new CourseParam();
-			param.setId(dto.getCourse().getId());
-			param.setOrgId(dto.getCourse().getOrgId());
-			param.setOrgName(dto.getCourse().getOrgName());
-			thirdApi.updateOrSaveCourse(param,token);
-			log.info("---------------在线课同步到讲师管理完毕 -------");
 			return success(dto);
 		} catch (Exception e) {
 			log.error("整体保存课程信息错误",e);

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java

@@ -11,7 +11,6 @@ import com.xboe.core.orm.FieldFilters;
 import com.xboe.module.course.dto.CourseQueryDto;
 import com.xboe.module.course.dto.CourseTeacherDto;
 import com.xboe.module.course.dto.RankingDto;
-import com.xboe.module.course.dto.TeacherCourseDto;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.ICourseContentService;
 import com.xboe.module.course.service.ICourseSectionService;
@@ -29,8 +28,6 @@ import com.xboe.school.study.entity.StudyHomeWork;
 import com.xboe.school.study.service.IStudyCourseService;
 import com.xboe.school.study.service.IStudyHomeWorkService;
 import com.xboe.school.study.service.IStudyService;
-import com.xboe.system.user.entity.User;
-import com.xboe.system.user.service.IUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,8 +60,7 @@ public class CoursePortalApi extends ApiBaseController{
 
 	@Resource
 	private ICourseService courseService;
-	@Resource
+
-	private IUserService userService;
 	@Resource
 	private ITeacherService teacherService;
 
@@ -282,7 +278,7 @@ public class CoursePortalApi extends ApiBaseController{
 		if (!Objects.isNull(studyCourse)){
 			pass = true;
 		}
-		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty() && !StringUtils.isEmpty(audiences)) {
+		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) {
 			List<String> audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组
 			log.error("---------------参数------------ audienceList = " + audienceList);
 			for (CourseCrowd c : courseCrowdList) {
@@ -305,30 +301,17 @@ public class CoursePortalApi extends ApiBaseController{
 		List<CourseContent> cclist=contentService.getByCourseId(id);
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
-		List<TeacherCourseDto> teacherCourseDtos = new ArrayList<>();
+
 
 		//获取教师的介绍信息,因为一门课程 的教师不会太多，所以这里简单直接遍历查询，后续再优化
 		for(CourseTeacher ct : teachers) {
-			TeacherCourseDto teacherCourseDto = new TeacherCourseDto();
 			Teacher t = teacherService.get(ct.getTeacherId());
-			User user = userService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
 				if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
 					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 						ct.setTeacherName("BOE教师");
 					}
-					teacherCourseDto.setCourseId(ct.getCourseId());
-					teacherCourseDto.setTeacherName(ct.getTeacherName());
-					teacherCourseDto.setTeacherId(ct.getTeacherId());
-					teacherCourseDto.setCode(ct.getCode());
-					teacherCourseDto.setRemark(ct.getRemark());
-					teacherCourseDto.setSysCreateAid(ct.getSysCreateAid());
-					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
-					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
-					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
-					teacherCourseDtos.add(teacherCourseDto);
 				}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 					List<String> list=new ArrayList<>();
 					list.add(ct.getTeacherId());
@@ -336,17 +319,6 @@ public class CoursePortalApi extends ApiBaseController{
 					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 						ct.setTeacherName("BOE教师");
 					}
-					teacherCourseDto.setCourseId(ct.getCourseId());
-					teacherCourseDto.setTeacherName(ct.getTeacherName());
-					teacherCourseDto.setTeacherId(ct.getTeacherId());
-					teacherCourseDto.setCode(ct.getCode());
-					teacherCourseDto.setRemark(ct.getRemark());
-					teacherCourseDto.setSysCreateAid(ct.getSysCreateAid());
-					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
-					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
-					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
-					teacherCourseDtos.add(teacherCourseDto);
 				}
 			}
 
@@ -355,7 +327,7 @@ public class CoursePortalApi extends ApiBaseController{
 		rs.put("isCrowd",pass);
 		rs.put("contents",	cclist);
 		rs.put("sections",sectionlist);
-		rs.put("teachers",teacherCourseDtos);
+		rs.put("teachers",teachers);
 		//查询课程
 		return success(rs);
 

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseWareApi.java

@@ -1,16 +1,20 @@
 package com.xboe.module.course.api;
 
-import java.util.Base64;
+import java.util.*;
-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;
@@ -33,13 +37,18 @@ 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 {
@@ -50,7 +59,7 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 资源地址的加密，返回加密后的地址
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @param cfid     资源地址的id
@@ -85,25 +94,22 @@ 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) throws Exception {
+	public JsonResponse<String> getVideo(HttpServletRequest request, HttpServletResponse response, String sign,
+										 @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;
@@ -115,21 +121,37 @@ public class CourseWareApi extends ApiBaseController {
 
 		if(!has) {
 			return badRequest("页面不存在");
-			//return "非法请求";
 		}
-
+//		String token = request.getHeader("Xboe-Access-Token");
-		//读取cookies中的时间
+//		if (StringUtils.isEmpty(token)) {
-		String cookieTime = getSignTimeCookie(request);
+//			token = request.getHeader("token");
-		if (StringUtils.isBlank(cookieTime)) {
+//		}
-			return badRequest("不支持的请求");
+//		读取cookies中的时间
-			// return;
+//		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验证错误");
 		}
-
+		// 将对象转换为字符串
+		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) {
@@ -139,8 +161,15 @@ 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);
@@ -172,7 +201,7 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 读取cookies值
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseParam.java

@@ -1,10 +0,0 @@
-package com.xboe.module.course.dto;
-
-import lombok.Data;
-
-@Data
-public class CourseParam {
-    private String id;
-    private String orgId;
-    private String orgName;
-}

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/ScoreParam.java

@@ -1,9 +0,0 @@
-package com.xboe.module.course.dto;
-
-import lombok.Data;
-
-@Data
-public class ScoreParam {
-    private Long courseId;
-    private Float score;
-}

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/TeacherCourseDto.java

@@ -1,11 +0,0 @@
-package com.xboe.module.course.dto;
-
-import com.xboe.module.course.entity.CourseTeacher;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class TeacherCourseDto extends CourseTeacher {
-    private String userNo;
-}

servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java

@@ -1,10 +1,7 @@
 package com.xboe.module.interaction.api;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
-import com.xboe.api.ThirdApi;
-import com.xboe.module.course.dto.ScoreParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,26 +25,18 @@ public class CourseGradeApi extends ApiBaseController {
 
     @Resource
     private ICourseGradeService service;
-    @Resource
-    private ThirdApi thirdApi;
-
     /**
      * 评分
      * */
     @PostMapping("/grade")
     @AutoLog(module = "评分",action = "评分")
-    public JsonResponse<Float> grade(String courseId,Float score,String studyId, HttpServletRequest request){
+    public JsonResponse<Float> grade(String courseId,Float score,String studyId){
         CourseGrade courseGrade = new CourseGrade();
         courseGrade.setCourseId(courseId);
         courseGrade.setScores(score);
         courseGrade.setStudyId(studyId);
         try {
 	        Float aFloat = service.save(courseGrade);
-            String token = request.getHeader("Xboe-Access-Token");
-            ScoreParam param = new ScoreParam();
-            param.setCourseId(Long.parseLong(courseId));
-            param.setScore(score);
-            thirdApi.syncOnLineScore(param,token);
 	        return success(aFloat);
         }catch(Exception e) {
         	log.error("评分保存错误",e);

servers/boe-server-all/src/main/java/com/xboe/module/teacher/entity/Teacher.java

@@ -1,8 +1,6 @@
 package com.xboe.module.teacher.entity;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -155,7 +153,7 @@ public class Teacher extends BaseEntity {
      */
     @Column(name = "courses")
     private String courses;
-
+    
     /**
      * 发薪地id
      */
@@ -208,56 +206,4 @@ public class Teacher extends BaseEntity {
     @Column(name = "expertise")
     private String expertise;
 
-    @Column(name = "user_no",length = 1)
-    private String userNo;
-
-//    @ApiModelProperty(value = "讲师类型 1 内部讲师  2外部讲师")
-    @Column(name = "teacher_type")
-    private Integer teacherType;
-
-//    @ApiModelProperty(value = "默认授课时长(分钟)")
-    @Column(name = "default_teaching_time")
-    private Integer defaultTeachingTime;
-
-//    @ApiModelProperty(value = "认证人")
-    @Column(name = "certify_by")
-    private String certifyBy;
-
-//    @ApiModelProperty(value = "认证时间")
-    @Column(name = "certify_at")
-    private LocalDateTime certifyAt;
-
-    //    @ApiModelProperty(value = "认证资料路径")
-    @Column(name = "certification")
-    private String certification;
-
-    //   @ApiModelProperty(value = "认证资料路径名称")
-    @Column(name = "certification_name")
-    private String certificationName;
-
-    //    @ApiModelProperty(value = "供应商")
-    @Column(name = "supplier")
-    private String supplier;
-
-
-    //   @ApiModelProperty(value = "教师专长名称 逗号分割")
-    @Column(name = "expertise_names")
-    private String expertiseNames;
-
-    //   @ApiModelProperty(value = "标识 0：自动录入/1：手动录入")
-    @Column(name = "create_from")
-    private Integer createFrom;
-
-    //    @ApiModelProperty(value = "组织id")
-    @Column(name = "org_id")
-    private Long orgId;
-
-    //     @ApiModelProperty(value = "组织名称")
-    @Column(name = "org_name")
-    private String orgName;
-
-    //    @ApiModelProperty(value = "旧系统kid字段")
-    @Column(name = "kid")
-    private String kid;
-
 }

servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java

@@ -102,12 +102,9 @@ public class TeacherServiceImpl implements ITeacherService {
     public List<Teacher> findByName(String name) {
     	String hql="Select t.id,t.name,u.userNo from "+Teacher.class.getSimpleName()+" t,"+User.class.getSimpleName()+" u ";
     	hql+=" where t.id=u.id and (t.name like '%"+name+"%' or u.userNo=?1)";
-//        String hql="Select t.id,t.name,t.userNo from "+Teacher.class.getSimpleName()+" t";
-//        hql+=" where t.deleted =0 and t.status =1 and (t.name like '%"+name+"%' or t.userNo like '%"+name+"%' )";
-
     	List<Teacher> teachers=new ArrayList<Teacher>();
     	try {
-			List<Object[]> list =dao.findListFields(hql);
+			List<Object[]> list =dao.findListFields(hql,name);
 			for(Object[] objs :list) {
 				Teacher t=new Teacher();
 				t.setId((String)objs[0]);

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

@@ -1,260 +0,0 @@
-package com.xboe.school.study.api;
-
-import cn.hutool.core.collection.CollUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.xboe.module.course.dto.CourseStudyDto;
-import com.xboe.school.study.dao.PhpOnlineCourseDao;
-import com.xboe.school.study.dto.PhpOnlineDto;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.elasticsearch.action.bulk.BulkRequest;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequest;
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
-import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-@Component
-@Slf4j
-public class PhpOnlineStudyRecordScheduledTasks {
-
-    @Resource
-    private PhpOnlineCourseDao phpOnlineCourseDao;
-
-    @Resource
-    RestHighLevelClient restHighLevelClient;
-
-    /**
-     * 定时同步PHP数据库数据到es中，计划定时20分钟执行一次。具体实现是，
-     * 第一步，查询最近半小时内完成任一课件的课程学习，获取的信息有课程ID，学员ID，学习状态、学习进度。
-     * 第二步，根据上述得到的课程ID，学员ID，查询es中的未完成的记录。
-     * 第三步，比对两者学习进度，如果不一致，以数据库学习记录为准，修改ES
-     */
-    @XxlJob("phpOnlineStudyRecordSyncEsTask")
-    public List<String> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
-
-        log.info("开始同步PHP学习记录到ES");
-        // 增量获取PHP中所有已完成的课程
-        if (syncTimePointOfBegin == null || syncTimePointOfEnd == null) {
-            LocalDateTime now = LocalDateTime.now();
-            LocalDateTime halfAnHourAgo = now.minusMinutes(30);
-            syncTimePointOfBegin = halfAnHourAgo.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
-            syncTimePointOfEnd = now.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
-
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            log.info("同步时间起点：{}", formatter.format(halfAnHourAgo));
-            log.info("同步时间终点：{}", formatter.format(now));
-        }
-
-        int pageSize = 1000;
-        int totalRecordsCount = phpOnlineCourseDao.selectRecentLearnRecordListOfCount(syncTimePointOfBegin, syncTimePointOfEnd); // 总记录数
-
-        int totalPages = (int) Math.ceil((double) totalRecordsCount / pageSize);
-
-        ArrayList<String> tempResultList = new ArrayList<>();
-
-        for (int pageNumber = 1; pageNumber <= totalPages; pageNumber++) {
-            int offset = (pageNumber - 1) * pageSize;
-            List<PhpOnlineDto> pageData = phpOnlineCourseDao.selectRecentLearnRecordList(syncTimePointOfBegin, syncTimePointOfEnd, offset, pageSize);
-            ArrayList<String> singleResultList = esDataHandle(isOnlyRead, pageData);
-            tempResultList.addAll(singleResultList);
-        }
-
-        return tempResultList;
-    }
-
-
-    private ArrayList<String> esDataHandle(Integer isOnlyRead, List<PhpOnlineDto> recentLearnRecordList) throws IOException {
-        ArrayList<String> tempResultList = new ArrayList<>();
-        // 将数据分批，每批50条
-        int batchSize = 50;
-        int totalSize = recentLearnRecordList.size();
-        List<List<PhpOnlineDto>> batches = new ArrayList<>();
-
-        for (int i = 0; i < totalSize; i += batchSize) {
-            int end = Math.min(i + batchSize, totalSize);
-            batches.add(recentLearnRecordList.subList(i, end));
-        }
-
-        for (List<PhpOnlineDto> batch : batches) {
-            // 构建映射关系
-            Map<String, PhpOnlineDto> map = batch.stream()
-                    .collect(Collectors.toMap(
-                            phpOnlineDto -> phpOnlineDto.getUserIdOfJava() + "-" + phpOnlineDto.getCourseId(),
-                            phpOnlineDto -> phpOnlineDto
-                    ));
-
-            // 获取ES中的数据
-            List<CourseStudyDto> esDataList = getEsData(batch);
-
-            if (CollUtil.isEmpty(esDataList)){
-                continue;
-            }
-
-            // 更新ES数据
-            List<CourseStudyDto> toBeUpdatedEs = esDataList.stream()
-                    .map(esDataItem -> {
-                        String key = esDataItem.getAccountId() + "-" + esDataItem.getCourseId();
-                        PhpOnlineDto phpOnlineDto = map.get(key);
-
-                        // 如果找到相应的 PhpOnlineDto 且进度有变化，则进行更新
-                        if (phpOnlineDto != null && !esDataItem.getProgress().equals(phpOnlineDto.getProgress())) {
-                            esDataItem.setProgress(phpOnlineDto.getProgress());
-                            if (phpOnlineDto.getProgress() == 100) {
-                                esDataItem.setStatus(9); // 完成
-                            } else {
-                                esDataItem.setStatus(2); // 进行中
-                            }
-                            return esDataItem;
-                        }
-                        return null; // 返回 null 表示不需要更新
-                    })
-                    .filter(Objects::nonNull) // 去掉返回为 null 的项
-                    .collect(Collectors.toList());
-
-            tempResultList.addAll(toBeUpdatedEs.stream().map(esDataItem -> esDataItem.getId()).collect(Collectors.toList()));
-
-            if (isOnlyRead != null && isOnlyRead == 1) {
-                continue;
-            }
-
-            // 调用批量更新方法
-            toBeUpdatedEs(toBeUpdatedEs);
-        }
-        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();
-
-        for (PhpOnlineDto phpOnlineDto : finishedCourseList) {
-            if (StringUtils.isBlank(phpOnlineDto.getUserIdOfJava()) || StringUtils.isBlank(phpOnlineDto.getCourseId())) {
-                continue;
-            }
-
-            boolQuery.should(QueryBuilders.boolQuery()
-                    .must(QueryBuilders.termQuery("courseId.keyword", phpOnlineDto.getCourseId()))
-                    .must(QueryBuilders.termQuery("accountId.keyword", phpOnlineDto.getUserIdOfJava()))
-                    .mustNot(QueryBuilders.termQuery("status", 9))
-            );
-        }
-
-        if (!boolQuery.hasClauses()) {
-            return null;
-        }
-        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);
-        SearchHits hits = response.getHits();
-
-        List<CourseStudyDto> courseStudyDtoList = new ArrayList<>();
-        ObjectMapper mapper = new ObjectMapper();
-        for (SearchHit hit : hits) {
-            String sourceAsString = hit.getSourceAsString();
-            try {
-                CourseStudyDto cft = mapper.readValue(sourceAsString, CourseStudyDto.class);
-                courseStudyDtoList.add(cft);
-            } catch (Exception e) {
-                log.error("转化json到对应失败", sourceAsString);
-            }
-        }
-        return courseStudyDtoList;
-    }
-
-    private void toBeUpdatedEs(List<CourseStudyDto> toBeUpdatedEsData) {
-        if (CollUtil.isEmpty(toBeUpdatedEsData)) {
-            return;
-        }
-        BulkRequest bulkRequest = new BulkRequest();
-        for (CourseStudyDto courseStudyDto : toBeUpdatedEsData) {
-            Map<String, Object> docMap = new HashMap<>();
-            docMap.put("status", courseStudyDto.getStatus());
-            docMap.put("progress", courseStudyDto.getProgress());
-
-            // 创建更新请求，并传入单一的docMap
-            UpdateRequest updateRequest = new UpdateRequest("new_study_resource", courseStudyDto.getId())
-                    .doc(docMap, XContentType.JSON);
-
-            // 将请求添加到批量请求中
-            bulkRequest.add(updateRequest);
-        }
-
-        try {
-            // 执行批量更新操作
-            BulkResponse bulkResponse = restHighLevelClient.bulk(bulkRequest, RequestOptions.DEFAULT);
-            // 检查是否有失败的操作
-            if (bulkResponse.hasFailures()) {
-                log.error("批量更新失败: {}", bulkResponse.buildFailureMessage());
-            } else {
-                List<String> collect = toBeUpdatedEsData.stream().map(CourseStudyDto::getId).collect(Collectors.toList());
-                log.info("批量更新成功，更新的ES ID列表: {}", collect);
-            }
-        } catch (IOException e) {
-            log.error("执行批量更新时发生错误", e);
-        }
-    }
-
-    /**
-     * 第一步，查询最近报名的学习，获取的信息有课程ID，学员ID，学习状态、学习进度。
-     * 第二步，根据上述得到的课程ID，学员ID，查询es中的未完成的记录。
-     * 第三步，比对两者学习进度，如果不一致，以数据库学习记录为准，修改ES。
-     */
-    public List<String> phpOnlineStudyRecordSyncEsOfFull(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
-
-        log.info("开始同步PHP学习记录到ES");
-        // 增量获取PHP中所有已完成的课程
-        if (syncTimePointOfBegin == null || syncTimePointOfEnd == null) {
-            LocalDateTime now = LocalDateTime.now();
-            LocalDateTime halfAnHourAgo = now.minusMinutes(30);
-            syncTimePointOfBegin = halfAnHourAgo.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
-            syncTimePointOfEnd = now.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
-
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            log.info("同步时间起点：{}", formatter.format(halfAnHourAgo));
-            log.info("同步时间终点：{}", formatter.format(now));
-        }
-
-        int pageSize = 1000;
-        int totalRecordsCount = phpOnlineCourseDao.selectRecentRegRecordListOfCount(syncTimePointOfBegin, syncTimePointOfEnd); // 总记录数
-
-        int totalPages = (int) Math.ceil((double) totalRecordsCount / pageSize);
-
-        ArrayList<String> tempResultList = new ArrayList<>();
-
-        for (int pageNumber = 1; pageNumber <= totalPages; pageNumber++) {
-            int offset = (pageNumber - 1) * pageSize;
-            List<PhpOnlineDto> pageData = phpOnlineCourseDao.selectRecentRegRecordList(syncTimePointOfBegin, syncTimePointOfEnd, offset, pageSize);
-            ArrayList<String> singleResultList = esDataHandle(isOnlyRead, pageData);
-            tempResultList.addAll(singleResultList);
-        }
-
-        return tempResultList;
-    }
-
-
-}

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

@@ -177,7 +177,7 @@ public class StudyCourseApi extends ApiBaseController{
 		if (!Objects.isNull(studyCourse)){
 			pass = true;
 		}
-		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty() && !StringUtils.isEmpty(audiences)) {
+		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) {
 			List<String> audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组
 			log.error("---------------参数------------ audienceList = " + audienceList);
 			for (CourseCrowd c : courseCrowdList) {
@@ -228,7 +228,7 @@ public class StudyCourseApi extends ApiBaseController{
 		
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
-		if(pass==true && sc==null) {
+		if(sc==null) {
 			//未报名，这里直接报名
 			StudySignup signup=new StudySignup();
 			signup.setCourseId(cid);
@@ -246,13 +246,13 @@ public class StudyCourseApi extends ApiBaseController{
 			signup.setSignTime(LocalDateTime.now());
 			sc=service.autoSignup(signup);
 		}
-		if (sc !=null){
+		
-			rs.put("studyId", sc.getId());//学习id
+		rs.put("signup",true);
-			rs.put("progress", sc.getProgress());
+		rs.put("studyId", sc.getId());//学习id
-			//查询上次学习的是什么资源。查询用户的学习情况
+		rs.put("progress", sc.getProgress());
-			List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
+		//查询上次学习的是什么资源。查询用户的学习情况
-			rs.put("contentStudys",items);//学习的内容
+		List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
-		}
+		rs.put("contentStudys",items);//学习的内容
 		
 		return success(rs);
 	}
@@ -750,26 +750,18 @@ public class StudyCourseApi extends ApiBaseController{
 	 * @param courseId 课程id 用于删除课程报名信息和修改课程学习人数
 	 * */
 	@PostMapping("/delete-signup")
-	public JsonResponse<Boolean> deleteSignUp(String id,String courseId,String studentId, HttpServletRequest request){
+	public JsonResponse<Boolean> deleteSignUp(String id,String courseId,String studentId){
 		if(StringUtils.isBlank(id)){
 			return badRequest("参数异常");
 		}
 		//String aid = this.getCurrent().getAccountId();
 		try {
 			service.deleteSignUp(id,courseId,studentId);
+			return success(true);
 		} catch (Exception e) {
 			log.error("删除报名信息失败",e.getMessage());
 			return error("删除失败",e.getMessage());
 		}
-
-		try {
-			String token = request.getHeader("Xboe-Access-Token");
-			thirdApi.syncCourseStudent(Long.parseLong(courseId),token);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return success(true);
-
 	}
 
 	/**

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

@@ -24,8 +24,6 @@ import com.xboe.school.study.service.IStudyCourseService;
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.annotation.Resource;
-
 /**
  * ES的课程检索
  * @author seastar
@@ -41,10 +39,6 @@ public class StudyCourseESApi extends ApiBaseController{
 	
 	@Autowired
 	IStudyCourseService service;
-
-	@Resource
-	private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;
-
 	
 	@RequestMapping(value="/search",method = {RequestMethod.GET,RequestMethod.POST})
 	public JsonResponse<PageList<CourseStudyDto>> search(Pagination page, CourseStudyDto dto){
@@ -167,26 +161,4 @@ public class StudyCourseESApi extends ApiBaseController{
 		
 		return success(true);
 	}
-
-	/**
-	 *
-	 * @param syncTimePointOfBegin
-	 * @param syncTimePointOfEnd
-	 * @param isOnlyRead
-	 * @return
-	 * @throws IOException
-	 */
-	@PostMapping("/phpOnlineStudyRecordSyncEs")
-	public JsonResponse<List<String>> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
-		List<String> courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEs(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead);
-		return success(courseStudyDtoList);
-	}
-
-	@PostMapping("/phpOnlineStudyRecordSyncEsOfFull")
-	public JsonResponse<List<String>> phpOnlineStudyRecordSyncEsOfFull(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
-		List<String> courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEsOfFull(syncTimePointOfBegin, syncTimePointOfEnd, isOnlyRead);
-		return success(courseStudyDtoList);
-	}
-
-
 }

servers/boe-server-all/src/main/java/com/xboe/school/study/dao/PhpOnlineCourseDao.java

@@ -1,280 +0,0 @@
-package com.xboe.school.study.dao;
-
-import cn.hutool.core.collection.CollUtil;
-import com.xboe.core.orm.BaseDao;
-import com.xboe.school.study.dto.PhpOnlineDto;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Repository;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
-@Repository
-@Slf4j
-public class PhpOnlineCourseDao extends BaseDao<PhpOnlineDto> {
-
-    @Value("${spring.profiles.active}")
-    private String activeProfile;
-
-    public List<PhpOnlineDto> selectRecentLearnRecordList(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer offset, Integer limit) {
-        String sql =
-                "SELECT\n" +
-                        "  elc.kid AS courseId,\n" +
-                        "  elcr.user_id AS userIdOfPhp,\n" +
-                        "  ROUND((SUM(CASE WHEN elrc.kid IS NOT NULL THEN 1 ELSE 0 END) / COUNT(1)) * 100, 0) AS progress\n" +
-                        "FROM\n" +
-                        "  elearninglms.eln_ln_course elc\n" +
-                        "  INNER JOIN elearninglms.eln_ln_course_reg elcr \n" +
-                        "    ON elc.kid = elcr.course_id\n" +
-                        "  INNER JOIN (\n" +
-                        "    SELECT\n" +
-                        "      user_id,\n" +
-                        "      course_id \n" +
-                        "    FROM\n" +
-                        "      elearninglms.eln_ln_res_complete\n" +
-                        "    WHERE\n" +
-                        "      complete_type = '1'\n" +
-                        "      AND complete_status = '2'\n" +
-                        "      AND updated_at > ?1 AND  updated_at < ?2\n" +
-                        "      AND is_deleted = 0\n" +
-                        "    GROUP BY\n" +
-                        "      user_id,\n" +
-                        "      course_id\n" +
-                        "  ) recentFinishStuent \n" +
-                        "    ON recentFinishStuent.user_id = elcr.user_id \n" +
-                        "    AND recentFinishStuent.course_id = elcr.course_id\n" +
-                        "  INNER JOIN elearninglms.eln_ln_mod_res elms \n" +
-                        "    ON elms.course_id = elcr.course_id\n" +
-                        "  LEFT JOIN elearninglms.eln_ln_res_complete elrc \n" +
-                        "    ON elrc.mod_res_id = elms.kid\n" +
-                        "    AND elrc.user_id = elcr.user_id\n" +
-                        "    AND elrc.complete_type = '1'\n" +
-                        "    AND elrc.complete_status = '2'\n" +
-                        "WHERE\n" +
-                        "  elc.is_deleted = 0\n" +
-                        "  AND elcr.is_deleted = 0\n" +
-                        "  AND elcr.reg_state = '1'\n" +
-                        "  AND elms.publish_status = '1'\n" +
-                        "  AND elms.is_deleted = '0'\n" +
-                        "GROUP BY\n" +
-                        "  elc.kid,\n" +
-                        "  elcr.user_id\n" +
-                        "LIMIT " + offset + "," + limit;
-
-
-        List<Object[]> objectList1 = this.sqlFindList(sql, syncTimePointOfBegin, syncTimePointOfEnd);
-        if (CollUtil.isEmpty(objectList1)) {
-            log.info("没有找到已完成的数据");
-            return null;
-        }
-
-        List<PhpOnlineDto> recentLearnRecordList = new ArrayList<>();
-        for (Object[] objects : objectList1) {
-            String courseId = objects[0].toString();
-            String userIdOfPhp = objects[1].toString();
-            Integer progress = ((BigDecimal) objects[2]).intValue();
-            PhpOnlineDto phpOnlineDto = new PhpOnlineDto();
-            phpOnlineDto.setCourseId(courseId);
-            phpOnlineDto.setUserIdOfPhp(userIdOfPhp);
-            phpOnlineDto.setProgress(progress);
-            recentLearnRecordList.add(phpOnlineDto);
-        }
-
-        // 拼接获取所有新系统用户id，这里不选择与上面的联表查询，有效率问题
-
-        String userBasicDataBase;
-        if (activeProfile.equals("pro")) {
-            userBasicDataBase = "user_basic";
-        } else {
-            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);
-
-        if (CollUtil.isEmpty(objectList1)) {
-            log.info("新系统用户数据不存在");
-            return null;
-        }
-
-        Map<Object, Object> kidAndUserIdMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
-
-        // 设置新系统用户ID
-        recentLearnRecordList = recentLearnRecordList.stream()
-                .map(phpOnlineDto -> {
-                    Object userIdOfJavaObj = kidAndUserIdMap.get(phpOnlineDto.getUserIdOfPhp());
-                    if (userIdOfJavaObj != null) {
-                        phpOnlineDto.setUserIdOfJava(userIdOfJavaObj.toString());
-                    }
-                    return phpOnlineDto;
-                })
-                .filter(phpOnlineDto -> StringUtils.isNotBlank(phpOnlineDto.getUserIdOfJava()))
-                .collect(Collectors.toList());
-
-        return recentLearnRecordList;
-    }
-
-
-    public int selectRecentLearnRecordListOfCount(Long syncTimePointOfBegin, Long syncTimePointOfEnd) {
-        String sql =
-                "SELECT COUNT(1) \n" +
-                        "FROM (\n" +
-                        "    SELECT elc.kid\n" +
-                        "    FROM elearninglms.eln_ln_course elc\n" +
-                        "    INNER JOIN elearninglms.eln_ln_course_reg elcr\n" +
-                        "        ON elc.kid = elcr.course_id\n" +
-                        "    INNER JOIN (\n" +
-                        "        SELECT user_id, course_id\n" +
-                        "        FROM elearninglms.eln_ln_res_complete\n" +
-                        "        WHERE complete_type = '1'\n" +
-                        "          AND complete_status = '2'\n" +
-                        "          AND updated_at > ?1\n" +
-                        "          AND updated_at < ?2\n" +
-                        "          AND is_deleted = 0\n" +
-                        "        GROUP BY user_id, course_id\n" +
-                        "    ) recentFinishStuent\n" +
-                        "        ON recentFinishStuent.user_id = elcr.user_id\n" +
-                        "        AND recentFinishStuent.course_id = elcr.course_id\n" +
-                        "    INNER JOIN elearninglms.eln_ln_mod_res elms\n" +
-                        "        ON elms.course_id = elcr.course_id\n" +
-                        "    LEFT JOIN elearninglms.eln_ln_res_complete elrc\n" +
-                        "        ON elrc.mod_res_id = elms.kid\n" +
-                        "        AND elrc.user_id = elcr.user_id\n" +
-                        "        AND elrc.complete_type = '1'\n" +
-                        "        AND elrc.complete_status = '2'\n" +
-                        "    WHERE elc.is_deleted = 0\n" +
-                        "      AND elcr.is_deleted = 0\n" +
-                        "      AND elcr.reg_state = '1'\n" +
-                        "      AND elms.publish_status = '1'\n" +
-                        "      AND elms.is_deleted = '0'\n" +
-                        "    GROUP BY elc.kid, elcr.user_id\n" +
-                        ") temp;\n";  // 每页 1000 条记录，OFFSET 计算分页
-
-
-        int count = this.sqlCount(sql, syncTimePointOfBegin, syncTimePointOfEnd);
-        return count;
-    }
-
-
-    public List<PhpOnlineDto> selectRecentRegRecordList(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer offset, Integer limit) {
-        String sql =
-                "SELECT\n" +
-                        "  elc.kid AS courseId,\n" +
-                        "  elcr.user_id AS userIdOfPhp,\n" +
-                        "  ROUND((SUM(CASE WHEN elrc.kid IS NOT NULL THEN 1 ELSE 0 END) / COUNT(1)) * 100, 0) AS progress\n" +
-                        "FROM\n" +
-                        "  elearninglms.eln_ln_course elc\n" +
-                        "  INNER JOIN elearninglms.eln_ln_course_reg elcr ON elc.kid = elcr.course_id AND  elcr.created_at > ?1 AND  elcr.created_at < ?2\n" +
-                        "  INNER JOIN elearninglms.eln_ln_mod_res elms \n" +
-                        "    ON elms.course_id = elcr.course_id\n" +
-                        "  LEFT JOIN elearninglms.eln_ln_res_complete elrc \n" +
-                        "    ON elrc.mod_res_id = elms.kid\n" +
-                        "    AND elrc.user_id = elcr.user_id\n" +
-                        "    AND elrc.complete_type = '1'\n" +
-                        "    AND elrc.complete_status = '2'\n" +
-                        "WHERE\n" +
-                        "  elc.is_deleted = 0\n" +
-                        "  AND elcr.is_deleted = 0\n" +
-                        "  AND elcr.reg_state = '1'\n" +
-                        "  AND elms.publish_status = '1'\n" +
-                        "  AND elms.is_deleted = '0'\n" +
-                        "GROUP BY\n" +
-                        "  elc.kid,\n" +
-                        "  elcr.user_id\n" +
-                        "LIMIT " + offset + "," + limit;
-
-
-        List<Object[]> objectList1 = this.sqlFindList(sql, syncTimePointOfBegin, syncTimePointOfEnd);
-        if (CollUtil.isEmpty(objectList1)) {
-            log.info("没有找到已完成的数据");
-            return null;
-        }
-
-        List<PhpOnlineDto> recentLearnRecordList = new ArrayList<>();
-        for (Object[] objects : objectList1) {
-            String courseId = objects[0].toString();
-            String userIdOfPhp = objects[1].toString();
-            Integer progress = ((BigDecimal) objects[2]).intValue();
-            PhpOnlineDto phpOnlineDto = new PhpOnlineDto();
-            phpOnlineDto.setCourseId(courseId);
-            phpOnlineDto.setUserIdOfPhp(userIdOfPhp);
-            phpOnlineDto.setProgress(progress);
-            recentLearnRecordList.add(phpOnlineDto);
-        }
-
-        // 拼接获取所有新系统用户id，这里不选择与上面的联表查询，有效率问题
-        String userBasicDataBase;
-        if (activeProfile.equals("pro")) {
-            userBasicDataBase = "user_basic";
-        } else {
-            userBasicDataBase = "userbasic";
-        }
-
-        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> userIdToKidMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
-
-        // 设置新系统用户ID
-        recentLearnRecordList = recentLearnRecordList.stream()
-                .map(phpOnlineDto -> {
-                    Object userIdOfJavaObj = userIdToKidMap.get(phpOnlineDto.getUserIdOfPhp());
-                    if (userIdOfJavaObj != null) {
-                        phpOnlineDto.setUserIdOfJava(userIdOfJavaObj.toString());
-                    }
-                    return phpOnlineDto;
-                })
-                .filter(phpOnlineDto -> phpOnlineDto.getUserIdOfJava() != null)
-                .collect(Collectors.toList());
-
-        return recentLearnRecordList;
-    }
-
-    public int selectRecentRegRecordListOfCount(Long syncTimePointOfBegin, Long syncTimePointOfEnd) {
-        String sql =
-                "SELECT COUNT(1)\n" +
-                        "FROM (\n" +
-                        "    SELECT\n" +
-                        "        elc.kid\n" +
-                        "    FROM\n" +
-                        "        elearninglms.eln_ln_course elc\n" +
-                        "    INNER JOIN elearninglms.eln_ln_course_reg elcr \n" +
-                        "        ON elc.kid = elcr.course_id\n" +
-                        "        AND elcr.created_at > ?1\n" +
-                        "        AND elcr.created_at < ?2\n" +
-                        "    INNER JOIN elearninglms.eln_ln_mod_res elms \n" +
-                        "        ON elms.course_id = elcr.course_id\n" +
-                        "    LEFT JOIN elearninglms.eln_ln_res_complete elrc \n" +
-                        "        ON elrc.mod_res_id = elms.kid\n" +
-                        "        AND elrc.user_id = elcr.user_id\n" +
-                        "        AND elrc.complete_type = '1'\n" +
-                        "        AND elrc.complete_status = '2'\n" +
-                        "    WHERE\n" +
-                        "        elc.is_deleted = 0\n" +
-                        "        AND elcr.is_deleted = 0\n" +
-                        "        AND elcr.reg_state = '1'\n" +
-                        "        AND elms.publish_status = '1'\n" +
-                        "        AND elms.is_deleted = '0'\n" +
-                        "    GROUP BY\n" +
-                        "        elc.kid,\n" +
-                        "        elcr.user_id\n" +
-                        ") temp;\n";  // 每页 1000 条记录，OFFSET 计算分页
-
-
-        int count = this.sqlCount(sql, syncTimePointOfBegin, syncTimePointOfEnd);
-        return count;
-    }
-
-
-}

servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java

@@ -2,14 +2,10 @@ package com.xboe.school.study.dao;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import com.xboe.api.ThirdApi;
-import com.xboe.constants.CacheName;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Repository;
 
 import com.xboe.core.orm.BaseDao;
@@ -30,9 +26,6 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 	
 	@Autowired
 	StudyCourseItemDao scItemDao;
-	@Autowired
-	StringRedisTemplate redisTemplate;
-
 
 	@Resource
 	private ThirdApi thirdApi;
@@ -43,11 +36,6 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 	 * @param total
 	 */
 	public void finishCheck(String studyId,String courseId,Integer total,String token){
-
-		if(StringUtils.isNotEmpty(redisTemplate.opsForValue().get(studyId + "_" + courseId + "_" + total))){
-			return ;
-		}
-
 		log.info("------1.完成情况检查---------------studyId = " + studyId + " , courseId = " + courseId + " , total = " + total );
 		LocalDateTime now=LocalDateTime.now();
 		//已完成的内容
@@ -62,9 +50,7 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 		}
 		log.info("------3.完成情况检查---------------studyId = " + studyId + " , courseId = " + courseId + " , total = " + total );
 		//以下注意，float类型，是否等于100对应
-		float percent=n*100/total;
+		float percent=n*100/total;    
-
-
 		if(n>=total) {
 			//自主报名的课程,代表学习完成
 			super.updateMultiFieldById(studyId,
@@ -72,13 +58,11 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 					UpdateBuilder.create("lastTime",now),
 					UpdateBuilder.create("finishTime",now),
 					UpdateBuilder.create("status",StudyCourse.STATUS_FINISH));
-			redisTemplate.opsForValue().set(studyId + "_" + courseId + "_" + total, "100", 24, TimeUnit.HOURS);
 		}else {
 			super.updateMultiFieldById(studyId,
 					UpdateBuilder.create("progress",percent),
 					UpdateBuilder.create("lastTime",LocalDateTime.now()),
 					UpdateBuilder.create("status",StudyCourse.STATUS_STUDYING));
-//			redisTemplate.opsForValue().set(studyId, String.valueOf(percent), 10, TimeUnit.SECONDS);
 		}
 
 		List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);

servers/boe-server-all/src/main/java/com/xboe/school/study/dto/PhpOnlineDto.java

@@ -1,33 +0,0 @@
-package com.xboe.school.study.dto;
-
-import lombok.Data;
-
-/**
- * 批量报名
- *
- * @author seastar
- */
-@Data
-public class PhpOnlineDto {
-
-    /**
-     * 课程id
-     */
-    private String courseId;
-
-    /**
-     * 课程名称
-     */
-    private String userIdOfPhp;
-
-
-    /**
-     * 课程名称
-     */
-    private String userIdOfJava;
-
-    /**
-     * 进度
-     */
-    private Integer progress;
-}

servers/boe-server-all/src/main/resources/application-pro.properties

@@ -74,12 +74,3 @@ xboe.email.url=https://u.boe.com/api/b1/email/send
 xboe.email.from=boeu_learning@boe.com.cn
 xboe.email.user=
 xboe.email.security=
-
-xxl.job.admin.addresses=http://u.boe.com/jobAdmin
-xxl.job.accessToken=65ddc683-22f5-83b4-de3a-3c97a0a29af0
-xxl.job.executor.appname=java-servers-job-api
-xxl.job.executor.port=9995
-xxl.job.executor.address=
-xxl.job.executor.ip=
-xxl.job.executor.logpath=/var/log/xxl-job/dw/
-xxl.job.executor.logretentiondays=30

servers/boe-server-all/src/main/resources/application-test.properties

@@ -80,13 +80,4 @@ xboe.email.from=boeu_learning@boe.com.cn
 xboe.email.user=
 xboe.email.security=
 
-boe.domain=https://u-pre.boe.com
+boe.domain=https://u-pre.boe.com
-
-xxl.job.admin.addresses=http://u-pre.boe.com/jobAdmin
-xxl.job.accessToken=65ddc683-22f5-83b4-de3a-3c97a0a29af0
-xxl.job.executor.appname=java-servers-job-api
-xxl.job.executor.port=9995
-xxl.job.executor.address=
-xxl.job.executor.ip=
-xxl.job.executor.logpath=/var/log/xxl-job/dw/
-xxl.job.executor.logretentiondays=30

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

@@ -76,8 +76,3 @@ manageApi.editExam=${boe.domain}/manageApi/admin/project/editExam
 userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfo
 coursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus
 userBasic.getUserBasicInfo=${boe.domain}/userbasic/user/getUserBasicInfo
-#讲师管理创建或修改在线课授课记录
-coursesuilt.updateOrSaveCourse=${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse
-coursesuilt.syncCourseStudent=${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent
-coursesuilt.syncOnLineScore=${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore
-coursesuilt.updateOnLineStatua=${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua