更新 image 相关对象字段

dfs-store/src/main/java/cn/reghao/dfs/store/db/mapper/ImageFileMapper.java

@@ -11,8 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ImageFileMapper extends BaseMapper<ImageFile> {
-    void updateOriginalUrl(ImageFile imageFile);
-
     ImageFile findByImageFileId(String imageFileId);
     ImageUrl findImageUrl(String imageFileId);
 }

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/ImageFile.java

@@ -19,20 +19,16 @@ public class ImageFile extends BaseObject<Integer> {
     private Integer width;
     private Integer height;
     private Boolean horizontal;
-    private String originalUrl;
     private String jpegUrl;
     private String webpUrl;
     private String thumbnailUrl;
-    @Deprecated
-    private String url;
 
     public ImageFile(String imageFileId, Integer width, Integer height, Boolean horizontal,
-                     String originalUrl, String jpegUrl, String webpUrl) {
+                     String jpegUrl, String webpUrl) {
         this.imageFileId = imageFileId;
         this.width = width;
         this.height = height;
         this.horizontal = horizontal;
-        this.originalUrl = originalUrl;
         this.jpegUrl = jpegUrl;
         this.webpUrl = webpUrl;
     }

dfs-store/src/main/java/cn/reghao/dfs/store/task/ImageFileProcessor.java

@@ -43,11 +43,6 @@ public class ImageFileProcessor {
             String dupObjectId = objectResult.getDupObjectId();
             ImageFile imageFile = mediaRepository.findImageFile(dupObjectId);
 
-            String originalUrl = imageFile.getOriginalUrl();
-            String originalObjectName = objectNameService.getObjectNameFromUrl(originalUrl);
-            ObjectResult objectResult1 = putObjectService.copyObject(originalObjectName);
-            String originalUrl1 = objectResult1.getUploadFileRet().getUrl();
-
             String jpegUrl = imageFile.getJpegUrl();
             String jpegObjectName = objectNameService.getObjectNameFromUrl(jpegUrl);
             ObjectResult objectResult2 = putObjectService.copyObject(jpegObjectName);
@@ -62,7 +57,7 @@ public class ImageFileProcessor {
             int height = imageFile.getHeight();
             boolean horizontal = imageFile.getHorizontal();
 
-            ImageFile imageFile1 = new ImageFile(objectId, width, height, horizontal, originalUrl1, jpegUrl1, webpUrl1);
+            ImageFile imageFile1 = new ImageFile(objectId, width, height, horizontal, jpegUrl1, webpUrl1);
             mediaRepository.saveImageFile(imageFile1);
             return;
         }
@@ -89,9 +84,8 @@ public class ImageFileProcessor {
 
             ImageOps.Size size = ImageOps.info(new File(absolutePath));
             boolean horizontal = size.getWidth() > size.getHeight();
-            String originalUrl = objectNameService.getObjectUrl(objectName);
             ImageFile imageFile =
-                    new ImageFile(objectId, size.getWidth(), size.getHeight(), horizontal, originalUrl, jpegUrl, webpUrl);
+                    new ImageFile(objectId, size.getWidth(), size.getHeight(), horizontal, jpegUrl, webpUrl);
             mediaRepository.saveImageFile(imageFile);
         } catch (Exception e) {
             e.printStackTrace();
@@ -100,17 +94,17 @@ public class ImageFileProcessor {
 
     private String getJpegUrl(String originalPath) throws Exception {
         byte[] bytes = ImageOps.convert2jpg(new File(originalPath));
-        return saveImage(bytes);
+        return saveImage(bytes, ".jpeg");
     }
 
     private String getWebpUrl(String originalPath) throws Exception {
         BufferedImage bi = ImageIO.read(new File(originalPath));
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ImageIO.write(bi, "webp", baos);
-        return saveImage(baos.toByteArray());
+        return saveImage(baos.toByteArray(), ".webp");
     }
 
-    private String saveImage(byte[] bytes) throws Exception {
+    private String saveImage(byte[] bytes, String suffix) throws Exception {
         ObjectProp objectProp = objectNameService.getObjectProp(UploadChannel.cover.getCode());
         String contentId = UUID.randomUUID().toString().replace("-", "");
         File savedFile = fileStoreService.saveFile(bytes, contentId);

dfs-store/src/main/resources/mapper/ImageFileMapper.xml

@@ -4,35 +4,29 @@
 <mapper namespace="cn.reghao.dfs.store.db.mapper.ImageFileMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into image_file
-        (`id`,`deleted`,`create_time`,`update_time`,`image_file_id`,`width`,`height`,`horizontal`,`original_url`,`jpeg_url`,`webp_url`,`thumbnail_url`)
+        (`id`,`deleted`,`create_time`,`update_time`,`image_file_id`,`width`,`height`,`horizontal`,`jpeg_url`,`webp_url`,`thumbnail_url`)
         values 
-        (#{id},#{deleted},#{createTime},#{updateTime},#{imageFileId},#{width},#{height},#{horizontal},#{originalUrl},#{jpegUrl},#{webpUrl},#{thumbnailUrl})
+        (#{id},#{deleted},#{createTime},#{updateTime},#{imageFileId},#{width},#{height},#{horizontal},#{jpegUrl},#{webpUrl},#{thumbnailUrl})
     </insert>
     <insert id="saveAll" useGeneratedKeys="true" keyProperty="id">
         insert into image_file
-        (`id`,`deleted`,`create_time`,`update_time`,`image_file_id`,`width`,`height`,`horizontal`,`original_url`,`jpeg_url`,`webp_url`,`thumbnail_url`)
+        (`id`,`deleted`,`create_time`,`update_time`,`image_file_id`,`width`,`height`,`horizontal`,`jpeg_url`,`webp_url`,`thumbnail_url`)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.id},#{item.deleted},#{item.createTime},#{item.updateTime},#{item.imageFileId},#{item.width},#{item.height},#{item.horizontal},#{item.originalUrl},#{item.jpegUrl},#{item.webpUrl},#{item.thumbnailUrl})
+            (#{item.id},#{item.deleted},#{item.createTime},#{item.updateTime},#{item.imageFileId},#{item.width},#{item.height},#{item.horizontal},#{item.jpegUrl},#{item.webpUrl},#{item.thumbnailUrl})
         </foreach>
     </insert>
 
-    <update id="updateOriginalUrl">
-        update image_file
-        set original_url=#{originalUrl}
-        where image_file_id=#{imageFileId}
-    </update>
-
     <select id="findAll" resultType="cn.reghao.dfs.store.model.po.ImageFile">
         select * from image_file
-        where original_url is null
+        where jpeg_url is null
     </select>
     <select id="findByImageFileId" resultType="cn.reghao.dfs.store.model.po.ImageFile">
         select * from image_file
         where image_file_id=#{imageFileId}
     </select>
     <select id="findImageUrl" resultType="cn.reghao.oss.api.dto.ImageUrl">
-        select original_url,webp_url,thumbnail_url
+        select jpeg_url,webp_url,thumbnail_url
         from image_file
         where image_file_id=#{imageFileId}
     </select>

dfs-store/src/test/java/FileTest.java

@@ -105,7 +105,9 @@ public class FileTest {
         Path path = Path.of(baseDir);
         //walkDir(path);
 
-        String filePath = "/run/media/reghao/a4d27bae-50d7-4d3b-9e55-7641f52277e5/1ren.tv/2/1125457010/rtmp_1664557007.flv";
+        String filePath = "/home/reghao/Downloads/仁和区 2.m4a";
+        filePath = "/home/reghao/Downloads/三生三世.wav";
+        FFmpegWrapper.convertAudio(filePath, "/home/reghao/Downloads/三生三世.m4a");
         MediaProps mediaProps = FFmpegWrapper.getMediaProps(filePath);
         System.out.println();
     }

dfs-store/src/test/java/ImageFileTest.java

@@ -25,13 +25,5 @@ public class ImageFileTest {
 
     @Test
     public void imageTest() {
-        List<ImageFile> list = imageFileMapper.findAll();
-        list.forEach(imageFile -> {
-            String url = imageFile.getUrl();
-            String url1 = url.replace("file.reghao.cn", "oss.reghao.cn");
-            imageFile.setOriginalUrl(url1);
-
-            imageFileMapper.updateOriginalUrl(imageFile);
-        });
     }
 }

oss-api/src/main/java/cn/reghao/oss/api/dto/ImageUrl.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class ImageUrl implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    private String originalUrl;
+    private String jpegUrl;
     private String webpUrl;
     private String thumbnailUrl;
 }