From 9bc2d2981b540aa291cfecde5d33615df56a078b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 09:59:19 +0800
Subject: [PATCH] update springboot 2.7.1 => 2.7.2 update hutool 5.8.3 => 5.8.4 update okhttp 4.9.1 => 4.10.0 update lock4j 2.2.1 => 2.2.2 update aws-java-sdk-s3 1.12.248 => 1.12.264 修复依赖安全漏洞 update aliyun.sms 2.0.9 => 2.0.16 update tencent.sms 3.1.537 => 3.1.555 update guava 30.0-jre => 31.1-jre
---
ruoyi-ui/src/router/index.js | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index e4ccf19..dd4d5f1 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -135,16 +135,16 @@
]
},
{
- path: '/monitor/job-log',
+ path: '/system/oss-config',
component: Layout,
hidden: true,
- permissions: ['monitor:job:list'],
+ permissions: ['system:oss:list'],
children: [
{
path: 'index',
- component: () => import('@/views/monitor/job/log'),
- name: 'JobLog',
- meta: { title: '璋冨害鏃ュ織', activeMenu: '/monitor/job' }
+ component: () => import('@/views/system/oss/config'),
+ name: 'OssConfig',
+ meta: { title: '閰嶇疆绠＄悊', activeMenu: '/system/oss' }
}
]
},
@@ -155,7 +155,7 @@
permissions: ['tool:gen:edit'],
children: [
{
- path: 'index',
+ path: 'index/:tableId(\\d+)',
component: () => import('@/views/tool/gen/editTable'),
name: 'GenEdit',
meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen' }
@@ -164,7 +164,14 @@
}
]
+// 闃叉杩炵画鐐瑰嚮澶氭璺敱鎶ラ敊
+let routerPush = Router.prototype.push;
+Router.prototype.push = function push(location) {
+ return routerPush.call(this, location).catch(err => err)
+}
+
export default new Router({
+ base: process.env.VUE_APP_CONTEXT_PATH,
mode: 'history', // 鍘绘帀url涓殑#
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
--
Gitblit v1.9.3