diff --git a/server/app/config/index.js b/server/app/config/index.js index 1d31257..f21d0c5 100644 --- a/server/app/config/index.js +++ b/server/app/config/index.js @@ -4,7 +4,7 @@ consola.info('debug日志:', process.env.DEBUG === '1' ? '开启' : '关闭') module.exports = { httpPort: 8082, - clientPort: 22022, // 暂不支持更改 + clientDefaultPort: 22022, uploadDir: path.join(process.cwd(),'app/db'), staticDir: path.join(process.cwd(),'app/static'), sftpCacheDir: path.join(process.cwd(),'app/socket/sftp-cache'), diff --git a/server/app/socket/clients.js b/server/app/socket/clients.js index dbbdecc..7160ddb 100644 --- a/server/app/socket/clients.js +++ b/server/app/socket/clients.js @@ -1,7 +1,7 @@ const { Server: ServerIO } = require('socket.io') const { io: ClientIO } = require('socket.io-client') const { readHostList } = require('../utils/storage') -const { clientPort } = require('../config') +const { clientDefaultPort } = require('../config') const { verifyAuthSync } = require('../utils/verify-auth') const { isAllowedIp } = require('../utils/tools') @@ -15,9 +15,9 @@ async function getClientsInfo(clientSockets) { if (!hostList.some(item => item.host === clientItem.host)) clientItem.close && clientItem.close() }) hostList - .map(({ host, name }) => { + .map(({ host, name, clientPort }) => { if (clientSockets.some(item => item.host === host)) return { name, isIo: true } // 已经建立io连接(无论是否连接成功)的host不再重复建立连接,因为存在多次(reconnectionAttempts)的重试机制 - let clientSocket = ClientIO(`http://${ host }:${ clientPort }`, { + let clientSocket = ClientIO(`http://${ host }:${ clientPort || clientDefaultPort }`, { path: '/client/os-info', forceNew: true, timeout: 5000, diff --git a/web/src/main.js b/web/src/main.js index 75830cb..c919421 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -24,7 +24,6 @@ app.config.globalProperties.$store = useStore() const serviceURI = import.meta.env.DEV ? process.env.serviceURI : location.origin app.config.globalProperties.$serviceURI = serviceURI -app.config.globalProperties.$clientPort = process.env.clientPort || 22022 app.config.globalProperties.$store.$patch({ serviceURI }) console.warn('ISDEV: ', import.meta.env.DEV) console.warn('serviceURI: ', serviceURI) diff --git a/web/src/store/index.js b/web/src/store/index.js index 2510365..50d86d4 100644 --- a/web/src/store/index.js +++ b/web/src/store/index.js @@ -21,7 +21,7 @@ const useStore = defineStore({ }), actions: { async setJwtToken(token, isSession = true) { - if(isSession) sessionStorage.setItem('token', token) + if (isSession) sessionStorage.setItem('token', token) else localStorage.setItem('token', token) this.$patch({ token }) }, @@ -73,7 +73,7 @@ const useStore = defineStore({ // setInterval(() => { // this.hostList.forEach((item) => { // const { host } = item - // ping(`http://${ host }:${ this.$clientPort }`) + // ping(`http://${ host }:${ 22022 }`) // .then((res) => { // item.ping = res // }) @@ -121,7 +121,7 @@ const useStore = defineStore({ localStorage.setItem('isDark', isDark) this.$patch({ isDark }) } - if(animate) { + if (animate) { let transition = document.startViewTransition(() => { document.documentElement.classList.toggle('dark') }) diff --git a/web/src/views/terminal/components/info-side.vue b/web/src/views/terminal/components/info-side.vue index de53060..767444b 100644 --- a/web/src/views/terminal/components/info-side.vue +++ b/web/src/views/terminal/components/info-side.vue @@ -301,17 +301,17 @@ const handleColor = (num) => { if (num <= 100) return '#ff4949' } -const getHostPing = () => { - pingTimer.value = setInterval(() => { - $tools.ping(`http://${ props.host }:22022`) - .then(res => { - ping.value = res - if (!import.meta.env.DEV) { - console.warn('Please tick \'Preserve Log\'') - } - }) - }, 3000) -} +// const getHostPing = () => { +// pingTimer.value = setInterval(() => { +// $tools.ping(`http://${ props.host }:22022`) +// .then(res => { +// ping.value = res +// if (!import.meta.env.DEV) { +// console.warn('Please tick \'Preserve Log\'') +// } +// }) +// }, 3000) +// } onBeforeUnmount(() => { socket.value && socket.value.close() diff --git a/web/vite.config.js b/web/vite.config.js index b7ffbf3..b70aa90 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -37,8 +37,7 @@ export default defineConfig({ define: { 'process.env': { serviceURI, - serviceApiPrefix, - clientPort: 22022 + serviceApiPrefix } }, plugins: [