From fbab383bd78e9ca1bd84e5a158d5833e5888f5ac Mon Sep 17 00:00:00 2001
From: 张利 <zhangli_wei555@163.com>
Date: Thu, 02 Nov 2023 10:57:04 +0800
Subject: [PATCH] update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java. 此处新密码加密了两次，多余的操作，且会导致新生成的数据库密码与缓存中的密码不同，如果修改的不对还请讲解回复下，谢谢。
---
ruoyi-ui/src/layout/components/Sidebar/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Sidebar/index.vue b/ruoyi-ui/src/layout/components/Sidebar/index.vue
index 342dbbe..24fb533 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/index.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/index.vue
@@ -1,20 +1,20 @@
<template>
- <div :class="{'has-logo':showLogo}">
+ <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<logo v-if="showLogo" :collapse="isCollapse" />
- <el-scrollbar wrap-class="scrollbar-wrapper">
+ <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
<el-menu
:default-active="activeMenu"
:collapse="isCollapse"
- :background-color="variables.menuBg"
- :text-color="variables.menuText"
+ :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
+ :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
:unique-opened="true"
:active-text-color="settings.theme"
:collapse-transition="false"
mode="vertical"
>
<sidebar-item
- v-for="route in permission_routes"
- :key="route.path"
+ v-for="(route, index) in sidebarRouters"
+ :key="route.path + index"
:item="route"
:base-path="route.path"
/>
@@ -33,7 +33,7 @@
components: { SidebarItem, Logo },
computed: {
...mapState(["settings"]),
- ...mapGetters(["permission_routes", "sidebar"]),
+ ...mapGetters(["sidebarRouters", "sidebar"]),
activeMenu() {
const route = this.$route;
const { meta, path } = route;
--
Gitblit v1.9.2