From 70ee9df22a2a63d05c181e9884089a25ba7ed4e4 Mon Sep 17 00:00:00 2001 From: spark Date: Wed, 12 Feb 2025 12:17:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(data):=E4=BC=98=E5=8C=96Edge=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=E8=B0=83=E7=94=A8=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DAI=E5=88=86=E6=9E=90=E4=BD=BF=E7=94=A8BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 Windows 系统上动态检查 Edge 浏览器安装情况 - 根据系统环境选择合适的 Edge 可执行文件路径 - 优化了 openai_api 和 stock_data_api 中的 Edge 调用逻辑 --- backend/data/openai_api.go | 36 ++++++++----- backend/data/stock_data_api.go | 96 ++++++++++++++++++++++++---------- 2 files changed, 89 insertions(+), 43 deletions(-) diff --git a/backend/data/openai_api.go b/backend/data/openai_api.go index dec35f7..9b583a4 100644 --- a/backend/data/openai_api.go +++ b/backend/data/openai_api.go @@ -293,20 +293,28 @@ func GetFinancialReports(stockCode string) *[]string { // 创建一个 chromedp 上下文 timeoutCtx, timeoutCtxCancel := context.WithTimeout(context.Background(), 30*time.Second) defer timeoutCtxCancel() - - edgePath := `C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe` - - pctx, pcancel := chromedp.NewExecAllocator( - timeoutCtx, - chromedp.ExecPath(edgePath), - chromedp.Flag("headless", true), - ) - defer pcancel() - ctx, cancel := chromedp.NewContext( - pctx, - chromedp.WithLogf(logger.SugaredLogger.Infof), - chromedp.WithErrorf(logger.SugaredLogger.Errorf), - ) + var ctx context.Context + var cancel context.CancelFunc + path, e := checkEdgeOnWindows() + if e { + pctx, pcancel := chromedp.NewExecAllocator( + timeoutCtx, + chromedp.ExecPath(path), + chromedp.Flag("headless", true), + ) + defer pcancel() + ctx, cancel = chromedp.NewContext( + pctx, + chromedp.WithLogf(logger.SugaredLogger.Infof), + chromedp.WithErrorf(logger.SugaredLogger.Errorf), + ) + } else { + ctx, cancel = chromedp.NewContext( + timeoutCtx, + chromedp.WithLogf(logger.SugaredLogger.Infof), + chromedp.WithErrorf(logger.SugaredLogger.Errorf), + ) + } defer cancel() defer func(ctx context.Context) { diff --git a/backend/data/stock_data_api.go b/backend/data/stock_data_api.go index c4af1e7..a739942 100644 --- a/backend/data/stock_data_api.go +++ b/backend/data/stock_data_api.go @@ -19,6 +19,7 @@ import ( "github.com/go-resty/resty/v2" "go-stock/backend/db" "go-stock/backend/logger" + "golang.org/x/sys/windows/registry" "golang.org/x/text/encoding/simplifiedchinese" "golang.org/x/text/transform" "gorm.io/gorm" @@ -517,25 +518,32 @@ func (IndexBasic) TableName() string { func SearchStockPriceInfo(stockCode string) *[]string { url := "https://www.cls.cn/stock?code=" + stockCode - // 创建一个 chromedp 上下文 + // 创建一个 chromedp 上下文 timeoutCtx, timeoutCtxCancel := context.WithTimeout(context.Background(), 30*time.Second) defer timeoutCtxCancel() - - edgePath := `C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe` - - pctx, pcancel := chromedp.NewExecAllocator( - timeoutCtx, - chromedp.ExecPath(edgePath), - chromedp.Flag("headless", true), - ) - defer pcancel() - ctx, cancel := chromedp.NewContext( - pctx, - chromedp.WithLogf(logger.SugaredLogger.Infof), - chromedp.WithErrorf(logger.SugaredLogger.Errorf), - ) - + var ctx context.Context + var cancel context.CancelFunc + path, e := checkEdgeOnWindows() + if e { + pctx, pcancel := chromedp.NewExecAllocator( + timeoutCtx, + chromedp.ExecPath(path), + chromedp.Flag("headless", true), + ) + defer pcancel() + ctx, cancel = chromedp.NewContext( + pctx, + chromedp.WithLogf(logger.SugaredLogger.Infof), + chromedp.WithErrorf(logger.SugaredLogger.Errorf), + ) + } else { + ctx, cancel = chromedp.NewContext( + timeoutCtx, + chromedp.WithLogf(logger.SugaredLogger.Infof), + chromedp.WithErrorf(logger.SugaredLogger.Errorf), + ) + } defer cancel() defer func(ctx context.Context) { @@ -603,20 +611,30 @@ func SearchStockInfo(stock, msgType string) *[]string { // 创建一个 chromedp 上下文 timeoutCtx, timeoutCtxCancel := context.WithTimeout(context.Background(), 30*time.Second) defer timeoutCtxCancel() - edgePath := `C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe` - - pctx, pcancel := chromedp.NewExecAllocator( - timeoutCtx, - chromedp.ExecPath(edgePath), - chromedp.Flag("headless", true), - ) - defer pcancel() - ctx, cancel := chromedp.NewContext( - pctx, - chromedp.WithLogf(logger.SugaredLogger.Infof), - chromedp.WithErrorf(logger.SugaredLogger.Errorf), - ) + var ctx context.Context + var cancel context.CancelFunc + path, e := checkEdgeOnWindows() + if e { + pctx, pcancel := chromedp.NewExecAllocator( + timeoutCtx, + chromedp.ExecPath(path), + chromedp.Flag("headless", true), + ) + defer pcancel() + ctx, cancel = chromedp.NewContext( + pctx, + chromedp.WithLogf(logger.SugaredLogger.Infof), + chromedp.WithErrorf(logger.SugaredLogger.Errorf), + ) + } else { + ctx, cancel = chromedp.NewContext( + timeoutCtx, + chromedp.WithLogf(logger.SugaredLogger.Infof), + chromedp.WithErrorf(logger.SugaredLogger.Errorf), + ) + } defer cancel() + defer func(ctx context.Context) { err := chromedp.Cancel(ctx) if err != nil { @@ -690,3 +708,23 @@ func SearchStockInfoByCode(stock string) *[]string { }) return &messages } + +// checkEdgeOnWindows 在 Windows 系统上检查Edge浏览器是否安装，并返回安装路径 +func checkEdgeOnWindows() (string, bool) { + key, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe`, registry.QUERY_VALUE) + if err != nil { + // 尝试在 WOW6432Node 中查找（适用于 64 位系统上的 32 位程序） + key, err = registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe`, registry.QUERY_VALUE) + if err != nil { + return "", false + } + defer key.Close() + } + defer key.Close() + path, _, err := key.GetStringValue("Path") + logger.SugaredLogger.Infof("Edge安装路径：%s", path) + if err != nil { + return "", false + } + return path + "\\msedge.exe", true +}