From 2b14b84c671e38b33f4ab47f973c17ddc801f4fc Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 11 Sep 2024 14:36:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=9C=A8=E6=B2=A1=E6=9C=89=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=BF=98=E4=BC=9A=E5=BB=BA=E7=AB=8B=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/app-provider.vue | 10 +---------
 src/layouts/base-layout/index.vue      | 10 +++++++++-
 src/theme/settings.ts                  | 12 ++++++------
 src/utils/sse.ts                       |  4 ++--
 src/utils/websocket.ts                 |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/components/common/app-provider.vue b/src/components/common/app-provider.vue
index 6330c496..f6aa5271 100644
--- a/src/components/common/app-provider.vue
+++ b/src/components/common/app-provider.vue
@@ -1,9 +1,7 @@
 <script setup lang="ts">
-import { createTextVNode, defineComponent, onMounted } from 'vue';
+import { createTextVNode, defineComponent } from 'vue';
 import { useDialog, useLoadingBar, useMessage, useNotification } from 'naive-ui';
 import useContentLoading from '@/hooks/common/loading';
-import { initWebSocket } from '@/utils/websocket';
-import { initSSE } from '@/utils/sse';
 
 defineOptions({
   name: 'AppProvider'
@@ -27,12 +25,6 @@ const ContextHolder = defineComponent({
     return () => createTextVNode();
   }
 });
-
-onMounted(() => {
-  const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
-  initWebSocket(`${protocol + window.location.host + import.meta.env.VITE_APP_BASE_API}/resource/websocket`);
-  initSSE(`${import.meta.env.VITE_APP_BASE_API}/resource/sse`);
-});
 </script>
 
 <template>
diff --git a/src/layouts/base-layout/index.vue b/src/layouts/base-layout/index.vue
index 7debe5d1..3e58cd4e 100644
--- a/src/layouts/base-layout/index.vue
+++ b/src/layouts/base-layout/index.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
-import { computed, defineAsyncComponent } from 'vue';
+import { computed, defineAsyncComponent, onMounted } from 'vue';
 import { AdminLayout, LAYOUT_SCROLL_EL_ID } from '@sa/materials';
 import type { LayoutMode } from '@sa/materials';
 import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
+import { initWebSocket } from '@/utils/websocket';
+import { initSSE } from '@/utils/sse';
 import GlobalHeader from '../modules/global-header/index.vue';
 import GlobalSider from '../modules/global-sider/index.vue';
 import GlobalTab from '../modules/global-tab/index.vue';
@@ -100,6 +102,12 @@ function getSiderCollapsedWidth() {
 
   return w;
 }
+
+onMounted(() => {
+  const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
+  initWebSocket(`${protocol + window.location.host + import.meta.env.VITE_APP_BASE_API}/resource/websocket`);
+  initSSE(`${import.meta.env.VITE_APP_BASE_API}/resource/sse`);
+});
 </script>
 
 <template>
diff --git a/src/theme/settings.ts b/src/theme/settings.ts
index dbae7247..f88320ba 100644
--- a/src/theme/settings.ts
+++ b/src/theme/settings.ts
@@ -1,15 +1,15 @@
 /** Default theme settings */
 export const themeSettings: App.Theme.ThemeSetting = {
-  themeScheme: 'light',
+  themeScheme: 'auto',
   grayscale: false,
   colourWeakness: false,
   recommendColor: false,
-  themeColor: '#2080f0',
+  themeColor: '#0E42D2',
   otherColor: {
-    info: '#2080f0',
-    success: '#52c41a',
-    warning: '#faad14',
-    error: '#f5222d'
+    info: '#0E42D2',
+    success: '#009A29',
+    warning: '#D25F00',
+    error: '#CB2634'
   },
   isInfoFollowPrimary: true,
   layout: {
diff --git a/src/utils/sse.ts b/src/utils/sse.ts
index 3c9b803f..a17112bf 100644
--- a/src/utils/sse.ts
+++ b/src/utils/sse.ts
@@ -5,10 +5,10 @@ import { localStg } from './storage';
 
 // 初始化
 export const initSSE = (url: any) => {
-  if (import.meta.env.VITE_APP_SSE === 'N') {
+  const token = localStg.get('token');
+  if (import.meta.env.VITE_APP_SSE === 'N' || !token) {
     return;
   }
-  const token = localStg.get('token');
   const sseUrl = `${url}?Authorization=Bearer ${token}&clientid=${import.meta.env.VITE_APP_CLIENT_ID}`;
   const { data, error } = useEventSource(sseUrl, [], {
     autoReconnect: {
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index 3e63a28a..519585d4 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -32,12 +32,12 @@ let socketError = 0; // 错误次数
 
 // 初始化socket
 export function initWebSocket(url: any) {
-  if (import.meta.env.VITE_APP_WEBSOCKET === 'N') {
+  const token = localStg.get('token');
+  if (import.meta.env.VITE_APP_WEBSOCKET === 'N' || !token) {
     return null;
   }
   socketUrl = url;
   // 初始化 websocket
-  const token = localStg.get('token');
   websocket = new WebSocket(`${url}?Authorization=Bearer ${token}&clientid=${import.meta.env.VITE_APP_CLIENT_ID}`);
   websocketonopen();
   websocketonmessage();