|
|
@@ -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);
|
|
|
}
|
|
|
|