视频进行工号验证

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,7 +236,7 @@
 			<artifactId>spring-retry</artifactId>
 			<version>1.3.1</version>
 		</dependency>
-	</dependencies>
+    </dependencies>
 	<build>
 		<resources>
 			<resource>

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

@@ -15,7 +15,7 @@ public class CaseScheduledTasks {
     /**
      * 每月的第一天的1:00执行
      */
-    @Scheduled(cron = "0 0 1 1 * ?")
+//    @Scheduled(cron = "0 0 1 1 * ?")
     public void refreshViewsRankOfMajor() {
         casesService.refreshViewsRankOfMajor();
     }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java

@@ -44,6 +44,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Array;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
@@ -1203,15 +1204,15 @@ public class CasesServiceImpl implements ICasesService {
         }
 
         //获取案例当月排名
-//        String sql =
-//                "SELECT bc.id,bcmt.major_id,bc.views - COALESCE(bc.last_month_views, 0) AS increment\n" +
-//                "FROM boe_cases bc\n" +
-//                "JOIN boe_cases_major_type bcmt ON bcmt.case_id = bc.id and bc.deleted=0 and file_path is not null and file_path!='' and bc.views - COALESCE(bc.last_month_views, 0)!=0";
-
         String sql =
-                "SELECT bc.id,bcmt.major_id,bc.views AS increment\n" +
-                        "FROM boe_cases bc\n" +
-                        "JOIN boe_cases_major_type bcmt ON bcmt.case_id = bc.id and bc.deleted=0 and file_path is not null and file_path!='' and bc.views !=0 and bc.views is not null";
+                "SELECT bc.id,bcmt.major_id,bc.views - COALESCE(bc.last_month_views, 0) AS increment\n" +
+                "FROM boe_cases bc\n" +
+                "JOIN boe_cases_major_type bcmt ON bcmt.case_id = bc.id and bc.deleted=0 and file_path is not null and file_path!='' and bc.views - COALESCE(bc.last_month_views, 0)!=0";
+
+//        String sql =
+//                "SELECT bc.id,bcmt.major_id,bc.views AS increment\n" +
+//                        "FROM boe_cases bc\n" +
+//                        "JOIN boe_cases_major_type bcmt ON bcmt.case_id = bc.id and bc.deleted=0 and file_path is not null and file_path!='' and bc.views !=0 and bc.views is not null";
 
         List<Object> caseListOfObject = casesDao.sqlFindList(sql);
 
@@ -1299,8 +1300,8 @@ public class CasesServiceImpl implements ICasesService {
             pageSize = 10;
         }
 
-        LocalDateTime startTime = month.withDayOfMonth(1);
-        LocalDateTime endTime = month.plusMonths(1).withDayOfMonth(1).withMinute(0);
+        LocalDateTime startTime = month.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0);
+        LocalDateTime endTime = YearMonth.from(month).atEndOfMonth().atTime(23, 59, 59);
 
         List<HashMap<String, Object>> popularityOfMajor = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime, majorId);
         List<String> caseIdList = popularityOfMajor.stream().map(map -> map.get("caseId").toString()).collect(Collectors.toList());

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

@@ -1,15 +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;
@@ -28,16 +33,22 @@ import com.xboe.module.course.service.ICourseFileService;
  */
 @RestController
 @RequestMapping(value = "/xboe/m/course/cware")
