Ver Fonte

update oss-store rpc interface

reghao há 2 anos atrás
pai
commit
541d213b0e

+ 7 - 7
oss-store/src/main/java/cn/reghao/oss/store/rpc/OssServerServiceImpl.java

@@ -1,11 +1,10 @@
 package cn.reghao.oss.store.rpc;
 
+import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.store.config.OssProperties;
 import cn.reghao.oss.store.util.JwtUtil;
 import cn.reghao.oss.api.constant.ChannelAction;
-import cn.reghao.oss.api.constant.UploadChannel;
 import cn.reghao.oss.api.dto.OssPayload;
-import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.oss.api.iface.OssServerService;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
@@ -24,14 +23,15 @@ public class OssServerServiceImpl implements OssServerService {
     }
 
     @Override
-    public ServerInfo getServerInfo(long userId, int channelId) {
+    public String getUploadToken(int channelId) {
+        long userId = 1;
         String action = ChannelAction.upload.getName();
         long expireAt = System.currentTimeMillis() + 3600*1000;
         OssPayload ossPayload = new OssPayload(action, channelId, userId);
-        String token = JwtUtil.createToken(ossPayload, expireAt, ossProperties.getSecretKey());
+        return JwtUtil.createToken(ossPayload, expireAt, ossProperties.getSecretKey());
+    }
 
-        String ossUrl = String.format("https://%s/", ossProperties.getDomain());
-        long maxSize = UploadChannel.getUploadChannel(channelId).getMaxSize();
-        return new ServerInfo(ossUrl, channelId, maxSize, token);
+    @Override
+    public void createChannel(long userId, ObjectChannel channel) {
     }
 }

+ 3 - 11
oss-store/src/main/java/cn/reghao/oss/store/rpc/media/ImageFileServiceImpl.java

@@ -44,16 +44,6 @@ public class ImageFileServiceImpl implements ImageFileService {
         return imageUrlDto;
     }
 
-    @Override
-    public ImageUrlDto getImageUrl(String imageFileId, long loginUser, int channelId) {
-        ImageUrlDto imageUrlDto = imageRepository.getImageUrl(channelId, imageFileId);
-        String originalUrl = getSignedUrl(imageUrlDto.getOriginalUrl(), loginUser, channelId);
-        imageUrlDto.setOriginalUrl(originalUrl);
-        String thumbnailUrl = getSignedUrl(imageUrlDto.getThumbnailUrl(), loginUser, channelId);
-        imageUrlDto.setThumbnailUrl(thumbnailUrl);
-        return imageUrlDto;
-    }
-
     @Override
     public List<ImageUrlDto> getImageUrls(Set<String> imageFileIds) {
         int channelId = UploadChannel.photo.getCode();
@@ -62,7 +52,9 @@ public class ImageFileServiceImpl implements ImageFileService {
     }
 
     @Override
-    public String getSignedUrl(String url, long loginUser, int channelId) {
+    public String getSignedUrl(String url) {
+        long loginUser = 1;
+        int channelId = 1;
         String signedUrl = signService.getSignedUrl(loginUser, url, channelId, 600);
         return signedUrl;
     }