From 54a3fcec645c96a5c79905a7c179f37445b7e459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com>
Date: Thu, 29 Oct 2020 13:45:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=A3=E5=8E=8B=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qiwenshare/file/api/IFileService.java |  2 +-
 .../file/controller/FileController.java       | 21 ++++++++++---------
 .../qiwenshare/file/service/FileService.java  |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java b/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java
index c785de8..6654db4 100644
--- a/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java
+++ b/file-web/src/main/java/com/qiwenshare/file/api/IFileService.java
@@ -9,7 +9,7 @@ import java.util.List;
 public interface IFileService  extends IService<FileBean> {
 
     void insertFile(FileBean fileBean);
-    void batchInsertFile(List<FileBean> fileBeanList);
+    void batchInsertFile(List<FileBean> fileBeanList, Long userId);
     void updateFile(FileBean fileBean);
     List<FileBean> selectFileByNameAndPath(FileBean fileBean);
     FileBean selectFileById(FileBean fileBean);
diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java
index d3bacb0..58f69df 100644
--- a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java
+++ b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java
@@ -89,15 +89,16 @@ public class FileController {
         if (1 == fileBean.getIsDir()) {
             fileBean.setOldFilePath(fileBean.getFilePath() + fileBean.getOldFileName() + "/");
             fileBean.setFilePath(fileBean.getFilePath() + fileBean.getFileName() + "/");
-        }
-        if (fileBean.getIsOSS() == 1) {
-            FileBean file = fileService.getById(fileBean.getFileId());
-            String fileUrl = file.getFileUrl();
-            String newFileUrl = fileUrl.replace(file.getFileName(), fileBean.getFileName());
-            fileBean.setFileUrl(newFileUrl);
-            AliyunOSSRename.rename(qiwenFileConfig.getAliyun().getOss(),
-                    fileUrl.substring(1),
-                    newFileUrl.substring(1));
+        } else {
+            if (fileBean.getIsOSS() == 1) {
+                FileBean file = fileService.getById(fileBean.getFileId());
+                String fileUrl = file.getFileUrl();
+                String newFileUrl = fileUrl.replace(file.getFileName(), fileBean.getFileName());
+                fileBean.setFileUrl(newFileUrl);
+                AliyunOSSRename.rename(qiwenFileConfig.getAliyun().getOss(),
+                        fileUrl.substring(1),
+                        newFileUrl.substring(1));
+            }
         }
         fileService.updateFile(fileBean);
         restResult.setSuccess(true);
@@ -241,7 +242,7 @@ public class FileController {
             }
             fileBeanList.add(tempFileBean);
         }
-        fileService.batchInsertFile(fileBeanList);
+        fileService.batchInsertFile(fileBeanList, sessionUserBean.getUserId());
         result.setSuccess(true);
 
         return result;
diff --git a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java
index 3868648..f849829 100644
--- a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java
+++ b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java
@@ -36,9 +36,9 @@ public class FileService extends ServiceImpl<FileMapper, FileBean> implements IF
     }
 
     @Override
-    public void batchInsertFile(List<FileBean> fileBeanList) {
-        UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal();
-        StorageBean storageBean = filetransferService.selectStorageBean(new StorageBean(sessionUserBean.getUserId()));
+    public void batchInsertFile(List<FileBean> fileBeanList, Long userId) {
+//        UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal();
+        StorageBean storageBean = filetransferService.selectStorageBean(new StorageBean(userId));
         long fileSizeSum = 0;
         for (FileBean fileBean : fileBeanList) {
             if (fileBean.getIsDir() == 0) {