From 19a69e28adadb7d686cf475e6ec36901bd151dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E7=94=B0=E5=BC=98?= <1240092443@qq.com> Date: Wed, 13 Nov 2024 15:08:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=81=8A?= =?UTF-8?q?=E5=A4=A9=E8=BE=B9=E6=A1=86=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/components.d.ts | 22 +++++++++++++++++++ .../src/components/window/WindowTemplate.vue | 2 +- frontend/src/stores/chat.ts | 4 +++- frontend/src/stores/upgrade.ts | 3 ++- godo/cmd/main.go | 2 ++ godo/store/start.go | 14 ++++++------ 6 files changed, 37 insertions(+), 10 deletions(-) diff --git a/frontend/components.d.ts b/frontend/components.d.ts index bc10101..8aec1ce 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -49,24 +49,46 @@ declare module 'vue' { DialogTemp: typeof import('./src/components/window/DialogTemp.vue')['default'] EditFileName: typeof import('./src/components/builtin/EditFileName.vue')['default'] EditType: typeof import('./src/components/builtin/EditType.vue')['default'] + ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] + ElBadge: typeof import('element-plus/es')['ElBadge'] ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] + ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] + ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] + ElContainer: typeof import('element-plus/es')['ElContainer'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] + ElDropdown: typeof import('element-plus/es')['ElDropdown'] + ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] + ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] + ElEmpty: typeof import('element-plus/es')['ElEmpty'] + ElFooter: typeof import('element-plus/es')['ElFooter'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] + ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] + ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] + ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] + ElPopover: typeof import('element-plus/es')['ElPopover'] ElProgress: typeof import('element-plus/es')['ElProgress'] ElRow: typeof import('element-plus/es')['ElRow'] + ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] + ElSelect: typeof import('element-plus/es')['ElSelect'] + ElSwitch: typeof import('element-plus/es')['ElSwitch'] + ElTable: typeof import('element-plus/es')['ElTable'] + ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] + ElText: typeof import('element-plus/es')['ElText'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTransfer: typeof import('element-plus/es')['ElTransfer'] ElTree: typeof import('element-plus/es')['ElTree'] Error: typeof import('./src/components/taskbar/Error.vue')['default'] FileIcon: typeof import('./src/components/builtin/FileIcon.vue')['default'] diff --git a/frontend/src/components/window/WindowTemplate.vue b/frontend/src/components/window/WindowTemplate.vue index 99c5873..4c0c297 100644 --- a/frontend/src/components/window/WindowTemplate.vue +++ b/frontend/src/components/window/WindowTemplate.vue @@ -198,7 +198,7 @@ border-radius: 10px; overflow: hidden; background-color: #fff; - // border: var(--window-border); + border: var(--window-border); display: flex; flex-direction: column; // box-shadow: var(--window-box-shadow); diff --git a/frontend/src/stores/chat.ts b/frontend/src/stores/chat.ts index 1c7258e..8a97eae 100644 --- a/frontend/src/stores/chat.ts +++ b/frontend/src/stores/chat.ts @@ -331,6 +331,7 @@ export const useChatStore = defineStore('chatStore', () => { } // 发送文件消息 const res = await fetchPost(config.userInfo.url + '/chat/send', JSON.stringify(Message)); + console.log(Message) console.log(res) if (!res.ok) { fileSendActive.value = false; @@ -344,7 +345,7 @@ export const useChatStore = defineStore('chatStore', () => { isMe: true, file_path: Message.message, file_name: Message.message.split('/').pop(), - file_size: fileInfo.data.file_info.size, + file_size: fileInfo.data.file_info?.size || 0, previewMessage: "[文件消息]", previewTimeFormat: formatTime(Date.now()), displayName: userInfo.value.nickname, @@ -375,6 +376,7 @@ export const useChatStore = defineStore('chatStore', () => { // 发送文字消息 const sendTextMessage = async () => { + // 判断是群聊发送还是单聊发送 if (targetGroupInfo.value && Object.keys(targetGroupInfo.value).length) { console.log('群聊发送'); diff --git a/frontend/src/stores/upgrade.ts b/frontend/src/stores/upgrade.ts index f21e1fe..eceda32 100644 --- a/frontend/src/stores/upgrade.ts +++ b/frontend/src/stores/upgrade.ts @@ -81,10 +81,11 @@ export const useUpgradeStore = defineStore('upgradeStore', () => { chatChatStore.onlineUserData(message.data) break; case 'user': + console.log(message.data) chatChatStore.userChatMessage(message.data) break case 'group': - console.log(message) + console.log(message.data) chatChatStore.groupChatMessage(message.data); break; case 'update_group': diff --git a/godo/cmd/main.go b/godo/cmd/main.go index c325e0c..823a9cb 100644 --- a/godo/cmd/main.go +++ b/godo/cmd/main.go @@ -81,6 +81,8 @@ func OsStart() { router.HandleFunc("/system/message", sys.HandleSystemEvents).Methods(http.MethodGet) router.HandleFunc("/system/update", sys.UpdateAppHandler).Methods(http.MethodGet) router.HandleFunc("/system/setting", sys.ConfigHandler).Methods(http.MethodPost) + + fileRouter := router.PathPrefix("/file").Subrouter() fileRouter.HandleFunc("/desktop", files.HandleDesktop).Methods(http.MethodGet) fileRouter.HandleFunc("/info", files.HandleSystemInfo).Methods(http.MethodGet) diff --git a/godo/store/start.go b/godo/store/start.go index 094d4a8..c3daeac 100644 --- a/godo/store/start.go +++ b/godo/store/start.go @@ -36,14 +36,14 @@ import ( func StartProcess(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) name := vars["name"] - processesMu.Lock() - defer processesMu.Unlock() - err := ExecuteScript(name) + // processesMu.Lock() + // defer processesMu.Unlock() + // err := ExecuteScript(name) - if err != nil { - respondWithError(w, http.StatusInternalServerError, err.Error()) - return - } + // if err != nil { + // respondWithError(w, http.StatusInternalServerError, err.Error()) + // return + // } w.WriteHeader(http.StatusOK) fmt.Fprintf(w, "Process %s started.", name)