From 7ca1d47875264e7c484b04b23fef7b4cd3b0a34a Mon Sep 17 00:00:00 2001
From: hansha <bdqn_hansha@163.com>
Date: Mon, 24 Jun 2024 11:08:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=85=B3=E8=81=94=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=8C=E5=85=A8=E5=B1=80=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A410s=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/dangan/controller/DaUserCatalogController.java | 11 +++++------
 dangan-ui/src/utils/request.js                        |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaUserCatalogController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaUserCatalogController.java
index 084d349..ff2b8dd 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaUserCatalogController.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaUserCatalogController.java
@@ -10,7 +10,6 @@ import com.da.common.utils.poi.ExcelUtil;
 import com.da.dangan.domain.DaUserCatalog;
 import com.da.dangan.service.IDaUserCatalogService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,7 +32,7 @@ public class DaUserCatalogController extends BaseController
     /**
      * 查询用户目录关联列表
      */
-    @PreAuthorize("@ss.hasPermi('dangan:userMuRelation:list')")
+    //@PreAuthorize("@ss.hasPermi('dangan:userMuRelation:list')")
     @GetMapping("/list")
     public TableDataInfo list(DaUserCatalog daUserCatalog)
     {
@@ -45,7 +44,7 @@ public class DaUserCatalogController extends BaseController
     /**
      * 导出用户目录关联列表
      */
-    @PreAuthorize("@ss.hasPermi('dangan:userMuRelation:export')")
+    //@PreAuthorize("@ss.hasPermi('dangan:userMuRelation:export')")
     @Log(title = "用户目录关联", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DaUserCatalog daUserCatalog)
@@ -58,7 +57,7 @@ public class DaUserCatalogController extends BaseController
     /**
      * 获取用户目录关联详细信息
      */
-    @PreAuthorize("@ss.hasPermi('dangan:userMuRelation:query')")
+    //@PreAuthorize("@ss.hasPermi('dangan:userMuRelation:query')")
     @GetMapping(value = "/{userId}")
     public AjaxResult getInfo(@PathVariable("userId") Long userId)
     {
@@ -68,7 +67,7 @@ public class DaUserCatalogController extends BaseController
     /**
      * 新增用户目录关联
      */
-    @PreAuthorize("@ss.hasPermi('dangan:userMuRelation:add')")
+    //@PreAuthorize("@ss.hasPermi('dangan:userMuRelation:add')")
     @Log(title = "用户目录关联", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DaUserCatalog daUserCatalog)
@@ -119,7 +118,7 @@ public class DaUserCatalogController extends BaseController
     /**
      * 删除用户目录关联
      */
-    @PreAuthorize("@ss.hasPermi('dangan:userMuRelation:remove')")
+    //@PreAuthorize("@ss.hasPermi('dangan:userMuRelation:remove')")
     @Log(title = "用户目录关联", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds)
diff --git a/dangan-ui/src/utils/request.js b/dangan-ui/src/utils/request.js
index a4eb298..1428f2b 100644
--- a/dangan-ui/src/utils/request.js
+++ b/dangan-ui/src/utils/request.js
@@ -16,8 +16,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
-  // 超时
-  timeout: 100000
+  // 10s超时
+  timeout: 10000
 })
 
 // request拦截器