Compare commits

..

5 Commits

Author SHA1 Message Date
zhaolongfei
eaafb57b83 视频进行工号验证 2024-11-11 15:15:28 +08:00
zhaolongfei
ee74f47261 视频进行工号验证 2024-11-11 15:12:27 +08:00
zhaolongfei
d9d1e0fecc 视频进行工号验证 2024-11-08 17:34:07 +08:00
zhaolongfei
af0c26294d 视频进行工号验证 2024-11-08 17:12:01 +08:00
zhaolongfei
87adf2aca5 在线视频播放时进行token和工号验证 2024-11-06 09:03:06 +08:00
13 changed files with 163 additions and 163 deletions

View File

@@ -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>
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>2.3.0</version>
</dependency>
</dependencies>
</dependencies>
<build>
<resources>
<resource>

View File

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

View File

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

View File

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

View File

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

View File

@@ -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 ?")
@XxlJob("refreshLastQuarterStatistics")
@Scheduled(cron = "0 0 2 1 1,4,7,10 ?")
public void refreshLastQuarterStatistics() {
casesService.refreshLastQuarterStatistics();
}

View File

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

View File

@@ -1,16 +1,20 @@
package com.xboe.module.course.api;
import java.util.Base64;
import java.util.HashSet;
import java.util.Set;
import java.util.*;
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 "非法请求";
}
//读取cookies中的时间
String cookieTime = getSignTimeCookie(request);
if (StringUtils.isBlank(cookieTime)) {
return badRequest("不支持的请求");
// return;
// String token = request.getHeader("Xboe-Access-Token");
// if (StringUtils.isEmpty(token)) {
// token = request.getHeader("token");
// }
// 读取cookies中的时间
// String cookieTime = getSignTimeCookie(request);
// if (StringUtils.isBlank(cookieTime)) {
// return badRequest("不支持的请求");
// }
String userInfo = CacheName.NAME_INFO + ":"+ token;
log.info("请求头里的token值:"+token);
log.info("从 Redis 获取的userInfo:"+userInfo);
Object o = redisTemplate.opsForValue().get(userInfo);
if (o == null) {
log.error("从 Redis 获取的值为 null ,", userInfo);
return badRequest("token验证错误");
}
// 将对象转换为字符串
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
*/

View File

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

View File

@@ -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("progress", sc.getProgress());
//查询上次学习的是什么资源。查询用户的学习情况
List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
rs.put("contentStudys",items);//学习的内容
}
rs.put("signup",true);
rs.put("studyId", sc.getId());//学习id
rs.put("progress", sc.getProgress());
//查询上次学习的是什么资源。查询用户的学习情况
List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
rs.put("contentStudys",items);//学习的内容
return success(rs);
}

View File

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

View File

@@ -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

View File

@@ -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
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
boe.domain=https://u-pre.boe.com