Merge remote-tracking branch 'refs/remotes/origin/master' into lucene

jamebal · May 20, 2024 · 90a1f05 · 90a1f05
2 parents fe39093 + 44574a1
commit 90a1f05
Show file tree

Hide file tree

Showing 11 changed files with 198 additions and 186 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -0,0 +1,34 @@
+# .github/release-drafter.yml
+name-template: 'v$NEXT_PATCH_VERSION'
+tag-template: 'v$NEXT_PATCH_VERSION'
+categories:
+  - title: '新功能 ✨'
+    labels:
+      - 'feature'
+  - title: '修复 🐛'
+    labels:
+      - 'bug'
+  - title: '优化 ⚡️'
+    labels:
+      - 'improvement'
+change-template: '- $TITLE (#$NUMBER)'
+no-changes-template: '- No changes'
+template: |
+  
+  [docker-docker.yml](https://github.com/jamebal/jmal-cloud-server/blob/master/docker-compose.example2.yml)
+  
+  #### 更新前备份数据库
+  
+  ```shell
+  docker exec -it jmalcloud_mongodb mongodump -d jmalcloud -o /dump/$PREVIOUS_TAG --gzip --quiet
+  ```
+  
+  ```shell
+  docker-compose pull && docker-compose up -d
+  ```
+  
+  ## Changes in this release:
+
+  $CHANGES
+  
+  **Full Changelog**: [$PREVIOUS_TAG...v$NEXT_PATCH_VERSION](https://github.com/jamebal/jmal-cloud-server/compare/$PREVIOUS_TAG...v$NEXT_PATCH_VERSION)
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -2,7 +2,8 @@ name: Build nightly
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - 'master'
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/nightly-nvidia-build.yml b/.github/workflows/nightly-nvidia-build.yml
@@ -2,7 +2,8 @@ name: Build nightly (nvidia)
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - 'master'
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -0,0 +1,18 @@
+# .github/workflows/release-drafter.yml
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: release-drafter/release-drafter@v5
+        with:
+          config-name: release-drafter.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/docker-compose.example2.yml b/docker-compose.example2.yml
@@ -18,6 +18,7 @@ services:
       TZ: Asia/Shanghai
     volumes:
       - ./docker/jmalcloud/mongodb/data/db:/data/db
+      - ./docker/jmalcloud/mongodb/backup:/dump
     restart: unless-stopped
     command: --wiredTigerCacheSizeGB 0.5
   nginx:

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.jmal</groupId>
     <artifactId>clouddisk</artifactId>
-    <version>2.8.2</version>
+    <version>2.8.3</version>
     <name>clouddisk</name>
     <description>Cloud Disk</description>
     <packaging>jar</packaging>

diff --git a/src/main/java/com/jmal/clouddisk/service/impl/CommonFileService.java b/src/main/java/com/jmal/clouddisk/service/impl/CommonFileService.java
@@ -109,10 +109,10 @@ public class CommonFileService {
     @Autowired
     public LuceneService luceneService;
 
-    /***
+    /**
      * 上传文件夹的写入锁缓存
      */
-    private final Cache<String, Lock> uploadFolderLockCache = CaffeineUtil.getUploadFolderLockCache();
+    private final Cache<String, Lock> uploadFileLockCache = CaffeineUtil.getUploadFileLockCache();
 
     protected static final Set<String> FILE_PATH_LOCK = new CopyOnWriteArraySet<>();
 
@@ -304,12 +304,9 @@ public String createFile(String username, File file, String userId, Boolean isPu
         }
 
         String fileAbsolutePath = file.getAbsolutePath();
-        Lock lock = null;
-        if (file.isDirectory()) {
-            lock = uploadFolderLockCache.get(fileAbsolutePath, key -> new ReentrantLock());
-            if (lock != null) {
-                lock.lock();
-            }
+        Lock lock = uploadFileLockCache.get(fileAbsolutePath, key -> new ReentrantLock());
+        if (lock != null) {
+            lock.lock();
         }
         UpdateResult updateResult;
         ObjectId objectId = new ObjectId();
@@ -356,6 +353,7 @@ public String createFile(String username, File file, String userId, Boolean isPu
         } finally {
             if (lock != null) {
                 lock.unlock();
+                uploadFileLockCache.invalidate(fileAbsolutePath);
             }
         }
         if (null != updateResult.getUpsertedId()) {
@@ -446,24 +444,28 @@ public void imageFileToWebp(File outputFile, BufferedImage image) throws IOExcep
     }
 
     private void setFileConfig(String fileId, String username, File file, String fileName, String suffix, String contentType, String relativePath, Update update) {
-        long size = file.length();
-        update.set("size", size);
-        update.set("md5", size + relativePath + fileName);
-        update.set(Constants.CONTENT_TYPE, getContentType(file, contentType));
-        update.set(Constants.SUFFIX, suffix);
-        if (contentType.contains(Constants.AUDIO)) {
-            setMusic(file, update);
-        }
-        if (contentType.contains(Constants.VIDEO)) {
-            setMediaCover(fileId, username, fileName, relativePath, update);
-        }
-        if (contentType.startsWith(Constants.CONTENT_TYPE_IMAGE) && (!"ico".equals(suffix) && !"svg".equals(suffix))) {
-            generateThumbnail(file, update);
-        }
-        if (contentType.contains(Constants.CONTENT_TYPE_MARK_DOWN) || "md".equals(suffix)) {
-            // 写入markdown内容
-            String markDownContent = FileUtil.readString(file, MyFileUtils.getFileCharset(file));
-            update.set("contentText", markDownContent);
+        try {
+            long size = file.length();
+            update.set("size", size);
+            update.set("md5", size + relativePath + fileName);
+            update.set(Constants.CONTENT_TYPE, getContentType(file, contentType));
+            update.set(Constants.SUFFIX, suffix);
+            if (contentType.contains(Constants.AUDIO)) {
+                setMusic(file, update);
+            }
+            if (contentType.contains(Constants.VIDEO)) {
+                setMediaCover(fileId, username, fileName, relativePath, update);
+            }
+            if (contentType.startsWith(Constants.CONTENT_TYPE_IMAGE) && (!"ico".equals(suffix) && !"svg".equals(suffix))) {
+                generateThumbnail(file, update);
+            }
+            if (contentType.contains(Constants.CONTENT_TYPE_MARK_DOWN) || "md".equals(suffix)) {
+                // 写入markdown内容
+                String markDownContent = FileUtil.readString(file, MyFileUtils.getFileCharset(file));
+                update.set("contentText", markDownContent);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
         }
     }
 

diff --git a/src/main/java/com/jmal/clouddisk/util/CaffeineUtil.java b/src/main/java/com/jmal/clouddisk/util/CaffeineUtil.java
@@ -70,10 +70,10 @@ public class CaffeineUtil {
      */
     private static Cache<String, Lock> chunkWriteLockCache;
 
-    /***
-     * 上传文件夹锁
+    /**
+     * 上传文件锁
      */
-    private static Cache<String, Lock> uploadFolderLockCache;
+    private static Cache<String, Lock> uploadFileLockCache;
 
     /***
      * 用户身份权限缓存
@@ -147,8 +147,8 @@ public static void initMyCache(){
         if(chunkWriteLockCache == null){
             chunkWriteLockCache = Caffeine.newBuilder().build();
         }
-        if(uploadFolderLockCache == null) {
-            uploadFolderLockCache = Caffeine.newBuilder().expireAfterWrite(30, TimeUnit.MINUTES).build();
+        if(uploadFileLockCache == null) {
+            uploadFileLockCache = Caffeine.newBuilder().build();
         }
     }
 
@@ -180,11 +180,11 @@ public static Cache<String, Lock> getChunkWriteLockCache(){
         return chunkWriteLockCache;
     }
 
-    public static Cache<String, Lock> getUploadFolderLockCache(){
-        if(uploadFolderLockCache == null){
+    public static Cache<String, Lock> getUploadFileLockCache(){
+        if(uploadFileLockCache == null){
             initMyCache();
         }
-        return uploadFolderLockCache;
+        return uploadFileLockCache;
     }
 
     public static void setSpaceFull(String userId) {