更新 file-service 中的 OssService#getSignedUrl 方法

content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/comment/CommentData.java

@@ -0,0 +1,4 @@
+package cn.reghao.tnb.content.api.dto.comment;
+
+public class CommentData {
+}

content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/comment/CommentDto.java

@@ -0,0 +1,4 @@
+package cn.reghao.tnb.content.api.dto.comment;
+
+public class CommentDto {
+}

content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/comment/CommentSbtDto.java

@@ -0,0 +1,40 @@
+package cn.reghao.tnb.search.app.comment.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2022-02-08 16:16:59
+ */
+@Setter
+@Getter
+public class CommentSbtDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @NotNull
+    private Long parentId;
+    @NotBlank
+    private String content;
+    @NotBlank
+    private String videoId;
+    private Long targetId;
+    private String targetUsername;
+
+    //private Long commentId;
+    /*private CommentData newComment;
+    private CommentData parent;
+    @Deprecated
+    private Long avId;
+    @Deprecated
+    private Long userId;
+    private String postId;
+    private String imgSrc;
+    private Long createAt;
+    private Integer likes;
+    private List<String> commentImages = new ArrayList<>();*/
+}

content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/comment/CommentUser.java

@@ -0,0 +1,4 @@
+package cn.reghao.tnb.content.api.dto.comment;
+
+public class CommentUser {
+}

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/ChatMessageService.java

@@ -94,7 +94,7 @@ public class ChatMessageService {
                 return;
             }
 
-            String signedUrl = ossService.getSignedUrl(uploadId);
+            String signedUrl = ossService.getSignedUrl(uploadId, null);
             String filename = objectMeta.getFilename();
             String suffix = getSuffix(filename);
             int fileType = objectMeta.getFileType();
