优化

build/windows/installer/wails_tools.nsh

@@ -14,7 +14,7 @@
     !define INFO_PRODUCTNAME "res-downloader"
 !endif
 !ifndef INFO_PRODUCTVERSION
-    !define INFO_PRODUCTVERSION "3.0.0"
+    !define INFO_PRODUCTVERSION "3.0.1"
 !endif
 !ifndef INFO_COPYRIGHT
     !define INFO_COPYRIGHT "Copyright © 2023"

core/app.go

@@ -42,7 +42,7 @@ func GetApp(assets embed.FS) *App {
 		appOnce = &App{
 			assets:      assets,
 			AppName:     "res-downloader",
-			Version:     "3.0.0",
+			Version:     "3.0.1",
 			Description: "res-downloader是一款集网络资源嗅探 + 高速下载功能于一体的软件，高颜值、高性能和多样化，提供个人用户下载自己上传到各大平台的网络资源功能！",
 			Copyright:   "Copyright © 2023~" + strconv.Itoa(time.Now().Year()),
 			PublicCrt: []byte(`

core/http.go

@@ -1,6 +1,7 @@
 package core
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"github.com/wailsapp/wails/v2/pkg/runtime"
@@ -35,7 +36,18 @@ func (h *HttpServer) run() {
 		log.Fatalf("无法启动监听: %v", err)
 	}
 	fmt.Println("服务已启动，监听 http://" + globalConfig.Host + ":" + globalConfig.Port)
-	if err := http.Serve(listener, proxyOnce.Proxy); err != nil {
+	if err := http.Serve(listener, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Host == "127.0.0.1:"+globalConfig.Port && strings.Contains(r.URL.Path, "/cert") {
+			w.Header().Set("Content-Type", "application/x-x509-ca-data")
+			w.Header().Set("Content-Disposition", "attachment;filename=res-downloader-public.crt")
+			w.Header().Set("Content-Transfer-Encoding", "binary")
+			w.Header().Set("Content-Length", fmt.Sprintf("%d", len(appOnce.PublicCrt)))
+			w.WriteHeader(http.StatusOK)
+			_, err = io.Copy(w, io.NopCloser(bytes.NewReader(appOnce.PublicCrt)))
+		} else {
+			proxyOnce.Proxy.ServeHTTP(w, r) // 代理
+		}
+	})); err != nil {
 		fmt.Printf("服务器异常: %v", err)
 	}
 }

core/proxy.go

@@ -105,40 +105,18 @@ func (p *Proxy) setTransport() {
 }
 
 func (p *Proxy) httpRequestEvent(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
-	if strings.Contains(r.Host, "res-downloader.666666.com") {
-		if strings.Contains(r.URL.Path, "/wechat") {
-			if globalConfig.WxAction && r.URL.Query().Get("type") == "1" {
-				return p.handleWechatRequest(r, ctx)
-			} else if !globalConfig.WxAction && r.URL.Query().Get("type") == "2" {
-				return p.handleWechatRequest(r, ctx)
-			} else {
-				return r, p.buildEmptyResponse(r)
-			}
-		}
-
-		if strings.Contains(r.URL.Path, "/cert") {
-			return p.handleCertRequest(r, ctx)
+	if strings.Contains(r.Host, "res-downloader.666666.com") && strings.Contains(r.URL.Path, "/wechat") {
+		if globalConfig.WxAction && r.URL.Query().Get("type") == "1" {
+			return p.handleWechatRequest(r, ctx)
+		} else if !globalConfig.WxAction && r.URL.Query().Get("type") == "2" {
+			return p.handleWechatRequest(r, ctx)
+		} else {
+			return r, p.buildEmptyResponse(r)
 		}
 	}
 	return r, nil
 }
 
-func (p *Proxy) handleCertRequest(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
-	resp := &http.Response{
-		StatusCode: http.StatusOK,
-		ProtoMajor: 1,
-		ProtoMinor: 1,
-		Header: http.Header{
-			"Content-Type":              []string{"application/x-x509-ca-data"},
-			"Content-Disposition":       []string{"attachment;filename=z-der-data.crt"},
-			"Content-Transfer-Encoding": []string{"binary"},
-		},
-		Body:    io.NopCloser(bytes.NewReader(appOnce.PublicCrt)),
-		Request: r,
-	}
-	return r, resp
-}
-
 func (p *Proxy) handleWechatRequest(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
 	body, err := io.ReadAll(r.Body)
 	if err != nil {

core/utils.go

@@ -4,6 +4,7 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
+	"github.com/wailsapp/wails/v2/pkg/runtime"
 	"net/url"
 	"os"
 	"strings"
@@ -14,9 +15,11 @@ func Empty(data interface{}) {
 }
 
 func DialogErr(message string) {
-	httpServerOnce.send("message", map[string]interface{}{
-		"code":    0,
-		"message": message,
+	_, _ = runtime.MessageDialog(appOnce.ctx, runtime.MessageDialogOptions{
+		Type:          runtime.ErrorDialog,
+		Title:         "Error",
+		Message:       message,
+		DefaultButton: "Cancel",
 	})
 }
 

frontend/src/components/Footer.vue

@@ -47,6 +47,7 @@
         <div>{{ store.appInfo.Copyright }}</div>
         <div class="flex">
           <button class="pl-4" @click="toWebsite('https://s.gowas.cn/d/4089')">论坛</button>
+          <button class="pl-4" @click="toWebsite('http://127.0.0.1:8899/cert')">证书</button>
           <button class="pl-4" @click="toWebsite('https://github.com/putyy/res-downloader')">软件源码</button>
           <button class="pl-4" @click="toWebsite('https://github.com/putyy/res-downloader/issues')">帮助支持</button>
           <button class="pl-4" @click="toWebsite('https://github.com/putyy/res-downloader/releases')">更新日志</button>

frontend/src/components/layout/Sider.vue

@@ -55,11 +55,12 @@ import {
   CloudOutline,
   SettingsOutline,
   HelpCircleOutline,
-  MoonOutline, SunnyOutline
+  MoonOutline, SunnyOutline, LogoGithub
 } from "@vicons/ionicons5"
 import {useIndexStore} from "@/stores"
 import Footer from "@/components/Footer.vue"
 import Screen from "@/components/Screen.vue";
+import {BrowserOpenURL} from "../../../wailsjs/runtime";
 
 const route = useRoute()
 const router = useRouter()
@@ -106,6 +107,11 @@ const footerOptions = ref([
     key: 'theme',
     icon: theme,
   },
+  {
+    label: "github",
+    key: 'github',
+    icon: renderIcon(LogoGithub),
+  },
   {
     label: "关于",
     key: 'about',
@@ -122,6 +128,11 @@ const handleFooterUpdate = (key: string, item: MenuOption) => {
     showAppInfo.value = true
     return
   }
+
+  if (key === "github") {
+    BrowserOpenURL("https://github.com/putyy/res-downloader")
+    return
+  }
   if (key === "theme") {
     if (globalConfig.value.Theme === "darkTheme") {
       store.setConfig(Object.assign({}, globalConfig.value, {Theme: "lightTheme"}))

frontend/src/views/setting.vue

@@ -85,7 +85,7 @@
           <span>可结合其他代理工具，用于访问国外网站、以及正常网络无法访问的资源(格式http://username:[email protected]:port)</span>
         </NTooltip>
       </NFormItem>
-      <NFormItem label="开启上游代理" path="OpenProxy" size="small">
+      <NFormItem label="开启代理" path="OpenProxy" size="small">
         <NSwitch v-model:value="formValue.OpenProxy" />
       </NFormItem>
       <NFormItem label="下载代理" path="DownloadProxy" size="small">
@@ -101,6 +101,14 @@
       </NFormItem>
       <NFormItem label="连接数" path="TaskNumber" size="small">
         <NInputNumber v-model:value="formValue.TaskNumber" :min="2" :max="64" class="w-64"/>
+        <NTooltip trigger="hover">
+          <template #trigger>
+            <NIcon size="20" class="pl-1">
+              <HelpCircleOutline />
+            </NIcon>
+          </template>
+          <span>如不清楚请保持默认，通常CPU核心数*2，用于分片下载</span>
+        </NTooltip>
       </NFormItem>
       <NFormItem label="UserAgent" path="UserAgent" size="small">
         <NInput v-model:value="formValue.UserAgent" style="width:256px" placeholder=""/>

go.mod

@@ -1,11 +1,11 @@
 module res-downloader
 
-go 1.21
+go 1.22.0
 
 toolchain go1.23.2
 
 require (
-	github.com/elazarl/goproxy v0.0.0-20241221210044-9faedc2f9e9f
+	github.com/elazarl/goproxy v0.0.0-20241223171911-d5978cb8c956
 	github.com/matoous/go-nanoid/v2 v2.1.0
 	github.com/rs/zerolog v1.33.0
 	github.com/vrischmann/userdir v0.0.0-20151206171402-20f291cebd68
@@ -15,29 +15,28 @@ require (
 
 require (
 	github.com/bep/debounce v1.2.1 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
-	github.com/labstack/echo/v4 v4.10.2 // indirect
-	github.com/labstack/gommon v0.4.0 // indirect
-	github.com/leaanthony/go-ansi-parser v1.6.0 // indirect
-	github.com/leaanthony/gosod v1.0.3 // indirect
+	github.com/labstack/echo/v4 v4.13.3 // indirect
+	github.com/labstack/gommon v0.4.2 // indirect
+	github.com/leaanthony/go-ansi-parser v1.6.1 // indirect
+	github.com/leaanthony/gosod v1.0.4 // indirect
 	github.com/leaanthony/slicer v1.6.0 // indirect
-	github.com/leaanthony/u v1.1.0 // indirect
+	github.com/leaanthony/u v1.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/samber/lo v1.38.1 // indirect
-	github.com/tkrajina/go-reflector v0.5.6 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/samber/lo v1.47.0 // indirect
+	github.com/tkrajina/go-reflector v0.5.8 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/wailsapp/go-webview2 v1.0.18 // indirect
 	github.com/wailsapp/mimetype v1.4.1 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 )