feat: channels/audit UI unify, apply flow hardening, bump v1.1.12

This commit is contained in:
2026-03-10 03:32:40 +08:00
parent 52b0d742a7
commit 8b2557b2bf
15 changed files with 2311 additions and 262 deletions

View File

@@ -11,18 +11,20 @@ import (
"xiaji-go/config"
"xiaji-go/internal/bot"
"xiaji-go/internal/channel"
"xiaji-go/internal/feishu"
"xiaji-go/internal/qq"
"xiaji-go/internal/service"
"xiaji-go/internal/web"
"xiaji-go/models"
"xiaji-go/version"
"github.com/gin-gonic/gin"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
)
func main() {
// 版本信息
if len(os.Args) > 1 && (os.Args[1] == "-v" || os.Args[1] == "--version" || os.Args[1] == "version") {
fmt.Println(version.Info())
return
@@ -30,7 +32,6 @@ func main() {
log.Printf("🦞 %s", version.Info())
// 1. 加载配置
cfgPath := "config.yaml"
if len(os.Args) > 1 {
cfgPath = os.Args[1]
@@ -41,28 +42,32 @@ func main() {
log.Fatalf("无法加载配置: %v", err)
}
// 2. 初始化数据库
db, err := gorm.Open(sqlite.Open(cfg.Database.Path), &gorm.Config{})
if err != nil {
log.Fatalf("无法连接数据库: %v", err)
}
// 3. 自动迁移表结构
if err := models.Migrate(db); err != nil {
log.Fatalf("数据库迁移失败: %v", err)
}
// 4. 初始化核心服务
if err := channel.InitSecretCipher(cfg.Server.Key); err != nil {
log.Fatalf("初始化渠道密钥加密失败: %v", err)
}
// DB 渠道配置覆盖 YAML 配置
if err := channel.ApplyChannelConfig(db, cfg); err != nil {
log.Printf("⚠️ 渠道配置加载失败,继续使用 YAML: %v", err)
}
finance := service.NewFinanceService(db)
defer finance.Close()
// 全局 context用于优雅退出
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
// 5. 启动 Telegram Bot
if cfg.Telegram.Enabled {
tgBot, err := bot.NewTGBot(cfg.Telegram.Token, finance)
tgBot, err := bot.NewTGBot(db, cfg.Telegram.Token, finance)
if err != nil {
log.Printf("⚠️ TG Bot 启动失败: %v", err)
} else {
@@ -70,29 +75,48 @@ func main() {
}
}
// 6. 启动 QQ Bot
if cfg.QQBot.Enabled {
qqBot := qq.NewQQBot(cfg.QQBot.AppID, cfg.QQBot.Secret, finance)
qqBot := qq.NewQQBot(db, cfg.QQBot.AppID, cfg.QQBot.Secret, finance)
go qqBot.Start(ctx)
}
// 7. 启动 Web 后台
webServer := web.NewWebServer(db, cfg.Server.Port, cfg.Admin.Username, cfg.Admin.Password)
go webServer.Start()
engine := gin.New()
engine.Use(gin.Recovery())
engine.Use(gin.Logger())
reloadFn := func() (string, error) {
if err := channel.ApplyChannelConfig(db, cfg); err != nil {
return "", err
}
return fmt.Sprintf("reload ok: tg=%v qq=%v feishu=%v", cfg.Telegram.Enabled, cfg.QQBot.Enabled, cfg.Feishu.Enabled), nil
}
webServer := web.NewWebServer(db, finance, cfg.Server.Port, cfg.Admin.Username, cfg.Admin.Password, cfg.Server.Key, reloadFn)
webServer.RegisterRoutes(engine)
if cfg.Feishu.Enabled {
fsBot := feishu.NewBot(db, finance, cfg.Feishu.AppID, cfg.Feishu.AppSecret, cfg.Feishu.VerificationToken, cfg.Feishu.EncryptKey)
fsBot.RegisterRoutes(engine)
go fsBot.Start(ctx)
}
go func() {
logAddr := fmt.Sprintf(":%d", cfg.Server.Port)
log.Printf("🌐 Web后台运行在 http://127.0.0.1%s", logAddr)
if err := engine.Run(logAddr); err != nil {
log.Printf("❌ Web服务启动失败: %v", err)
}
}()
// 8. 优雅关闭
log.Println("🦞 Xiaji-Go 已全面启动")
sig := make(chan os.Signal, 1)
signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
<-sig
log.Println("⏳ 正在关闭服务...")
cancel() // 通知所有 goroutine 停止
// 等待一点时间让 goroutine 退出
cancel()
time.Sleep(2 * time.Second)
// 关闭数据库连接
sqlDB, err := db.DB()
if err == nil {
sqlDB.Close()