fix

.gitignore

@@ -37,3 +37,5 @@ miaoShare.db
 
 # JWT SK
 *.key
+
+visualizer.html

src/App.vue

@@ -26,8 +26,7 @@ import config from "../miaoShareConfig.json"
 
 const settingData = useSettingStore();
 const serverPort = settingData.serverPort;
-const baseUrl =
+const baseUrl = settingData.baseUrl
-    location.protocol + "//" + location.hostname + ":" + serverPort + "/";
 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
         })
     },

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,

src/pinia/store.js

@@ -1,72 +1,83 @@
-import { defineStore } from "pinia";
+import { defineStore } from 'pinia'
-import config from "../../miaoShareConfig.json"
+import config from '../../miaoShareConfig.json'
 
-const userID = localStorage.getItem('userID');
+console.log(location)
-const userGroup = localStorage.getItem('userGroup');
+
+const userID = localStorage.getItem('userID')
+const userGroup = localStorage.getItem('userGroup')
 
 const tokenExpiresIn = config.tokenExpiresIn
-if(localStorage.getItem('tokenExpiredTime') == null || 
+if (
-   		parseInt(localStorage.getItem('tokenExpiredTime')) < parseInt(Date.now())){
+    localStorage.getItem('tokenExpiredTime') == null ||
+    parseInt(localStorage.getItem('tokenExpiredTime')) < parseInt(Date.now())
+) {
     localStorage.removeItem('token')
-   }
+}
 
-const token = localStorage.getItem('token');
+const token = localStorage.getItem('token')
-
-// console.log(token)
 
 var activeFuctionLocal = localStorage.getItem('activeFuction')
-if (activeFuctionLocal == null){
+if (activeFuctionLocal == null) {
     activeFuctionLocal = 'AES128'
-    localStorage.setItem('activeFuction',activeFuctionLocal)
+    localStorage.setItem('activeFuction', activeFuctionLocal)
 }
 // localStorage.removeItem('activeKeyMap')
 var activeKeyMap = localStorage.getItem('activeKeyMap')
 
-if (activeKeyMap == null ){
+if (activeKeyMap == null) {
-    activeKeyMap = JSON.stringify(['A-Z','0-9'])
+    activeKeyMap = JSON.stringify(['A-Z', '0-9'])
-    localStorage.setItem('activeKeyMap',activeKeyMap)
+    localStorage.setItem('activeKeyMap', activeKeyMap)
 }
 
 // 开发环境下服务器端口使用设置的端口，否则使用与页面相同的端口
-const serverPort = process.env.NODE_ENV === 'development' ? config.PORT : location.port
+const serverPort =
+    process.env.NODE_ENV === 'development' ? config.PORT : location.port
+
+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", {
+export const useSettingStore = defineStore('setting', {
     state: () => ({
         activeFuction: activeFuctionLocal,
-        activeKeyMap:JSON.parse(activeKeyMap),
+        activeKeyMap: JSON.parse(activeKeyMap),
-		enableGuest:config.enableGuest,
+        enableGuest: config.enableGuest,
         serverPort,
         token,
         userID,
-		userGroup
+        userGroup,
+        baseUrl,
+        wsBaseUrl
     }),
     getters: {
         // double: state => state.count * 2
     },
     actions: {
-		setJWT( token,keepTokenLocal ){
+        setJWT(token, keepTokenLocal) {
             this.token = token
-			if(keepTokenLocal){
+            if (keepTokenLocal) {
-				localStorage.setItem('token',token)
+                localStorage.setItem('token', token)
-				localStorage.setItem('tokenExpiredTime',parseInt(Date.now())+parseInt(tokenExpiresIn)*3600000)
+                localStorage.setItem(
+                    'tokenExpiredTime',
+                    parseInt(Date.now()) + parseInt(tokenExpiresIn) * 3600000
+                )
             }
         },
-		setUserID( id,keepTokenLocal ){
+        setUserID(id, keepTokenLocal) {
             this.userID = id
-			if(keepTokenLocal)
+            if (keepTokenLocal) localStorage.setItem('userID', id)
-				localStorage.setItem('userID',id)
         },
-		setUserGroup( g,keepTokenLocal ){
+        setUserGroup(g, keepTokenLocal) {
             this.userGroup = g
-			if(keepTokenLocal)
+            if (keepTokenLocal) localStorage.setItem('userGroup', g)
-				localStorage.setItem('userGroup',g)
         },
-		getToken(){
+        getToken() {
             return localStorage.getItem('token')
         }
         // increment() {
         // 	this.count++;
         // }
     }
-});
+})

src/views/chat.vue

@@ -105,9 +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 baseUrl = location.protocol + "//" + location.hostname + ":" + serverPort + "/";
+const wsBaseUrl = setting.wsBaseUrl
-const QRIconUrl = ref(location.protocol + "//" + location.hostname + ":" + serverPort + "/favicon.ico")
+// const baseUrl = location.protocol + "//" + location.hostname + ":" + serverPort + "/";
+const baseUrl = setting.baseUrl
+const QRIconUrl = ref(baseUrl + "favicon.ico")
 
 const columns = [
     {

src/views/downloadFileMiao.vue

@@ -40,8 +40,8 @@ const setting = useSettingStore();
 // 服务端端口
 const serverPort = setting.serverPort;
 
-var baseUrl =
+// const baseUrl = location.protocol + "//" + location.hostname + ":" + serverPort + "/";
-    location.protocol + "//" + location.hostname + ":" + serverPort + "/";
+const baseUrl = setting.baseUrl
 // console.log(baseUrl);
 
 // const blob2Uint8Array = function(blob) {

src/views/login.vue

@@ -43,8 +43,8 @@ const serverPort = settingData.serverPort;
 const userIDInput = ref('')
 const userPasswordInput = ref('')
 const isLogining = ref(false)
-const baseUrl =
+// const baseUrl = location.protocol + "//" + location.hostname + ":" + serverPort + "/";
-    location.protocol + "//" + location.hostname + ":" + serverPort + "/";
+const baseUrl = settingData.baseUrl
 
 const Token = computed(() => settingData.token)
 const keepTokenLocal = ref(true)

src/views/uploadFileMiao.vue

@@ -94,8 +94,9 @@ var file_Code_Map = ref([]);
 var uploadProcess = ref(0);
 
 
-const baseUrl =
+// const baseUrl = location.protocol + "//" + location.hostname + ":" + serverPort + "/";
-    location.protocol + "//" + location.hostname + ":" + serverPort + "/";
+const baseUrl = setting.baseUrl
+console.log(baseUrl)
 
 
 // const blob2Uint8Array = function(blob) {