diff --git a/hb-file/src/main/java/com/ruoyi/file/aop/WebLogAcpect.java b/hb-file/src/main/java/com/ruoyi/file/aop/WebLogAcpect.java
index 7d403b3..e83cdb3 100644
--- a/hb-file/src/main/java/com/ruoyi/file/aop/WebLogAcpect.java
+++ b/hb-file/src/main/java/com/ruoyi/file/aop/WebLogAcpect.java
@@ -2,8 +2,6 @@ package com.ruoyi.file.aop;
 
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
-import com.qiwenshare.common.util.security.JwtUser;
-import com.qiwenshare.common.util.security.SessionUtil;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.file.api.IOperationLogService;
@@ -11,12 +9,10 @@ import com.ruoyi.file.util.OperationLogUtil;
 import com.ruoyi.file.vo.user.UserLoginVo;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.CodeSignature;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
diff --git a/hb-file/src/main/java/com/ruoyi/file/api/ICommonFileService.java b/hb-file/src/main/java/com/ruoyi/file/api/ICommonFileService.java
index 9539e96..c82b8a7 100644
--- a/hb-file/src/main/java/com/ruoyi/file/api/ICommonFileService.java
+++ b/hb-file/src/main/java/com/ruoyi/file/api/ICommonFileService.java
@@ -8,6 +8,6 @@ import com.ruoyi.file.vo.commonfile.CommonFileUser;
 import java.util.List;
 
 public interface ICommonFileService extends IService<CommonFile> {
-    List<CommonFileUser> selectCommonFileUser(String userId);
-    List<CommonFileListVo> selectCommonFileByUser(String userId, String sessionUserId);
+    List<CommonFileUser> selectCommonFileUser(Long userId);
+    List<CommonFileListVo> selectCommonFileByUser(Long userId, Long sessionUserId);
 }
diff --git a/hb-file/src/main/java/com/ruoyi/file/component/FileDealComp.java b/hb-file/src/main/java/com/ruoyi/file/component/FileDealComp.java
index 5d582d3..6ef0401 100644
--- a/hb-file/src/main/java/com/ruoyi/file/component/FileDealComp.java
+++ b/hb-file/src/main/java/com/ruoyi/file/component/FileDealComp.java
@@ -7,19 +7,6 @@ import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qiwenshare.common.util.DateUtil;
 import com.qiwenshare.common.util.MusicUtils;
-import com.qiwenshare.common.util.security.SessionUtil;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.file.api.IShareFileService;
-import com.ruoyi.file.api.IShareService;
-import com.ruoyi.file.config.es.FileSearch;
-//import com.qiwenshare.file.domain.*;
-import com.ruoyi.file.domain.*;
-import com.ruoyi.file.io.QiwenFile;
-import com.ruoyi.file.mapper.FileMapper;
-import com.ruoyi.file.mapper.MusicMapper;
-import com.ruoyi.file.mapper.UserFileMapper;
-import com.ruoyi.file.util.QiwenFileUtil;
-import com.ruoyi.file.util.TreeNode;
 import com.qiwenshare.ufop.factory.UFOPFactory;
 import com.qiwenshare.ufop.operation.copy.Copier;
 import com.qiwenshare.ufop.operation.copy.domain.CopyFile;
@@ -28,6 +15,18 @@ import com.qiwenshare.ufop.operation.download.domain.DownloadFile;
 import com.qiwenshare.ufop.operation.write.Writer;
 import com.qiwenshare.ufop.operation.write.domain.WriteFile;
 import com.qiwenshare.ufop.util.UFOPUtils;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.file.api.IShareFileService;
