From 5ad3f873239e62eb45bfb8d6348b2b449b3da0a1 Mon Sep 17 00:00:00 2001
From: Zhoujiahui <539943419@qq.com>
Date: Mon, 29 Jul 2024 14:58:13 +0800
Subject: [PATCH] fix

---
 src/App.vue               | 4 +---
 src/components/chatui.vue | 2 +-
 src/pinia/store.js        | 2 ++
 src/views/chat.vue        | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5f97ae7..8a7b86e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,8 +26,7 @@ import config from "../miaoShareConfig.json"
 
 const settingData = useSettingStore();
 const serverPort = settingData.serverPort;
-const baseUrl =
-    location.protocol + "//" + location.hostname + ":" + serverPort + "/";
+const baseUrl = settingData.baseUrl
 const tokenExpiresIn = config.tokenExpiresIn
 
 
@@ -46,7 +45,6 @@ const menuOptions = ref([
         key: 'upload',
         icon: renderIcon(uploadIcon),
         disabled: computed(() => {
-            // console.log(settingData)
             return settingData.token === null
         })
     },
diff --git a/src/components/chatui.vue b/src/components/chatui.vue
index 88f6898..89811d8 100644
--- a/src/components/chatui.vue
+++ b/src/components/chatui.vue
@@ -70,7 +70,7 @@ const _toClipboard = async (text) => {
 }
 const setting = useSettingStore();
 const serverPort = setting.serverPort;
-const baseUrl = location.protocol + "//" + location.hostname + ":" + serverPort + "/";
+const baseUrl = setting.baseUrl
 const props = defineProps({
     messages: {
         type: Array,
diff --git a/src/pinia/store.js b/src/pinia/store.js
index 0c5cd55..e06109b 100644
--- a/src/pinia/store.js
+++ b/src/pinia/store.js
@@ -36,6 +36,8 @@ const serverPort =
 const baseUrl =
     location.protocol + '//' + location.hostname + ':' + serverPort + '/'
 
+const wsBaseUrl = 'ws' + '://' + location.hostname + ':' + serverPort
+
 // console.log(process.env.NODE_ENV,config.DEVPORT,location.port,serverPort)
 export const useSettingStore = defineStore('setting', {
     state: () => ({
diff --git a/src/views/chat.vue b/src/views/chat.vue
index 0bf6b6c..d7e4cf0 100644
--- a/src/views/chat.vue
+++ b/src/views/chat.vue
@@ -105,10 +105,11 @@ const _toClipboard = async (text) => {
 
 const setting = useSettingStore();
 const serverPort = setting.serverPort;
-const wsBaseUrl = 'ws' + "://" + location.hostname + ":" + serverPort;
+// const wsBaseUrl = 'ws' + "://" + location.hostname + ":" + serverPort;
+const wsBaseUrl = setting.wsBaseUrl
 // const baseUrl = location.protocol + "//" + location.hostname + ":" + serverPort + "/";
 const baseUrl = setting.baseUrl
-const QRIconUrl = ref(location.protocol + "//" + location.hostname + ":" + serverPort + "/favicon.ico")
+const QRIconUrl = ref(baseUrl + "favicon.ico")
 
 const columns = [
     {