Merge branch 'dev' of http://192.168.1.245:11111/jinjilong/onlineEducation-fwd into dev

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/FileController.java

@@ -280,7 +280,7 @@ public class FileController {
             @Parameter(description = "页面数量", required = true) long pageCount){
         String userId = StpLoginUserUtil.getLoginUser().getId();
         if ("0".equals(fileType)) {
-            IPage<FileListVO> fileList = userFileService.userFileList(null, filePath, currentPage, pageCount);
+            IPage<FileListVO> fileList = userFileService.userFileList(userId, filePath, currentPage, pageCount);
             return RestResult.success().dataList(fileList.getRecords(), fileList.getTotal());
         } else {
             IPage<FileListVO> fileList = userFileService.getFileByFileType(Integer.valueOf(fileType), currentPage, pageCount, userId);

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/FiletransferController.java

@@ -3,10 +3,18 @@ package vip.xiaonuo.disk.controller;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
 import com.qiwenshare.common.util.MimeUtils;
+import com.qiwenshare.ufop.factory.UFOPFactory;
+import com.qiwenshare.ufop.operation.download.Downloader;
+import com.qiwenshare.ufop.operation.download.domain.DownloadFile;
+import com.qiwenshare.ufop.operation.download.domain.Range;
+import com.qiwenshare.ufop.util.UFOPUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
-import vip.xiaonuo.disk.service.IFileService;
-import vip.xiaonuo.disk.service.IFiletransferService;
-import vip.xiaonuo.disk.service.IUserFileService;
 import vip.xiaonuo.disk.component.FileDealComp;
 import vip.xiaonuo.disk.domain.FileBean;
 import vip.xiaonuo.disk.domain.StorageBean;
@@ -16,22 +24,13 @@ import vip.xiaonuo.disk.dto.file.DownloadFileDTO;
 import vip.xiaonuo.disk.dto.file.PreviewDTO;
 import vip.xiaonuo.disk.dto.file.UploadFileDTO;
 import vip.xiaonuo.disk.io.QiwenFile;
+import vip.xiaonuo.disk.service.IFileService;
+import vip.xiaonuo.disk.service.IFiletransferService;
+import vip.xiaonuo.disk.service.IUserFileService;
 import vip.xiaonuo.disk.service.impl.StorageService;
 import vip.xiaonuo.disk.vo.file.UploadFileVo;
-import com.qiwenshare.ufop.factory.UFOPFactory;
-import com.qiwenshare.ufop.operation.download.Downloader;
-import com.qiwenshare.ufop.operation.download.domain.DownloadFile;
-import com.qiwenshare.ufop.operation.download.domain.Range;
-import com.qiwenshare.ufop.util.UFOPUtils;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -77,7 +76,7 @@ public class FiletransferController {
         if (!isCheckSuccess) {
             return RestResult.fail().message("存储空间不足");
         }
-        UploadFileVo uploadFileVo = filetransferService.uploadFileSpeed(uploadFileDto);
+        UploadFileVo uploadFileVo = filetransferService.uploadFileSpeed(userId,uploadFileDto);
         return RestResult.success().data(uploadFileVo);
 
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/UserFile.java

@@ -5,17 +5,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qiwenshare.common.util.DateUtil;
-import vip.xiaonuo.disk.io.QiwenFile;
 import lombok.Data;
-import lombok.Getter;
+import vip.xiaonuo.disk.io.QiwenFile;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 
 @Data
-@Table(name = "userfile", uniqueConstraints = {
-        @UniqueConstraint(name = "fileindex", columnNames = {"userId", "filePath", "fileName", "extendName", "deleteFlag", "isDir"})
-})
+@Table(name = "userfile")
 @Entity
 @TableName("userfile")
 public class UserFile {

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/IFiletransferService.java

@@ -1,12 +1,10 @@
 package vip.xiaonuo.disk.service;
 
 import vip.xiaonuo.disk.domain.FileBean;
-import vip.xiaonuo.disk.domain.UserFile;
 import vip.xiaonuo.disk.dto.file.DownloadFileDTO;
 import vip.xiaonuo.disk.dto.file.PreviewDTO;
 import vip.xiaonuo.disk.dto.file.UploadFileDTO;
 import vip.xiaonuo.disk.vo.file.UploadFileVo;
-import com.qiwenshare.ufop.constant.StorageTypeEnum;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -14,7 +12,7 @@ import java.util.List;
 
 public interface IFiletransferService {
 
-    UploadFileVo uploadFileSpeed(UploadFileDTO uploadFileDTO);
+    UploadFileVo uploadFileSpeed(String userId,UploadFileDTO uploadFileDTO);
 
     void uploadFile(HttpServletRequest request, UploadFileDTO UploadFileDto, String userId);
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/FiletransferService.java

@@ -7,16 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qiwenshare.common.util.DateUtil;
 import com.qiwenshare.common.util.MimeUtils;
-import com.qiwenshare.common.util.security.SessionUtil;
-import vip.xiaonuo.disk.service.IFiletransferService;
-import vip.xiaonuo.disk.component.FileDealComp;
-import vip.xiaonuo.disk.domain.*;
-import vip.xiaonuo.disk.dto.file.DownloadFileDTO;
-import vip.xiaonuo.disk.dto.file.PreviewDTO;
-import vip.xiaonuo.disk.dto.file.UploadFileDTO;
-import vip.xiaonuo.disk.io.QiwenFile;
-import vip.xiaonuo.disk.mapper.*;
-import vip.xiaonuo.disk.vo.file.UploadFileVo;
 import com.qiwenshare.ufop.constant.StorageTypeEnum;
 import com.qiwenshare.ufop.constant.UploadFileStatusEnum;
 import com.qiwenshare.ufop.exception.operation.DownloadException;
@@ -37,6 +27,15 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.disk.component.FileDealComp;
+import vip.xiaonuo.disk.domain.*;
+import vip.xiaonuo.disk.dto.file.DownloadFileDTO;
+import vip.xiaonuo.disk.dto.file.PreviewDTO;
+import vip.xiaonuo.disk.dto.file.UploadFileDTO;
+import vip.xiaonuo.disk.io.QiwenFile;
+import vip.xiaonuo.disk.mapper.*;
+import vip.xiaonuo.disk.service.IFiletransferService;
+import vip.xiaonuo.disk.vo.file.UploadFileVo;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -84,7 +83,7 @@ public class FiletransferService implements IFiletransferService {
     public static Executor exec = Executors.newFixedThreadPool(20);
 
     @Override
-    public UploadFileVo uploadFileSpeed(UploadFileDTO uploadFileDTO) {
+    public UploadFileVo uploadFileSpeed(String userId,UploadFileDTO uploadFileDTO) {
         UploadFileVo uploadFileVo = new UploadFileVo();
         Map<String, Object> param = new HashMap<>();
         param.put("identifier", uploadFileDTO.getIdentifier());
@@ -101,7 +100,7 @@ public class FiletransferService implements IFiletransferService {
 
         if (list != null && !list.isEmpty()) {
             FileBean file = list.get(0);
-            UserFile userFile = new UserFile(qiwenFile, SessionUtil.getUserId(), file.getFileId());
+            UserFile userFile = new UserFile(qiwenFile, userId, file.getFileId());
 
             try {
                 userFileMapper.insert(userFile);
@@ -114,7 +113,7 @@ public class FiletransferService implements IFiletransferService {
             if (relativePath.contains("/")) {
                 QiwenFile finalQiwenFile = qiwenFile;
                 exec.execute(()->{
-                    fileDealComp.restoreParentFilePath(finalQiwenFile, SessionUtil.getUserId());
+                    fileDealComp.restoreParentFilePath(finalQiwenFile, userId);
                 });
 
             }
@@ -139,7 +138,7 @@ public class FiletransferService implements IFiletransferService {
                     uploadTask.setFileName(qiwenFile.getNameNotExtend());
                     uploadTask.setFilePath(qiwenFile.getParent());
                     uploadTask.setExtendName(qiwenFile.getExtendName());
-                    uploadTask.setUserId(SessionUtil.getUserId());
+                    uploadTask.setUserId(userId);
                     uploadTaskMapper.insert(uploadTask);
                 }
             }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/UserFileService.java

@@ -10,19 +10,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qiwenshare.common.constant.FileConstant;
 import com.qiwenshare.common.util.DateUtil;
-import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
-import vip.xiaonuo.disk.service.IUserFileService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.disk.component.FileDealComp;
 import vip.xiaonuo.disk.domain.RecoveryFile;
 import vip.xiaonuo.disk.domain.UserFile;
 import vip.xiaonuo.disk.io.QiwenFile;
 import vip.xiaonuo.disk.mapper.RecoveryFileMapper;
 import vip.xiaonuo.disk.mapper.UserFileMapper;
+import vip.xiaonuo.disk.service.IUserFileService;
 import vip.xiaonuo.disk.vo.file.FileListVO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.nio.charset.StandardCharsets;
@@ -72,15 +71,8 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> imple
     public IPage<FileListVO> userFileList(String userId, String filePath, Long currentPage, Long pageCount) {
         Page<FileListVO> page = new Page<>(currentPage, pageCount);
         UserFile userFile = new UserFile();
-//        JwtUser sessionUserBean = SessionUtil.getSession();
-        if (userId == null) {
-            userFile.setUserId(StpLoginUserUtil.getLoginUser().getId());
-        } else {
-            userFile.setUserId(userId);
-        }
-
+        userFile.setUserId(userId);
         userFile.setFilePath(URLDecoder.decodeForPath(filePath, StandardCharsets.UTF_8));
-
         return userFileMapper.selectPageVo(page, userFile, null);
     }
 
@@ -171,7 +163,6 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> imple
     @Override
     public IPage<FileListVO> getFileByFileType(Integer fileTypeId, Long currentPage, Long pageCount, String userId) {
         Page<FileListVO> page = new Page<>(currentPage, pageCount);
-
         UserFile userFile = new UserFile();
         userFile.setUserId(userId);
         return userFileMapper.selectPageVo(page, userFile, fileTypeId);

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/domain/Message.java

@@ -14,7 +14,7 @@ public class Message implements Serializable {
     /**
      * 标题
      */
-    private String title;
+    private String title="6";
 
     /**
      * 内容
@@ -120,4 +120,5 @@ public class Message implements Serializable {
     public void setReadCount(Integer readCount) {
         this.readCount = readCount;
     }
+
 }