+@Slf4j
 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 {
@@ -48,7 +59,7 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 资源地址的加密，返回加密后的地址
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @param cfid     资源地址的id
@@ -83,64 +94,90 @@ 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;
-		 for(String txt :allowUrlSet) {
-			 if(httpReferer.indexOf(txt)>-1) {
-				 has=true;
-			 }
-		 }
-		 
-		 if(!has) {
-			 return badRequest("页面不存在");
-			 //return "非法请求";
-		 }
-
-		//读取cookies中的时间
-		String cookieTime = getSignTimeCookie(request);
-		if (StringUtils.isBlank(cookieTime)) {
-			return badRequest("不支持的请求");
-			// return;
+		for(String txt :allowUrlSet) {
+			if(httpReferer.indexOf(txt)>-1) {
+				has=true;
+			}
 		}
 
+		if(!has) {
+			return badRequest("页面不存在");
+		}
+//		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) {
+			log.info("解密后的字符串:"+signStr);
+			log.info("解密后的字符串的时间拼接:"+index);
 			return badRequest("验证错误");
 		}
 
 		String time = signStr.substring(0, signStr.indexOf("/"));// 时间字符中，long
+		String[] split = signStr.split("/");
 		String cfid = signStr.substring(index+1);// 文件路径
+		log.info("解密后的字符串:"+signStr);
 
-		if (!time.equals(cookieTime)) {
-			return badRequest("验证错误");
+		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);
+//			return badRequest("验证错误");
+//		}
 		if(StringUtils.isBlank(cfid) || cfid.length()<10) {
+			log.info("查看时间文件路径："+cfid);
+			log.info("解密后的字符串的时间拼接:"+signStr);
 			return badRequest("验证错误");
 		}
 
@@ -164,7 +201,7 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 读取cookies值
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */

servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java

@@ -354,18 +354,18 @@ public class AloneExamApi extends ApiBaseController {
     		if(StringUtils.isBlank(paperJson)) {
     			return badRequest("此考试无试卷内容，考试已经过期或试卷已被删除");
     		}
-            try {
-            	List<TestQuestionVo> qlist=this.randomQuestion(examTest, paperJson);
-            	ObjectMapper objectMapper = new ObjectMapper();
-            	paperJson=objectMapper.writeValueAsString(qlist);
-			} catch (XaskException e) {
-				log.error("生成试卷错误",e);
-				return error("生成考试试卷错误",e.getMessage(),map);
-			} catch (JsonProcessingException e) {
-				log.error("生成试卷，解析生成json错误",e);
-				return error("生成考试试卷解析错误",e.getMessage(),map);
-			}
     	}
+        try {
+            List<TestQuestionVo> qlist=this.randomQuestion(examTest, paperJson);
+            ObjectMapper objectMapper = new ObjectMapper();
+            paperJson=objectMapper.writeValueAsString(qlist);
+        } catch (XaskException e) {
+            log.error("生成试卷错误",e);
+            return error("生成考试试卷错误",e.getMessage(),map);
+        } catch (JsonProcessingException e) {
+            log.error("生成试卷，解析生成json错误",e);
+            return error("生成考试试卷解析错误",e.getMessage(),map);
+        }
     	map.put("paper", paperJson);
     	long end=System.currentTimeMillis();
     	log.info("开始考试用时="+(end-start)+" ms");

servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java

@@ -312,14 +312,19 @@ public class ExamQuestionApi extends ApiBaseController {
                     if(row1.getCell(1).getStringCellValue().equals("多选题")){
                         examQuestion.setType(2);
                     }
-                    if(row1.getCell(2).getStringCellValue().equals("中")){
-                        examQuestion.setDifficulty(2f);
-                    }else if(row1.getCell(2).getStringCellValue().equals("难")){
-                        examQuestion.setDifficulty(3f);
-                    } else if(row1.getCell(2).getStringCellValue().equals("易")){
-                        examQuestion.setDifficulty(1f);
-                    }else  if(row1.getCell(2).getStringCellValue().equals("")){
+                    log.debug("row1.getCell(2) = " + row1.getCell(2));
+                    if (row1.getCell(2)==null ||row1.getCell(2).getStringCellValue() == null  || row1.getCell(2).getStringCellValue().equals("")){
                         examQuestion.setDifficulty(null);
+                    }else{
+                        if( row1.getCell(2).getStringCellValue().equals("中")){
+                            examQuestion.setDifficulty(2f);
+                        }else if(row1.getCell(2).getStringCellValue().equals("难")){
+                            examQuestion.setDifficulty(3f);
+                        } else if(row1.getCell(2).getStringCellValue().equals("易")){
+                            examQuestion.setDifficulty(1f);
+                        }else  if(row1.getCell(2).getStringCellValue().equals("")){
+                            examQuestion.setDifficulty(null);
+                        }
                     }
                     Cell cell = row1.getCell(3);
                     cell.setCellType(CellType.STRING);

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

@@ -116,4 +116,8 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 		
 		this.update(update.builder());
 	}
+
+	public StudyCourse findByCourseIdAndAid(String aid, String courseId) {
+		return this.findOne(FieldFilters.eq("aid",aid),FieldFilters.eq("courseId",courseId));
+	}
 }

servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java

@@ -265,6 +265,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
 	}
 	@Override
 	public void deleteSignUp(String id,String courseId,String aid) {
+		log.info("参数id："+id+"参数课程id："+courseId+"参数用户id："+aid);
 		//删除课程学习记录主表
 		studyCourseDao.deleteById(id);
 		//删除学习课程的评估测试结果

servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java

@@ -61,7 +61,10 @@ public class StudySignupServiceImpl implements IStudySignupService{
 	@Override
 	public void selfSignup(StudySignup signup) {
 		signup.setSignType(StudySignup.SIGNTYPE_SELF);
-		this.addSignup(signup);
+		StudyCourse sc=studyCourseDao.findByCourseIdAndAid(signup.getAid(), signup.getCourseId());
+		if (sc == null){
+			this.addSignup(signup);
+		}
 		//更新课程学习人数
 		courseDao.updateMultiFieldById(signup.getCourseId(),UpdateBuilder.create("studys", "studys+1",FieldUpdateType.EXPRESSION));
 	}

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

@@ -26,7 +26,7 @@ logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
 # 设置logback.xml位置
-logging.config=classpath:log/logback-dev.xml
+logging.config=classpath:log/logback-@profileActive@.xml
 
 ## 静态文件目录，默认是在static下面，以后独立到nginx下面配置
 spring.web.resources.static-locations=file:E:/Projects/BOE/10/static

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

@@ -23,7 +23,7 @@ logging.level.org.hibernate.SQL=ERROR
 #logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
 # 设置logback.xml位置
-logging.config=classpath:log/logback-dev.xml
+logging.config=classpath:log/logback-@profileActive@.xml
 
 ## 静态文件目录，默认是在static下面，以后独立到nginx下面配置
 spring.web.resources.static-locations=file:E:/Projects/BOE/java/static

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

@@ -34,7 +34,7 @@ logging.level.org.hibernate.SQL=ERROR
 # logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
 # 设置logback.xml位置
-logging.config=classpath:log/logback-dev.xml
+logging.config=classpath:log/logback-@profileActive@.xml
 
 ## ???????????static????????nginx????
 spring.web.resources.static-locations=file:E:/Projects/BOE/java/static