mapleafgo/game-driver
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

全面替换log为zap

Browse Source
This commit is contained in:
mapleafgo
2024-11-08 18:42:13 +08:00
parent 3da1fe761e
commit edb8d30605
17 changed files with 269 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/routes/wait.go
View File

@@ -5,12 +5,12 @@ import (
"game-driver/internal/schema"
"game-driver/leaf"
"game-driver/pkg/audio"
"game-driver/pkg/logger"
"game-driver/pkg/relay"
"game-driver/pkg/tts"
"game-driver/pkg/utils"
"game-driver/pkg/video"
"github.com/gopxl/beep/v2/speaker"
"log"
"sync"
"time"
)
@@ -34,7 +34,7 @@ func WaitAction(c *leaf.Context) {
payload := leaf.Value[*schema.WaitModel](c, middleware.PayloadJSONKey)
if payload.Start != 0 && payload.End != 0 && time.Unix(payload.Start, 0).After(time.Unix(payload.End, 0)) {
log.Println("开始时间大于结束时间")
logger.Infoln("开始时间大于结束时间")
return
}
@@ -81,7 +81,7 @@ func WaitAction(c *leaf.Context) {
}()
case schema.WaitWeb:
default:
log.Printf("不支持的类型: %d\n", item.Type)
logger.Infof("不支持的类型: %d\n", item.Type)
}
}
}
@@ -89,7 +89,7 @@ func WaitAction(c *leaf.Context) {
func audioAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel) {
if item.Start != 0 && time.Unix(item.Start, 0).Before(time.Unix(root.Start, 0)) {
log.Println("开始时间小于根任务开始时间")
logger.Infoln("开始时间小于根任务开始时间")
return
}
@@ -102,13 +102,13 @@ func audioAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
case <-c.Done():
case <-timerAction(item.Start):
{
log.Println("开始执行后台任务")
logger.Infoln("开始执行后台任务")
data := utils.LinkAudio(item.Data)
ctrl, closer := audio.PlayBgmMP3(data)
defer closer()
if ctrl == nil {
log.Println("播放背景音乐失败")
logger.Infoln("播放背景音乐失败")
return
}
@@ -126,7 +126,7 @@ func audioAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
func ttsAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel) {
if item.Start != 0 && time.Unix(item.Start, 0).Before(time.Unix(root.Start, 0)) {
log.Println("开始时间小于根任务开始时间")
logger.Infoln("开始时间小于根任务开始时间")
return
}
@@ -137,7 +137,7 @@ func ttsAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel
reader, err := tts.DefaultTTS.Get(item.Data)
if err != nil {
log.Println("语音合成异常: ", err)
logger.Infoln("语音合成异常: ", err)
return
}
@@ -159,7 +159,7 @@ func ttsAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel
func relayAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel) {
if item.Start != 0 && time.Unix(item.Start, 0).Before(time.Unix(root.Start, 0)) {
log.Println("开始时间小于根任务开始时间")
logger.Infoln("开始时间小于根任务开始时间")
return
}
@@ -170,7 +170,7 @@ func relayAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
device, err := relay.New(item.Data, nil)
if err != nil {
log.Println("继电器初始化异常: ", err)
logger.Infoln("继电器初始化异常: ", err)
return
}
defer device.Close()
@@ -188,7 +188,7 @@ func relayAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
func videoAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel) {
if item.Start != 0 && time.Unix(item.Start, 0).Before(time.Unix(root.Start, 0)) {
log.Println("开始时间小于根任务开始时间")
logger.Infoln("开始时间小于根任务开始时间")
return
}
@@ -207,7 +207,7 @@ func videoAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
for {
err := video.Play(c, utils.LinkVideo(item.Data))
if err != nil {
log.Panicln("视频播放异常: ", err)
logger.Panicln("视频播放异常: ", err)
}
select {
case <-c.Done():