diff --git a/frontend/src/system/config.ts b/frontend/src/system/config.ts index 8c638e2..9ca9cbc 100644 --- a/frontend/src/system/config.ts +++ b/frontend/src/system/config.ts @@ -24,7 +24,7 @@ export const getSystemConfig = (ifset = false) => { } // 初始化API相关URL,若本地存储中已存在则不进行覆盖 if (!config.apiUrl) { - config.apiUrl = 'http://' + window.location.host + ':56780'; + config.apiUrl = `${window.location.protocol}//${window.location.hostname}:56780`; } if (!config.userType) { config.userType = 'person' @@ -149,7 +149,7 @@ export const getSystemConfig = (ifset = false) => { } } if (!config.ollamaUrl) { - config.ollamaUrl = 'http://' + window.location.host + ':11434' + config.ollamaUrl = `${window.location.protocol}//${window.location.hostname}:11434` } if (!config.dataDir) { config.dataDir = '' diff --git a/godo/files/pwdfile.go b/godo/files/pwdfile.go index 116b242..ae4864c 100644 --- a/godo/files/pwdfile.go +++ b/godo/files/pwdfile.go @@ -44,6 +44,7 @@ func HandleWriteFile(w http.ResponseWriter, r *http.Request) { return } configPwd, ishas := libs.GetConfig("filePwd") + //log.Printf("configPwd: %s", configPwd) // 如果不是加密文件或者exe文件 if !ishas || strings.HasPrefix(string(fileData), "link::") { // 没开启加密,直接明文写入 @@ -111,6 +112,7 @@ func HandleReadFile(w http.ResponseWriter, r *http.Request) { return } strData := string(fileData) + //log.Printf("isPwd: %v", strData) if strings.HasPrefix(strData, "link::") { res := libs.APIResponse{Message: "文件读取成功", Data: strData} json.NewEncoder(w).Encode(res) @@ -118,6 +120,7 @@ func HandleReadFile(w http.ResponseWriter, r *http.Request) { } // 判断是否为加密文件 isPwd := IsPwdFile(fileData) + if !isPwd { // 未加密文件,直接返回 content := base64.StdEncoding.EncodeToString(fileData)