去掉租户拼接

snowy-modules/snowy-web-app/src/main/java/vip/xiaonuo/web/core/config/GlobalConfigure.java

@@ -173,9 +173,8 @@ public class GlobalConfigure implements WebMvcConfigurer {
 
             /* easyTrans */
             "/easyTrans/proxy/**",
-
             /* 文件预览 */
-            "/api/webapp/filetransfer/preview",
+            "/filetransfer/preview",
     };
 
     /**

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

@@ -14,9 +14,19 @@ import com.qiwenshare.common.exception.QiwenException;
 import com.qiwenshare.common.result.RestResult;
 import com.qiwenshare.common.util.DateUtil;
 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 io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+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.web.bind.annotation.*;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
-import vip.xiaonuo.disk.service.IFileService;
-import vip.xiaonuo.disk.service.IUserFileService;
 import vip.xiaonuo.disk.component.AsyncTaskComp;
 import vip.xiaonuo.disk.component.FileDealComp;
 import vip.xiaonuo.disk.config.es.FileSearch;
@@ -24,23 +34,15 @@ import vip.xiaonuo.disk.domain.FileBean;
 import vip.xiaonuo.disk.domain.UserFile;
 import vip.xiaonuo.disk.dto.file.*;
 import vip.xiaonuo.disk.io.QiwenFile;
+import vip.xiaonuo.disk.service.IFileService;
+import vip.xiaonuo.disk.service.IOperationLogService;
+import vip.xiaonuo.disk.service.IUserFileService;
+import vip.xiaonuo.disk.util.OperationLogUtil;
 import vip.xiaonuo.disk.util.QiwenFileUtil;
 import vip.xiaonuo.disk.util.TreeNode;
 import vip.xiaonuo.disk.vo.file.FileDetailVO;
 import vip.xiaonuo.disk.vo.file.FileListVO;
 import vip.xiaonuo.disk.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 io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-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.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -69,6 +71,11 @@ public class FileController {
     FileDealComp fileDealComp;
     @Resource
     AsyncTaskComp asyncTaskComp;
+    @Resource
+    OperationLogUtil operationLogUtil;
+    @Resource
+    IOperationLogService iOperationLogService;
+
     @Autowired
     private ElasticsearchClient elasticsearchClient;
     @Value("${ufop.storage-type}")

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

@@ -29,6 +29,7 @@ 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.util.OperationLogUtil;
 import vip.xiaonuo.disk.vo.file.UploadFileVo;
 
 import javax.annotation.Resource;
@@ -63,17 +64,22 @@ public class FiletransferController {
     @Resource
     UFOPFactory ufopFactory;
 
+    @Resource
+    OperationLogUtil operationLogUtil;
+
     @Value("${common.account}")
     private String commonUserId;
-
+    public static final String SUCCESS = "操作成功";
 
     public static final String CURRENT_MODULE = "文件传输接口";
 
+    public static final String FAIL = "操作失败";
+
     @Operation(summary = "极速上传", description = "校验文件MD5判断文件是否存在，如果存在直接上传成功并返回skipUpload=true，如果不存在返回skipUpload=false需要再次调用该接口的POST方法", tags = {"filetransfer"})
     @RequestMapping(value = "/uploadfile", method = RequestMethod.GET)
     @MyLog(operation = "极速上传", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<UploadFileVo> uploadFileSpeed(UploadFileDTO uploadFileDto) {
+    public RestResult<UploadFileVo> uploadFileSpeed(HttpServletRequest request,UploadFileDTO uploadFileDto) {
         String userId = StpLoginUserUtil.getLoginUser().getId();
 
         boolean isCheckSuccess = storageService.checkStorage(userId, uploadFileDto.getTotalSize());
@@ -81,6 +87,9 @@ public class FiletransferController {
             return RestResult.fail().message("存储空间不足");
         }
         UploadFileVo uploadFileVo = filetransferService.uploadFileSpeed(userId,uploadFileDto);
+
+        operationLogUtil.getOperationLogObj(request,userId,RestResult.success().getMessage(),CURRENT_MODULE,"极速上传",SUCCESS);
+
         return RestResult.success().data(uploadFileVo);
 
     }
@@ -90,7 +99,7 @@ public class FiletransferController {
     @RequestMapping(value = "/uploadCommonFile", method = RequestMethod.GET)
     @MyLog(operation = "极速上传", module = CURRENT_MODULE)
     @ResponseBody
-    public RestResult<UploadFileVo> uploadCommonFile(UploadFileDTO uploadFileDto) {
+    public RestResult<UploadFileVo> uploadCommonFile1(HttpServletRequest request,UploadFileDTO uploadFileDto) {
         String userId = commonUserId;
 
         boolean isCheckSuccess = storageService.checkStorage(userId, uploadFileDto.getTotalSize());
@@ -98,6 +107,7 @@ public class FiletransferController {
             return RestResult.fail().message("存储空间不足");
         }
         UploadFileVo uploadFileVo = filetransferService.uploadFileSpeed(userId,uploadFileDto);
+        operationLogUtil.getOperationLogObj(request,userId,RestResult.success().getMessage(),CURRENT_MODULE,"极速上传",SUCCESS);
         return RestResult.success().data(uploadFileVo);
 
     }
@@ -113,6 +123,9 @@ public class FiletransferController {
         filetransferService.uploadFile(request, uploadFileDto, userId);
 
         UploadFileVo uploadFileVo = new UploadFileVo();
+
+        operationLogUtil.getOperationLogObj(request,userId,RestResult.success().getMessage(),CURRENT_MODULE,"上传文件",SUCCESS);
+
         return RestResult.success().data(uploadFileVo);
 
     }
@@ -126,6 +139,8 @@ public class FiletransferController {
         filetransferService.uploadFile(request, uploadFileDto, userId);
 
         UploadFileVo uploadFileVo = new UploadFileVo();
+        operationLogUtil.getOperationLogObj(request,userId,RestResult.success().getMessage(),CURRENT_MODULE,"上传文件",SUCCESS);
+
         return RestResult.success().data(uploadFileVo);
 
     }
@@ -169,6 +184,8 @@ public class FiletransferController {
         httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName);// 设置文件名
 
         filetransferService.downloadFile(httpServletResponse, downloadFileDTO);
+        operationLogUtil.getOperationLogObj(httpServletRequest,StpLoginUserUtil.getLoginUser().getId(),RestResult.success().getMessage(),CURRENT_MODULE,"下载文件",SUCCESS);
+
     }
 
 
@@ -212,6 +229,8 @@ public class FiletransferController {
         httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName);// 设置文件名
 
         filetransferService.downloadFile(httpServletResponse, downloadFileDTO);
+        operationLogUtil.getOperationLogObj(httpServletRequest,commonUserId,RestResult.success().getMessage(),CURRENT_MODULE,"下载文件",SUCCESS);
+
     }
 
 
@@ -266,6 +285,8 @@ public class FiletransferController {
         String fileName = String.valueOf(date.getTime());
         httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName + ".zip");// 设置文件名
         filetransferService.downloadUserFileList(httpServletResponse, userFile.getFilePath(), fileName, userFileIds);
+        operationLogUtil.getOperationLogObj(httpServletRequest,StpLoginUserUtil.getLoginUser().getId(),RestResult.success().getMessage(),CURRENT_MODULE,"批量下载文件",SUCCESS);
+
     }
 
 
@@ -315,6 +336,9 @@ public class FiletransferController {
         String fileName = String.valueOf(date.getTime());
         httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName + ".zip");// 设置文件名
         filetransferService.downloadUserFileList(httpServletResponse, userFile.getFilePath(), fileName, userFileIds);
+        operationLogUtil.getOperationLogObj(httpServletRequest,commonUserId,RestResult.success().getMessage(),CURRENT_MODULE,"批量下载文件",SUCCESS);
+
+
     }
 
 
@@ -402,6 +426,7 @@ public class FiletransferController {
                     downloadFile.getOssClient().shutdown();
                 }
             }
+            operationLogUtil.getOperationLogObj(httpServletRequest,StpLoginUserUtil.getLoginUser().getId(),RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS);
 
         } else {
             filetransferService.previewFile(httpServletResponse, previewDTO);
@@ -503,6 +528,7 @@ public class FiletransferController {
                     downloadFile.getOssClient().shutdown();
                 }
             }
+            operationLogUtil.getOperationLogObj(httpServletRequest,commonUserId,RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS);
 
         } else {
             filetransferService.previewFile(httpServletResponse, previewDTO);
@@ -517,7 +543,7 @@ public class FiletransferController {
     @Operation(summary = "获取存储信息", description = "获取存储信息", tags = {"filetransfer"})
     @RequestMapping(value = "/getstorage", method = RequestMethod.GET)
     @ResponseBody
-    public RestResult<StorageBean> getStorage() {
+    public RestResult<StorageBean> getStorage(HttpServletRequest httpServletRequest) {
 
 //        JwtUser sessionUserBean = SessionUtil.getSession();
         String userId = StpLoginUserUtil.getLoginUser().getId();
@@ -532,6 +558,7 @@ public class FiletransferController {
         storage.setStorageSize(storageSize);
         Long totalStorageSize = storageService.getTotalStorageSize(userId);
         storage.setTotalStorageSize(totalStorageSize);
+        operationLogUtil.getOperationLogObj(httpServletRequest,StpLoginUserUtil.getLoginUser().getId(),RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS);
         return RestResult.success().data(storage);
 
     }
@@ -539,7 +566,7 @@ public class FiletransferController {
     @Operation(summary = "获取存储信息", description = "获取存储信息", tags = {"filetransfer"})
     @RequestMapping(value = "/getCommonStorage", method = RequestMethod.GET)
     @ResponseBody
-    public RestResult<StorageBean> getCommonStorage() {
+    public RestResult<StorageBean> getCommonStorage(HttpServletRequest httpServletRequest) {
 
         String userId = commonUserId;
         StorageBean storageBean = new StorageBean();
@@ -553,6 +580,8 @@ public class FiletransferController {
         storage.setStorageSize(storageSize);
         Long totalStorageSize = storageService.getTotalStorageSize(userId);
         storage.setTotalStorageSize(totalStorageSize);
+        operationLogUtil.getOperationLogObj(httpServletRequest,commonUserId,RestResult.success().getMessage(),CURRENT_MODULE,"预览文件",SUCCESS);
+
         return RestResult.success().data(storage);
 
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/util/OperationLogUtil.java

@@ -3,10 +3,11 @@ package vip.xiaonuo.disk.util;
 import com.qiwenshare.common.constant.PlatformEnum;
 import com.qiwenshare.common.util.CollectUtil;
 import com.qiwenshare.common.util.DateUtil;
+import org.springframework.stereotype.Component;
 import vip.xiaonuo.disk.domain.OperationLogBean;
 
 import javax.servlet.http.HttpServletRequest;
-
+@Component
 public class OperationLogUtil {
 
     /**
@@ -19,7 +20,7 @@ public class OperationLogUtil {
      * @param detail    详细信息
      * @return 操作日志参数
      */
-    public static OperationLogBean getOperationLogObj(HttpServletRequest request, String userId, String isSuccess, String source, String operation, String detail) {
+    public  OperationLogBean getOperationLogObj(HttpServletRequest request, String userId, String isSuccess, String source, String operation, String detail) {
 
         //用户需要登录才能进行的操作，需要记录操作日志
         OperationLogBean operationLogBean = new OperationLogBean();

snowy-server/snowy-gateway-app/src/main/java/vip/xiaonuo/gateway/config/GatewayConfigure.java

@@ -125,9 +125,7 @@ public class GatewayConfigure {
             "/actuator",
             "/actuator/**",
 
-            /* 文件预览 */
             "/api/webapp/filetransfer/preview",
-
             /* 支付相关回调通知 */
             "/api/bizapp/pay/ali/notifyUrl",
             "/api/bizapp/pay/wx/notifyUrl",