diff --git a/config.go b/config.go deleted file mode 100644 index f6ca91f8..00000000 --- a/config.go +++ /dev/null @@ -1,14 +0,0 @@ -// package main 主函数 -package main - -import ( - zero "github.com/wdvxdr1123/ZeroBot" - "github.com/wdvxdr1123/ZeroBot/driver" -) - -type zbpcfg struct { - Z zero.Config `json:"zero"` - W []*driver.WSClient `json:"ws"` -} - -var config zbpcfg diff --git a/main.go b/main.go index fbb7013b..fbac2a2f 100644 --- a/main.go +++ b/main.go @@ -24,8 +24,10 @@ import ( // vvvvvvv高优先级区vvvvvvv // // vvvvvvvvvvvvvv // // vvvv // + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/antiabuse" // 违禁词 - _ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat" // 基础词库 + + _ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat" // 基础词库 _ "github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage" // 统计睡眠时间 @@ -163,6 +165,13 @@ import ( // -----------------------以上为内置依赖,勿动------------------------ // ) +type zbpcfg struct { + Z zero.Config `json:"zero"` + W []*driver.WSClient `json:"ws"` +} + +var config zbpcfg + func init() { sus := make([]int64, 0, 16) // 解析命令行参数 diff --git a/run.bat b/run.bat index 0317834c..3c17203f 100644 --- a/run.bat +++ b/run.bat @@ -3,5 +3,5 @@ go env -w GOPROXY=https://goproxy.cn,direct go env -w GO111MODULE=auto go mod tidy ::go build -ldflags="-s -w" -o ZeroBot-Plugin.exe -go run main.go main_win.go config.go +go run main.go main_win.go pause diff --git a/run.sh b/run.sh index 11835cdc..39afee7e 100644 --- a/run.sh +++ b/run.sh @@ -3,4 +3,4 @@ go env -w GOPROXY=https://goproxy.cn,direct go env -w GO111MODULE=auto go mod tidy #go build -ldflags="-s -w" -o ZeroBot-Plugin -go run main.go config.go \ No newline at end of file +go run main.go \ No newline at end of file