无目录有权限就报名

servers/boe-server-all/pom.xml

@@ -205,11 +205,7 @@
 			<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>
@@ -236,7 +232,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

@@ -1,25 +0,0 @@
-package com.xboe.config;
-
-public class ConditionException extends RuntimeException{
-    private Integer code;
-    private String message;
-
-
-    public ConditionException(Integer code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public ConditionException(String message) {
-        this(600, message);
-    }
-
-    public Integer getCode() {
-        return this.code;
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
-    }
-}

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

@@ -1,63 +0,0 @@
-package com.xboe.config;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.xboe.common.utils.Sha256Mac;
-import org.apache.commons.codec.binary.Base64;
-
-import java.util.Map;
-
-/**
- * Jwt工具类
- *
- * @author ruoyi
- */
-public class JwtUtils {
-
-    public static final String secretKey = "JDF_BOE";
-
-    /**
-     * 从数据声明生成令牌
-     *
-     * @param claims 数据声明
-     * @return 令牌
-     */
-    public static String createToken(Map<String, Object> claims) {
-        JSONObject header = new JSONObject();
-        header.put("alg", "HS256");
-        header.put("type", "token");
-        String payload64 = Base64.encodeBase64String(JSON.toJSONString(claims).getBytes());
-        String header64 = Base64.encodeBase64String(header.toString().getBytes());
-        String sign = Sha256Mac.sha256_mac(header64 + payload64, secretKey);
-        return header64 + "." + payload64 + "." + sign;
-    }
-
-    /**
-     * 从令牌中获取数据声明
-     *
-     * @param token 令牌
-     * @return 数据声明
-     */
-    public static Map<String, Object> parseToken(String token) throws ConditionException {
-        String[] tokens = token.split("\\.");
-        if (tokens.length != 3) {
-            throw new ConditionException("token不合法 : " + token);
-        }
-        String payload = new String(Base64.decodeBase64(tokens[1]));
-        String sign = Sha256Mac.sha256_mac(tokens[0] + tokens[1], secretKey);
-        if (sign.equals(tokens[2])) {
-            JSONObject jsonObject = JSON.parseObject(payload);
-            long exp = jsonObject.getLong("exp");
-            long now = System.currentTimeMillis() / 1000;
-            if (now > exp) {
-                throw new ConditionException("token过期 : " + token);
-            }
-            Map<String, Object> map = JSON.parseObject(payload, new TypeReference<Map<String, Object>>() {
-            });
-            return map;
-        } else {
-            throw new ConditionException("token错误 : " + token);
-        }
-    }
-
-}

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

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

servers/boe-server-all/src/main/java/com/xboe/module/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/course/api/CoursePortalApi.java

@@ -11,6 +11,7 @@ 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;
@@ -28,6 +29,8 @@ 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;
@@ -60,7 +63,8 @@ public class CoursePortalApi extends ApiBaseController{
 
 	@Resource
 	private ICourseService courseService;
-
+	@Resource
+	private IUserService userService;
 	@Resource
 	private ITeacherService teacherService;
 
@@ -301,17 +305,30 @@ 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());
@@ -319,6 +336,17 @@ 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);
 				}
 			}
 
