从url正则中去除用字 (#160 )

从url正则中去除用字,以防止url中包含用字前缀导致图片显示失败
fix lint
2026-02-08 16:10:25 +00:00 · 2022-03-20 14:43:55 +08:00 · 2022-03-20 14:40:47 +08:00 · 2022-03-20 14:33:43 +08:00 · 2022-03-20 14:20:37 +08:00 · 2022-03-20 10:59:11 +08:00
47 changed files with 819 additions and 859 deletions
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -28,7 +28,7 @@ jobs:
      - name: Setup Go environment
        uses: actions/setup-go@v2.1.3
        with:
-          go-version: 1.17
+          go-version: 1.18
      - name: Cache downloaded module
        uses: actions/cache@v2
        with:
--- a/.github/workflows/pull.yml
+++ b/.github/workflows/pull.yml
@@ -8,7 +8,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v2
        with:
-          go-version: 1.17
+          go-version: 1.18

      - name: Check out code into the Go module directory
        uses: actions/checkout@v2
@@ -25,12 +25,12 @@ jobs:
          # Optional: golangci-lint command line arguments.
          # args: --issues-exit-code=0

-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
-
          # Optional: if set to true then the action will use pre-installed Go.
          skip-go-installation: true

+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
+
          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
          # skip-pkg-cache: true

--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -8,7 +8,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v2
        with:
-          go-version: 1.17
+          go-version: 1.18

      - name: Check out code into the Go module directory
        uses: actions/checkout@v2
@@ -18,6 +18,7 @@ jobs:
        with:
          version: latest
          args: --issues-exit-code=0
+          # Optional: if set to true then the action will use pre-installed Go.
          skip-go-installation: true
      - name: Commit back
        continue-on-error: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v2
        with:
-          go-version: '1.17'
+          go-version: '1.18'

      - name: Run GoReleaser
        uses: goreleaser/goreleaser-action@v2
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -6,10 +6,6 @@ linters-settings:
  goimports:
    local-prefixes: github.com/FloatTech/ZeroBot-Plugin

-  gocritic:
-    disabled-checks:
-      - exitAfterDefer
-
  forbidigo:
    # Forbid the following identifiers
    forbid:
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
    - [x] /服务列表
    - [x] /服务详情
    - [x] @Bot 插件冲突检测 (会在本群发送一条消息并在约 1s 后撤回以检测其它同类 bot 中已启用的插件并禁用)
- **定时指令触发器** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/job"`
+- **定时指令触发器** `import _ "github.com/FloatTech/zbputils/job"`
    - [x] 记录以"完全匹配关键词"触发的(代表我执行的)指令
    - [x] 取消以"完全匹配关键词"触发的(代表我执行的)指令
    - [x] 记录在"cron"触发的指令
@@ -145,7 +145,7 @@ print("run[CQ:image,file="+j["img"]+"]")
    - [x] 退出群聊[群号]@Bot
    - [x] *入群欢迎
    - [x] *退群通知
-    - [x] 设置欢迎语[欢迎~]
+    - [x] 设置欢迎语[欢迎~]  可选添加 [{at}] [{nickname}] [{avatar}]
    - [x] 在[MM]月[dd]日的[hh]点[mm]分时(用[url])提醒大家[xxx]
    - [x] 在[MM]月[每周 | 周几]的[hh]点[mm]分时(用[url])提醒大家[xxx]
    - [x] 取消在[MM]月[dd]日的[hh]点[mm]分的提醒
@@ -159,11 +159,13 @@ print("run[CQ:image,file="+j["img"]+"]")
    - [ ] 同意好友请求
    - [ ] 撤回[@xxx] [xxx]
    - [ ] 警告[@xxx]
-    - [x] run[xxx]
    - 注：使用gist加群自动审批，请在群介绍添加以下说明，同时开启`需要回答问题并由管理员审核`：加群请在github新建一个gist，其文件名为本群群号的字符串的md5(小写)，内容为一行，是当前unix时间戳(10分钟内有效)。然后请将您的用户名和gist哈希(小写)按照username/gisthash的格式填写到回答即可。
+    - 设置欢迎语可选添加参数说明：{at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像
 - **GitHub仓库搜索** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"`
    - [x] >github [xxx]
    - [x] >github -p [xxx]
+- **注入指令** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/inject"`
+    - [x] run[CQ码]
 - **在线代码运行** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/runcode"`
    - [x] > runcode [language] help
    - [x] > runcode [language] [code block]
@@ -193,9 +195,17 @@ print("run[CQ:image,file="+j["img"]+"]")
 - **摸鱼** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu"`
    - [x] /启用 moyu
    - [x] /禁用 moyu
+```
+记录在"0 10 * * *"触发的指令
+摸鱼提醒
+```
 - **摸鱼人日历** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar"`
    - [x] /启用 moyucalendar
    - [x] /禁用 moyucalendar
+```
+记录在"30 8 * * *"触发的指令
+摸鱼人日历
+```
 - **涩图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/setutime"`
    - [x] 来份[涩图/二次元/风景/车万]
    - [x] 添加[涩图/二次元/风景/车万][P站图片ID]
@@ -233,6 +243,9 @@ print("run[CQ:image,file="+j["img"]+"]")
 - **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/fortune`
    - [x] 运势 | 抽签
    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘 东方归言录]
+- **原神抽卡** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/genshin`
+    - [x] 切换原神卡池
+    - [x] 原神十连
 - **睡眠管理** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage`
    - [x] 早安 | 晚安
 - **浅草寺求签** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/omikuji`
@@ -345,6 +358,18 @@ print("run[CQ:image,file="+j["img"]+"]")
    - [x] galCG[xxx]
    - [x] gal表情包[xxx]
    - [x] 更新gal
+- **城市疫情查询** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/epidemic"`
+    - [x] xxx疫情
+- **早报** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao"`
+    - api早上8点更新，推荐定时在8点30后。配合插件`job`中的记录在"cron"触发的指令使用
+    - [x] /启用 zaobao
+    - [x] /禁用 zaobao
+- **舔狗日记** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"`
+    - [x] 舔狗日记
+```
+记录在"00 9 * * *"触发的指令
+今日早报
+```
 - **TODO...**

 ## 使用方法
--- a/2
+++ b/2
--- a/go.mod
+++ b/go.mod
@@ -1,27 +1,28 @@
 module github.com/FloatTech/ZeroBot-Plugin

-go 1.17
+go 1.18

 require (
-	github.com/FloatTech/AnimeAPI v1.3.1-0.20220311024222-ed58ddf6834e
+	github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b
 	github.com/FloatTech/sqlite v0.2.1
-	github.com/FloatTech/zbputils v1.3.1-0.20220311032316-df8ab8b3c180
+	github.com/FloatTech/zbputils v1.3.2-0.20220319114731-e5088958ce00
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
-	github.com/fumiama/go-base16384 v1.3.0
+	github.com/fumiama/go-base16384 v1.4.0
 	github.com/fumiama/go-registry v0.1.1
-	github.com/fumiama/gofastTEA v0.0.9
+	github.com/fumiama/gofastTEA v0.0.10
 	github.com/fumiama/gotracemoe v0.0.3
 	github.com/fumiama/sqlite3 v1.14.6
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/jinzhu/gorm v1.9.16
 	github.com/mroth/weightedrand v0.4.1
 	github.com/pkumza/numcn v1.0.0
 	github.com/shirou/gopsutil/v3 v3.22.2
 	github.com/sirupsen/logrus v1.8.1
 	github.com/tidwall/gjson v1.14.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220307142419-a1b34e6da007
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217
 	golang.org/x/image v0.0.0-20220302094943-723b81ca9867
 )

@@ -31,7 +32,6 @@ require (
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
@@ -47,9 +47,9 @@ require (
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
+	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	modernc.org/libc v1.14.6 // indirect
+	modernc.org/libc v1.14.11 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.0.5 // indirect
+	modernc.org/memory v1.0.6 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,9 @@
-github.com/FloatTech/AnimeAPI v1.3.1-0.20220311024222-ed58ddf6834e h1:PKm/g1M7rYu6YMOV5k8xCOkgXTKF2Tk9v2exeYyCe+0=
-github.com/FloatTech/AnimeAPI v1.3.1-0.20220311024222-ed58ddf6834e/go.mod h1:JNF2O/RdbrsDIccSQ29a4g1pQRrZsN0Jh3ggFZYzZuY=
-github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
+github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b h1:lgYo6Q8s9yf/mkb2AeXS2d6mVrzNSLrDKf/FeNM5oxg=
+github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b/go.mod h1:VgjXeR2M2wxs43Rmh9/3ybn+gAtzSFRwBmb/rXFEwsM=
 github.com/FloatTech/sqlite v0.2.1 h1:9t6Me48XJJCIoPy4nLRvcdhcVKfT0c2lilp7SEKROG8=
 github.com/FloatTech/sqlite v0.2.1/go.mod h1:6NfHRzqOo9RWeMJEoAQVuo51Omd5LFNxCNQhMF02/9U=
-github.com/FloatTech/zbputils v1.3.1-0.20220307143543-1139754cacdf/go.mod h1:u+PiX1khNvtAgfRVTVP4hkA2oUnn5q5dTZSk1Cgp0Gw=
-github.com/FloatTech/zbputils v1.3.1-0.20220311032316-df8ab8b3c180 h1:8tE9DYu0+YMk3oKeO0ffl80818ZrPM9afbRgb2ag0tQ=
-github.com/FloatTech/zbputils v1.3.1-0.20220311032316-df8ab8b3c180/go.mod h1:u+PiX1khNvtAgfRVTVP4hkA2oUnn5q5dTZSk1Cgp0Gw=
+github.com/FloatTech/zbputils v1.3.2-0.20220319114731-e5088958ce00 h1:aNrYgJ4wTF7bUpbOt3CZPBn2/LeCOCicRqUBMJ8vgUw=
+github.com/FloatTech/zbputils v1.3.2-0.20220319114731-e5088958ce00/go.mod h1:Z4pVG8bHlDgVuPjgPvMyylPOBrroFq6x3a5QSVK1V08=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=
@@ -16,7 +14,6 @@ github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8=
 github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
 github.com/corona10/goimagehash v1.0.3 h1:NZM518aKLmoNluluhfHGxT3LGOnrojrxhGn63DR/CZA=
 github.com/corona10/goimagehash v1.0.3/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -34,27 +31,19 @@ github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzP
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo=
 github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY=
-github.com/fumiama/go-base16384 v1.3.0 h1:J5Xtwh/3alGJt/z/0IFralo5UQA89iFWQqbxj5ZQZi8=
-github.com/fumiama/go-base16384 v1.3.0/go.mod h1:RGA715p34BiLoZvPRtaxuo2q25Kq9jFsgUsJb8dwy14=
+github.com/fumiama/go-base16384 v1.4.0 h1:4KrtewnmAChrZjPA7/QYc72t+vvsKF+DYB0q1iRPdpo=
+github.com/fumiama/go-base16384 v1.4.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
 github.com/fumiama/go-registry v0.1.1 h1:cmCRizjXHFW2ApwUHCXi8wKLJ6Gtt4GrShJlamGPbVI=
 github.com/fumiama/go-registry v0.1.1/go.mod h1:iJT3DVgH7KXpJZs6waXEjnWtJPUBBGhF+ByJIMRfngk=
-github.com/fumiama/gofastTEA v0.0.9 h1:adaWz+014vMShnLUNWIHLBs0Yv6JNUohcaXZNtct5J0=
-github.com/fumiama/gofastTEA v0.0.9/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
+github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ=
+github.com/fumiama/gofastTEA v0.0.10/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
 github.com/fumiama/gotracemoe v0.0.3 h1:iI5EbE9A3UUbfukG6+/soYPjp1S31eCNYf4tw7s6/Jc=
 github.com/fumiama/gotracemoe v0.0.3/go.mod h1:tyqahdUzHf0bQIAVY/GYmDWvYYe5ik1ZbhnGYh+zl40=
 github.com/fumiama/sqlite3 v1.14.6 h1:+e+iygyiDXQJVi7xeXIviBvR7hAc5y20WA9hRwfKn10=
 github.com/fumiama/sqlite3 v1.14.6/go.mod h1:Xx9a2/OtHuy9pBjow0N+bE/RhNeZ7zZz5xh25vqbA5A=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
@@ -65,16 +54,11 @@ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4er
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -84,18 +68,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
@@ -106,10 +80,6 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
 github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
 github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mroth/weightedrand v0.4.1 h1:rHcbUBopmi/3x4nnrvwGJBhX9d0vk+KgoLUZeDP6YyI=
 github.com/mroth/weightedrand v0.4.1/go.mod h1:3p2SIcC8al1YMzGhAIoXD+r9olo/g/cdJgAD905gyNE=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
@@ -117,7 +87,6 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkumza/numcn v1.0.0 h1:ZT5cf9IJkUZgRgEtCiNNykk0RwsrKXSTsvDHOwUTzgE=
 github.com/pkumza/numcn v1.0.0/go.mod h1:QSeH+al9dWCd8di5HZM/ZqHqhZmUKfph572e9Ev/ETc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -127,8 +96,6 @@ github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkB
 github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/shirou/gopsutil/v3 v3.22.2 h1:wCrArWFkHYIdDxx/FSfF5RB4dpJYW6t7rcp3+zL8uks=
 github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -137,11 +104,9 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
 github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
@@ -157,12 +122,8 @@ github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYa
 github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220307142419-a1b34e6da007 h1:yHCJCj8u3Y0JDgTlrUqPHxIO6KU0WK9+voECZ2im5lo=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220307142419-a1b34e6da007/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217 h1:mJPi1JVivQ3F9fDZUiGE8pW9ShNct01C8yqBPcbcepI=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
@@ -171,9 +132,7 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 h1:L8CkJyVoa0/NslN3RUMLgasK5+KatNvyRGQ9QyCYAfc=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
 golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
@@ -186,8 +145,6 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -202,26 +159,18 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
+golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
@@ -234,22 +183,12 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
@@ -267,6 +206,7 @@ modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g
 modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.35.20/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.35.22/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.24/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
 modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60=
 modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw=
 modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI=
@@ -308,7 +248,12 @@ modernc.org/ccgo/v3 v3.13.1/go.mod h1:aBYVOUfIlcSnrsRVU8VRS35y2DIfpgkmVkYZ0tpIXi
 modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0=
 modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8=
 modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I=
+modernc.org/ccgo/v3 v3.15.14/go.mod h1:144Sz2iBCKogb9OKwsu7hQEub3EVgOlyI8wMUPGKUXQ=
+modernc.org/ccgo/v3 v3.15.15/go.mod h1:z5qltXjU4PJl0pE5nhYQCvA9DhPHiWsl5GWl89+NSYE=
+modernc.org/ccgo/v3 v3.15.16/go.mod h1:XbKRMeMWMdq712Tr5ECgATYMrzJ+g9zAZEj2ktzBe24=
+modernc.org/ccgo/v3 v3.15.17/go.mod h1:bofnFkpRFf5gLY+mBZIyTW6FEcp26xi2lgOFk2Rlvs0=
 modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
+modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
 modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
 modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q=
@@ -352,16 +297,21 @@ modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
 modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34=
 modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ=
 modernc.org/libc v1.14.5/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
-modernc.org/libc v1.14.6 h1:SSiZiE5199iYsGM9gtkDj90xqcXVwubWG8CtoYE+Mnk=
 modernc.org/libc v1.14.6/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
+modernc.org/libc v1.14.7/go.mod h1:f8xfWXW8LW41qb4X5+huVQo5dcfPlq7Cbny2TDheMv0=
+modernc.org/libc v1.14.8/go.mod h1:9+JCLb1MWSY23smyOpIPbd5ED+rSS/ieiDWUpdyO3mo=
+modernc.org/libc v1.14.10/go.mod h1:y1MtIWhwpJFpLYm6grAThtuXJKEsY6xkdZmXbRngIdo=
+modernc.org/libc v1.14.11 h1:ivxNmUkfp5iSGAGMIjylvx5R53s6QTJW9qUru1yrnk4=
+modernc.org/libc v1.14.11/go.mod h1:l5/Mz/GrZwOqzwRHA3abgSCnSeJzzTl+Ify0bAwKbAw=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
 modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
-modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14=
 modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
+modernc.org/memory v1.0.6 h1:5IaT/LChMrMdxLCy/a4qmb+7SzGiU8/ozPgkEOrfvFw=
+modernc.org/memory v1.0.6/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
--- a/kanban/banner.go
+++ b/kanban/banner.go
@@ -10,7 +10,7 @@ import (
 var (
 	info = [...]string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.3.1 - 2022-03-07 13:40:58 +0800 CST",
+		"* Version 1.3.2 - 2022-03-13 13:21:15 +0800 CST",
 		"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}
--- a/main.go
+++ b/main.go
@@ -35,6 +35,8 @@ import (

 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus" // 词典匹配回复

+	_ "github.com/FloatTech/zbputils/job" // 定时指令触发器
+
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
 	//                      ^^^^^^^高优先级区^^^^^^^                      //
@@ -70,14 +72,16 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/diana"          // 嘉心糖发病
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/drift_bottle"   // 漂流瓶
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/emojimix"       // 合成emoji
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/epidemic"       // 城市疫情查询
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/fortune"        // 运势
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/funny"          // 笑话
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/genshin"        // 原神抽卡
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/gif"            // 制图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"         // 搜索GitHub仓库
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/hs"             // 炉石
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/image_finder"   // 关键字搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/inject"         // 注入指令
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/jandan"         // 煎蛋网无聊图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/job"            // 定时指令触发器
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/juejuezi"       // 绝绝子生成器
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/lolicon"        // lolicon 随机图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu"           // 摸鱼
@@ -97,12 +101,14 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/setutime"       // 来份涩图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shadiao"        // 沙雕app
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shindan"        // 测定
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"        // 舔狗日记
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tracemoe"       // 搜番
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/translation"    // 翻译
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation"  // vtb语录
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun"      // 网易云音乐热评
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle"         // 猜单词
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"          // 月幕galgame
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao"         // 早报

 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf"            // 鬼东西
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_push"  // b站推送
@@ -203,7 +209,7 @@ func main() {
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text(kanban.Kanban()))
 		})
-	zero.Run(
+	zero.RunAndBlock(
 		zero.Config{
 			NickName:      append([]string{*adana}, nicks...),
 			CommandPrefix: *prefix,
@@ -212,7 +218,6 @@ func main() {
 			SuperUsers: flag.Args(), // 通过命令行参数的方式添加主人账号
 			Driver:     []zero.Driver{driver.NewWebSocketClient(*url, *token)},
 		},
+		process.GlobalInitMutex.Unlock,
 	)
-	process.GlobalInitMutex.Unlock()
-	select {}
 }
--- a/plugin/acgimage/classify.go
+++ b/plugin/acgimage/classify.go
@@ -65,7 +65,7 @@ func init() { // 插件主体
 			}
 		})
 	// 直接随机图片，无r18保护，后果自负。如果出r18图可尽快通过发送"太涩了"撤回
-	engine.OnFullMatch("直接随机", ctxext.UserOrGrpAdmin).SetBlock(true).
+	engine.OnFullMatch("直接随机", zero.UserOrGrpAdmin).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if block {
 				ctx.SendChain(message.Text("请稍后再试哦"))
@@ -97,7 +97,7 @@ func init() { // 插件主体
 			}
 		})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			url := ctx.State["image_url"].([]string)[0]
--- a/plugin/b14/main.go
+++ b/plugin/b14/main.go
@@ -23,9 +23,9 @@ func init() {
 	en.OnRegex(`^加密\s?(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
-			es, err := base14.UTF16be2utf8(base14.EncodeString(str))
-			if err == nil {
-				ctx.SendChain(message.Text(helper.BytesToString(es)))
+			es := base14.EncodeString(str)
+			if es != "" {
+				ctx.SendChain(message.Text(es))
 			} else {
 				ctx.SendChain(message.Text("加密失败!"))
 			}
@@ -33,8 +33,8 @@ func init() {
 	en.OnRegex(`^解密\s?([一-踀]*[㴁-㴆]?)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
-			es, err := base14.UTF82utf16be(helper.StringToBytes(str))
-			if err == nil {
+			es := base14.DecodeString(str)
+			if es != "" {
 				ctx.SendChain(message.Text(base14.DecodeString(es)))
 			} else {
 				ctx.SendChain(message.Text("解密失败!"))
@@ -44,7 +44,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)
-			es, err := base14.UTF16be2utf8(base14.Encode(t.Encrypt(helper.StringToBytes(str))))
+			es, err := base14.UTF16BE2UTF8(base14.Encode(t.Encrypt(helper.StringToBytes(str))))
 			if err == nil {
 				ctx.SendChain(message.Text(helper.BytesToString(es)))
 			} else {
@@ -55,7 +55,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)
-			es, err := base14.UTF82utf16be(helper.StringToBytes(str))
+			es, err := base14.UTF82UTF16BE(helper.StringToBytes(str))
 			if err == nil {
 				ctx.SendChain(message.Text(helper.BytesToString(t.Decrypt(base14.Decode(es)))))
 			} else {
--- a/plugin/bilibili_push/bilibili_push.go
+++ b/plugin/bilibili_push/bilibili_push.go
@@ -18,7 +18,6 @@ import (
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/control/order"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/web"
 )
@@ -79,7 +78,7 @@ func init() {
 		log.Println("[bilibilipush]加载bilibilipush数据库")
 	}()

-	en.OnRegex(`^添加订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^添加订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -105,7 +104,7 @@ func init() {
 			ctx.SendChain(message.Text("已添加" + name + "的订阅"))
 		}
 	})
-	en.OnRegex(`^取消订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -131,7 +130,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的订阅"))
 		}
 	})
-	en.OnRegex(`^取消动态订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消动态订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -157,7 +156,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
 		}
 	})
-	en.OnRegex(`^取消直播订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消直播订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -183,7 +182,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
 		}
 	})
-	en.OnFullMatch("推送列表", ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnFullMatch("推送列表", zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		gid := ctx.Event.GroupID
 		if gid == 0 {
 			gid = -ctx.Event.UserID
@@ -231,7 +230,7 @@ func bilibiliPushDaily() {
 }

 func checkBuid(buid int64) (status int, name string) {
-	data, err := web.GetDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
 	if err != nil {
 		log.Errorln("[bilibilipush]:", err)
 	}
@@ -289,7 +288,7 @@ func unsubscribeLive(buid, groupid int64) (err error) {
 }

 func getUserDynamicCard(buid int64) (cardList []gjson.Result) {
-	data, err := web.GetDataWith(web.NewDefaultClient(), fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
 	if err != nil {
 		log.Errorln("[bilibilipush]:", err)
 	}
--- a/plugin/coser/coser.go
+++ b/plugin/coser/coser.go
@@ -28,7 +28,7 @@ func init() {
 	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中......"))
-			data, err := web.GetDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
+			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
 			if err != nil {
 				log.Println("err为:", err)
 			}
--- a/plugin/cpstory/cpstory.go
+++ b/plugin/cpstory/cpstory.go
@@ -9,7 +9,6 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"

 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/math"

@@ -41,8 +40,8 @@ func init() {

 	engine.OnRegex("^组cp.*?(\\d+).*?(\\d+)", zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		cs := getRandomCpStory()
-		gong := ctxext.CardOrNickName(ctx, math.Str2Int64(ctx.State["regex_matched"].([]string)[1]))
-		shou := ctxext.CardOrNickName(ctx, math.Str2Int64(ctx.State["regex_matched"].([]string)[2]))
+		gong := ctx.CardOrNickName(math.Str2Int64(ctx.State["regex_matched"].([]string)[1]))
+		shou := ctx.CardOrNickName(math.Str2Int64(ctx.State["regex_matched"].([]string)[2]))
 		text := strings.ReplaceAll(cs.Story, "<攻>", gong)
 		text = strings.ReplaceAll(text, "<受>", shou)
 		text = strings.ReplaceAll(text, cs.Gong, gong)
--- a/plugin/danbooru/main.go
+++ b/plugin/danbooru/main.go
@@ -8,7 +8,6 @@ import (
 	"github.com/FloatTech/AnimeAPI/danbooru"
 	"github.com/FloatTech/AnimeAPI/saucenao"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -29,7 +28,7 @@ func init() { // 插件主体
 	cachefolder := engine.DataFolder()

 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {
--- a/plugin/drift_bottle/main.go
+++ b/plugin/drift_bottle/main.go
@@ -8,7 +8,6 @@ import (

 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/control/order"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -51,7 +50,7 @@ func init() {
 			err = newBottle(
 				ctx.Event.UserID,
 				grp,
-				ctxext.CardOrNickName(ctx, ctx.Event.UserID),
+				ctx.CardOrNickName(ctx.Event.UserID),
 				msg,
 			).throw(sea, channel)
 			if err != nil {
--- a/plugin/epidemic/epidemic.go
+++ b/plugin/epidemic/epidemic.go
@@ -0,0 +1,123 @@
+// Package epidemic 城市疫情查询
+package epidemic
+
+import (
+	"encoding/json"
+
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/web"
+)
+
+const (
+	servicename = "epidemic"
+	txurl       = "https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5"
+)
+
+// result 疫情查询结果
+type result struct {
+	Data string `json:"data"`
+}
+
+// epidemic 疫情数据
+type epidemic struct {
+	LastUpdateTime string  `json:"lastUpdateTime"`
+	AreaTree       []*area `json:"areaTree"`
+}
+
+// area 城市疫情数据
+type area struct {
+	Name  string `json:"name"`
+	Today struct {
+		Confirm int `json:"confirm"`
+	} `json:"today"`
+	Total struct {
+		NowConfirm int    `json:"nowConfirm"`
+		Confirm    int    `json:"confirm"`
+		Dead       int    `json:"dead"`
+		Heal       int    `json:"heal"`
+		Grade      string `json:"grade"`
+	} `json:"total"`
+	Children []*area `json:"children"`
+}
+
+func init() {
+	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help: "城市疫情查询\n" +
+			"- xxx疫情\n",
+	})
+	engine.OnSuffix("疫情").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			city := ctx.State["args"].(string)
+			if city == "" {
+				ctx.SendChain(message.Text("你还没有输入城市名字呢！"))
+				return
+			}
+			data, time, err := queryEpidemic(city)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			if data == nil {
+				ctx.SendChain(message.Text("没有找到【", city, "】城市的疫情数据."))
+				return
+			}
+			ctx.SendChain(
+				message.Text(
+					"【", data.Name, "】疫情数据\n",
+					"新增：", data.Today.Confirm, " ,",
+					"现有确诊：", data.Total.NowConfirm, " ,",
+					"治愈：", data.Total.Heal, " ,",
+					"死亡：", data.Total.Dead, " ", data.Total.Grade, "\n",
+					"更新时间：", time, "\n",
+					"温馨提示：请大家做好防疫工作，出门带好口罩！",
+				),
+			)
+		})
+}
+
+// rcity 查找城市
+func rcity(a *area, cityName string) *area {
+	if a == nil {
+		return nil
+	}
+	if a.Name == cityName {
+		return a
+	}
+	for _, v := range a.Children {
+		if v.Name == cityName {
+			return v
+		}
+		c := rcity(v, cityName)
+		if c != nil {
+			return c
+		}
+	}
+	return nil
+}
+
+// queryEpidemic 查询城市疫情
+func queryEpidemic(findCityName string) (citydata *area, times string, err error) {
+	data, err := web.GetData(txurl)
+	if err != nil {
+		return
+	}
+	var r result
+	err = json.Unmarshal(data, &r)
+	if err != nil {
+		return
+	}
+	var e epidemic
+	err = json.Unmarshal(binary.StringToBytes(r.Data), &e)
+	if err != nil {
+		return
+	}
+	citydata = rcity(e.AreaTree[0], findCityName)
+	return citydata, e.LastUpdateTime, nil
+}
--- a/plugin/funny/laugh.go
+++ b/plugin/funny/laugh.go
@@ -48,7 +48,7 @@ func init() {

 	en.OnPrefix("讲个笑话").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		// 获取名字
-		name := ctxext.NickName(ctx)
+		name := ctx.NickName()
 		var j joke
 		err := db.Pick("jokes", &j)
 		if err != nil {
--- a/plugin/genshin/data.go
+++ b/plugin/genshin/data.go
@@ -0,0 +1,16 @@
+package genshin
+
+type storage uint64
+
+func (s *storage) is5starsmode() bool {
+	return *s&1 == 1
+}
+
+func (s *storage) setmode(is5stars bool) bool {
+	if is5stars {
+		*s |= 1
+	} else {
+		*s &= 0xffffffff_fffffffe
+	}
+	return is5stars
+}
--- a/plugin/genshin/ys.go
+++ b/plugin/genshin/ys.go
@@ -0,0 +1,343 @@
+// Package genshin 原神抽卡
+package genshin
+
+import (
+	"archive/zip"
+	"image"
+	"image/color"
+	"image/draw"
+	"image/jpeg"
+	"image/png"
+	"math/rand"
+	"strings"
+	"sync/atomic"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/golang/freetype"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+type zipfilestructure map[string][]*zip.File
+
+var (
+	totl                   uint64 // 累计抽奖次数
+	filetree               = make(zipfilestructure, 32)
+	starN3, starN4, starN5 *zip.File
+)
+
+func init() {
+	engine := control.Register("genshin", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help:             "原神抽卡\n- 原神十连\n- 切换原神卡池",
+		PublicDataFolder: "Genshin",
+	}).ApplySingle(ctxext.DefaultSingle)
+
+	go func() {
+		zipfile := engine.DataFolder() + "Genshin.zip"
+		_, err := file.GetLazyData(zipfile, false, false)
+		if err != nil {
+			panic(err)
+		}
+		err = parsezip(zipfile)
+		if err != nil {
+			panic(err)
+		}
+	}()
+
+	engine.OnFullMatch("切换原神卡池").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			c, ok := control.Lookup("genshin")
+			if !ok {
+				ctx.SendChain(message.Text("找不到服务!"))
+				return
+			}
+			gid := ctx.Event.GroupID
+			if gid == 0 {
+				gid = -ctx.Event.UserID
+			}
+			store := (storage)(c.GetData(gid))
+			if store.setmode(!store.is5starsmode()) {
+				process.SleepAbout1sTo2s()
+				ctx.SendChain(message.Text("切换到五星卡池~"))
+			} else {
+				process.SleepAbout1sTo2s()
+				ctx.SendChain(message.Text("切换到普通卡池~"))
+			}
+			err := c.SetData(gid, int64(store))
+			if err != nil {
+				process.SleepAbout1sTo2s()
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+		})
+
+	engine.OnFullMatch("原神十连").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			c, ok := control.Lookup("genshin")
+			if !ok {
+				ctx.SendChain(message.Text("找不到服务!"))
+				return
+			}
+			gid := ctx.Event.GroupID
+			if gid == 0 {
+				gid = -ctx.Event.UserID
+			}
+			store := (storage)(c.GetData(gid))
+			img, err := randnums(10, store)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			b, cl := writer.ToBytes(img)
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.ImageBytes(b)))
+			cl()
+		})
+}
+
+func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
+	var (
+		fours, fives                  = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10)                           // 抽到 四, 五星角色
+		threeArms, fourArms, fiveArms = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10), make([]*zip.File, 0, 10) // 抽到 三 , 四, 五星武器
+		fourN, fiveN                  = 0, 0                                                                         // 抽到 四, 五星角色的数量
+		bgs                           = make([]*zip.File, 0, 10)                                                     // 背景图片名
+		threeN2, fourN2, fiveN2       = 0, 0, 0                                                                      // 抽到 三 , 四, 五星武器的数量
+		hero, stars                   = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10)                           // 角色武器名, 储存星级图标
+
+		cicon                      = make([]*zip.File, 0, 10)                                                            // 元素图标
+		five_bg, four_bg, three_bg = filetree["five_bg.jpg"][0], filetree["four_bg.jpg"][0], filetree["three_bg.jpg"][0] // 背景图片名
+		fivelen                    = len(filetree["five"])
+		five2len                   = len(filetree["five2"])
+		threelen                   = len(filetree["Three"])
+		fourlen                    = len(filetree["four"])
+		four2len                   = len(filetree["four2"])
+	)
+
+	if totl%9 == 0 { // 累计9次加入一个五星
+		switch rand.Intn(2) {
+		case 0:
+			fiveN++
+			fives = append(fives, filetree["five"][rand.Intn(fivelen)])
+		case 1:
+			fiveN2++
+			fiveArms = append(fiveArms, filetree["five2"][rand.Intn(five2len)])
+		}
+		nums--
+	}
+
+	if store.is5starsmode() { // 5星模式
+		for i := 0; i < nums; i++ {
+			switch rand.Intn(2) {
+			case 0:
+				fiveN++
+				fives = append(fives, filetree["five"][rand.Intn(fivelen)])
+			case 1:
+				fiveN2++
+				fiveArms = append(fiveArms, filetree["five2"][rand.Intn(five2len)])
+			}
+		}
+	} else { // 默认模式
+		for i := 0; i < nums; i++ {
+			a := rand.Intn(1000)
+			switch { // 抽卡几率 三星75% 四星18% 五星7%
+			case a >= 0 && a <= 750:
+				threeN2++
+				threeArms = append(threeArms, filetree["Three"][rand.Intn(threelen)])
+			case a > 750 && a <= 840:
+				fourN++
+				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) // 随机角色
+			case a > 840 && a <= 930:
+				fourN2++
+				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) // 随机武器
+			case a > 930 && a <= 965:
+				fiveN++
+				fives = append(fives, filetree["five"][rand.Intn(fivelen)])
+			default:
+				fiveN2++
+				fiveArms = append(fiveArms, filetree["five2"][rand.Intn(five2len)])
+			}
+		}
+		if fourN+fourN2 == 0 && threeN2 > 0 { // 没有四星时自动加入
+			threeN2--
+			threeArms = threeArms[:len(threeArms)-1]
+			switch rand.Intn(2) {
+			case 0:
+				fourN++
+				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) //随机角色
+			case 1:
+				fourN2++
+				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) //随机武器
+			}
+		}
+		_ = atomic.AddUint64(&totl, 1)
+	}
+
+	icon := func(f *zip.File) *zip.File {
+		name := f.Name
+		name = name[strings.LastIndex(name, "/")+1:strings.Index(name, "_")] + ".png"
+		logrus.Debugln("[genshin]get named file", name)
+		return filetree[name][0]
+	}
+
+	he := func(cnt int, id int, f *zip.File, bg *zip.File) {
+		var hen *[]*zip.File
+		for i := 0; i < cnt; i++ {
+			switch id {
+			case 1:
+				hen = &threeArms
+			case 2:
+				hen = &fourArms
+			case 3:
+				hen = &fours
+			case 4:
+				hen = &fiveArms
+			case 5:
+				hen = &fives
+			}
+			bgs = append(bgs, bg) // 加入颜色背景
+			hero = append(hero, (*hen)[i])
+			stars = append(stars, f)               // 加入星级图标
+			cicon = append(cicon, icon((*hen)[i])) // 加入元素图标
+		}
+	}
+
+	if fiveN > 0 { // 按顺序加入
+		he(fiveN, 5, starN5, five_bg) // 五星角色
+	}
+	if fourN > 0 {
+		he(fourN, 3, starN4, four_bg) // 四星角色
+	}
+	if fiveN2 > 0 {
+		he(fiveN2, 4, starN5, five_bg) // 五星武器
+	}
+	if fourN2 > 0 {
+		he(fourN2, 2, starN4, four_bg) // 四星武器
+	}
+	if threeN2 > 0 {
+		he(threeN2, 1, starN3, three_bg) // 三星武器
+	}
+
+	var c1, c2, c3 uint8 = 50, 50, 50 // 背景颜色
+
+	img00, err := filetree["bg0.jpg"][0].Open() // 打开背景图片
+	if err != nil {
+		return
+	}
+
+	rectangle := image.Rect(0, 0, 1920, 1080) // 图片宽度, 图片高度
+	rgba = image.NewRGBA(rectangle)
+	draw.Draw(rgba, rgba.Bounds(), image.NewUniform(color.RGBA{c1, c2, c3, 255}), image.Point{}, draw.Over)
+	context := freetype.NewContext() // 创建一个新的上下文
+	context.SetDPI(72)               // 每英寸 dpi
+	context.SetClip(rgba.Bounds())
+	context.SetDst(rgba)
+
+	defer img00.Close()
+	img0, err := jpeg.Decode(img00) // 读取一个本地图像
+	if err != nil {
+		return
+	}
+
+	offset := image.Pt(0, 0) // 图片在背景上的位置
+	draw.Draw(rgba, img0.Bounds().Add(offset), img0, image.Point{}, draw.Over)
+
+	w1, h1 := 230, 0
+	for i := 0; i < len(hero); i++ {
+		if i > 0 {
+			w1 += 146 // 图片宽度
+		}
+
+		imgs, err := bgs[i].Open() // 取出背景图片
+		if err != nil {
+			return nil, err
+		}
+		defer imgs.Close()
+
+		img, _ := jpeg.Decode(imgs)
+		offset := image.Pt(w1, h1)
+		draw.Draw(rgba, img.Bounds().Add(offset), img, image.Point{}, draw.Over)
+
+		imgs1, err := hero[i].Open() // 取出图片名
+		if err != nil {
+			return nil, err
+		}
+		defer imgs1.Close()
+
+		img1, _ := png.Decode(imgs1)
+		offset1 := image.Pt(w1, h1)
+		draw.Draw(rgba, img1.Bounds().Add(offset1), img1, image.Point{}, draw.Over)
+
+		imgs2, err := stars[i].Open() // 取出星级图标
+		if err != nil {
+			return nil, err
+		}
+		defer imgs2.Close()
+
+		img2, _ := png.Decode(imgs2)
+		offset2 := image.Pt(w1, h1)
+		draw.Draw(rgba, img2.Bounds().Add(offset2), img2, image.Point{}, draw.Over)
+
+		imgs3, err := cicon[i].Open() // 取出类型图标
+		if err != nil {
+			return nil, err
+		}
+		defer imgs3.Close()
+
+		img3, _ := png.Decode(imgs3)
+		offset3 := image.Pt(w1, h1)
+		draw.Draw(rgba, img3.Bounds().Add(offset3), img3, image.Point{}, draw.Over)
+	}
+	imgs4, err := filetree["Reply.png"][0].Open() // "分享" 图标
+	if err != nil {
+		return nil, err
+	}
+	defer imgs4.Close()
+	img4, err := png.Decode(imgs4)
+	if err != nil {
+		return nil, err
+	}
+	offset4 := image.Pt(1270, 945) // 宽, 高
+	draw.Draw(rgba, img4.Bounds().Add(offset4), img4, image.Point{}, draw.Over)
+	return
+}
+
+func parsezip(zipFile string) error {
+	zipReader, err := zip.OpenReader(zipFile) // will not close
+	if err != nil {
+		return err
+	}
+	for _, f := range zipReader.File {
+		if f.FileInfo().IsDir() {
+			filetree[f.Name] = make([]*zip.File, 0, 32)
+			continue
+		}
+		f.Name = f.Name[8:]
+		i := strings.LastIndex(f.Name, "/")
+		if i < 0 {
+			filetree[f.Name] = []*zip.File{f}
+			logrus.Debugln("[genshin]insert file", f.Name)
+			continue
+		}
+		folder := f.Name[:i]
+		if folder != "" {
+			filetree[folder] = append(filetree[folder], f)
+			logrus.Debugln("[genshin]insert file into", folder)
+			if folder == "gacha" {
+				switch f.Name[i+1:] {
+				case "ThreeStar.png":
+					starN3 = f
+				case "FourStar.png":
+					starN4 = f
+				case "FiveStar.png":
+					starN5 = f
+				}
+			}
+		}
+	}
+	return nil
+}
--- a/plugin/hs/run.go
+++ b/plugin/hs/run.go
@@ -66,7 +66,7 @@ func init() {
 			cid := gjson.Get(g, `list.`+strconv.Itoa(i)+`.CardID`).String()
 			cachefile := cachedir + cid
 			if file.IsNotExist(cachefile) {
-				data, err := web.GetDataWith(web.NewDefaultClient(),
+				data, err := web.RequestDataWith(web.NewDefaultClient(),
 					`https://res.fbigame.com/hs/v13/`+cid+`.png?auth_key=`+
 						gjson.Get(g, `list.`+strconv.Itoa(i)+`.auth_key`).String(),
 					reqconf[0], reqconf[1], reqconf[2])
@@ -98,10 +98,10 @@ func init() {
 }

 func sh(s string) string {
-	data, err := web.GetDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
+	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
 	if err == nil {
 		url := hs + para + "&hash=" + strings.SplitN(strings.SplitN(helper.BytesToString(data), `var hash = "`, 2)[1], `"`, 2)[0] + "&search=" + s
-		r, err := web.GetDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
 		if err == nil {
 			return helper.BytesToString(r)
 		}
@@ -110,10 +110,10 @@ func sh(s string) string {
 }

 func kz(s string) string {
-	data, err := web.GetDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
+	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
 	if err == nil {
 		url := hs + para + "mod=general_deck_image&deck_code=" + s + "&deck_text=&hash=" + strings.SplitN(strings.SplitN(helper.BytesToString(data), `var hash = "`, 2)[1], `"`, 2)[0] + "&search=" + s
-		r, err := web.GetDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
 		if err == nil {
 			return "base64://" + gjson.Get(helper.BytesToString(r), "img").String()
 		}
--- a/plugin/job/main.go
+++ b/plugin/job/main.go
@@ -1,541 +0,0 @@
-// Package job 定时指令触发器
-package job
-
-import (
-	"encoding/json"
-	"hash/crc64"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/FloatTech/zbputils/binary"
-	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/process"
-	"github.com/FloatTech/zbputils/vevent"
-	"github.com/FloatTech/zbputils/web"
-	"github.com/fumiama/cron"
-	"github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
-	"github.com/wdvxdr1123/ZeroBot/message"
-)
-
-var (
-	lo       map[int64]vevent.Loop
-	entries  = map[int64]cron.EntryID{} // id entryid
-	matchers = map[int64]*zero.Matcher{}
-	mu       sync.Mutex
-	limit    = rate.NewLimiter(time.Second*2, 1)
-	en       = control.Register("job", order.AcquirePrio(), &control.Options{
-		DisableOnDefault:  false,
-		Help:              "定时指令触发器\n- 记录以\"完全匹配关键词\"触发的指令\n- 取消以\"完全匹配关键词\"触发的指令\n- 记录在\"cron\"触发的指令\n- 取消在\"cron\"触发的指令\n- 查看所有触发指令\n- 查看在\"cron\"触发的指令\n- 查看以\"完全匹配关键词\"触发的指令\n- 注入指令结果：任意指令\n- 执行指令：任意指令",
-		PrivateDataFolder: "job",
-	})
-)
-
-func init() {
-	db.DBPath = en.DataFolder() + "job.db"
-	err := db.Open()
-	if err != nil {
-		panic(err)
-	}
-	go func() {
-		process.GlobalInitMutex.Lock()
-		process.SleepAbout1sTo2s()
-		lo = make(map[int64]vevent.Loop, len(zero.BotConfig.Driver))
-		for _, drv := range zero.BotConfig.Driver {
-			id := drv.SelfID()
-			ids := strconv.FormatInt(id, 36)
-			c := &cmd{}
-			lo[id] = vevent.NewLoop(id)
-			err := db.Create(ids, c)
-			logrus.Infoln("[job]创建表", ids)
-			if err != nil {
-				panic(err)
-			}
-			_ = db.FindFor(ids, c, "", func() error {
-				mu.Lock()
-				defer mu.Unlock()
-				if strings.HasPrefix(c.Cron, "fm:") {
-					m := en.OnFullMatch(c.Cron[3:] /* skip fm: */).SetBlock(true)
-					m.Handle(generalhandler(c))
-					matchers[c.ID] = getmatcher(m)
-					return nil
-				}
-				if strings.HasPrefix(c.Cron, "sm:") {
-					m := en.OnFullMatch(c.Cron[3:] /* skip fm: */).SetBlock(true)
-					m.Handle(superuserhandler(c))
-					matchers[c.ID] = getmatcher(m)
-					return nil
-				}
-				eid, err := process.CronTab.AddFunc(c.Cron, inject(id, []byte(c.Cmd)))
-				if err != nil {
-					return err
-				}
-				entries[c.ID] = eid
-				return nil
-			})
-		}
-		logrus.Infoln("[job]本地环回初始化完成")
-		process.GlobalInitMutex.Unlock()
-	}()
-	en.OnRegex(`^记录在"(.*)"触发的指令$`, ctxext.UserOrGrpAdmin, islonotnil, isfirstregmatchnotnil, logevent).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		cron := ctx.State["regex_matched"].([]string)[1]
-		command := ctx.State["job_raw_event"].(string)
-		c := &cmd{
-			ID:   idof(cron, command),
-			Cron: cron,
-			Cmd:  command,
-		}
-		err := addcmd(ctx.Event.SelfID, c)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnRegex(`^记录以"(.*)"触发的指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil, logevent).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		cron := "fm:" + ctx.State["regex_matched"].([]string)[1]
-		command := ctx.State["job_new_event"].(gjson.Result).Get("message").Raw
-		logrus.Debugln("[job] get cmd:", command)
-		c := &cmd{
-			ID:   idof(cron, command),
-			Cron: cron,
-			Cmd:  command,
-		}
-		err := registercmd(ctx.Event.SelfID, c)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnRegex(`^记录以"(.*)"触发的代表我执行的指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil, logevent).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		cron := "sm:" + ctx.State["regex_matched"].([]string)[1]
-		command := ctx.State["job_raw_event"].(string)
-		logrus.Debugln("[job] get cmd:", command)
-		c := &cmd{
-			ID:   idof(cron, command),
-			Cron: cron,
-			Cmd:  command,
-		}
-		err := registercmd(ctx.Event.SelfID, c)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnRegex(`^取消在"(.*)"触发的指令$`, ctxext.UserOrGrpAdmin, islonotnil, isfirstregmatchnotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		cron := ctx.State["regex_matched"].([]string)[1]
-		err := rmcmd(ctx.Event.SelfID, ctx.Event.UserID, cron)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnRegex(`^取消以"(.*)"触发的(代表我执行的)?指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		issu := ctx.State["regex_matched"].([]string)[2] != ""
-		cron := ""
-		if issu {
-			cron = "sm:"
-		} else {
-			cron = "fm:"
-		}
-		cron += ctx.State["regex_matched"].([]string)[1]
-		err := delcmd(ctx.Event.SelfID, cron)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnFullMatch("查看所有触发指令", zero.SuperUserPermission, islonotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		c := &cmd{}
-		ids := strconv.FormatInt(ctx.Event.SelfID, 36)
-		mu.Lock()
-		defer mu.Unlock()
-		n, err := db.Count(ids)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		lst := make([]string, 0, n)
-		err = db.FindFor(ids, c, "GROUP BY cron", func() error {
-			lst = append(lst, c.Cron+"\n")
-			return nil
-		})
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text(lst))
-	})
-	en.OnRegex(`^查看在"(.*)"触发的指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		c := &cmd{}
-		ids := strconv.FormatInt(ctx.Event.SelfID, 36)
-		cron := ctx.State["regex_matched"].([]string)[1]
-		mu.Lock()
-		defer mu.Unlock()
-		n, err := db.Count(ids)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		lst := make([]string, 0, n)
-		err = db.FindFor(ids, c, "WHERE cron='"+cron+"'", func() error {
-			lst = append(lst, c.Cmd+"\n")
-			return nil
-		})
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text(lst))
-	})
-	en.OnRegex(`^查看以"(.*)"触发的(代表我执行的)?指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		c := &cmd{}
-		ids := strconv.FormatInt(ctx.Event.SelfID, 36)
-		issu := ctx.State["regex_matched"].([]string)[2] != ""
-		cron := ""
-		if issu {
-			cron = "sm:"
-		} else {
-			cron = "fm:"
-		}
-		cron += ctx.State["regex_matched"].([]string)[1]
-		mu.Lock()
-		defer mu.Unlock()
-		n, err := db.Count(ids)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		lst := make([]string, 0, n)
-		err = db.FindFor(ids, c, "WHERE cron='"+cron+"'", func() error {
-			lst = append(lst, c.Cmd+"\n")
-			return nil
-		})
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text(lst))
-	})
-	en.OnPrefix("执行指令：", ctxext.UserOrGrpAdmin, islonotnil, func(ctx *zero.Ctx) bool {
-		return ctx.State["args"].(string) != ""
-	}, parseArgs).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		ev := strings.ReplaceAll(ctx.Event.RawEvent.Raw, "执行指令：", "")
-		logrus.Debugln("[job] inject:", ev)
-		inject(ctx.Event.SelfID, binary.StringToBytes(ev))()
-	})
-	en.OnPrefix("注入指令结果：", ctxext.UserOrGrpAdmin, islonotnil, func(ctx *zero.Ctx) bool {
-		return ctx.State["args"].(string) != ""
-	}, parseArgs).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		vevent.NewLoopOf(vevent.NewAPICallerHook(ctx, func(rsp zero.APIResponse, err error) {
-			if err == nil {
-				logrus.Debugln("[job] CallerHook returned")
-				id := message.NewMessageID(rsp.Data.Get("message_id").String())
-				if id.ID() == 0 {
-					ctx.SendChain(message.Text("ERROR:未获取到返回结果"))
-					return
-				}
-				msg := ctx.GetMessage(id)
-				ctx.Event.NativeMessage = json.RawMessage("\"" + msg.Elements.String() + "\"")
-				ctx.Event.RawMessageID = json.RawMessage(msg.MessageId.String())
-				ctx.Event.RawMessage = msg.Elements.String()
-				time.Sleep(time.Second * 5) // 防止风控
-				ctx.Event.Time = time.Now().Unix()
-				ctx.DeleteMessage(id)
-				vev, cl := binary.OpenWriterF(func(w *binary.Writer) {
-					err = json.NewEncoder(w).Encode(ctx.Event)
-				})
-				if err != nil {
-					cl()
-					ctx.SendChain(message.Text("ERROR:", err))
-					return
-				}
-				logrus.Debugln("[job] inject:", binary.BytesToString(vev))
-				inject(ctx.Event.SelfID, vev)()
-				cl()
-			}
-		})).Echo(binary.StringToBytes(strings.ReplaceAll(ctx.Event.RawEvent.Raw, "注入指令结果：", "")))
-	})
-}
-
-func islonotnil(ctx *zero.Ctx) bool {
-	return len(lo) > 0
-}
-
-func isfirstregmatchnotnil(ctx *zero.Ctx) bool {
-	return ctx.State["regex_matched"].([]string)[1] != ""
-}
-
-func inject(bot int64, response []byte) func() {
-	return func() {
-		if limit.Acquire() {
-			lo[bot].Echo(response)
-		}
-	}
-}
-
-func idof(cron, cmd string) int64 {
-	return int64(crc64.Checksum(binary.StringToBytes(cron+cmd), crc64.MakeTable(crc64.ISO)))
-}
-
-func addcmd(bot int64, c *cmd) error {
-	mu.Lock()
-	defer mu.Unlock()
-	eid, err := process.CronTab.AddFunc(c.Cron, inject(bot, []byte(c.Cmd)))
-	if err != nil {
-		return err
-	}
-	entries[c.ID] = eid
-	return db.Insert(strconv.FormatInt(bot, 36), c)
-}
-
-func registercmd(bot int64, c *cmd) error {
-	mu.Lock()
-	defer mu.Unlock()
-	m := en.OnFullMatch(c.Cron[3:] /* skip fm: or sm: */).SetBlock(true)
-	if strings.HasPrefix(c.Cron, "sm:") {
-		m.Handle(superuserhandler(c))
-	} else {
-		m.Handle(generalhandler(c))
-	}
-	matchers[c.ID] = getmatcher(m)
-	return db.Insert(strconv.FormatInt(bot, 36), c)
-}
-
-func generalhandler(c *cmd) zero.Handler {
-	return func(ctx *zero.Ctx) {
-		ctx.Event.NativeMessage = json.RawMessage(c.Cmd) // c.Cmd only have message
-		ctx.Event.Time = time.Now().Unix()
-		var err error
-		vev, cl := binary.OpenWriterF(func(w *binary.Writer) {
-			err = json.NewEncoder(w).Encode(ctx.Event)
-		})
-		if err != nil {
-			cl()
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		logrus.Debugln("[job] inject:", binary.BytesToString(vev))
-		inject(ctx.Event.SelfID, vev)()
-		cl()
-	}
-}
-
-func superuserhandler(c *cmd) zero.Handler {
-	e := &zero.Event{Sender: new(zero.User)}
-	err := json.Unmarshal(binary.StringToBytes(c.Cmd), e)
-	return func(ctx *zero.Ctx) {
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.Event.UserID = e.UserID
-		ctx.Event.RawMessage = e.RawMessage
-		ctx.Event.Sender = e.Sender
-		ctx.Event.NativeMessage = e.NativeMessage
-		vev, cl := binary.OpenWriterF(func(w *binary.Writer) {
-			err = json.NewEncoder(w).Encode(ctx.Event)
-		})
-		if err != nil {
-			cl()
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		logrus.Debugln("[job] inject:", binary.BytesToString(vev))
-		inject(ctx.Event.SelfID, vev)()
-		cl()
-	}
-}
-
-func rmcmd(bot, caller int64, cron string) error {
-	c := &cmd{}
-	mu.Lock()
-	defer mu.Unlock()
-	bots := strconv.FormatInt(bot, 36)
-	e := new(zero.Event)
-	var delcmd []string
-	err := db.FindFor(bots, c, "WHERE cron='"+cron+"'", func() error {
-		err := json.Unmarshal(binary.StringToBytes(c.Cmd), e)
-		if err != nil {
-			return err
-		}
-		if e.UserID != caller {
-			return nil
-		}
-		eid, ok := entries[c.ID]
-		if ok {
-			process.CronTab.Remove(eid)
-			delete(entries, c.ID)
-			delcmd = append(delcmd, "id="+strconv.FormatInt(c.ID, 10))
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	if len(delcmd) > 0 {
-		return db.Del(bots, "WHERE "+strings.Join(delcmd, " or "))
-	}
-	return nil
-}
-
-func delcmd(bot int64, cron string) error {
-	c := &cmd{}
-	mu.Lock()
-	defer mu.Unlock()
-	bots := strconv.FormatInt(bot, 36)
-	var delcmd []string
-	err := db.FindFor(bots, c, "WHERE cron='"+cron+"'", func() error {
-		m, ok := matchers[c.ID]
-		if ok {
-			m.Delete()
-			delete(matchers, c.ID)
-			delcmd = append(delcmd, "id="+strconv.FormatInt(c.ID, 10))
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	if len(delcmd) > 0 {
-		return db.Del(bots, "WHERE "+strings.Join(delcmd, " or "))
-	}
-	return nil
-}
-
-func parseArgs(ctx *zero.Ctx) bool {
-	cmds := ctx.State["args"].(string)
-	if !strings.Contains(cmds, "?::") && !strings.Contains(cmds, "!::") {
-		return true
-	}
-	args := make(map[int]string)
-	for strings.Contains(ctx.Event.RawEvent.Raw, "?::") {
-		start := strings.Index(ctx.Event.RawEvent.Raw, "?::")
-		msgend := strings.Index(ctx.Event.RawEvent.Raw[start+3:], "::")
-		if msgend < 0 {
-			ctx.SendChain(message.Text("ERROR:找不到结束的::"))
-			return false
-		}
-		msgend += start + 3
-		numend := strings.Index(ctx.Event.RawEvent.Raw[msgend+2:], "!")
-		if numend <= 0 {
-			ctx.SendChain(message.Text("ERROR:找不到结束的!"))
-			return false
-		}
-		numend += msgend + 2
-		logrus.Debugln("[job]", start, msgend, numend)
-		msg := ctx.Event.RawEvent.Raw[start+3 : msgend]
-		arg, err := strconv.Atoi(ctx.Event.RawEvent.Raw[msgend+2 : numend])
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return false
-		}
-		arr, ok := args[arg]
-		if !ok {
-			var id message.MessageID
-			if msg == "" {
-				id = ctx.SendChain(message.At(ctx.Event.UserID), message.Text("请输入参数", arg))
-			} else {
-				id = ctx.SendChain(message.At(ctx.Event.UserID), message.Text("[", arg, "] ", msg))
-			}
-			select {
-			case <-time.After(time.Second * 120):
-				ctx.Send(message.ReplyWithMessage(id, message.Text("参数读取超时")))
-				if msg[0] != '?' {
-					return false
-				}
-			case e := <-zero.NewFutureEvent("message", 0, true, zero.CheckUser(ctx.Event.UserID)).Next():
-				args[arg] = e.Message.String()
-				arr = args[arg]
-				process.SleepAbout1sTo2s()
-				ctx.SendChain(message.Reply(e.MessageID), message.Text("已记录"))
-				process.SleepAbout1sTo2s()
-			}
-		}
-		ctx.Event.RawEvent.Raw = ctx.Event.RawEvent.Raw[:start] + arr + ctx.Event.RawEvent.Raw[numend+1:]
-	}
-	args = make(map[int]string)
-	for strings.Contains(ctx.Event.RawEvent.Raw, "!::") {
-		start := strings.Index(ctx.Event.RawEvent.Raw, "!::")
-		msgend := strings.Index(ctx.Event.RawEvent.Raw[start+3:], "::")
-		if msgend < 0 {
-			ctx.SendChain(message.Text("ERROR:找不到结束的::"))
-			return false
-		}
-		msgend += start + 3
-		numend := strings.Index(ctx.Event.RawEvent.Raw[msgend+2:], "!")
-		if numend <= 0 {
-			ctx.SendChain(message.Text("ERROR:找不到结束的!"))
-			return false
-		}
-		numend += msgend + 2
-		logrus.Debugln("[job]", start, msgend, numend)
-		u := ctx.Event.RawEvent.Raw[start+3 : msgend]
-		if u == "" {
-			return false
-		}
-		arg, err := strconv.Atoi(ctx.Event.RawEvent.Raw[msgend+2 : numend])
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return false
-		}
-		arr, ok := args[arg]
-		if !ok {
-			isnilable := u[0] == '?'
-			if isnilable {
-				u = u[1:]
-				if u == "" {
-					return false
-				}
-			}
-			b, err := web.GetData(u)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				if !isnilable {
-					return false
-				}
-			}
-			if len(b) > 0 {
-				type fakejson struct {
-					Arg string `json:"arg"`
-				}
-				f := fakejson{Arg: binary.BytesToString(b)}
-				w := binary.SelectWriter()
-				defer binary.PutWriter(w)
-				_ = json.NewEncoder(w).Encode(&f)
-				arr = w.String()[8 : w.Len()-3]
-				args[arg] = arr
-			}
-		}
-		w := binary.SelectWriter()
-		w.WriteString(ctx.Event.RawEvent.Raw[:start])
-		w.WriteString(arr)
-		w.WriteString(ctx.Event.RawEvent.Raw[numend+1:])
-		ctx.Event.RawEvent.Raw = string(w.Bytes())
-		binary.PutWriter(w)
-	}
-	return true
-}
-
-func logevent(ctx *zero.Ctx) bool {
-	ctx.SendChain(message.Text("您的下一条指令将被记录，在", ctx.State["regex_matched"].([]string)[1], "时触发"))
-	select {
-	case <-time.After(time.Second * 120):
-		ctx.SendChain(message.Text("指令记录超时"))
-		return false
-	case e := <-zero.NewFutureEvent("message", 0, true, zero.CheckUser(ctx.Event.UserID)).Next():
-		ctx.State["job_raw_event"] = e.RawEvent.Raw
-		ctx.State["job_new_event"] = e.RawEvent
-		return true
-	}
-}
--- a/plugin/job/matcher.go
+++ b/plugin/job/matcher.go
@@ -1,16 +0,0 @@
-package job
-
-import (
-	"unsafe"
-
-	"github.com/FloatTech/zbputils/control"
-	zero "github.com/wdvxdr1123/ZeroBot"
-)
-
-type matcherinstance struct {
-	m *zero.Matcher
-}
-
-func getmatcher(m control.Matcher) *zero.Matcher {
-	return (*matcherinstance)(unsafe.Pointer(&m)).m
-}
--- a/plugin/job/model.go
+++ b/plugin/job/model.go
@@ -1,11 +0,0 @@
-package job
-
-import sql "github.com/FloatTech/sqlite"
-
-type cmd struct {
-	ID   int64  `db:"id"`
-	Cron string `db:"cron"`
-	Cmd  string `db:"cmd"`
-}
-
-var db = &sql.Sqlite{}
--- a/plugin/manager/manager.go
+++ b/plugin/manager/manager.go
@@ -48,7 +48,7 @@ const (
 		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
-		"- 设置欢迎语XXX（可加{at}在欢迎时@对方）\n" +
+		"- 设置欢迎语XXX 可选添加 [{at}] [{nickname}] [{avatar}] {at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像\n" +
 		"- 测试欢迎语\n" +
 		"- [开启 | 关闭]入群验证"
 )
@@ -294,7 +294,7 @@ func init() { // 插件主体
 			var url, alert string
 			switch len(dateStrs) {
 			case 4:
-				url = dateStrs[2]
+				url = strings.TrimPrefix(dateStrs[2], "用")
 				alert = dateStrs[3]
 			case 3:
 				alert = dateStrs[2]
@@ -381,7 +381,7 @@ func init() { // 插件主体
 				var w welcome
 				err := db.Find("welcome", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
 				if err == nil {
-					ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(strings.ReplaceAll(w.Msg, "{at}", "[CQ:at,qq="+strconv.FormatInt(ctx.Event.UserID, 10)+"]")))
+					ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
 				} else {
 					ctx.SendChain(message.Text("欢迎~"))
 				}
@@ -431,7 +431,7 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			if ctx.Event.NoticeType == "group_decrease" {
 				userid := ctx.Event.UserID
-				ctx.SendChain(message.Text(ctxext.CardOrNickName(ctx, userid), "(", userid, ")", "离开了我们..."))
+				ctx.SendChain(message.Text(ctx.CardOrNickName(userid), "(", userid, ")", "离开了我们..."))
 			}
 		})
 	// 设置欢迎语
@@ -454,7 +454,7 @@ func init() { // 插件主体
 			var w welcome
 			err := db.Find("welcome", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
 			if err == nil {
-				ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(strings.ReplaceAll(w.Msg, "{at}", "[CQ:at,qq="+strconv.FormatInt(ctx.Event.UserID, 10)+"]")))
+				ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
 			} else {
 				ctx.SendChain(message.Text("欢迎~"))
 			}
@@ -540,3 +540,14 @@ func init() { // 插件主体
 		}
 	})
 }
+
+// 传入 ctx 和 welcome格式string 返回cq格式string  使用方法:welcometocq(ctx,w.Msg)
+func welcometocq(ctx *zero.Ctx, welcome string) string {
+	nickname := ctx.GetGroupMemberInfo(ctx.Event.GroupID, ctx.Event.UserID, false).Get("nickname").Str
+	at := "[CQ:at,qq=" + strconv.FormatInt(ctx.Event.UserID, 10) + "]"
+	avatar := "[CQ:image,file=" + "http://q4.qlogo.cn/g?b=qq&nk=" + strconv.FormatInt(ctx.Event.UserID, 10) + "&s=640]"
+	cqstring := strings.ReplaceAll(welcome, "{at}", at)
+	cqstring = strings.ReplaceAll(cqstring, "{nickname}", nickname)
+	cqstring = strings.ReplaceAll(cqstring, "{avatar}", avatar)
+	return cqstring
+}
--- a/plugin/moyu/run.go
+++ b/plugin/moyu/run.go
@@ -2,68 +2,62 @@
 package moyu

 import (
+	"sync"
 	"time"

 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"

 	"github.com/FloatTech/zbputils/control/order"
 )

+var (
+	msg        message.Message
+	mu         sync.Mutex
+	lastupdate time.Time
+)
+
 func init() { // 插件主体
 	control.Register("moyu", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: true,
 		Help: "moyu\n" +
 			"- /启用 moyu\n" +
-			"- /禁用 moyu",
-	})
-
-	// 定时任务每天10点执行一次
-	_, err := process.CronTab.AddFunc("0 10 * * *", func() { sendNotice() })
-	if err != nil {
-		panic(err)
-	}
-}
-
-// 获取数据拼接消息链并发送
-func sendNotice() {
-	m, ok := control.Lookup("moyu")
-	if ok {
-		if registry.Connect() != nil {
-			return
-		}
-		msg := message.Message{
-			message.Text(time.Now().Format("2006-01-02")),
-			message.Text("上午好，摸鱼人！\n工作再累，一定不要忘记摸鱼哦！有事没事起身去茶水间，去厕所，去廊道走走别老在工位上坐着，钱是老板的,但命是自己的。\n"),
-			message.Text(weekend()),
-			message.Text("\n"),
-			message.Text(GetHoliday("元旦")),
-			message.Text("\n"),
-			message.Text(GetHoliday("春节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("清明节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("劳动节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("端午节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("中秋节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("国庆节")),
-			message.Text("\n"),
-			message.Text("上班是帮老板赚钱，摸鱼是赚老板的钱！最后，祝愿天下所有摸鱼人，都能愉快的渡过每一天…"),
-		}
-		_ = registry.Close()
-		zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
-			for _, g := range ctx.GetGroupList().Array() {
-				grp := g.Get("group_id").Int()
-				if m.IsEnabledIn(grp) {
-					ctx.SendGroupMessage(grp, msg)
+			"- /禁用 moyu\n" +
+			"- 记录在\"0 10 * * *\"触发的指令\n" +
+			"   - 摸鱼提醒",
+	}).OnFullMatch("摸鱼提醒").SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			mu.Lock()
+			defer mu.Unlock()
+			if msg == nil || time.Since(lastupdate) > time.Hour*20 {
+				if registry.Connect() != nil {
+					return
 				}
+				msg = message.Message{
+					message.Text(time.Now().Format("2006-01-02")),
+					message.Text("上午好，摸鱼人！\n工作再累，一定不要忘记摸鱼哦！有事没事起身去茶水间，去厕所，去廊道走走别老在工位上坐着，钱是老板的,但命是自己的。\n"),
+					message.Text(weekend()),
+					message.Text("\n"),
+					message.Text(GetHoliday("元旦")),
+					message.Text("\n"),
+					message.Text(GetHoliday("春节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("清明节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("劳动节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("端午节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("中秋节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("国庆节")),
+					message.Text("\n"),
+					message.Text("上班是帮老板赚钱，摸鱼是赚老板的钱！最后，祝愿天下所有摸鱼人，都能愉快的渡过每一天…"),
+				}
+				_ = registry.Close()
+				lastupdate = time.Now()
 			}
-			return true
+			ctx.Send(msg)
 		})
-	}
 }
--- a/plugin/moyu_calendar/calendar.go
+++ b/plugin/moyu_calendar/calendar.go
@@ -14,7 +14,6 @@ import (

 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/control/order"
-	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"

@@ -31,7 +30,9 @@ func init() {
 		DisableOnDefault: true,
 		Help: "摸鱼人日历\n" +
 			"- /启用 moyucalendar\n" +
-			"- /禁用 moyucalendar",
+			"- /禁用 moyucalendar\n" +
+			"- 记录在\"30 8 * * *\"触发的指令\n" +
+			"   - 摸鱼人日历",
 	}).OnFullMatch("摸鱼人日历").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			title := fmt.Sprintf("摸鱼人日历 %d月%d日", time.Now().Month(), time.Now().Day())
@@ -52,40 +53,6 @@ func init() {
 			}
 			ctx.SendChain(message.Image(image))
 		})
-
-	// 定时任务每天8点30分执行一次
-	_, err := process.CronTab.AddFunc("30 8 * * *", func() {
-		m, ok := control.Lookup("moyucalendar")
-		if !ok {
-			return
-		}
-		title := fmt.Sprintf("摸鱼人日历 %d月%d日", time.Now().Month(), time.Now().Day())
-		sg, cookies, err := sougou(title, "摸鱼人日历", ua)
-		if err != nil {
-			return
-		}
-		wx, err := redirect(sg, cookies, ua)
-		if err != nil {
-			return
-		}
-		image, err := calendar(wx, ua)
-		if err != nil {
-			return
-		}
-		zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
-			for _, g := range ctx.GetGroupList().Array() {
-				grp := g.Get("group_id").Int()
-				if m.IsEnabledIn(grp) {
-					ctx.SendGroupMessage(grp, message.Message{message.Image(image)})
-					process.SleepAbout1sTo2s()
-				}
-			}
-			return true
-		})
-	})
-	if err != nil {
-		panic(err)
-	}
 }

 func sougou(title, publisher, ua string) (string, []*http.Cookie, error) {
--- a/plugin/nativewife/main.go
+++ b/plugin/nativewife/main.go
@@ -19,7 +19,6 @@ import (
 	"github.com/FloatTech/zbputils/control/order"

 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 )

@@ -47,7 +46,7 @@ func init() {
 				ctx.SendChain(message.Text("大家的wife都是", wn, "\n"), message.Image(baseuri+"/"+grpf+"/"+wn), message.Text("\n哦~"))
 			default:
 				// 获取名字
-				name := ctxext.NickName(ctx)
+				name := ctx.NickName()
 				now := time.Now()
 				s := md5.Sum(helper.StringToBytes(fmt.Sprintf("%s%d%d%d", name, now.Year(), now.Month(), now.Day())))
 				r := rand.New(rand.NewSource(int64(binary.LittleEndian.Uint64(s[:]))))
@@ -57,7 +56,7 @@ func init() {
 			}
 		})
 	// 上传一张图
-	engine.OnPrefix("添加wife", zero.OnlyGroup, chkAddWifePermission, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnPrefix("添加wife", zero.OnlyGroup, chkAddWifePermission, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			name := ""
 			for _, elem := range ctx.Event.Message {
--- a/plugin/novel/qianbi.go
+++ b/plugin/novel/qianbi.go
@@ -25,14 +25,14 @@ import (
 )

 const (
-	websiteURL   = "https://www.23qb.net"
+	websiteURL   = "https://www.23qb.com"
 	websiteTitle = "铅笔小说"
 	errorTitle   = "出现错误！"
 	username     = "zerobot"
 	password     = "123456"
 	submit       = "%26%23160%3B%B5%C7%26%23160%3B%26%23160%3B%C2%BC%26%23160%3B"
 	ua           = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
-	loginURL     = websiteURL + "/login.php?do=submit&jumpurl=https%3A%2F%2Fwww.23qb.net%2F"
+	loginURL     = websiteURL + "/login.php?do=submit&jumpurl=https%3A%2F%2Fwww.23qb.com%2F"
 	searchURL    = websiteURL + "/saerch.php"
 	idReg        = `/(\d+)/`
 )
--- a/plugin/nsfw/main.go
+++ b/plugin/nsfw/main.go
@@ -18,7 +18,7 @@ func init() {
 		Help:             "nsfw图片识别\n- nsfw打分[图片]",
 	}).ApplySingle(ctxext.DefaultSingle)
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"nsfw打分"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"nsfw打分"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
@@ -35,7 +35,7 @@ func init() {
 		DisableOnDefault: true,
 		Help:             "nsfw图片自动识别\n- 当图片属于非 neutral 类别时自动发送评价",
 	})
-	en.OnMessage(ctxext.IsPicExists).SetBlock(false).
+	en.OnMessage(zero.IsPicExists).SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
--- a/plugin/saucenao/searcher.go
+++ b/plugin/saucenao/searcher.go
@@ -53,6 +53,7 @@ func init() { // 插件主体
 							continue
 						}
 						logrus.Debugln("[sausenao]开始下载", n)
+						logrus.Debugln("[sausenao]urls:", illust.ImageUrls)
 						err1 := illust.DownloadToCache(i)
 						if err1 == nil {
 							m.SetFile(f)
@@ -83,7 +84,7 @@ func init() { // 插件主体
 			}
 		})
 	// 以图搜图
-	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))
--- a/plugin/scale/main.go
+++ b/plugin/scale/main.go
@@ -39,7 +39,7 @@ func init() {
 	}).ApplySingle(ctxext.DefaultSingle)
 	cachedir := engine.DataFolder()
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"放大图片"}, zero.OnlyGroup, ctxext.MustProvidePicture, getPara).SetBlock(true).
+	engine.OnKeywordGroup([]string{"放大图片"}, zero.OnlyGroup, zero.MustProvidePicture, getPara).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
--- a/plugin/score/sign_in.go
+++ b/plugin/score/sign_in.go
@@ -14,7 +14,6 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"

 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/text"
@@ -107,7 +106,7 @@ func init() {
 			canvas.SetRGB(0, 0, 0)
 			canvas.DrawString(hourWord, float64(back.Bounds().Size().X)*0.1, float64(back.Bounds().Size().Y)*1.2)
 			canvas.DrawString(monthWord, float64(back.Bounds().Size().X)*0.6, float64(back.Bounds().Size().Y)*1.2)
-			nickName := ctxext.CardOrNickName(ctx, uid)
+			nickName := ctx.CardOrNickName(uid)
 			if err = canvas.LoadFontFace(text.FontFile, float64(back.Bounds().Size().X)*0.04); err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
@@ -203,12 +202,12 @@ func getLevel(count int) int {

 func initPic(picFile string) {
 	if file.IsNotExist(picFile) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), backgroundURL, "GET", referer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), backgroundURL, "GET", referer, ua)
 		if err != nil {
 			log.Errorln("[score]", err)
 		}
 		picURL := gjson.Get(string(data), "pic").String()
-		data, err = web.GetDataWith(web.NewDefaultClient(), picURL, "GET", "", ua)
+		data, err = web.RequestDataWith(web.NewDefaultClient(), picURL, "GET", "", ua)
 		if err != nil {
 			log.Errorln("[score]", err)
 		}
--- a/plugin/shadiao/caihongpi.go
+++ b/plugin/shadiao/caihongpi.go
@@ -11,7 +11,7 @@ import (

 func init() {
 	engine.OnFullMatch("哄我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), chpURL, "GET", chpReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), chpURL, "GET", chpReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
--- a/plugin/shadiao/dujitang.go
+++ b/plugin/shadiao/dujitang.go
@@ -11,7 +11,7 @@ import (

 func init() {
 	engine.OnFullMatch("来碗毒鸡汤").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), duURL, "GET", duReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), duURL, "GET", duReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
--- a/plugin/shadiao/pengyouquan.go
+++ b/plugin/shadiao/pengyouquan.go
@@ -11,7 +11,7 @@ import (

 func init() {
 	engine.OnFullMatch("发个朋友圈").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), pyqURL, "GET", pyqReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), pyqURL, "GET", pyqReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
--- a/plugin/shadiao/sweetnothings.go
+++ b/plugin/shadiao/sweetnothings.go
@@ -12,7 +12,7 @@ import (

 func init() {
 	engine.OnFullMatch("来碗绿茶").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), chayiURL, "GET", loveliveReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), chayiURL, "GET", loveliveReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
@@ -22,7 +22,7 @@ func init() {
 	})

 	engine.OnFullMatch("渣我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), ganhaiURL, "GET", loveliveReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), ganhaiURL, "GET", loveliveReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
--- a/plugin/shadiao/yduanzi.go
+++ b/plugin/shadiao/yduanzi.go
@@ -14,7 +14,7 @@ import (

 func init() {
 	engine.OnFullMatch("讲个段子").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), yduanziURL, "POST", yduanziReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), yduanziURL, "POST", yduanziReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
--- a/plugin/shindan/shindan.go
+++ b/plugin/shindan/shindan.go
@@ -33,7 +33,7 @@ func init() {
 // shindanmaker 处理函数
 func handle(ctx *zero.Ctx) {
 	// 获取名字
-	name := ctxext.NickName(ctx)
+	name := ctx.NickName()
 	// 调用接口
 	txt, err := shindanmaker.Shindanmaker(ctx.State["id"].(int64), name)
 	if err != nil {
--- a/plugin/sleep_manage/model/model.go
+++ b/plugin/sleep_manage/model/model.go
@@ -1,5 +1,4 @@
-// Package model 睡眠管理数据库
-package model
+package sleepmanage

 import (
 	"os"
@@ -10,11 +9,14 @@ import (
 	log "github.com/sirupsen/logrus"
 )

-// SleepDB 睡眠数据库
-type SleepDB gorm.DB
+// sdb 睡眠数据库全局变量
+var sdb *sleepdb

-// Initialize 初始化
-func Initialize(dbpath string) *SleepDB {
+// sleepdb 睡眠数据库结构体
+type sleepdb gorm.DB
+
+// initialize 初始化
+func initialize(dbpath string) *sleepdb {
 	var err error
 	if _, err = os.Stat(dbpath); err != nil || os.IsNotExist(err) {
 		// 生成文件
@@ -29,27 +31,18 @@ func Initialize(dbpath string) *SleepDB {
 		panic(err)
 	}
 	gdb.AutoMigrate(&SleepManage{})
-	return (*SleepDB)(gdb)
-}
-
-// Open 打开
-func Open(dbpath string) (*SleepDB, error) {
-	db, err := gorm.Open("sqlite3", dbpath)
-	if err != nil {
-		return nil, err
-	}
-	return (*SleepDB)(db), nil
+	return (*sleepdb)(gdb)
 }

 // Close 关闭
-func (sdb *SleepDB) Close() error {
+func (sdb *sleepdb) Close() error {
 	db := (*gorm.DB)(sdb)
 	return db.Close()
 }

 // SleepManage 睡眠信息
 type SleepManage struct {
-	gorm.Model
+	ID        uint      `gorm:"primary_key"`
 	GroupID   int64     `gorm:"column:group_id"`
 	UserID    int64     `gorm:"column:user_id"`
 	SleepTime time.Time `gorm:"column:sleep_time"`
@@ -60,8 +53,8 @@ func (SleepManage) TableName() string {
 	return "sleep_manage"
 }

-// Sleep 更新睡眠时间
-func (sdb *SleepDB) Sleep(gid, uid int64) (position int, awakeTime time.Duration) {
+// sleep 更新睡眠时间
+func (sdb *sleepdb) sleep(gid, uid int64) (position int, awakeTime time.Duration) {
 	db := (*gorm.DB)(sdb)
 	now := time.Now()
 	var today time.Time
@@ -92,8 +85,8 @@ func (sdb *SleepDB) Sleep(gid, uid int64) (position int, awakeTime time.Duration
 	return position, awakeTime
 }

-// GetUp 更新起床时间
-func (sdb *SleepDB) GetUp(gid, uid int64) (position int, sleepTime time.Duration) {
+// getUp 更新起床时间
+func (sdb *sleepdb) getUp(gid, uid int64) (position int, sleepTime time.Duration) {
 	db := (*gorm.DB)(sdb)
 	now := time.Now()
 	today := now.Add(-time.Hour*time.Duration(-6+now.Hour()) - time.Minute*time.Duration(now.Minute()) - time.Second*time.Duration(now.Second()))
--- a/plugin/sleep_manage/sleep_manage.go
+++ b/plugin/sleep_manage/sleep_manage.go
@@ -12,8 +12,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"

 	"github.com/FloatTech/zbputils/control/order"
-
-	"github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage/model"
 )

 func init() {
@@ -22,15 +20,13 @@ func init() {
 		Help:              "sleepmanage\n- 早安\n- 晚安",
 		PrivateDataFolder: "sleep",
 	})
-	dbfile := engine.DataFolder() + "manage.db"
+	go func() {
+		sdb = initialize(engine.DataFolder() + "manage.db")
+		log.Println("[sleepmanage]加载sleepmanage数据库")
+	}()
 	engine.OnFullMatch("早安", isMorning, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			db, err := model.Open(dbfile)
-			if err != nil {
-				log.Errorln(err)
-				return
-			}
-			position, getUpTime := db.GetUp(ctx.Event.GroupID, ctx.Event.UserID)
+			position, getUpTime := sdb.getUp(ctx.Event.GroupID, ctx.Event.UserID)
 			log.Println(position, getUpTime)
 			hour, minute, second := timeDuration(getUpTime)
 			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
@@ -38,16 +34,10 @@ func init() {
 			} else {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("早安成功！你的睡眠时长为%d时%d分%d秒,你是今天第%d个起床的", hour, minute, second, position)))
 			}
-			db.Close()
 		})
 	engine.OnFullMatch("晚安", isEvening, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			db, err := model.Open(dbfile)
-			if err != nil {
-				log.Errorln(err)
-				return
-			}
-			position, sleepTime := db.Sleep(ctx.Event.GroupID, ctx.Event.UserID)
+			position, sleepTime := sdb.sleep(ctx.Event.GroupID, ctx.Event.UserID)
 			log.Println(position, sleepTime)
 			hour, minute, second := timeDuration(sleepTime)
 			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
@@ -55,7 +45,6 @@ func init() {
 			} else {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("晚安成功！你的清醒时长为%d时%d分%d秒,你是今天第%d个睡觉的", hour, minute, second, position)))
 			}
-			db.Close()
 		})
 }

--- a/plugin/tiangou/tiangou.go
+++ b/plugin/tiangou/tiangou.go
@@ -0,0 +1,54 @@
+// Package tiangou 舔狗日记
+package tiangou
+
+import (
+	sql "github.com/FloatTech/sqlite"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+type tiangou struct {
+	ID   uint32 `db:"id"`
+	Text string `db:"text"`
+}
+
+var db = &sql.Sqlite{}
+
+func init() {
+	en := control.Register("tiangou", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help: "舔狗日记\n" +
+			"- 舔狗日记",
+		PublicDataFolder: "Tiangou",
+	})
+
+	go func() {
+		dbpath := en.DataFolder()
+		db.DBPath = dbpath + "tiangou.db"
+		_, err := file.GetLazyData(db.DBPath, false, true)
+		if err != nil {
+			panic(err)
+		}
+		err = db.Create("tiangou", &tiangou{})
+		if err != nil {
+			panic(err)
+		}
+		c, _ := db.Count("tiangou")
+		logrus.Infoln("[tiangou]加载", c, "条舔狗日记")
+	}()
+
+	en.OnFullMatch("舔狗日记").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		var t tiangou
+		err := db.Pick("tiangou", &t)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		ctx.SendChain(message.Text(t.Text))
+	})
+}
--- a/plugin/tracemoe/moe.go
+++ b/plugin/tracemoe/moe.go
@@ -5,7 +5,6 @@ import (
 	"fmt"

 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	trmoe "github.com/fumiama/gotracemoe"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -23,7 +22,7 @@ func init() { // 插件主体
 		Help:             "tracemoe\n- 搜番 | 搜索番剧[图片]",
 	})
 	// 以图搜图
-	engine.OnKeywordGroup([]string{"搜番", "搜索番剧"}, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"搜番", "搜索番剧"}, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))
--- a/plugin/wangyiyun/main.go
+++ b/plugin/wangyiyun/main.go
@@ -24,7 +24,7 @@ func init() {
 		Help:             "wangyiyun \n- 来份网易云热评",
 	}).OnFullMatch("来份网易云热评").SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			data, err := web.GetDataWith(web.NewDefaultClient(), wangyiyunURL, "GET", wangyiyunReferer, ua)
+			data, err := web.RequestDataWith(web.NewDefaultClient(), wangyiyunURL, "GET", wangyiyunReferer, ua)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
--- a/plugin/zaobao/zaobao.go
+++ b/plugin/zaobao/zaobao.go
@@ -0,0 +1,67 @@
+// Package zaobao 易即今日公众号api的今日早报
+package zaobao
+
+import (
+	"sync"
+	"time"
+
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/zbputils/binary"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/web"
+
+	"github.com/FloatTech/zbputils/control/order"
+)
+
+const (
+	api     = "http://api.soyiji.com/news_jpg"
+	referer = "safe.soyiji.com"
+	ua      = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
+)
+
+var (
+	picdata []byte
+	mu      sync.Mutex
+	pictime time.Time
+)
+
+func init() { // 插件主体
+	engine := control.Register("zaobao", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: true,
+		Help: "易即今日公众号api的今日早报\n" +
+			"api早上8点更新，推荐定时在8点30后\n" +
+			"配合插件job中的记录在\"cron\"触发的指令使用\n" +
+			"- 记录在\"0 9 * * *\"触发的指令\n" +
+			"   - 今日早报",
+	})
+	engine.OnFullMatch("今日早报", zero.OnlyGroup).SetBlock(false).
+		Handle(func(ctx *zero.Ctx) {
+			err := getdata()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.ImageBytes(picdata))
+		})
+}
+
+func getdata() error { // 获取图片链接并且下载
+	mu.Lock()
+	defer mu.Unlock()
+	if picdata != nil && time.Since(pictime) <= time.Hour*20 {
+		return nil
+	}
+	data, err := web.RequestDataWith(web.NewDefaultClient(), api, "GET", "", ua)
+	if err != nil {
+		return err
+	}
+	picdata, err = web.RequestDataWith(web.NewDefaultClient(), gjson.Get(binary.BytesToString(data), "url").String(), "GET", referer, ua)
+	if err != nil {
+		return err
+	}
+	pictime = time.Now()
+	return nil
+}
Author	SHA1	Message	Date
GenesisAN	5cd46b3926	从url正则中去除用字 (#160 ) 从url正则中去除用字,以防止url中包含用字前缀导致图片显示失败	2022-03-20 14:43:55 +08:00
源文雨	6e2b10b788	fix lint	2022-03-20 14:40:47 +08:00
源文雨	5e301ccaaf	fix lint	2022-03-20 14:33:43 +08:00
源文雨	206a38efab	fix #154 : 优化代码结构	2022-03-20 14:20:37 +08:00
Coloured-glaze	cdf844be52	🎨原神抽卡 (#156 ) * Add files via upload * 原神抽卡 * 🎨原神抽卡	2022-03-20 10:59:11 +08:00
源文雨	70cc28c191	fix ci	2022-03-19 19:58:16 +08:00
源文雨	35282fba6c	update data	2022-03-19 19:52:54 +08:00
源文雨	e43f8e594d	Merge branch 'master' of https://github.com/FloatTech/ZeroBot-Plugin	2022-03-19 19:51:59 +08:00
源文雨	21988fab76	⬆️ update to go 1.18	2022-03-19 19:51:45 +08:00
himawari	2f3823abe2	feat:添加舔狗日记和修复睡眠管理的问题 (#152 ) * feat:添加舔狗日记和修复睡眠管理的问题 * fix:修lint * fix:修改铅笔小说网址 * fix:修改铅笔小说网址	2022-03-19 11:29:31 +08:00
源文雨	2c545e7b7f	🎨 优化pool	2022-03-18 16:50:07 +08:00
源文雨	22f2200778	🐛 b14 panic	2022-03-15 22:50:38 +08:00
源文雨	2f63253ec0	🎨 优化代码结构	2022-03-14 12:50:50 +08:00
源文雨	be7e8134f9	🎨 优化代码结构	2022-03-14 12:46:54 +08:00
源文雨	b85408e3e5	✨ pixiv add backend dns result	2022-03-13 22:43:41 +08:00
源文雨	4828451f9e	🔖 v1.3.2	2022-03-13 13:21:52 +08:00
源文雨	b3b50e1353	🐛 搜图有时无法下载图片	2022-03-13 13:14:01 +08:00
源文雨	95e8bf2f55	📝 edit readme	2022-03-12 20:22:28 +08:00
源文雨	cde7669c0b	✨ 优化代码结构	2022-03-12 11:35:20 +08:00
源文雨	ff4a33c51c	edit readme	2022-03-12 11:05:19 +08:00
源文雨	06cf6f84aa	edit readme	2022-03-12 00:27:27 +08:00
源文雨	556f6f134f	edit readme	2022-03-12 00:27:15 +08:00
源文雨	b1ab7ef118	edit readme	2022-03-12 00:25:59 +08:00
源文雨	e5fd108a9c	edit readme	2022-03-12 00:25:21 +08:00
源文雨	5a67bf2417	🐛 每天刷新	2022-03-12 00:18:26 +08:00
源文雨	cb020c1bbd	🐛 每天刷新	2022-03-12 00:17:33 +08:00
源文雨	bf75b29e33	🐛 每天刷新	2022-03-12 00:16:04 +08:00
源文雨	d730fd9cab	✨ 优化代码结构	2022-03-12 00:05:41 +08:00
Jiang-Red	a862e5be7c	添加早报插件及设置欢迎语增加更多自定义 (#147 ) * 添加早报插件 * 添加早报插件 * 添加早报插件 * 添加设置欢迎语更多自定义 * 添加 help说明 * 添加 manager设置欢迎语说明 * 怪 * 🎨 改进代码样式 * Update zaobao.go * Update zaobao.go Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>	2022-03-11 23:47:39 +08:00
源文雨	ebca124c86	🐛 修复 run	2022-03-11 23:02:08 +08:00
源文雨	3b7803a81b	✨ 优化代码结构	2022-03-11 16:34:26 +08:00
源文雨	b7b9d92148	✨ 优化代码结构	2022-03-11 16:18:11 +08:00
Rainy	44575fb19e	增加城市疫情查询 (#146 ) * 增加城市疫情查询 * 增加城市疫情查询 * 增加城市疫情查询 * 增加城市疫情查询 * 增加查询城市疫情 * 增加城市查询疫情 * 增加城市疫情查询 * Update epidemic.go Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>	2022-03-11 16:10:14 +08:00