Prechádzať zdrojové kódy

更新 getObjectInfo 方法的后端接口

reghao 2 rokov pred
rodič
commit
cf0d74ad7f

+ 5 - 7
oss-console/src/main/java/cn/reghao/oss/console/app/controller/OssServerController.java

@@ -2,7 +2,6 @@ package cn.reghao.oss.console.app.controller;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.oss.console.app.rpc.OssObjectService;
-import cn.reghao.oss.console.app.service.OssStoreService;
 import cn.reghao.oss.console.app.service.UploadChannelService;
 import cn.reghao.oss.console.util.AuthKeyContext;
 import cn.reghao.oss.store.api.dto.DownloadUrl;
@@ -28,14 +27,12 @@ import org.springframework.web.bind.annotation.RestController;
 public class OssServerController {
     private final OssService ossService;
     private final OssObjectService ossObjectService;
-    private final OssStoreService ossStoreService;
-    private UploadChannelService uploadChannelService;
+    private final UploadChannelService uploadChannelService;
 
     public OssServerController(OssService ossService, OssObjectService ossObjectService,
-                               OssStoreService ossStoreService, UploadChannelService uploadChannelService) {
+                               UploadChannelService uploadChannelService) {
         this.ossService = ossService;
         this.ossObjectService = ossObjectService;
-        this.ossStoreService = ossStoreService;
         this.uploadChannelService = uploadChannelService;
     }
 
@@ -56,8 +53,9 @@ public class OssServerController {
 
     @ApiOperation(value = "获取对象信息")
     @GetMapping(value = "/object/info", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String getObjectInfo(@RequestParam("objectId") String objectId) {
-        ObjectInfo objectInfo = ossObjectService.getObjectInfo(objectId);
+    public String getObjectInfo(@RequestParam("channelId") int channelId,
+                                @RequestParam("objectId") String objectId) throws Exception {
+        ObjectInfo objectInfo = ossObjectService.getObjectInfo(channelId, objectId);
         return WebResult.success(objectInfo);
     }
 

+ 6 - 8
oss-console/src/main/java/cn/reghao/oss/console/app/rpc/OssObjectService.java

@@ -4,10 +4,10 @@ import cn.reghao.oss.console.app.model.dto.ObjectsScopeDto;
 import cn.reghao.oss.console.app.model.dto.SetScopeDto;
 import cn.reghao.oss.console.app.model.po.StoreNode;
 import cn.reghao.oss.console.app.service.UploadChannelService;
+import cn.reghao.oss.console.util.AuthKeyContext;
 import cn.reghao.oss.store.api.dto.DownloadUrl;
 import cn.reghao.oss.store.api.dto.ObjectInfo;
 import cn.reghao.oss.store.api.iface.ObjectService;
-import cn.reghao.oss.store.api.iface.media.ImageFileService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,7 +26,6 @@ public class OssObjectService {
     }
 
     public void setObjectScope(SetScopeDto setScopeDto) {
-
     }
 
     public void setObjectsScope(ObjectsScopeDto objectsScopeDto) throws Exception {
@@ -45,12 +44,11 @@ public class OssObjectService {
         objectService.deleteByObjectNames(objectNames);
     }
 
-    public ObjectInfo getObjectInfo(String objectId) {
-        RemoteService<ObjectService> remoteService = new RemoteService<>();
-        String host = "";
-        int port = -1;
-        ObjectService objectService = remoteService.getService(host, port, ObjectService.class);
-        return objectService.getObjectInfo(objectId);
+    public ObjectInfo getObjectInfo(int channelId, String objectId) throws Exception {
+        ObjectService objectService = getObjectService(channelId);
+        int loginUser = AuthKeyContext.getUser();
+        int expireSecond = 3600;
+        return objectService.getObjectInfo(loginUser, objectId, expireSecond);
     }
 
     public DownloadUrl getDownloadUrl(String objectId) {