apps/ecs
1
0
Fork 0
mirror of https://github.com/oneclickvirt/ecs.git synced 2025-10-05 15:27:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v0.0.75

Browse Source 
修复终止命令在选项选择时不可用的问题
展示分享链接时同时展示http和https协议的链接
This commit is contained in:
spiritsoul
2024-10-04 23:30:06 +08:00
parent bdd00d46f8
commit 681da08f01
2 changed files with 163 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
utils/utils.go
View File

@@ -238,7 +238,7 @@ func PrintAndCapture(f func(), tempOutput, output string) string {
}
// UploadText 上传文本内容到指定URL
func UploadText(absPath string) (string, error) {
func UploadText(absPath string) (string, string, error) {
primaryURL := "http://hpaste.spiritlhl.net/api/upload"
backupURL := "https://paste.spiritlhl.net/api/upload"
token := network.SecurityUploadToken
@@ -250,10 +250,10 @@ func UploadText(absPath string) (string, error) {
SetRetryFixedInterval(2 * time.Second)
file, err := os.Open(absPath)
if err != nil {
return "", err
return "", "", err
}
defer file.Close()
upload := func(url string) (string, error) {
upload := func(url string) (string, string, error) {
resp, err := client.R().
SetHeader("Authorization", token).
SetHeader("Format", "RANDOM").
@@ -264,23 +264,24 @@ func UploadText(absPath string) (string, error) {
SetFileReader("file", "goecs.txt", file).
Post(url)
if err != nil {
return "", err
return "", "", err
}
if resp.StatusCode >= 200 && resp.StatusCode <= 299 {
return strings.ReplaceAll(resp.String(), "https://paste.spiritlhl.net/", "http://hpaste.spiritlhl.net/"), nil
return strings.ReplaceAll(resp.String(), "https://paste.spiritlhl.net/", "http://hpaste.spiritlhl.net/"),
strings.ReplaceAll(resp.String(), "http://hpaste.spiritlhl.net/", "https://paste.spiritlhl.net/"), nil
} else {
return "", fmt.Errorf("upload failed with status code: %d", resp.StatusCode)
return "", "", fmt.Errorf("upload failed with status code: %d", resp.StatusCode)
}
}
result, err := upload(primaryURL)
http_url, https_url, err := upload(primaryURL)
if err == nil {
return result, nil
return http_url, https_url, nil
}
result, err = upload(backupURL)
http_url, https_url, err = upload(backupURL)
if err != nil {
return "", err
return "", "", err
}
return result, nil
return http_url, https_url, nil
}
// ProcessAndUpload 创建结果文件并上传文件
@@ -321,12 +322,12 @@ func ProcessAndUpload(output string, filePath string, enableUplaod bool) {
return
}
// 上传文件并生成短链接
shorturl, err3 := UploadText(absPath)
http_url, https_url, err3 := UploadText(absPath)
if err3 != nil {
fmt.Println("Upload failed, cannot generate short URL.")
fmt.Println(err3.Error())
return
}
fmt.Println("Upload successful, short URL:", shorturl)
fmt.Println("Upload successful, short URL:", http_url, https_url)
}
}