From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-ui/src/router/index.js |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index a826980..cedf0b3 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -126,6 +126,19 @@
     ]
   },
   {
+    path: '/system/oss-config',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'index',
+        component: (resolve) => require(['@/views/system/oss/config'], resolve),
+        name: 'OssConfig',
+        meta: { title: '閰嶇疆绠$悊', activeMenu: '/system/oss'}
+      }
+    ]
+  },
+  {
     path: '/monitor/job-log',
     component: Layout,
     hidden: true,
@@ -154,6 +167,7 @@
 ]
 
 export default new Router({
+  base: "", // 椤圭洰鍓嶇紑 涓� publicPath 鍚屾 渚嬪 /api
   mode: 'history', // 鍘绘帀url涓殑#
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes

--
Gitblit v1.9.3