From 55dd565e9255abcc80869de2f526c6ab6e4b290e Mon Sep 17 00:00:00 2001
From: wxxwjef <505322415@qq.com>
Date: Tue, 14 Nov 2023 11:36:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=89=A9=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/adapter/controller/GorseController.java   | 8 ++++----
 .../java/com/wx/application/gorse4j/GorseService.java     | 7 +++++--
 web/src/components/menus/EntrysManage.vue                 | 6 +++++-
 web/src/components/menus/UserManage.vue                   | 8 ++------
 4 files changed, 16 insertions(+), 13 deletions(-)

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<String, String> data, @RequestParam("file") MultipartFile file, @PathVariable("type") String type) throws Exception {
+    public ResponseData bulkUserOrItem(@RequestParam Map<String, String> 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 @@
       </div>
       <div style="margin: 0px 0 20px 0">
         <el-button type="primary" @click="createRow()" icon="el-icon-plus">添 加</el-button>
+        <el-button type="primary" @click="downloadItem()" icon="el-icon-download">导出条目</el-button>
         <el-button type="primary" @click="showImportItemPage()" icon="el-icon-upload2">导入条目</el-button>
       </div>
       <div>
@@ -144,7 +145,7 @@
 </template>
 
 <script>
-import request from '@/utils/request';
+import request, {getBaseUrl} from '@/utils/request';
 
 var _this;
 export default {
@@ -210,6 +211,9 @@ export default {
       _this.qo.pageNo = val;
       _this.queryData();
     },
+    downloadItem() {
+      window.open(getBaseUrl() + '/bulk/get_bulk/items');
+    },
     similarItem(item) {
       _this.$router.push({
         path: "similarItem", query: {
diff --git a/web/src/components/menus/UserManage.vue b/web/src/components/menus/UserManage.vue
index ef59513..74dfb04 100644
--- a/web/src/components/menus/UserManage.vue
+++ b/web/src/components/menus/UserManage.vue
@@ -81,7 +81,7 @@
 </template>
 
 <script>
-import request from '@/utils/request';
+import request, {getBaseUrl} from '@/utils/request';
 
 var _this;
 export default {
@@ -139,11 +139,7 @@ export default {
       });
     },
     downloadUser() {
-      request({
-        url: '/gorse/get_bulk_user',
-        method: 'get'
-      }).then(res => {
-      });
+      window.open(getBaseUrl() + '/bulk/get_bulk/users');
     },
     linkUser(item) {
       _this.$router.push({