diff --git a/api/src/main/java/com/wx/application/adapter/controller/GorseController.java b/api/src/main/java/com/wx/application/adapter/controller/GorseController.java index ec65437..20e6edb 100644 --- a/api/src/main/java/com/wx/application/adapter/controller/GorseController.java +++ b/api/src/main/java/com/wx/application/adapter/controller/GorseController.java @@ -119,13 +119,13 @@ public class GorseController extends BaseController { } @PutMapping(value = "/bulk/{type}") - public ResponseData bulkUser(@RequestParam Map data, @RequestParam("file") MultipartFile file, @PathVariable("type") String type) throws Exception { + public ResponseData bulkUserOrItem(@RequestParam Map data, @RequestParam("file") MultipartFile file, @PathVariable("type") String type) throws Exception { return success(gorseService.bulkUserOrItem(data, file, type)); } - @GetMapping(value = "/get_bulk_user") - public ResponseData getBulkUser() throws Exception { - return success(gorseService.getBulkUser()); + @GetMapping(value = "/get_bulk/{type}") + public String getBulkUserOrItem(@PathVariable("type") String type) throws Exception { + return gorseService.getBulkUserOrItem(type); } diff --git a/api/src/main/java/com/wx/application/gorse4j/GorseService.java b/api/src/main/java/com/wx/application/gorse4j/GorseService.java index 5aa2bf9..e75a020 100644 --- a/api/src/main/java/com/wx/application/gorse4j/GorseService.java +++ b/api/src/main/java/com/wx/application/gorse4j/GorseService.java @@ -127,8 +127,11 @@ public class GorseService { } - public File getBulkUser() throws IOException { - return this.request("GET", this.endpoint + "/api/bulk/users", null, File.class); + /** + * 导出用户或物品信息 + */ + public String getBulkUserOrItem(String type) { + return "redirect:" + this.endpoint + "/api/bulk/" + type; } public JSONObject sendPostFormData(String url, MultipartEntityBuilder builder) throws IOException { diff --git a/web/src/components/menus/EntrysManage.vue b/web/src/components/menus/EntrysManage.vue index f2aeccf..800bb89 100644 --- a/web/src/components/menus/EntrysManage.vue +++ b/web/src/components/menus/EntrysManage.vue @@ -19,6 +19,7 @@
添 加 + 导出条目 导入条目
@@ -144,7 +145,7 @@