chore: 规范tg模块

twbworld · Jan 13, 2024 · 3332147 · 3332147
1 parent e4fedb3
commit 3332147
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 60 deletions.
diff --git a/controller/index.go b/controller/index.go
@@ -50,6 +50,6 @@ func Tg(ctx *gin.Context) {
 	}()
 
 	service.IsTgSend = false
-	err = service.TgWebhookHandle(ctx)
+	err = service.Webhook(ctx)
 
 }
diff --git a/initialize/server.go b/initialize/server.go
@@ -72,7 +72,7 @@ func Init() {
 		global.Log.Panicln("服务关闭出错[oijojiud]", err)
 	}
 	service.TgSend("服务退出成功")
-	service.TgWebhookClear()
+	TgClear()
 	global.Log.Infoln("服务退出成功")
 
 }
diff --git a/initialize/tg.go b/initialize/tg.go
@@ -40,9 +40,17 @@ func TgInit() {
 		}
 
 		if info.LastErrorDate != 0 {
-			global.Log.Errorln("Telegram callback failed[fosdjfoisj]: ", info.LastErrorMessage)
+			global.Log.Errorln("获取tg信息错误[fosdjfoisj]: ", info.LastErrorMessage)
 			return
 		}
 		global.Log.Printf("成功配置tg[doiasjo]: %s", global.Bot.Self.UserName)
 	}
 }
+
+func TgClear() (err error) {
+	if global.Bot == nil {
+		return
+	}
+	_, err = global.Bot.Request(tg.DeleteWebhookConfig{})
+	return
+}
diff --git a/initialize/userHandle.go b/initialize/userHandle.go
@@ -27,6 +27,7 @@ func Clear() {
 		} else {
 			err = tx.Commit()
 			if err != nil {
+				tx.Rollback()
 				panic("错误[sgfjhios]: " + err.Error())
 			}
 			global.Log.Println("[Clear]成功")
@@ -105,6 +106,7 @@ func Expiry() {
 		} else {
 			err = tx.Commit()
 			if err != nil {
+				tx.Rollback()
 				panic("错误[opiakjf]: " + err.Error())
 			}
 			global.Log.Infoln("[Expiry]过期用户处理: ", ids)