@@ -327,7 +355,7 @@ public class CoursePortalApi extends ApiBaseController{
 		rs.put("isCrowd",pass);
 		rs.put("contents",	cclist);
 		rs.put("sections",sectionlist);
-		rs.put("teachers",teachers);
+		rs.put("teachers",teacherCourseDtos);
 		//查询课程
 		return success(rs);
 

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

@@ -1,20 +1,16 @@
 package com.xboe.module.course.api;
 
-import java.util.*;
+import java.util.Base64;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.annotation.Resource;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.hutool.json.JSONUtil;
-import com.xboe.constants.CacheName;
-import com.xboe.data.outside.IOutSideDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -37,18 +33,13 @@ import com.xboe.module.course.service.ICourseFileService;
 public class CourseWareApi extends ApiBaseController {
 
 	private String cookieName = "PLAYSIGN_TIME";
-	@Autowired
-	IOutSideDataService outsideDataService;
+
 	@Resource
 	private ICourseFileService courseFileService;
 
 	@Resource
 	private XFileUploader fileUploader;
 
-
-	@Resource
-	RedisTemplate<String, Object> redisTemplate;
-
 	private static Set<String> allowUrlSet = new HashSet<String>();
 
 	static {
@@ -59,7 +50,7 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 资源地址的加密，返回加密后的地址
-	 *
+	 * 
 	 * @param request
 	 * @param response
 	 * @param cfid     资源地址的id
@@ -94,22 +85,25 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 获取资源，在header中保存
-	 *
+	 * 
 	 * @param request
 	 * @param response
+	 * @param cfid
+	 * @param cf
 	 * @throws Exception
 	 */
 	@GetMapping("/resource")
-	public JsonResponse<String> getVideo(HttpServletRequest request, HttpServletResponse response, String sign,
-										 @CookieValue(name = "token",required = false)String token
-	) throws Exception {
+	public JsonResponse<String> getVideo(HttpServletRequest request, HttpServletResponse response, String sign) throws Exception {
 
 		if (StringUtils.isBlank(sign)) {
 			return badRequest("非法请求");
+			// return;
 		}
+
 		String httpReferer = request.getHeader("referer");
 		if (StringUtils.isBlank(httpReferer)) {
 			return badRequest("非法请求");
+			// return "非法请求";
 		}
 
 		boolean has=false;
@@ -121,37 +115,21 @@ public class CourseWareApi extends ApiBaseController {
 
 		if(!has) {
 			return badRequest("页面不存在");
+			//return "非法请求";
 		}
-//		String token = request.getHeader("Xboe-Access-Token");
-//		if (StringUtils.isEmpty(token)) {
-//			token = request.getHeader("token");
-//		}
-//		读取cookies中的时间
-//		String cookieTime = getSignTimeCookie(request);
-//		if (StringUtils.isBlank(cookieTime)) {
-//			return badRequest("不支持的请求");
-//		}
-		String userInfo = CacheName.NAME_INFO + ":"+ token;
-		log.info("请求头里的token值：:"+token);
-		log.info("从 Redis 获取的userInfo:"+userInfo);
-		Object o = redisTemplate.opsForValue().get(userInfo);
-		if (o == null) {
-			log.error("从 Redis 获取的值为 null ,", userInfo);
-			return badRequest("token验证错误");
+
+		//读取cookies中的时间
+		String cookieTime = getSignTimeCookie(request);
+		if (StringUtils.isBlank(cookieTime)) {
+			return badRequest("不支持的请求");
+			// return;
 		}
-		// 将对象转换为字符串
-		String userNoStr = o.toString();
-		// 检查字符串是否为空或空白
-		if (StringUtils.isBlank(userNoStr)) {
-			log.error("从 Redis 获取的值为空或空白,", userInfo);
-			return badRequest("token验证错误");
-		}
-		HashMap bean = JSONUtil.toBean(userNoStr, HashMap.class);
-		Object userNo = bean.get("userNo");
+
 		byte[] signBytes = Base64.getDecoder().decode(sign);
 		// byte[] signBytes = RSAUtil.decryptBase64(sign);
 		byte[] signDecryt = RSAUtil.decryptByPrivateKey(ConfigSecretKey.TEMP_PRIVATESTR, signBytes);
 		String signStr = new String(signDecryt);
+		// System.out.println("解密后的字符串："+signStr);
 		// 第一个/前端是时间
 		int index = signStr.indexOf("/");
 		if (index <= 0) {
@@ -161,20 +139,13 @@ 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);
+			return badRequest("验证错误");
 		}
-//		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);
@@ -201,7 +172,7 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 读取cookies值
-	 *
+	 * 
 	 * @param request
 	 * @return
 	 */

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

@@ -0,0 +1,11 @@
+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/school/study/api/StudyCourseApi.java

@@ -228,7 +228,7 @@ public class StudyCourseApi extends ApiBaseController{
 		
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
-		if(sc==null) {
+		if(pass==true && sc==null) {
 			//未报名，这里直接报名
 			StudySignup signup=new StudySignup();
 			signup.setCourseId(cid);
@@ -246,14 +246,13 @@ public class StudyCourseApi extends ApiBaseController{
 			signup.setSignTime(LocalDateTime.now());
 			sc=service.autoSignup(signup);
 		}
-		
-		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);//学习的内容
-		
+		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);//学习的内容
+		}
 		return success(rs);
 	}
 

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

@@ -1,9 +1,6 @@
 package com.xboe.system.api;
 
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -14,6 +11,12 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.xboe.core.SysConstant;
+import com.xboe.standard.BaseConstant;
+import com.xboe.system.assist.entity.XUploadResultDto;
+import it.sauronsoftware.jave.Encoder;
+import it.sauronsoftware.jave.MultimediaInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -115,8 +118,17 @@ public class SysUploaderApi  extends ApiBaseController{
 //				ex.printStackTrace();
 				log.error("处理失败",ex);
 			}
-			
-			return wrap(xur);
+			XUploadResultDto dto=new XUploadResultDto();
+			String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath();
+			Encoder encoder = new Encoder();
+			MultimediaInfo m = encoder.getInfo(new File(fileFullPath));
+			Long ls = m.getDuration() / 1000;//秒
+			dto.setDuration(ls);
+			dto.setDisplayName(xur.getDisplayName());
+			dto.setFilePath(xur.getFilePath());
+			dto.setFileType(xur.getFileType());
+			dto.setHttpPath(xur.getHttpPath());
+			return wrap(dto);
 
 		} catch (Exception e) {
 			log.error("upload file error ",e);

servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java

@@ -0,0 +1,9 @@
+package com.xboe.system.assist.entity;
+
+import com.xboe.core.upload.XUploadResult;
+import lombok.Data;
+
+@Data
+public class XUploadResultDto extends XUploadResult {
+    private Long duration;
+}