channelId 修改为 channelCode

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/FileMsg.java

@@ -18,5 +18,5 @@ public class FileMsg extends ChatMsg implements Serializable {
 
     private String uploadId;
     private Integer fileType;
-    private Integer channelId;
+    private Integer channelCode;
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/ImageMessage.java

@@ -19,7 +19,7 @@ public class ImageMessage implements Serializable {
     @NotNull
     private Long receiverId;
     @NotNull
-    private Integer channelId;
+    private Integer channelCode;
     @NotBlank
     private String uploadId;
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/ImageMsg.java

@@ -17,5 +17,5 @@ public class ImageMsg implements Serializable {
     private long receiverId;
     private int talkType;
     private String uploadId;
-    private Integer channelId;
+    private Integer channelCode;
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/message/FileMessage.java

@@ -16,7 +16,7 @@ public class FileMessage extends BaseObject<Integer> {
     private Integer fileType;
     private Long recordId;
     private String uploadId;
-    private Integer channelId;
+    private Integer channelCode;
     private String filename;
     private Integer width;
     private Integer height;

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

@@ -88,13 +88,13 @@ public class ChatMessageService {
         String uploadId = imageMsg.getUploadId();
 
         try {
-            int channelId = 110;
-            ObjectInfo objectInfo = ossService.getObjectInfo(channelId, uploadId);
+            int channelCode = 110;
+            ObjectInfo objectInfo = ossService.getObjectInfo(channelCode, uploadId);
             if (objectInfo == null) {
                 return;
             }
 
-            String signedUrl = ossService.getSignedUrl(channelId, uploadId);
+            String signedUrl = ossService.getSignedUrl(channelCode, uploadId);
             String filename = objectInfo.getFilename();
             String suffix = getSuffix(filename);
             int fileType = objectInfo.getFileType();
@@ -137,8 +137,8 @@ public class ChatMessageService {
         String uploadId = fileMsg.getUploadId();
 
         try {
-            int channelId = 110;
-            ObjectInfo objectInfo = ossService.getObjectInfo(channelId, uploadId);
+            int channelCode = 110;
+            ObjectInfo objectInfo = ossService.getObjectInfo(channelCode, uploadId);
             if (objectInfo == null) {
                 return;
             }
@@ -154,7 +154,7 @@ public class ChatMessageService {
             chatRecordMapper.save(chatRecord);
             fileMessageMapper.save(fileMessage);
 
-            String signedUrl = ossService.getSignedUrl(channelId, uploadId);
+            String signedUrl = ossService.getSignedUrl(channelCode, uploadId);
             ContactDetail contactDetail = contactService.getContactDetail(loginUser);
             ChatRecordGetRet chatRecordGetRet = new ChatRecordGetRet(chatRecord, contactDetail);
             String createAt = DateTimeConverter.format(chatRecord.getCreateTime());
@@ -211,9 +211,9 @@ public class ChatMessageService {
     }
 
     public String putImageMessage(ImageMessage imageMessage) throws Exception {
-        int channelId = imageMessage.getChannelId();
+        int channelCode = imageMessage.getChannelCode();
         String uploadId = imageMessage.getUploadId();
-        return ossService.getSignedUrl(channelId, uploadId);
+        return ossService.getSignedUrl(channelCode, uploadId);
     }
 
     public List<DateDto> getDateList() {

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

@@ -88,8 +88,8 @@ public class ChatRecordService {
         } else if (msgType == MsgType.media.getCode()) {
             FileMessage fileMessage = fileMessageMapper.findByRecordId(recordId1);
             String uploadId = fileMessage.getUploadId();
-            int channelId = 110;
-            String url = ossService.getSignedUrl(channelId, uploadId);
+            int channelCode = 110;
+            String url = ossService.getSignedUrl(channelCode, uploadId);
 
             String filename = fileMessage.getFilename();
             String suffix = getSuffix(filename);

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/AudioPublishSbt.java

@@ -29,5 +29,5 @@ public class AudioPublishSbt implements Serializable {
     private Integer scope;
     private LocalDateTime scheduledPubDate;
     @NotNull
-    private Integer channelId;
+    private Integer channelCode;
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/po/AudioPost.java

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 public class AudioPost extends BaseObject<Integer> {
     private String audioId;
     private String audioFileId;
-    private Integer channelId;
+    private Integer channelCode;
     private String audioUrl;
     private String title;
     private int duration;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/vo/AlbumCard.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 public class AlbumCard {
     private Long albumId;
     private String albumName;
-    private Integer channelId;
+    private Integer channelCode;
     private String coverUrl;
     private Integer total;
     private LocalDateTime createdAt;
@@ -22,7 +22,7 @@ public class AlbumCard {
     public AlbumCard(PostAlbum postAlbum, String userIdStr) {
         this.albumId = postAlbum.getAlbumId();
         this.albumName = postAlbum.getAlbumName();
-        this.channelId = postAlbum.getChannelCode();
+        this.channelCode = postAlbum.getChannelCode();
         this.coverUrl = postAlbum.getCoverUrl();
         this.total = postAlbum.getTotal();
         this.createdAt = DateTimeConverter.localDateTime(postAlbum.getCreateAt());

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

@@ -39,16 +39,16 @@ public class AudioPostService {
 
     public void submit(AudioPublishSbt audioPublishSbt) {
         try {
-            int channelId = audioPublishSbt.getChannelId();
+            int channelCode = audioPublishSbt.getChannelCode();
             String audioFileId = audioPublishSbt.getAudioFileId();
-            AudioInfo audioInfo = ossService.getAudioInfo(channelId, audioFileId);
+            AudioInfo audioInfo = ossService.getAudioInfo(channelCode, audioFileId);
             if (audioInfo == null) {
                 log.error("音频文件 {} 在 oss 中不存在", audioFileId);
                 return;
             }
 
             int scope = PostScope.PUBLIC.getCode();
-            ossService.setObjectScope(channelId, audioFileId, scope);
+            ossService.setObjectScope(channelCode, audioFileId, scope);
 
             String audioUrl = audioInfo.getUrl();
             int duration = audioInfo.getDuration();
@@ -76,9 +76,9 @@ public class AudioPostService {
 
         String audioFileId = audioPost.getAudioFileId();
         int scope = audioScopeUpdate.getScope();
-        int channelId = audioPost.getChannelId();
+        int channelCode = audioPost.getChannelCode();
         try {
-            ossService.setObjectScope(channelId, audioFileId, scope);
+            ossService.setObjectScope(channelCode, audioFileId, scope);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -93,7 +93,7 @@ public class ImagePostService {
         try {
             ImageInfo imageInfo = ossService.getImageInfo(channelCode, imageFileId);
             /*Map<String, ConvertedImageInfo> map = imageFileIds.stream()
-                    .map(imageFileId -> ossService.getWebpInfo(channelId, imageFileId))
+                    .map(imageFileId -> ossService.getWebpInfo(channelCode, imageFileId))
                     .filter(Objects::nonNull)
                     .collect(Collectors.toMap(ConvertedImageInfo::getImageFileId, convertedImageInfo -> convertedImageInfo));
             if (map.isEmpty()) {

content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/model/dto/ProductAddDto.java

@@ -12,7 +12,7 @@ import lombok.Setter;
 public class ProductAddDto {
     private String title;
     private String coverFileId;
-    private Integer coverChannelId;
+    private Integer coverChannelCode;
     private Double price;
     private Integer amount;
 }

content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/service/ProductService.java

@@ -66,8 +66,8 @@ public class ProductService {
 
     public Result addProduct(ProductAddDto productAddDto) throws Exception {
         String coverFileId = productAddDto.getCoverFileId();
-        int coverChannelId = productAddDto.getCoverChannelId();
-        ImageInfo imageInfo = ossService.getImageInfo(coverChannelId, coverFileId);
+        int coverChannelCode = productAddDto.getCoverChannelCode();
+        ImageInfo imageInfo = ossService.getImageInfo(coverChannelCode, coverFileId);
         if (imageInfo == null) {
             String errMsg = String.format("封面文件 %s 在 oss 中不存在", coverFileId);
             return Result.fail(errMsg);

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

@@ -32,7 +32,7 @@ public interface VideoPostMapper extends BaseMapper<VideoPost> {
     void updateVideoPublish(VideoPost videoPost);
     void updateVideoCached(@Param("videoId") String videoId,
                            @Param("videoInfo") VideoInfo videoInfo,
-                           @Param("channelId") int channelId);
+                           @Param("channelCode") int channelCode);
     void updateVideoUser(@Param("newUserId") long newUserId,
                          @Param("videoIds") List<String> videoIds);
     void deleteByVideoId(String videoId);

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/repository/VideoRepository.java

@@ -46,10 +46,10 @@ public class VideoRepository {
 
     @Transactional(rollbackFor = Exception.class)
     @Deprecated
-    public void updateBiliVideoFile(String videoId, VideoInfo videoInfo, int channelId) {
-        VideoFile videoFile = new VideoFile(videoId, videoInfo, channelId);
+    public void updateBiliVideoFile(String videoId, VideoInfo videoInfo, int channelCode) {
+        VideoFile videoFile = new VideoFile(videoId, videoInfo, channelCode);
         videoFileMapper.save(videoFile);
-        videoPostMapper.updateVideoCached(videoId, videoInfo, channelId);
+        videoPostMapper.updateVideoCached(videoId, videoInfo, channelCode);
     }
 
     public void updateVideoStatistic(VideoStatistic videoStatistic) {

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

@@ -127,9 +127,9 @@ public class AdminVodService {
             try {
                 List<VideoUrl> urls = list.stream().map(videoUrlDto -> {
                     try {
-                        int channelId = videoUrlDto.getChannelCode();
+                        int channelCode = videoUrlDto.getChannelCode();
                         String quality = videoUrlDto.getQuality();
-                        String signedUrl = ossService.getSignedUrl(channelId, videoUrlDto.getObjectId());
+                        String signedUrl = ossService.getSignedUrl(channelCode, videoUrlDto.getObjectId());
                         return new VideoUrl(quality, signedUrl);
                     } catch (Exception e) {
                         e.printStackTrace();

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

@@ -61,19 +61,19 @@ public class CrawledDataService {
             return;
         }
 
-        int channelId = 101;
+        int channelCode = 101;
         String videoFileId = videoFileUpdate.getVideoFileId();
         try {
-            VideoInfo videoInfo = ossService.getVideoInfo(channelId, videoFileId);
+            VideoInfo videoInfo = ossService.getVideoInfo(channelCode, videoFileId);
             if (videoInfo == null) {
                 log.error("{} not exist", videoFileId);
                 return;
             }
 
-            videoRepository.updateBiliVideoFile(videoId, videoInfo, channelId);
+            videoRepository.updateBiliVideoFile(videoId, videoInfo, channelCode);
             int scope = videoPost.getScope();
             if (scope != PostScope.PRIVATE.getCode()) {
-                ossService.setObjectScope(channelId, videoFileId, scope);
+                ossService.setObjectScope(channelCode, videoFileId, scope);
             }
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -47,9 +47,9 @@ public class VideoService {
         List<VideoUrlDto> list = videoRepository.getVideoUrls(videoId);
         for (VideoUrlDto videoUrlDto : list) {
             try {
-                int channelId = videoUrlDto.getChannelCode();
+                int channelCode = videoUrlDto.getChannelCode();
                 String videoFileId = videoUrlDto.getObjectId();
-                String signedUrl = ossService.getSignedUrl(channelId, videoFileId);
+                String signedUrl = ossService.getSignedUrl(channelCode, videoFileId);
                 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

@@ -95,10 +95,10 @@ public class VideoPlayServiceImpl implements VideoPlayService {
             try {
                 List<VideoUrl> urls = list.stream().map(videoUrlDto -> {
                     try {
-                        int channelId = videoUrlDto.getChannelCode();
+                        int channelCode = videoUrlDto.getChannelCode();
                         String videoFileId = videoUrlDto.getObjectId();
                         String quality = videoUrlDto.getQuality();
-                        String signedUrl = ossService.getSignedUrl(channelId, videoFileId);
+                        String signedUrl = ossService.getSignedUrl(channelCode, videoFileId);
                         return new VideoUrl(quality, signedUrl);
                     } catch (Exception e) {
                         e.printStackTrace();

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

@@ -303,12 +303,12 @@ public class VideoPostQueryImpl implements VideoPostQuery {
             return Collections.emptyList();
         }
 
-        int channelId = 105;
+        int channelCode = 105;
         List<VideoUrlDto> list = videoRepository.getVideoUrls(videoId);
         for (VideoUrlDto videoUrlDto : list) {
             String videoFileId = videoUrlDto.getObjectId();
             try {
-                VideoInfo videoInfo = ossService.getVideoInfo(channelId, videoFileId);
+                VideoInfo videoInfo = ossService.getVideoInfo(channelCode, videoFileId);
                 return videoInfo != null ? List.of(videoInfo) : Collections.emptyList();
             } catch (Exception e) {
                 e.printStackTrace();

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

@@ -175,9 +175,9 @@ public class VideoPostServiceImpl implements VideoPostService {
         for (VideoUrlDto videoUrlDto : list) {
             String videoFileId = videoUrlDto.getObjectId();
             try {
-                int channelId = videoUrlDto.getChannelCode();
+                int channelCode = videoUrlDto.getChannelCode();
                 int scope = videoScopeUpdate.getScope();
-                ossService.setObjectScope(channelId, videoFileId, scope);
+                ossService.setObjectScope(channelCode, videoFileId, scope);
                 videoPostMapper.updateVideoScope(videoScopeUpdate);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -204,8 +204,8 @@ public class VideoPostServiceImpl implements VideoPostService {
 
         String coverFileId = videoCoverUpdate.getCoverFileId();
         try {
-            int channelId = 105;
-            ImageInfo imageInfo = ossService.getImageInfo(channelId, coverFileId);
+            int channelCode = 105;
+            ImageInfo imageInfo = ossService.getImageInfo(channelCode, coverFileId);
             if (imageInfo == null) {
                 return;
             }
@@ -238,8 +238,8 @@ public class VideoPostServiceImpl implements VideoPostService {
         for (VideoUrlDto videoUrlDto : list) {
             String videoFileId = videoFileUpdate.getVideoFileId();
             try {
-                int channelId = 101;
-                VideoInfo videoInfo = ossService.getVideoInfo(channelId, videoFileId);
+                int channelCode = 101;
+                VideoInfo videoInfo = ossService.getVideoInfo(channelCode, videoFileId);
                 if (videoInfo == null) {
                     log.error("{} not exist", videoFileId);
                     return;
@@ -248,10 +248,10 @@ public class VideoPostServiceImpl implements VideoPostService {
                 videoPostMapper.updateVideoFile(videoId, videoInfo);
                 int scope = videoPost.getScope();
                 if (scope != PostScope.PRIVATE.getCode()) {
-                    ossService.setObjectScope(channelId, videoId, scope);
+                    ossService.setObjectScope(channelCode, videoId, scope);
                 }
 
-                ossService.deleteByObjectId(channelId, videoFileId);
+                ossService.deleteByObjectId(channelCode, videoFileId);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -271,8 +271,8 @@ public class VideoPostServiceImpl implements VideoPostService {
             for (VideoUrlDto videoUrlDto : list) {
                 String videoFileId = videoUrlDto.getObjectId();
                 try {
-                    int channelId = videoUrlDto.getChannelCode();
-                    ossService.deleteByObjectId(channelId, videoFileId);
+                    int channelCode = videoUrlDto.getChannelCode();
+                    ossService.deleteByObjectId(channelCode, videoFileId);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

content/content-service/src/main/resources/mapper/chat/FileMessageMapper.xml

@@ -4,9 +4,9 @@
 <mapper namespace="cn.reghao.tnb.content.app.chat.db.mapper.FileMessageMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into chat_file_message
-        (`file_type`,`record_id`,`upload_id`,`channel_id`,`filename`,`width`,`height`)
+        (`file_type`,`record_id`,`upload_id`,`channel_code`,`filename`,`width`,`height`)
         values 
-        (#{fileType},#{recordId},#{uploadId},#{channelId},#{filename},#{width},#{height})
+        (#{fileType},#{recordId},#{uploadId},#{channelCode},#{filename},#{width},#{height})
     </insert>
 
     <select id="findByRecordId" resultType="cn.reghao.tnb.content.app.chat.model.po.message.FileMessage">

content/content-service/src/test/java/cn/reghao/tnb/content/app/geo/service/GeoTest.java

@@ -129,9 +129,9 @@ public class GeoTest {
         List<CameraPhoto> list = cameraPhotoMapper.findAll();
         for (CameraPhoto cameraPhoto : list) {
             /*String objectId = cameraPhoto.getObjectId();
-            int channelId = cameraPhoto.getChannelId();
+            int channelCode = cameraPhoto.getChannelCode();
             try {
-                ObjectInfo objectInfo = ossConsoleClient.getObjectInfo(channelId, objectId);
+                ObjectInfo objectInfo = ossConsoleClient.getObjectInfo(channelCode, objectId);
             } catch (Exception e) {
                 log.info("objectId {} not exist", objectId);
             }*/

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/AvatarUpdate.java

@@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 public class AvatarUpdate {
     @NotNull
-    private Integer channelId;
+    private Integer channelCode;
     @NotBlank
     private String uploadId;
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/UploadedFile.java

@@ -16,7 +16,7 @@ public class UploadedFile {
     @NotNull
     private MultipartFile file;
     @NotNull
-    private Integer channelId;
+    private Integer channelCode;
     private String objectName;
     private String client;
     private String sha256sum;

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

@@ -89,7 +89,7 @@ public class ConsoleServiceImpl implements ConsoleService {
 
         UserNode userNode = userNodeService.getUserNode(uploadChannel.getUserNodeId());
         if (userNode == null) {
-            String errMsg = String.format("channel_id %s not associate with any store_node", uploadChannel.getId());
+            String errMsg = String.format("channel_code %s not associate with any store_node", uploadChannel.getId());
             return null;
         }
 

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

@@ -36,7 +36,7 @@ public class StoreServiceWrapper {
     private StoreService getStoreService(int channelCode, int owner) throws Exception {
         StoreNode storeNode = userNodeService.getStoreNodeByChannel(channelCode, owner);
         if (storeNode == null) {
-            String errMsg = String.format("channel_id %s not associate with any store_node", channelCode);
+            String errMsg = String.format("channel_code %s not associate with any store_node", channelCode);
             throw new Exception(errMsg);
         }
 

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

@@ -23,9 +23,9 @@ public class AvatarService {
     }
 
     public String updateAvatar(AvatarUpdate avatarUpdate) throws Exception {
-        int channelId = avatarUpdate.getChannelId();
+        int channelCode = avatarUpdate.getChannelCode();
         String uploadId = avatarUpdate.getUploadId();
-        ImageInfo imageInfo = ossService.getImageInfo(channelId, uploadId);
+        ImageInfo imageInfo = ossService.getImageInfo(channelCode, uploadId);
         if (imageInfo != null) {
             String avatarUrl = imageInfo.getUrl();
             long loginUser = UserContext.getUserId();

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

@@ -130,7 +130,7 @@ public class UserNodeService {
     public StoreNode getStoreNodeByChannel(int channelCode, int owner) throws Exception {
         UploadChannel uploadChannel = uploadChannelMapper.findByCreateByAndChannelCode(owner, channelCode);
         if (uploadChannel == null) {
-            String errMsg = String.format("channel_id %s not exist", channelCode);
+            String errMsg = String.format("channel_code %s not exist", channelCode);
             throw new Exception(errMsg);
         }