diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 14ae886..d3ed402 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -3,7 +3,9 @@ "allow": [ "Bash(tree:*)", "Bash(mvn clean package:*)", - "Bash(echo:*)" + "Bash(echo:*)", + "Bash(git add:*)", + "Bash(git commit:*)" ], "deny": [], "ask": [] diff --git a/plus-ui/src/layout/components/Navbar.vue b/plus-ui/src/layout/components/Navbar.vue index efb1ae3..27d113d 100644 --- a/plus-ui/src/layout/components/Navbar.vue +++ b/plus-ui/src/layout/components/Navbar.vue @@ -27,8 +27,8 @@ - - + +
@@ -281,6 +262,7 @@ watch( .avatar-container { margin-right: 40px; + margin-left: 20px; .avatar-wrapper { margin-top: 5px; diff --git a/plus-ui/src/layout/components/Settings/index.vue b/plus-ui/src/layout/components/Settings/index.vue index bbd53cb..9007c53 100644 --- a/plus-ui/src/layout/components/Settings/index.vue +++ b/plus-ui/src/layout/components/Settings/index.vue @@ -34,12 +34,6 @@
-
- 深色模式 - - - -
@@ -114,22 +108,6 @@ const sideTheme = ref(settingsStore.sideTheme); const storeSettings = computed(() => settingsStore); const predefineColors = ref(['#409EFF', '#ff4500', '#ff8c00', '#ffd700', '#90ee90', '#00ced1', '#1e90ff', '#c71585']); -// 是否暗黑模式 -const isDark = useDark({ - storageKey: 'useDarkKey', - valueDark: 'dark', - valueLight: 'light' -}); -// 匹配菜单颜色 -watch(isDark, () => { - if (isDark.value) { - settingsStore.sideTheme = SideThemeEnum.DARK; - } else { - settingsStore.sideTheme = sideTheme.value; - } -}); -const toggleDark = () => useToggle(isDark); - const topNavChange = (val: any) => { if (!val) { appStore.toggleSideBarHide(false); @@ -148,11 +126,6 @@ const themeChange = (val: string) => { }; const handleTheme = (val: string) => { sideTheme.value = val; - if (isDark.value && val === SideThemeEnum.LIGHT) { - // 暗黑模式颜色不变 - settingsStore.sideTheme = SideThemeEnum.DARK; - return; - } settingsStore.sideTheme = val; }; const saveSetting = () => { diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index 89b9ab6..b958e72 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -103,13 +103,14 @@ public class AuthController { // 登录 LoginVo loginVo = IAuthStrategy.login(body, client, grantType); - Long userId = LoginHelper.getUserId(); - scheduledExecutorService.schedule(() -> { - SseMessageDto dto = new SseMessageDto(); - dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统"); - dto.setUserIds(List.of(userId)); - SseMessageUtils.publishMessage(dto); - }, 5, TimeUnit.SECONDS); + // 注释掉登录欢迎消息推送 - UI定制需求 + // Long userId = LoginHelper.getUserId(); + // scheduledExecutorService.schedule(() -> { + // SseMessageDto dto = new SseMessageDto(); + // dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统"); + // dto.setUserIds(List.of(userId)); + // SseMessageUtils.publishMessage(dto); + // }, 5, TimeUnit.SECONDS); return R.ok(loginVo); }