diff --git a/go.mod b/go.mod index 77db549..14b1a63 100644 --- a/go.mod +++ b/go.mod @@ -1,19 +1,18 @@ module yatori-go-console -go 1.22 - -replace yatori-go-core => github.com/Yatori-Dev/yatori-go-core v1.0.0 +go 1.22.4 require ( github.com/faiface/beep v1.1.0 github.com/spf13/viper v1.19.0 github.com/thedevsaddam/gojsonq v1.9.1 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df - yatori-go-core v0.0.0-00010101000000-000000000000 -//github.com/Yatori-Dev/yatori-go-core v0.0.0-20241128062333-62529e779228 ) +require github.com/Yatori-Dev/yatori-go-core v1.0.0 + require ( + //github.com/Yatori-Dev/yatori-go-core v1.0.1-0.20241128132014-0686bf0299db // indirect github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/hajimehoshi/go-mp3 v0.3.4 // indirect github.com/hajimehoshi/oto v0.7.1 // indirect diff --git a/go.sum b/go.sum index efe658d..e57a5f3 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/Yatori-Dev/yatori-go-core v1.0.0 h1:427ZhG45ql4wIffFJ288jmRixupY2h5t98HOQu2ulM8= -github.com/Yatori-Dev/yatori-go-core v1.0.0/go.mod h1:a2Lx2k1Xa0ecrzMMblyq7RYWTlP3465oUVR2VCHk8Xc= +github.com/Yatori-Dev/yatori-go-core v1.0.0 h1:Rwe6qEOLNpCJBTgYS3UkbN09kWAXas0k8w92hiPdCHw= +github.com/Yatori-Dev/yatori-go-core v1.0.0/go.mod h1:F7qQeB6dQ2FtzwTW7V3+vNPeHXspxhm4hfEAAJDAsSg= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/logic/Lunch.go b/logic/Lunch.go index 05a2464..a51837d 100644 --- a/logic/Lunch.go +++ b/logic/Lunch.go @@ -1,6 +1,7 @@ package logic import ( + lg "github.com/Yatori-Dev/yatori-go-core/utils/log" "math/rand" "os" "strings" @@ -11,7 +12,6 @@ import ( "yatori-go-console/logic/xuexitong" "yatori-go-console/logic/yinghua" "yatori-go-console/utils" - lg "yatori-go-core/utils/log" ) func Lunch() { diff --git a/logic/enaea/EnaeaPart.go b/logic/enaea/EnaeaPart.go index 8cb1d3d..67bbb0d 100644 --- a/logic/enaea/EnaeaPart.go +++ b/logic/enaea/EnaeaPart.go @@ -2,6 +2,9 @@ package enaea import ( "fmt" + "github.com/Yatori-Dev/yatori-go-core/aggregation/enaea" + enaeaApi "github.com/Yatori-Dev/yatori-go-core/api/enaea" + lg "github.com/Yatori-Dev/yatori-go-core/utils/log" "log" "os" "sync" @@ -9,9 +12,6 @@ import ( "yatori-go-console/config" utils2 "yatori-go-console/utils" modelLog "yatori-go-console/utils/log" - "yatori-go-core/aggregation/enaea" - enaeaApi "yatori-go-core/api/enaea" - lg "yatori-go-core/utils/log" ) var videosLock sync.WaitGroup //视屏锁 diff --git a/logic/xuexitong/XueXiTongPart.go b/logic/xuexitong/XueXiTongPart.go index 025d903..7bf7f65 100644 --- a/logic/xuexitong/XueXiTongPart.go +++ b/logic/xuexitong/XueXiTongPart.go @@ -1,11 +1,11 @@ package xuexitong import ( + "github.com/Yatori-Dev/yatori-go-core/aggregation/yinghua" + yinghuaApi "github.com/Yatori-Dev/yatori-go-core/api/yinghua" + lg "github.com/Yatori-Dev/yatori-go-core/utils/log" "log" "yatori-go-console/config" - "yatori-go-core/aggregation/yinghua" - yinghuaApi "yatori-go-core/api/yinghua" - lg "yatori-go-core/utils/log" ) // 用于过滤英华账号 diff --git a/logic/yinghua/YinghuaPart.go b/logic/yinghua/YinghuaPart.go index 12c851a..c7a342b 100644 --- a/logic/yinghua/YinghuaPart.go +++ b/logic/yinghua/YinghuaPart.go @@ -2,6 +2,10 @@ package yinghua import ( "fmt" + "github.com/Yatori-Dev/yatori-go-core/aggregation/yinghua" + yinghuaApi "github.com/Yatori-Dev/yatori-go-core/api/yinghua" + "github.com/Yatori-Dev/yatori-go-core/utils" + lg "github.com/Yatori-Dev/yatori-go-core/utils/log" "github.com/thedevsaddam/gojsonq" "log" "os" @@ -12,10 +16,6 @@ import ( "yatori-go-console/config" utils2 "yatori-go-console/utils" modelLog "yatori-go-console/utils/log" - "yatori-go-core/aggregation/yinghua" - yinghuaApi "yatori-go-core/api/yinghua" - "yatori-go-core/utils" - lg "yatori-go-core/utils/log" ) var videosLock sync.WaitGroup //视屏锁 diff --git a/utils/NoticeUtils.go b/utils/NoticeUtils.go index e01b9d6..3527f43 100644 --- a/utils/NoticeUtils.go +++ b/utils/NoticeUtils.go @@ -1,6 +1,7 @@ package utils import ( + lg "github.com/Yatori-Dev/yatori-go-core/utils/log" "github.com/faiface/beep" "github.com/faiface/beep/mp3" "github.com/faiface/beep/speaker" @@ -8,7 +9,6 @@ import ( "os" "sync" "time" - lg "yatori-go-core/utils/log" ) var NSMutex sync.Mutex diff --git a/utils/YatoriConsoleInit.go b/utils/YatoriConsoleInit.go index 049c57c..8626602 100644 --- a/utils/YatoriConsoleInit.go +++ b/utils/YatoriConsoleInit.go @@ -2,9 +2,9 @@ package utils import ( _ "embed" + "github.com/Yatori-Dev/yatori-go-core/utils" "log" "os" - "yatori-go-core/utils" ) //go:embed finishNotice.mp3 diff --git a/utils/log/LogModel.go b/utils/log/LogModel.go index 30da6ec..41fe179 100644 --- a/utils/log/LogModel.go +++ b/utils/log/LogModel.go @@ -1,6 +1,6 @@ package log -import lg "yatori-go-core/utils/log" +import lg "github.com/Yatori-Dev/yatori-go-core/utils/log" func ModelPrint(isSw bool, LOGLEVEL lg.LOGLEVEL, logText ...interface{}) { if isSw {