chron: 优化镜像

jamebal · May 3, 2024 · afad59c · afad59c
1 parent 18e8701
commit afad59c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 42 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,6 +9,8 @@ RUN mkdir -p /jmalcloud/files
 
 ADD docker/ip2region.xdb /jmalcloud/
 
+ADD target/lib /usr/local/clouddisk-lib
+
 ADD target/clouddisk-${VERSION}-exec.jar /usr/local/
 
 VOLUME /jmalcloud/
@@ -26,4 +28,4 @@ ENV DOCKER_DEFAULT_PLATFORM=linux/amd64,linux/arm64
 
 EXPOSE 8088
 
-CMD java -jar -Xms50m -Xmx512m /usr/local/clouddisk-$VERSION-exec.jar --spring.profiles.active=$RUN_ENVIRONMENT --spring.data.mongodb.uri=$MONGODB_URI --file.monitor=false --file.rootDir=/jmalcloud/files --file.ip2region-db-path=/jmalcloud/ip2region.xdb
+CMD java -Dloader.path=/usr/local/clouddisk-lib -jar -Xms50m -Xmx512m /usr/local/clouddisk-$VERSION-exec.jar --spring.profiles.active=$RUN_ENVIRONMENT --spring.data.mongodb.uri=$MONGODB_URI --file.monitor=false --file.rootDir=/jmalcloud/files --file.ip2region-db-path=/jmalcloud/ip2region.xdb
diff --git a/pom.xml b/pom.xml
@@ -13,6 +13,7 @@
     <version>2.8.0</version>
     <name>clouddisk</name>
     <description>Cloud Disk</description>
+    <packaging>jar</packaging>
 
     <properties>
         <java.version>17</java.version>
@@ -306,50 +307,40 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <excludes>
-                    <exclude>static/**</exclude>
-                </excludes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>static/**</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>libs</directory>
-                <targetPath>BOOT-INF/lib/</targetPath>
-                <includes>
-                    <include>**/*.jar</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <targetPath>BOOT-INF/classes/</targetPath>
-            </resource>
-        </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.1.0</version>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <!--maven插件打包时会打两个jar包，一个是普通的jar包，一个是可执行的jar包，默认的名字会一样的，可执行jar包会覆盖掉普通jar包-->
-                <!--加了这个配置，打包的时候，可执行的jar包的名字和普通jar包的名字不一样，可执行jar包就不会覆盖普通jar包了-->
-                <version>${project.parent.version}</version>
                 <configuration>
-                    <classifier>exec</classifier>
+                    <mainClass>com.jmal.clouddisk.ClouddiskApplication</mainClass>
+                    <executable>true</executable>
+                    <layout>ZIP</layout>
+                    <includes>
+                        <include>
+                            <groupId>nothing</groupId>
+                            <artifactId>nothing</artifactId>
+                        </include>
+                    </includes>
                 </configuration>
             </plugin>
+            <!-- 将第三方包拷贝到lib目录 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration><outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
+
 </project>
diff --git a/src/main/java/com/jmal/clouddisk/service/video/VideoProcessService.java b/src/main/java/com/jmal/clouddisk/service/video/VideoProcessService.java
@@ -102,10 +102,13 @@ public void deleteVideoCacheById(String username, String fileId) {
     }
 
     public void deleteVideoCache(String username, String fileAbsolutePath) {
-        String fileId = commonFileService.getFileDocument(username, fileAbsolutePath).getId();
-        String videoCacheDir = getVideoCacheDir(username, fileId);
-        if (FileUtil.exist(videoCacheDir)) {
-            FileUtil.del(videoCacheDir);
+        FileDocument fileDocument = commonFileService.getFileDocument(username, fileAbsolutePath);
+        if (fileDocument != null) {
+            String fileId = fileDocument.getId();
+            String videoCacheDir = getVideoCacheDir(username, fileId);
+            if (FileUtil.exist(videoCacheDir)) {
+                FileUtil.del(videoCacheDir);
+            }
         }
     }
 
@@ -177,7 +180,7 @@ private static ProcessBuilder getVideoCoverProcessBuilder(String videoPath, Stri
                 "-y",
                 "-ss", formattedTimestamp,
                 "-i", videoPath,
-                "-vf", "scale='min(320,iw)':-1",
+                "-vf", "\"scale='min(320,iw)':-1\"",
                 "-frames:v", "1",
                 outputPath
         );