reghao 2 anos atrás
pai
commit
25a9727221

+ 1 - 1
oss-sdk/src/main/java/cn/reghao/oss/sdk/ObjectMultipartUploadService.java

@@ -101,7 +101,7 @@ public class ObjectMultipartUploadService {
         MultiPartBodyPublisher publisher = new MultiPartBodyPublisher();
         ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
         publisher.addPart("file", () -> bais, uploadFilePart.getFilename(), "")
-                //.addPart("file", Path.of("/home/reghao/Downloads/video.mp4"))
+                //.addPart("file", Path.of(""))
                 .addPart("channelId", uploadFilePart.getChannelId()+"")
                 .addPart("identifier", uploadFilePart.getIdentifier())
                 .addPart("filename", uploadFilePart.getFilename())

+ 2 - 2
oss-sdk/src/test/java/ObjectTest.java

@@ -28,7 +28,7 @@ public class ObjectTest {
 
     static void multipartUpload() throws Exception {
         ObjectMultipartUploadService multipartUploadService = new ObjectMultipartUploadService(endpoint);
-        String filePath = "/home/reghao/Downloads/abc.mp4";
+        String filePath = "";
         int channelId = 1;
         multipartUploadService.upload(new File(filePath), channelId);
         //multipartUploadService.create();
@@ -36,7 +36,7 @@ public class ObjectTest {
     }
 
     public static void main(String[] args) throws Exception {
-        String filePath = "/home/reghao/Downloads/Screenshot_20230828_171528.jpeg";
+        String filePath = "";
         File file = new File(filePath);
         objectUploadService.postObjectWithJdkHttp(file, UploadChannel.image.getCode(), 10000);
     }

+ 3 - 8
oss-store/src/test/java/FileMetaTest.java

@@ -129,16 +129,11 @@ public class FileMetaTest {
     int total = 1;
     @Test
     public void deleteFile() throws IOException, InterruptedException {
-        String baseDir = "/home/reghao/mnt1/spider/bili/img/vidcover";
-        //baseDir = "/run/media/reghao/7c43343d-c1e2-4e68-bc18-89bd3f61b0c8/cover";
-        //baseDir = "/home/reghao/mnt1/spider/bili/img/avatar";
+        String baseDir = "";
         Path path = Path.of(baseDir);
         //walkDir(path);
 
-        threadPool.submit(new Task("/home/reghao/mnt1/spider/bili/img/avatar"));
-        threadPool.submit(new Task("/run/media/reghao/7c43343d-c1e2-4e68-bc18-89bd3f61b0c8/cover"));
-        threadPool.submit(new Task("/run/media/reghao/7c43343d-c1e2-4e68-bc18-89bd3f61b0c8/avatar"));
-
+        threadPool.submit(new Task(baseDir));
         Thread.sleep(3600_000*24*7);
     }
 
@@ -204,7 +199,7 @@ public class FileMetaTest {
             String absolutePath = dataBlock.getAbsolutePath();
             int idx = absolutePath.lastIndexOf("/");
             String parent = absolutePath.substring(0, idx);
-            String relativeDir = parent.replace("/opt/oss/disk/13f654c8-af87-4710-aac9-7aa086c99aec", "");
+            String relativeDir = parent.replace("", "");
             dataBlock.setRelativeDir(relativeDir);
 
             /*String contentId = dataBlock.getContentId();

+ 4 - 4
oss-store/src/test/java/LocalFileTest.java

@@ -110,14 +110,14 @@ public class LocalFileTest {
 
     @Test
     public void test22() throws IOException {
-        String baseDir = "/home/reghao/Downloads/b/";
+        String baseDir = "";
         Path path = Path.of(baseDir);
         walkDir(path);
 
-        /*String filePath = "/home/reghao/Downloads/仁和区 2.m4a";
-        filePath = "/home/reghao/Downloads/三生三世.wav";
+        /*String filePath = "";
+        String filePath1 = "";
         String mediaType = FileType.getMediaType(filePath);
         MediaProps mediaProps = FFmpegWrapper.getMediaProps(filePath);
-        FFmpegWrapper.convertAudio(filePath, "/home/reghao/Downloads/三生三世.m4a");*/
+        FFmpegWrapper.convertAudio(filePath, filePath1);*/
     }
 }

+ 13 - 4
zzz/build.sh

@@ -1,7 +1,16 @@
-#######################################################################################################################
-# Java 应用构建脚本
-#######################################################################################################################
 #!/bin/bash
 
+#cd /home/reghao/code/java/oss/oss-api/
+#mvn clean install -Dmaven.test.skip
+#
+#cd /home/reghao/code/java/oss/oss-sdk/
+#mvn clean install -Dmaven.test.skip
+
+cd /home/reghao/code/java/oss/oss-api/
+mvn clean deploy -Dmaven.test.skip
+
+cd /home/reghao/code/java/oss/oss-sdk/
+mvn clean deploy -Dmaven.test.skip
+
 cd /home/reghao/code/java/oss/oss-store/
-mvn clean package -Dmaven.test.skip -Ptest
+mvn clean package -Dmaven.test.skip

+ 0 - 10
zzz/deploy.sh

@@ -1,10 +0,0 @@
-#######################################################################################################################
-# Java 应用构建脚本
-#######################################################################################################################
-#!/bin/bash
-
-cd /home/reghao/code/java/oss/oss-api/
-mvn clean deploy -Dmaven.test.skip
-
-cd /home/reghao/code/java/oss/oss-sdk/
-mvn clean deploy -Dmaven.test.skip

+ 0 - 10
zzz/install.sh

@@ -1,10 +0,0 @@
-#######################################################################################################################
-# Java 应用构建脚本
-#######################################################################################################################
-#!/bin/bash
-
-cd /home/reghao/code/java/oss/oss-api/
-mvn clean install -Dmaven.test.skip
-
-cd /home/reghao/code/java/oss/oss-sdk/
-mvn clean install -Dmaven.test.skip