From 3a16b9feaef765ff1aec1e1d1eb3b52928f0828d Mon Sep 17 00:00:00 2001 From: Mmx233 Date: Mon, 1 Jan 2024 16:02:00 +0800 Subject: [PATCH] =?UTF-8?q?improve:=20=E8=87=AA=E5=8A=A8=20acid=20?= =?UTF-8?q?=E5=9C=A8=20reality=20=E6=9C=AA=E6=89=BE=E5=88=B0=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=20fallback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/controllers/login.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/controllers/login.go b/internal/controllers/login.go index 0f8c0f3..b295022 100644 --- a/internal/controllers/login.go +++ b/internal/controllers/login.go @@ -26,6 +26,7 @@ func Login(eth *tools.Eth, debugOutput bool) error { }) // Reality 与 Acid + var acidOnReality bool if config.Settings.Reality.Enable { log.Debugln("开始 Reality 流程") acid, _, err := srunClient.Reality(config.Settings.Reality.Addr, flags.AutoAcid) @@ -35,20 +36,22 @@ func Login(eth *tools.Eth, debugOutput bool) error { } if flags.AutoAcid { if acid != "" { + acidOnReality = true log.Debugf("使用嗅探 acid: %s", acid) srunClient.LoginInfo.Meta.Acid = acid } else { - log.Errorln("找不到 acid，使用配置 acid") + log.Debugln("Reality 流程未找到 acid") } } - } else if flags.AutoAcid { + } + if !acidOnReality && flags.AutoAcid { log.Debugln("开始嗅探 acid") acid, err := srunClient.DetectAcid() if err != nil { if errors.Is(err, srun.ErrAcidCannotFound) { - log.Errorln("找不到 acid，使用配置 acid") + log.Warnln("找不到 acid，使用配置 acid") } else { - log.Errorf("嗅探 acid 失败，使用配置 acid: %v", err) + log.Warnf("嗅探 acid 失败，使用配置 acid: %v", err) } } else { log.Debugf("使用嗅探 acid: %s", acid)