From 5d05e0a3431a020d11e8c88ef9d23fc90b360768 Mon Sep 17 00:00:00 2001
From: wood chen <wood@czl.net>
Date: Thu, 19 Sep 2024 22:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/init.go | 21 +++++++++++++++++----
 main.go      | 12 +-----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/core/init.go b/core/init.go
index fb30bd9..c9534d0 100644
--- a/core/init.go
+++ b/core/init.go
@@ -39,7 +39,20 @@ func mustParseInt64(s string) (int64, error) {
 
 	return value, nil
 }
-func Init(botToken string, adminID int64) error {
+func Init() error {
+	// 从环境变量获取 BOT_TOKEN
+	BOT_TOKEN = os.Getenv("BOT_TOKEN")
+	if BOT_TOKEN == "" {
+		return fmt.Errorf("BOT_TOKEN 环境变量未设置")
+	}
+
+	// 从环境变量获取 ADMIN_ID
+	adminIDStr := os.Getenv("ADMIN_ID")
+	var err error
+	ADMIN_ID, err = mustParseInt64(adminIDStr)
+	if err != nil {
+		return fmt.Errorf("Invalid ADMIN_ID: %v", err)
+	}
 
 	// 设置数据库文件路径
 	DB_FILE = filepath.Join("/app/data", "q58.db")
@@ -55,7 +68,7 @@ func Init(botToken string, adminID int64) error {
 	chatIDStr := os.Getenv("CHAT_ID")
 	ChatID, err = mustParseInt64(chatIDStr)
 	if err != nil {
-		log.Fatalf("Invalid CHAT_ID: %v", err)
+		return fmt.Errorf("Invalid CHAT_ID: %v", err)
 	}
 
 	// 初始化 Symbols
@@ -74,9 +87,9 @@ func Init(botToken string, adminID int64) error {
 	}
 
 	// 初始化 Bot API
-	Bot, err = tgbotapi.NewBotAPI(botToken)
+	Bot, err = tgbotapi.NewBotAPI(BOT_TOKEN)
 	if err != nil {
-		log.Fatal(err)
+		return fmt.Errorf("创建 Bot API 失败: %v", err)
 	}
 
 	log.Printf("账户已授权 %s", Bot.Self.UserName)
diff --git a/main.go b/main.go
index 445d5a7..a6c5803 100644
--- a/main.go
+++ b/main.go
@@ -2,8 +2,6 @@ package main
 
 import (
 	"log"
-	"os"
-	"strconv"
 
 	"github.com/woodchen-ink/Q58Bot/core"
 	"github.com/woodchen-ink/Q58Bot/service"
@@ -13,15 +11,7 @@ import (
 func main() {
 	log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
 
-	botToken := os.Getenv("BOT_TOKEN")
-
-	adminIDStr := os.Getenv("ADMIN_ID")
-	adminID, err := strconv.ParseInt(adminIDStr, 10, 64)
-	if err != nil {
-		log.Fatalf("Failed to get ADMIN_ID: %v", err)
-	}
-
-	err = core.Init(botToken, adminID)
+	err := core.Init()
 	if err != nil {
 		log.Fatalf("Failed to initialize service: %v", err)
 	}