|
@@ -1,9 +1,7 @@
|
|
|
package cn.reghao.oss.console.app.controller.page;
|
|
package cn.reghao.oss.console.app.controller.page;
|
|
|
|
|
|
|
|
import cn.reghao.jutil.jdk.result.WebResult;
|
|
import cn.reghao.jutil.jdk.result.WebResult;
|
|
|
-import cn.reghao.oss.console.app.db.repository.UploadChannelRepository;
|
|
|
|
|
-import cn.reghao.oss.console.app.model.po.UploadChannel;
|
|
|
|
|
-import cn.reghao.oss.console.app.service.StoreNodeService;
|
|
|
|
|
|
|
+import cn.reghao.oss.console.account.model.po.DiskFile;
|
|
|
import cn.reghao.oss.console.util.DefaultSetting;
|
|
import cn.reghao.oss.console.util.DefaultSetting;
|
|
|
import cn.reghao.oss.console.util.db.PageSort;
|
|
import cn.reghao.oss.console.util.db.PageSort;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
@@ -23,14 +21,6 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
@Controller
|
|
@Controller
|
|
|
@RequestMapping("/store/object")
|
|
@RequestMapping("/store/object")
|
|
|
public class StoreObjectPageController {
|
|
public class StoreObjectPageController {
|
|
|
- private final UploadChannelRepository uploadChannelRepository;
|
|
|
|
|
- private final StoreNodeService storeNodeService;
|
|
|
|
|
-
|
|
|
|
|
- public StoreObjectPageController(UploadChannelRepository uploadChannelRepository, StoreNodeService storeNodeService) {
|
|
|
|
|
- this.uploadChannelRepository = uploadChannelRepository;
|
|
|
|
|
- this.storeNodeService = storeNodeService;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
@ApiOperation(value = "文件列表页面")
|
|
@ApiOperation(value = "文件列表页面")
|
|
|
@GetMapping(value = "/list")
|
|
@GetMapping(value = "/list")
|
|
|
public String index(@RequestParam(value = "env", required = false) String env,
|
|
public String index(@RequestParam(value = "env", required = false) String env,
|
|
@@ -45,7 +35,7 @@ public class StoreObjectPageController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
PageRequest pageRequest = PageSort.pageRequest();
|
|
PageRequest pageRequest = PageSort.pageRequest();
|
|
|
- Page<UploadChannel> page = uploadChannelRepository.findAll(pageRequest);
|
|
|
|
|
|
|
+ Page<DiskFile> page = Page.empty();
|
|
|
|
|
|
|
|
model.addAttribute("env", env);
|
|
model.addAttribute("env", env);
|
|
|
model.addAttribute("type", type);
|
|
model.addAttribute("type", type);
|