+import com.ruoyi.file.api.IShareService;
+import com.ruoyi.file.config.es.FileSearch;
+import com.ruoyi.file.domain.*;
+import com.ruoyi.file.io.QiwenFile;
+import com.ruoyi.file.mapper.FileMapper;
+import com.ruoyi.file.mapper.MusicMapper;
+import com.ruoyi.file.mapper.UserFileMapper;
+import com.ruoyi.file.util.QiwenFileUtil;
+import com.ruoyi.file.util.TreeNode;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -289,9 +288,10 @@ public class FileDealComp {
         exec.execute(()->{
             try {
 
-                Map<String, Object> param = new HashMap<>();
-                param.put("userFileId", userFileId);
-                List<UserFile> userfileResult = userFileMapper.selectByMap(param);
+//                Map<String, Object> param = new HashMap<>();
+//                param.put("userFileId", userFileId);
+//                List<UserFile> userfileResult = userFileMapper.selectByMap(param);
+                List<UserFile> userfileResult = userFileMapper.selectByUserFileId(userFileId);
                 if (userfileResult != null && userfileResult.size() > 0) {
                     FileSearch fileSearch = new FileSearch();
                     BeanUtil.copyProperties(userfileResult.get(0), fileSearch);
@@ -420,7 +420,7 @@ public class FileDealComp {
         userFile.setFileId(fileBean.getFileId());
         userFile.setUploadTime(DateUtil.getCurrentTime());
         userFile.setModifyTime(DateUtil.getCurrentTime());
-        userFile.setModifyUserId(SessionUtil.getUserId());
+        userFile.setModifyUserId(SecurityUtils.getUserId());
         userFileMapper.updateById(userFile);
         return fileUrl;
     }
diff --git a/hb-file/src/main/java/com/ruoyi/file/controller/CommonFileController.java b/hb-file/src/main/java/com/ruoyi/file/controller/CommonFileController.java
index 5dc1c78..e1c6544 100644
--- a/hb-file/src/main/java/com/ruoyi/file/controller/CommonFileController.java
+++ b/hb-file/src/main/java/com/ruoyi/file/controller/CommonFileController.java
@@ -5,8 +5,8 @@ import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
-import com.qiwenshare.common.util.security.JwtUser;
-import com.qiwenshare.common.util.security.SessionUtil;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.file.api.ICommonFileService;
 import com.ruoyi.file.api.IFilePermissionService;
 import com.ruoyi.file.api.IUserFileService;
@@ -73,7 +73,7 @@ public class CommonFileController {
     @ResponseBody
     public RestResult<List<CommonFileUser>> commonFileUserList() {
 
-        JwtUser sessionUserBean =  SessionUtil.getSession();
+        LoginUser sessionUserBean =  SecurityUtils.getLoginUser();
         List<CommonFileUser> list = commonFileService.selectCommonFileUser(sessionUserBean.getUserId());
         return RestResult.success().data(list);
     }
@@ -82,8 +82,8 @@ public class CommonFileController {
     @RequestMapping(value = "/getCommonFileByUser", method = RequestMethod.GET)
     @ResponseBody
     public RestResult<CommonFileListVo> getCommonFileByUser(
-            @Parameter(description = "用户id", required = true) String userId){
-        JwtUser sessionUserBean =  SessionUtil.getSession();
+            @Parameter(description = "用户id", required = true) Long userId){
+        LoginUser sessionUserBean =  SecurityUtils.getLoginUser();
         List<CommonFileListVo> commonFileVo = commonFileService.selectCommonFileByUser(userId, sessionUserBean.getUserId());
 
         return RestResult.success().data(commonFileVo);
diff --git a/hb-file/src/main/java/com/ruoyi/file/controller/FileController.java b/hb-file/src/main/java/com/ruoyi/file/controller/FileController.java
index 0b8777c..f45ae0c 100644
--- a/hb-file/src/main/java/com/ruoyi/file/controller/FileController.java
+++ b/hb-file/src/main/java/com/ruoyi/file/controller/FileController.java
@@ -13,8 +13,9 @@ import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.exception.QiwenException;
 import com.qiwenshare.common.result.RestResult;
 import com.qiwenshare.common.util.DateUtil;
-import com.qiwenshare.common.util.security.JwtUser;
-import com.qiwenshare.common.util.security.SessionUtil;
+import com.qiwenshare.ufop.factory.UFOPFactory;
+import com.qiwenshare.ufop.operation.copy.Copier;
+import com.qiwenshare.ufop.operation.copy.domain.CopyFile;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.file.api.IFileService;
@@ -24,17 +25,13 @@ import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.config.es.FileSearch;
 import com.ruoyi.file.domain.FileBean;
 import com.ruoyi.file.domain.UserFile;
-//import com.qiwenshare.file.dto.file.*;
+import com.ruoyi.file.dto.file.*;
 import com.ruoyi.file.io.QiwenFile;
 import com.ruoyi.file.util.QiwenFileUtil;
 import com.ruoyi.file.util.TreeNode;
 import com.ruoyi.file.vo.file.FileDetailVO;
 import com.ruoyi.file.vo.file.FileListVO;
 import com.ruoyi.file.vo.file.SearchFileVO;
-import com.qiwenshare.ufop.factory.UFOPFactory;
-import com.qiwenshare.ufop.operation.copy.Copier;
-import com.qiwenshare.ufop.operation.copy.domain.CopyFile;
-import com.ruoyi.file.dto.file.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -42,15 +39,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jetty.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.ClassUtils;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.URLDecoder;
+import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -110,13 +106,23 @@ public class FileController {
             } else if ("drawio".equals(extendName)) {
                 templateFilePath = "template/Drawio.drawio";
             }
-            String url2 = ClassUtils.getDefaultClassLoader().getResource("static/" + templateFilePath).getPath();
-            url2 = URLDecoder.decode(url2, "UTF-8");
-            FileInputStream fileInputStream = new FileInputStream(url2);
+            //String url2 = ClassUtils.getDefaultClassLoader().getResource("static/" + templateFilePath).getPath();
+            //url2 = URLDecoder.decode(url2, "UTF-8");
+            //FileInputStream fileInputStream = new FileInputStream(url2);
+
+            // 使用 ClassPathResource 获取资源
+            ClassPathResource resource = new ClassPathResource("static/" + templateFilePath);
+            if (!resource.exists()) {
+                return RestResult.fail().message("模板文件不存在");
+            }
+            InputStream inputStream = resource.getInputStream();
+
             Copier copier = ufopFactory.getCopier();
             CopyFile copyFile = new CopyFile();
             copyFile.setExtendName(extendName);
-            String fileUrl = copier.copy(fileInputStream, copyFile);
+
+            //String fileUrl = copier.copy(fileInputStream, copyFile);
+            String fileUrl = copier.copy(inputStream, copyFile);
 
             FileBean fileBean = new FileBean();
             fileBean.setFileId(IdUtil.getSnowflakeNextIdStr());
@@ -226,12 +232,14 @@ public class FileController {
         }
 
         List<SearchFileVO> searchFileVOList = new ArrayList<>();
-        for (Hit<FileSearch> hit : search.hits().hits()) {
-            SearchFileVO searchFileVO = new SearchFileVO();
-            BeanUtil.copyProperties(hit.source(), searchFileVO);
-            searchFileVO.setHighLight(hit.highlight());
-            searchFileVOList.add(searchFileVO);
-            asyncTaskComp.checkESUserFileId(searchFileVO.getUserFileId());
+        if (search != null) {
+            for (Hit<FileSearch> hit : search.hits().hits()) {
+                SearchFileVO searchFileVO = new SearchFileVO();
+                BeanUtil.copyProperties(hit.source(), searchFileVO);
+                searchFileVO.setHighLight(hit.highlight());
+                searchFileVOList.add(searchFileVO);
+                asyncTaskComp.checkESUserFileId(searchFileVO.getUserFileId());
+            }
         }
         return RestResult.success().dataList(searchFileVOList, searchFileVOList.size());
     }
diff --git a/hb-file/src/main/java/com/ruoyi/file/controller/FiletransferController.java b/hb-file/src/main/java/com/ruoyi/file/controller/FiletransferController.java
index a381f96..771666b 100644
--- a/hb-file/src/main/java/com/ruoyi/file/controller/FiletransferController.java
+++ b/hb-file/src/main/java/com/ruoyi/file/controller/FiletransferController.java
@@ -1,12 +1,13 @@
 package com.ruoyi.file.controller;
 
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
 import com.qiwenshare.common.util.MimeUtils;
-import com.qiwenshare.common.util.security.JwtUser;
-import com.qiwenshare.common.util.security.SessionUtil;
+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 com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.file.api.IFileService;
@@ -23,13 +24,6 @@ import com.ruoyi.file.dto.file.UploadFileDTO;
 import com.ruoyi.file.io.QiwenFile;
 import com.ruoyi.file.service.StorageService;
 import com.ruoyi.file.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.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -51,9 +45,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
-//@Tag(name = "filetransfer", description = "该接口为文件传输接口，主要用来做文件的上传、下载和预览")
-@Api(tags = "5 文件传输接口")
-@ApiSupport(order = 5)
+@Tag(name = "filetransfer", description = "该接口为文件传输接口，主要用来做文件的上传、下载和预览")
 @RestController
 @RequestMapping("/filetransfer")
 public class FiletransferController {
@@ -216,6 +208,9 @@ public class FiletransferController {
                     }
                 }
             }
+            if (StringUtils.isEmpty(token)) {
+                token = httpServletRequest.getHeader("token");
+            }
         }
 
         UserFile userFile = userFileService.getById(previewDTO.getUserFileId());
@@ -295,9 +290,7 @@ public class FiletransferController {
 
     }
 
-    //@Operation(summary = "获取存储信息", description = "获取存储信息", tags = {"filetransfer"})
-    @ApiOperation(value = "5.1 获取存储信息")
-    @ApiOperationSupport(order = 1)
+    @Operation(summary = "获取存储信息", description = "获取存储信息", tags = {"filetransfer"})
     @RequestMapping(value = "/getstorage", method = RequestMethod.GET)
     @ResponseBody
     public RestResult<StorageBean> getStorage() {
diff --git a/hb-file/src/main/java/com/ruoyi/file/controller/OfficeController.java b/hb-file/src/main/java/com/ruoyi/file/controller/OfficeController.java
index e2a0921..2f9923c 100644
--- a/hb-file/src/main/java/com/ruoyi/file/controller/OfficeController.java
+++ b/hb-file/src/main/java/com/ruoyi/file/controller/OfficeController.java
@@ -4,8 +4,8 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.qiwenshare.common.exception.NotLoginException;
 import com.qiwenshare.common.result.RestResult;
-import com.qiwenshare.common.util.security.JwtUser;
-import com.qiwenshare.common.util.security.SessionUtil;
+import com.qiwenshare.ufop.factory.UFOPFactory;
+import com.qiwenshare.ufop.operation.download.domain.DownloadFile;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -14,7 +14,6 @@ import com.ruoyi.file.api.IUserFileService;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.FileBean;
 import com.ruoyi.file.domain.UserFile;
-import com.ruoyi.file.domain.user.UserBean;
 import com.ruoyi.file.dto.file.EditOfficeFileDTO;
 import com.ruoyi.file.dto.file.PreviewOfficeFileDTO;
 import com.ruoyi.file.office.documentserver.managers.history.HistoryManager;
@@ -24,15 +23,12 @@ import com.ruoyi.file.office.documentserver.models.filemodel.FileModel;
 import com.ruoyi.file.office.entities.User;
 import com.ruoyi.file.office.services.configurers.FileConfigurer;
 import com.ruoyi.file.office.services.configurers.wrappers.DefaultFileWrapper;
-import com.qiwenshare.ufop.factory.UFOPFactory;
-import com.qiwenshare.ufop.operation.download.domain.DownloadFile;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
diff --git a/hb-file/src/main/java/com/ruoyi/file/controller/RecoveryFileController.java b/hb-file/src/main/java/com/ruoyi/file/controller/RecoveryFileController.java
index bcbbbab..537e855 100644
--- a/hb-file/src/main/java/com/ruoyi/file/controller/RecoveryFileController.java
+++ b/hb-file/src/main/java/com/ruoyi/file/controller/RecoveryFileController.java
@@ -3,11 +3,11 @@ package com.ruoyi.file.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
-import com.qiwenshare.common.util.security.JwtUser;
-import com.qiwenshare.common.util.security.SessionUtil;
-//import com.qiwenshare.file.api.*;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.*;
+import com.ruoyi.file.api.IFileService;
+import com.ruoyi.file.api.IFiletransferService;
+import com.ruoyi.file.api.IRecoveryFileService;
+import com.ruoyi.file.api.IUserFileService;
 import com.ruoyi.file.component.AsyncTaskComp;
 import com.ruoyi.file.domain.RecoveryFile;
 import com.ruoyi.file.dto.file.DeleteRecoveryFileDTO;
diff --git a/hb-file/src/main/java/com/ruoyi/file/controller/ShareController.java b/hb-file/src/main/java/com/ruoyi/file/controller/ShareController.java
index d40c68c..47528fa 100644
--- a/hb-file/src/main/java/com/ruoyi/file/controller/ShareController.java
+++ b/hb-file/src/main/java/com/ruoyi/file/controller/ShareController.java
@@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
 import com.qiwenshare.common.util.DateUtil;
-import com.qiwenshare.common.util.security.JwtUser;
-import com.qiwenshare.common.util.security.SessionUtil;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.file.api.IShareFileService;
@@ -20,13 +18,12 @@ import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.Share;
 import com.ruoyi.file.domain.ShareFile;
 import com.ruoyi.file.domain.UserFile;
-//import com.qiwenshare.file.dto.sharefile.*;
+import com.ruoyi.file.dto.sharefile.*;
 import com.ruoyi.file.io.QiwenFile;
 import com.ruoyi.file.vo.share.ShareFileListVO;
 import com.ruoyi.file.vo.share.ShareFileVO;
 import com.ruoyi.file.vo.share.ShareListVO;
 import com.ruoyi.file.vo.share.ShareTypeVO;
-import com.ruoyi.file.dto.sharefile.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -35,7 +32,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 
 @Tag(name = "share", description = "该接口为文件分享接口")
 @RestController
diff --git a/hb-file/src/main/java/com/ruoyi/file/domain/FileBean.java b/hb-file/src/main/java/com/ruoyi/file/domain/FileBean.java
index e7d9255..bbd3902 100644
--- a/hb-file/src/main/java/com/ruoyi/file/domain/FileBean.java
+++ b/hb-file/src/main/java/com/ruoyi/file/domain/FileBean.java
@@ -51,8 +51,8 @@ public class FileBean {
     @Column(columnDefinition="varchar(25) comment '修改时间'")
     private String modifyTime;
 
-    @Column(columnDefinition="varchar(20) comment '修改用户id'")
-    private String modifyUserId;
+    @Column(columnDefinition="bigint(0) comment '修改用户id'")
+    private Long modifyUserId;
 
     public FileBean(){
 
diff --git a/hb-file/src/main/java/com/ruoyi/file/domain/UserFile.java b/hb-file/src/main/java/com/ruoyi/file/domain/UserFile.java
index 20613f7..0d44692 100644
--- a/hb-file/src/main/java/com/ruoyi/file/domain/UserFile.java
+++ b/hb-file/src/main/java/com/ruoyi/file/domain/UserFile.java
@@ -2,6 +2,7 @@ package com.ruoyi.file.domain;
 
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qiwenshare.common.util.DateUtil;
@@ -54,12 +55,16 @@ public class UserFile {
     private String deleteBatchNum;
     @Column(columnDefinition="varchar(30) comment '创建时间'")
     private String createTime;
-    @Column(columnDefinition="bigint(20) comment '创建用户id'")
+    @Column(columnDefinition="bigint(0) comment '创建用户id'")
     private Long createUserId;
     @Column(columnDefinition="varchar(30) comment '修改时间'")
     private String modifyTime;
-    @Column(columnDefinition="varchar(20) comment '修改用户id'")
-    private String modifyUserId;
+    @Column(columnDefinition="bigint(0) comment '修改用户id'")
+    private Long modifyUserId;
+
+    //@Column(columnDefinition="bigint(0) comment '文件大小'")
+    @TableField(exist = false)
+    private Long fileSize;
 
     public UserFile() {};
     public UserFile(QiwenFile qiwenFile, Long userId, String fileId) {
diff --git a/hb-file/src/main/java/com/ruoyi/file/mapper/CommonFileMapper.java b/hb-file/src/main/java/com/ruoyi/file/mapper/CommonFileMapper.java
index 9c391a9..1bf6d3d 100644
--- a/hb-file/src/main/java/com/ruoyi/file/mapper/CommonFileMapper.java
+++ b/hb-file/src/main/java/com/ruoyi/file/mapper/CommonFileMapper.java
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface CommonFileMapper extends BaseMapper<CommonFile> {
-    List<CommonFileUser> selectCommonFileUser(@Param("userId") String userId);
-    List<CommonFileListVo> selectCommonFileByUser(@Param("userId") String userId, @Param("sessionUserId") String sessionUserId);
+    List<CommonFileUser> selectCommonFileUser(@Param("userId") Long userId);
+    List<CommonFileListVo> selectCommonFileByUser(@Param("userId") Long userId, @Param("sessionUserId") Long sessionUserId);
 
 }
diff --git a/hb-file/src/main/java/com/ruoyi/file/mapper/UserFileMapper.java b/hb-file/src/main/java/com/ruoyi/file/mapper/UserFileMapper.java
index e1aeb6a..bd5e735 100644
--- a/hb-file/src/main/java/com/ruoyi/file/mapper/UserFileMapper.java
+++ b/hb-file/src/main/java/com/ruoyi/file/mapper/UserFileMapper.java
@@ -15,4 +15,6 @@ public interface UserFileMapper extends BaseMapper<UserFile> {
 
     IPage<FileListVO> selectPageVo(Page<?> page, @Param("userFile") UserFile userFile, @Param("fileTypeId") Integer fileTypeId);
     Long selectStorageSizeByUserId(@Param("userId") Long userId);
+
+    List<UserFile> selectByUserFileId(String userFileId);
 }
diff --git a/hb-file/src/main/java/com/ruoyi/file/service/CommonFileService.java b/hb-file/src/main/java/com/ruoyi/file/service/CommonFileService.java
index 1d058a7..c9f65f2 100644
--- a/hb-file/src/main/java/com/ruoyi/file/service/CommonFileService.java
+++ b/hb-file/src/main/java/com/ruoyi/file/service/CommonFileService.java
@@ -22,12 +22,12 @@ public class CommonFileService extends ServiceImpl<CommonFileMapper, CommonFile>
     CommonFileMapper commonFileMapper;
 
     @Override
-    public List<CommonFileUser> selectCommonFileUser(String userId) {
+    public List<CommonFileUser> selectCommonFileUser(Long userId) {
         return commonFileMapper.selectCommonFileUser(userId);
     }
 
     @Override
-    public List<CommonFileListVo> selectCommonFileByUser(String userId, String sessionUserId) {
+    public List<CommonFileListVo> selectCommonFileByUser(Long userId, Long sessionUserId) {
         return commonFileMapper.selectCommonFileByUser(userId, sessionUserId);
     }
 
diff --git a/hb-file/src/main/java/com/ruoyi/file/service/FileService.java b/hb-file/src/main/java/com/ruoyi/file/service/FileService.java
index 7e7e65c..e8e9fca 100644
--- a/hb-file/src/main/java/com/ruoyi/file/service/FileService.java
+++ b/hb-file/src/main/java/com/ruoyi/file/service/FileService.java
@@ -7,7 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qiwenshare.common.exception.QiwenException;
 import com.qiwenshare.common.operation.FileOperation;
 import com.qiwenshare.common.util.DateUtil;
-import com.qiwenshare.common.util.security.SessionUtil;
+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.util.UFOPUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.file.api.IFileService;
 import com.ruoyi.file.component.AsyncTaskComp;
 import com.ruoyi.file.component.FileDealComp;
@@ -21,10 +25,6 @@ import com.ruoyi.file.mapper.MusicMapper;
 import com.ruoyi.file.mapper.UserFileMapper;
 import com.ruoyi.file.util.QiwenFileUtil;
 import com.ruoyi.file.vo.file.FileDetailVO;
-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.util.UFOPUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -128,12 +128,12 @@ public class FileService extends ServiceImpl<FileMapper, FileBean> implements IF
         fileBean.setIdentifier(identifier);
         fileBean.setFileSize(fileSize);
         fileBean.setModifyTime(currentTime);
-        fileBean.setModifyUserId(SessionUtil.getUserId());
+        fileBean.setModifyUserId(SecurityUtils.getUserId());
         fileBean.setFileId(userFile.getFileId());
         fileMapper.updateById(fileBean);
         userFile.setUploadTime(currentTime);
         userFile.setModifyTime(currentTime);
-        userFile.setModifyUserId(SessionUtil.getUserId());
+        userFile.setModifyUserId(SecurityUtils.getUserId());
         userFileMapper.updateById(userFile);
     }
 
diff --git a/hb-file/src/main/java/com/ruoyi/file/service/FiletransferService.java b/hb-file/src/main/java/com/ruoyi/file/service/FiletransferService.java
index 0391a4f..af35646 100644
--- a/hb-file/src/main/java/com/ruoyi/file/service/FiletransferService.java
+++ b/hb-file/src/main/java/com/ruoyi/file/service/FiletransferService.java
@@ -7,19 +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 com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IFiletransferService;
-import com.ruoyi.file.component.FileDealComp;
-//import com.qiwenshare.file.domain.*;
-import com.ruoyi.file.domain.*;
-import com.ruoyi.file.dto.file.DownloadFileDTO;
-import com.ruoyi.file.dto.file.PreviewDTO;
-import com.ruoyi.file.dto.file.UploadFileDTO;
-import com.ruoyi.file.io.QiwenFile;
-//import com.qiwenshare.file.mapper.*;
-import com.ruoyi.file.mapper.*;
-import com.ruoyi.file.vo.file.UploadFileVo;
 import com.qiwenshare.ufop.constant.StorageTypeEnum;
 import com.qiwenshare.ufop.constant.UploadFileStatusEnum;
 import com.qiwenshare.ufop.exception.operation.DownloadException;
@@ -35,6 +22,16 @@ import com.qiwenshare.ufop.operation.upload.Uploader;
 import com.qiwenshare.ufop.operation.upload.domain.UploadFile;
 import com.qiwenshare.ufop.operation.upload.domain.UploadFileResult;
 import com.qiwenshare.ufop.util.UFOPUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.file.api.IFiletransferService;
+import com.ruoyi.file.component.FileDealComp;
+import com.ruoyi.file.domain.*;
+import com.ruoyi.file.dto.file.DownloadFileDTO;
+import com.ruoyi.file.dto.file.PreviewDTO;
+import com.ruoyi.file.dto.file.UploadFileDTO;
+import com.ruoyi.file.io.QiwenFile;
+import com.ruoyi.file.mapper.*;
+import com.ruoyi.file.vo.file.UploadFileVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/hb-file/src/main/java/com/ruoyi/file/service/UserFileService.java b/hb-file/src/main/java/com/ruoyi/file/service/UserFileService.java
index 280ee13..87ee52a 100644
--- a/hb-file/src/main/java/com/ruoyi/file/service/UserFileService.java
+++ b/hb-file/src/main/java/com/ruoyi/file/service/UserFileService.java
@@ -10,8 +10,6 @@ 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 com.qiwenshare.common.util.security.JwtUser;
-import com.qiwenshare.common.util.security.SessionUtil;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.file.api.IUserFileService;
diff --git a/hb-file/src/main/java/com/ruoyi/file/util/QiwenFileUtil.java b/hb-file/src/main/java/com/ruoyi/file/util/QiwenFileUtil.java
index 4de4d73..61d278a 100644
--- a/hb-file/src/main/java/com/ruoyi/file/util/QiwenFileUtil.java
+++ b/hb-file/src/main/java/com/ruoyi/file/util/QiwenFileUtil.java
@@ -2,7 +2,6 @@ package com.ruoyi.file.util;
 
 import cn.hutool.core.util.IdUtil;
 import com.qiwenshare.common.util.DateUtil;
-import com.qiwenshare.common.util.security.SessionUtil;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.file.domain.UserFile;
 import com.ruoyi.file.io.QiwenFile;
diff --git a/hb-file/src/main/resources/mapper/UserFileMapper.xml b/hb-file/src/main/resources/mapper/UserFileMapper.xml
index 70f91af..522910f 100644
--- a/hb-file/src/main/resources/mapper/UserFileMapper.xml
+++ b/hb-file/src/main/resources/mapper/UserFileMapper.xml
@@ -6,6 +6,24 @@
 
 <mapper namespace="com.ruoyi.file.mapper.UserFileMapper">
 
+    <resultMap id="UserFileWithSizeMap" type="com.ruoyi.file.domain.UserFile">
+        <id property="userFileId" column="userFileId"/>
+        <result property="fileId" column="fileId"/>
+        <result property="fileName" column="fileName"/>
+        <result property="filePath" column="filePath"/>
+        <result property="extendName" column="extendName"/>
+        <result property="isDir" column="isDir"/>
+        <result property="uploadTime" column="uploadTime"/>
+        <result property="deleteFlag" column="deleteFlag"/>
+        <result property="deleteTime" column="deleteTime"/>
+        <result property="deleteBatchNum" column="deleteBatchNum"/>
+        <result property="createTime" column="createTime"/>
+        <result property="createUserId" column="createUserId"/>
+        <result property="modifyTime" column="modifyTime"/>
+        <result property="modifyUserId" column="modifyUserId"/>
+        <result property="fileSize" column="fileSize"/>
+    </resultMap>
+
     <select id="selectPageVo" resultType="com.ruoyi.file.vo.file.FileListVO">
         select * from userfile a
         left join image on a.fileId = image.fileId
@@ -53,4 +71,10 @@
         WHERE userfile.userId = #{userId}
     </select>
 
+    <select id="selectByUserFileId" resultMap="UserFileWithSizeMap" parameterType="java.lang.String">
+        SELECT userfile.*, file.fileSize as fileSize FROM userfile
+        LEFT JOIN file ON file.fileId = userfile.fileId
+        WHERE userfile.userFileId = #{userFileId}
+    </select>
+
 </mapper>