@@ -154,7 +154,7 @@ public class ChatMessageService {
             chatRecordMapper.save(chatRecord);
             fileMessageMapper.save(fileMessage);
 
-            String signedUrl = ossService.getSignedUrl(uploadId);
+            String signedUrl = ossService.getSignedUrl(uploadId, null);
             ContactDetail contactDetail = contactService.getContactDetail(loginUser);
             ChatRecordGetRet chatRecordGetRet = new ChatRecordGetRet(chatRecord, contactDetail);
             String createAt = DateTimeConverter.format(chatRecord.getCreateTime());
@@ -213,7 +213,7 @@ public class ChatMessageService {
     public String putImageMessage(ImageMessage imageMessage) throws Exception {
         int channelCode = imageMessage.getChannelCode();
         String uploadId = imageMessage.getUploadId();
-        return ossService.getSignedUrl(uploadId);
+        return ossService.getSignedUrl(uploadId, null);
     }
 
     public List<DateDto> getDateList() {

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/ChatRecordService.java

@@ -89,7 +89,7 @@ public class ChatRecordService {
             FileMessage fileMessage = fileMessageMapper.findByRecordId(recordId1);
             String uploadId = fileMessage.getUploadId();
             int channelCode = 110;
-            String url = ossService.getSignedUrl(uploadId);
+            String url = ossService.getSignedUrl(uploadId, null);
 
             String filename = fileMessage.getFilename();
             String suffix = getSuffix(filename);

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/ImagePostService.java

@@ -149,7 +149,7 @@ public class ImagePostService {
                         if (!coverUrl.isBlank()) {
                             PostItem postItem = albumRepository.getByUrl(coverUrl);
                             String objectId = postItem.getObjectId();
-                            postAlbum.setCoverUrl(ossService.getSignedUrl(objectId));
+                            postAlbum.setCoverUrl(ossService.getSignedUrl(objectId, null));
                         }
                     }
                 }
@@ -223,7 +223,7 @@ public class ImagePostService {
                 int channelCode = postAlbum.getChannelCode();
                 if (channelCode != 501) {
                     try {
-                        String signedUrl = ossService.getSignedUrl(imageFileId);
+                        String signedUrl = ossService.getSignedUrl(imageFileId, null);
                         imageData.setThumbnailUrl(signedUrl);
                         imageData.setOriginalUrl(signedUrl);
                     } catch (Exception e) {

content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/service/PhotoMapService.java

@@ -132,7 +132,7 @@ public class PhotoMapService {
         if (channelCode != 0) {
             String uploadId = markerInfo.getUploadId();
             try {
-                String signedUrl = ossService.getSignedUrl(uploadId);
+                String signedUrl = ossService.getSignedUrl(uploadId, null);
                 if (signedUrl != null) {
                     markerInfo.setPhotoUrl(signedUrl);
                 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/VideoFileMapper.java

@@ -4,6 +4,7 @@ import cn.reghao.jutil.jdk.web.db.BaseMapper;
 import cn.reghao.tnb.content.app.vod.model.po.VideoFile;
 import cn.reghao.tnb.content.app.vod.model.dto.VideoUrlDto;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
 @Mapper
 public interface VideoFileMapper extends BaseMapper<VideoFile> {
     void updateDeleteByObjectId(String objectId);
+    void updateUrl(@Param("objectId") String objectId, @Param("url") String url);
 
     List<VideoUrlDto> findVideoUrls(String videoId);
     List<VideoFile> findByVideoId(String videoId);

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/AdminVodService.java

@@ -130,7 +130,7 @@ public class AdminVodService {
                     try {
                         int channelCode = videoUrlDto.getChannelCode();
                         String quality = videoUrlDto.getQuality();
-                        String signedUrl = ossService.getSignedUrl(videoUrlDto.getObjectId());
+                        String signedUrl = ossService.getSignedUrl(videoUrlDto.getObjectId(), null);
                         return new VideoUrl(quality, signedUrl);
                     } catch (Exception e) {
                         e.printStackTrace();

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/AlbumService.java

@@ -116,7 +116,7 @@ public class AlbumService {
                     int channelCode = postItem.getChannelCode();
                     String objectId = postItem.getObjectId();
                     try {
-                        String signedUrl = ossService.getSignedUrl(objectId);
+                        String signedUrl = ossService.getSignedUrl(objectId, null);
                         postAlbum.setCoverUrl(signedUrl);
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -152,7 +152,7 @@ public class AlbumService {
                     int channelCode = postItem.getChannelCode();
                     String objectId = postItem.getObjectId();
                     try {
-                        String signedUrl = ossService.getSignedUrl(objectId);
+                        String signedUrl = ossService.getSignedUrl(objectId, null);
                         postAlbum.setCoverUrl(signedUrl);
                     } catch (Exception e) {
                         e.printStackTrace();

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/VideoService.java

@@ -49,7 +49,7 @@ public class VideoService {
             try {
                 int channelCode = videoUrlDto.getChannelCode();
                 String videoFileId = videoUrlDto.getObjectId();
-                String signedUrl = ossService.getSignedUrl(videoFileId);
+                String signedUrl = ossService.getSignedUrl(videoFileId, null);
                 return new DownloadUrl(signedUrl, "");
             } catch (Exception e) {
                 e.printStackTrace();

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPlayServiceImpl.java

@@ -100,9 +100,10 @@ public class VideoPlayServiceImpl implements VideoPlayService {
                 List<VideoUrl> urls = list.stream().map(videoUrlDto -> {
                     try {
                         int channelCode = videoUrlDto.getChannelCode();
-                        String videoFileId = videoUrlDto.getObjectId();
+                        String objectUrl = videoUrlDto.getUrl();
+                        String objectId = videoUrlDto.getObjectId();
                         String quality = videoUrlDto.getQuality();
-                        String signedUrl = ossService.getSignedUrl(videoFileId);
+                        String signedUrl = ossService.getSignedUrl(objectId, objectUrl);
                         return new VideoUrl(quality, signedUrl);
                     } catch (Exception e) {
                         log.error("{}", e.getMessage());

content/content-service/src/main/resources/mapper/vod/VideoFileMapper.xml

@@ -22,10 +22,20 @@
         set deleted=1
         where object_id=#{objectId}
     </update>
+    <update id="updateUrl">
+        update vod_video_file
+        set url=#{url}
+        where object_id=#{objectId}
+    </update>
 
     <select id="findAll" resultType="cn.reghao.tnb.content.app.vod.model.po.VideoFile">
         select *
-        from vod_video_file
+        from vod_video_file vvf
+        where vvf.video_id in (
+            select post_id
+            from vod_post_item vpi
+            where vpi.album_id = 3
+        )
     </select>
     <select id="findByVideoId" resultType="cn.reghao.tnb.content.app.vod.model.po.VideoFile">
         select *

content/content-service/src/test/java/cn/reghao/tnb/content/app/vod/service/VideoPostTest.java

@@ -58,6 +58,9 @@ public class VideoPostTest {
     RedisHash<VideoCard> redisHash;
     @Autowired
     VideoPostQuery videoPostQuery;
+    @Autowired
+    private VideoFileMapper videoFileMapper;
+
     @Test
     public void getPageByTag() {
         int pageSize = 100;
@@ -429,10 +432,18 @@ public class VideoPostTest {
 
     @Test
     public void videoCategoryTest() {
-        PostCategory postCategory1 = new PostCategory(0, "杂");
+        /*PostCategory postCategory1 = new PostCategory(0, "杂");
         PostCategory postCategory2 = new PostCategory(1, "bili");
 
         List<PostCategory> list = List.of(postCategory1, postCategory2);
-        postCategoryMapper.saveAll(list);
+        postCategoryMapper.saveAll(list);*/
+
+        videoFileMapper.findAll().forEach(videoFile -> {
+            String objectId = videoFile.getObjectId();
+            String url = videoFile.getUrl();
+            String url1 = url.replace("oss.reghao.cn", "oss2.reghao.cn");
+            videoFileMapper.updateUrl(objectId, url1);
+            log.info("update url {}", url1);
+        });
     }
 }

file/file-api/src/main/java/cn/reghao/file/api/iface/OssService.java

@@ -11,7 +11,7 @@ public interface OssService {
     void checkAndSetScope(String objectId, int scope);
     void deleteByObjectId(String objectId);
     void deleteByObjectUrl(String objectUrl);
-    String getSignedUrl(String objectId);
+    String getSignedUrl(String objectId, String objectUrl);
     ObjectMeta getObjectMeta(String objectId);
     VideoMeta getVideoMeta(String videoFileId);
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/StoreServiceWrapperRouter.java

@@ -48,9 +48,9 @@ public class StoreServiceWrapperRouter implements OssService {
     }
 
     @Override
-    public String getSignedUrl(String objectId) {
+    public String getSignedUrl(String objectId, String objectUrl) {
         try {
-            return ossClientManager.getOssClient().getSignedUrl(objectId, ObjectAction.access.getName());
+            return ossClientManager.getOssClient().getSignedUrl(objectId, ObjectAction.access.getName(), objectUrl);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/CamRecordService.java

@@ -158,7 +158,7 @@ public class CamRecordService {
 
         String videoFileId = camRecord.getVideoFileId();
         try {
-            String signedUrl = ossService.getSignedUrl(videoFileId);
+            String signedUrl = ossService.getSignedUrl(videoFileId, null);
             return new CamRecordDetail(camRecord, signedUrl);
         } catch (Exception e) {
             log.error("{}", e.getMessage());

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/DiskAlbumService.java

@@ -256,7 +256,7 @@ public class DiskAlbumService {
             String coverUrl = "";
             try {
                 String coverFileId = diskAlbum.getCoverFileId();
-                coverUrl = ossService.getSignedUrl(coverFileId);
+                coverUrl = ossService.getSignedUrl(coverFileId, null);
             } catch (Exception e) {
                 log.error("getSignedUrl error: {}", e.getMessage());
             }
@@ -330,7 +330,7 @@ public class DiskAlbumService {
         for (DiskFileDetail diskFileDetail : list) {
             String fileId = diskFileDetail.getFileId();
             try {
-                String signedUrl = ossService.getSignedUrl(fileId);
+                String signedUrl = ossService.getSignedUrl(fileId, null);
                 diskFileDetail.setUrl(signedUrl);
             } catch (Exception e) {
                 e.printStackTrace();

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/DiskFileService.java

@@ -585,7 +585,7 @@ public class DiskFileService {
     public DiskFileDetail getDiskFileDetail(int channelCode, String objectId) {
         try {
             ObjectMeta objectMeta = ossService.getObjectMeta(objectId);
-            String signedUrl = ossService.getSignedUrl(objectId);
+            String signedUrl = ossService.getSignedUrl(objectId, null);
             return new DiskFileDetail(objectMeta, signedUrl);
         } catch (Exception e) {
             log.error("{}", e.getMessage());