From e25dab3ec02b83b668bc20684c90677021fb7a17 Mon Sep 17 00:00:00 2001 From: iyear Date: Tue, 6 Jul 2021 21:21:49 +0800 Subject: [PATCH] Modify documents --- README.md | 64 ++++++++++++++------------------- README_zhCN.md | 89 ++++++++++++++-------------------------------- config.yml.example | 4 ++- config/config.go | 1 - go.mod | 5 ++- go.sum | 27 +++++++++++--- 6 files changed, 79 insertions(+), 111 deletions(-) diff --git a/README.md b/README.md index b81acd7..45707a4 100644 --- a/README.md +++ b/README.md @@ -4,20 +4,13 @@ ![](https://img.shields.io/badge/license-GPL-lightgrey.svg?style=flat-square) ![](https://img.shields.io/github/v/release/iyear/E5SubBot?color=green&style=flat-square) -English | [简体中文](https://github.com/iyear/E5SubBot/blob/master/README_zhCN.md) +English | [简体中文](https://github.com/iyear/E5SubBot/blob/master/README_zhCN.md) | [交流群组](https://t.me/e5subbot) A Simple Telebot for E5 Renewal `Golang` + `MySQL` -DEMO: https://t.me/E5Sub_bot (all new functions will be tested in DEMO) - -Communication: [Telegram Group](https://t.me/e5subbot) - -## Preview -
- -
+DEMO: https://t.me/E5Sub_bot ## Feature @@ -25,7 +18,7 @@ Communication: [Telegram Group](https://t.me/e5subbot) - Manageable Simple Account System - Available Task Execution Feedback - Convenient Authorization - +- Use concurrency to speed up ## Principle @@ -60,15 +53,16 @@ docker-compose up -d ``` ### Binary Deployment -Download the binary files of the corresponding system on the [Releases](https://github.com/iyear/E5SubBot/releases) page and upload it to the server +Download the binary files of the corresponding system on the [Releases](https://github.com/iyear/E5SubBot/releases) page +and upload it to the server -Windows: Start `E5SubBot.exe` in `cmd` +Windows: Start `E5SubBot.exe` -Linux: +Linux: ```bash screen -S e5sub -chmod 773 E5SubBot +chmod +x E5SubBot ./E5SubBot (Ctrl A+D) ``` @@ -77,7 +71,7 @@ chmod 773 E5SubBot Download the source code and install the GO environment ```shell -go build +git clone https://github.com/iyear/E5SubBot.git && cd E5SubBot && go build ``` ## Configuration @@ -91,6 +85,7 @@ bot_token: YOUR_BOT_TOKEN socks5: 127.0.0.1:1080 notice: "first line \n second line" admin: 66666,77777,88888 +goroutine: 10 errlimit: 5 cron: "1 */3 * * *" bindmax: 3 @@ -100,21 +95,25 @@ mysql: user: e5sub password: e5sub database: e5sub + table: users ``` -`bindmax`, `notice`, `admin`, `errlimit` can be hot updated, just update `config.yml` to save. -| Configuration | Explanation| -| ---- | ---- | -| bot_token | Change to your own `BotToken` | -| socks5 | `Socks5` proxy,if you do not need ,you should delete it. For example: `127.0.0.1:1080` | -|notice|Announcement. Merged into `/help`| -|admin|The administrator's `tgid`, go to https://t.me/userinfobot to get it, separated by `,`; Administrator permissions: manually call the task, get the total feedback of the task| -|errlimit|The maximum number of errors for a single account, automatically unbind the single account and send a notification when it is full, without limiting the number of errors, change the value to a negative number `(-1)`; all errors will be cleared after the bot restarts| -|cron|API call frequency, using `cron` expression| -|bindmax|Maximum number of bindable| -|mysql|Mysql configuration, please create database in advance| +`bindmax`, `notice`, `admin`,`goroutine`, `errlimit` can be hot updated, just update `config.yml` to save. + +| Configuration | Explanation|Default| +| ---- | ---- |----| +| bot_token | Change to your own `BotToken` |-| +| socks5 | `Socks5` proxy,if you do not need ,you should delete it. For example: `127.0.0.1:1080` |-| +|notice|Announcement. Merged into `/help`|-| +|admin|The administrator's `tgid`, go to https://t.me/userinfobot to get it, separated by `,`; Administrator permissions: manually call the task, get the total feedback of the task|-| +|goroutine|Concurrent number, don’t be too big|10| +|errlimit|The maximum number of errors for a single account, automatically unbind the single account and send a notification when it is full, without limiting the number of errors, change the value to a negative number `(-1)`; all errors will be cleared after the bot restarts|5| +|cron|API call frequency, using `cron` expression|-| +|bindmax|Maximum number of bindable|5| +|mysql|Mysql configuration, please create database in advance(If you upgrade the old version, please set table to users, otherwise the data table cannot be read)|-| ### Command + ``` /my View bound account information /bind Bind new account @@ -141,25 +140,14 @@ Suspected memory leak. Not yet resolved, please run the daemon or restart Bot re https://t.me/e5subbot/5201 -## Third-Party -- [Telebot](https://gopkg.in/tucnak/telebot) -- [Mysql_driver](https://github.com/go-sql-driver/mysql) -- [Gjson](https://github.com/tidwall/gjson) -- [Cron](https://github.com/robfig/cron/) -- [Viper](https://github.com/spf13/viper) -- [Goreleaser](https://https://github.com/goreleaser/goreleaser) - ## Contributing - Provide documentation in other languages - Provide help for code operation - Suggests user interaction - …… ## More Functions -If you still want to support new features, please use FeatHub to vote. We will consider the voting results and other factors to determine the development priority. -[![Feature Requests](https://cloud.githubusercontent.com/assets/390379/10127973/045b3a96-6560-11e5-9b20-31a2032956b2.png)](http://feathub.com/NervJS/taro) - -[![Feature Requests](https://feathub.com/iyear/E5SubBot?format=svg)](https://feathub.com/iyear/E5SubBot) +If you still want to support new features, please initiate an issue. ## License diff --git a/README_zhCN.md b/README_zhCN.md index 019784e..b382260 100644 --- a/README_zhCN.md +++ b/README_zhCN.md @@ -4,20 +4,14 @@ ![](https://img.shields.io/badge/license-GPL-lightgrey.svg?style=flat-square) ![](https://img.shields.io/github/v/release/iyear/E5SubBot?color=green&style=flat-square) -[English](https://github.com/iyear/E5SubBot) | 简体中文 +[English](https://github.com/iyear/E5SubBot) | 简体中文 | [交流群组](https://t.me/e5subbot) A Simple Telebot for E5 Renewal `Golang` + `MySQL` -DEMO: https://t.me/E5Sub_bot (长期运行,所有新功能会在DEMO测试) +DEMO: https://t.me/E5Sub_bot -[交流群组](https://t.me/e5subbot) - -## 预览 -
- -
## 特性 @@ -25,6 +19,7 @@ DEMO: https://t.me/E5Sub_bot (长期运行,所有新功能会在DEMO测试) - 可管理的简易账户系统 - 完善的任务执行反馈 - 极为方便的授权方式 +- 使用并发加快运行速度 ## 原理 @@ -61,13 +56,13 @@ docker-compose up -d 在[Releases](https://github.com/iyear/E5SubBot/releases)页面下载对应系统的二进制文件,上传至服务器 -Windows: 在`cmd`中启动 `E5SubBot.exe` +Windows: 启动 `E5SubBot.exe` -Linux: +Linux: ```bash screen -S e5sub -chmod 773 E5SubBot +chmod +x E5SubBot ./E5SubBot (Ctrl A+D) ``` @@ -76,7 +71,7 @@ chmod 773 E5SubBot 下载源码,安装GO环境 ```shell -go build +git clone https://github.com/iyear/E5SubBot.git && cd E5SubBot && go build ``` ## 部署配置 @@ -90,6 +85,7 @@ bot_token: YOUR_BOT_TOKEN socks5: 127.0.0.1:1080 notice: "第一行\n第二行" admin: 66666,77777,88888 +goroutine: 10 errlimit: 5 cron: "1 */3 * * *" bindmax: 3 @@ -99,21 +95,25 @@ mysql: user: e5sub password: e5sub database: e5sub + table: users ``` -`bindmax`,`notice`,`admin`,`errlimit`可热更新,直接更新`config.yml`保存即可 -| 配置项 | 说明 | -| ---- | ---- | -| bot_token | 更换为自己的`BotToken` | -| socks5 | `Socks5`代理,不需要删去即可.例如:`127.0.0.1:1080` | -|notice|公告.合并至`/help`| -|admin|管理员`tgid`,前往 https://t.me/userinfobot 获取,用`,`隔开;管理员权限: 手动调用任务,获得任务总反馈| -|errlimit|单账户最大出错次数,满后自动解绑单账户并发送通知,不限制错误次数将值改为负数`(-1)`即可;bot重启后会清零所有错误次数| -|cron|API调用频率,使用cron表达式| -|bindmax|最大可绑定数| -|mysql|mysql配置,请提前创建数据库| +`bindmax`,`notice`,`admin`,`goroutine`,`errlimit`可热更新,直接更新`config.yml`保存即可 + +| 配置项 | 说明 |默认值| +| ---- | ---- | ---- | +| bot_token | 更换为自己的`BotToken` | -| +| socks5 | `Socks5`代理,不需要删去即可.例如:`127.0.0.1:1080` |-| +|notice|公告.合并至`/help`|-| +|admin|管理员`tgid`,前往 https://t.me/userinfobot 获取,用`,`隔开;管理员权限: 手动调用任务,获得任务总反馈|-| +|goroutine|并发数,不要过大|10| +|errlimit|单账户最大出错次数,满后自动解绑单账户并发送通知,不限制错误次数将值改为负数`(-1)`即可;bot重启后会清零所有错误次数|5| +|cron|API调用频率,使用cron表达式|-| +|bindmax|最大可绑定数|5| +|mysql|mysql配置,请提前创建数据库(旧版本升级请设置table为users,否则读不到数据表)|-| ### 命令 + ``` /my 查看已绑定账户信息 /bind 绑定新账户 @@ -143,54 +143,17 @@ mysql: > 无法通过Bot创建应用程序 https://t.me/e5subbot/5201 + ## 更多功能 -如果你还想支持新的特性,请使用 FeatHub 进行投票,我们将综合考虑投票结果等因素来确定开发的优先级。 -[![Feature Requests](https://cloud.githubusercontent.com/assets/390379/10127973/045b3a96-6560-11e5-9b20-31a2032956b2.png)](http://feathub.com/NervJS/taro) +如果你还想支持新的特性,请发起issue. -[![Feature Requests](https://feathub.com/iyear/E5SubBot?format=svg)](https://feathub.com/iyear/E5SubBot) ## 做出贡献 + - 提供其他语言的文档 - 为代码运行提供帮助 - 对用户交互提出建议 - …… -## 小总结 -#### 得到了什么? -- git的基本操作:add,commit,pull,push.但是对代码合并与冲突解决没有得到足够的实践和深入 -- github版本库方面的使用(issue,pull request...),还有一些没玩过 -- 体验了Docker Hub 的自动构建 -- sql的CRUD,但都只是浮于表面,有时间再去琢磨 -- telegram bot的golang基本框架和一些有意思的玩法 -- 一些著名第三方库(viper,gjson)的基本用法 -- docker以及docker-compose的基本用法 -- 一些工具:gox;goreleaser的基本用法 -- …… -#### 还缺点什么? - -- 对`CGO`知难而退,编译各种出错。下个项目如果用到`sqlite`一定解决`CGO`交叉编译 -- `DockerFile` 还不会写 -- 对项目的概念和意识不太行,目录太乱,随缘写全局变量 -- 看`telebot`的文档还好,看`stackflow` 只能看看代码。搜索还是习惯性带中文导致`stackflow`很难出现,降低了解决问题的效率 - -#### 最后 - -从2020.3.28开发至2020.4.12,一共经历14天,利用课余时间最终完成。 - -就要开学了,因为马上步入高三,学习紧迫,遂不再进行功能开发。 - -项目差不多就停更了,最多也就是每个星期看看issue、tg群组,修一修bug - -**DEMO依旧能保持服务水平,不会因为个人问题在这段时间停止运行** - -如果一年后还有人在用,一定会继续 - -## Third-Party -- [telebot](https://gopkg.in/tucnak/telebot) -- [mysql_driver](https://github.com/go-sql-driver/mysql) -- [gjson](https://github.com/tidwall/gjson) -- [cron](https://github.com/robfig/cron/) -- [viper](https://github.com/spf13/viper) -- [goreleaser](https://https://github.com/goreleaser/goreleaser) ## License diff --git a/config.yml.example b/config.yml.example index c9fdae3..167d375 100644 --- a/config.yml.example +++ b/config.yml.example @@ -2,6 +2,7 @@ bot_token: xxx #socks5: 127.0.0.1:1080 bindmax: 3 admin: 555,666,777 +goroutine: 10 errlimit: 5 notice: "aaa\nbbb" cron: "1 */3 * * *" @@ -11,4 +12,5 @@ mysql: port: 3306 user: root password: root - database: e5sub \ No newline at end of file + database: e5sub + table: users \ No newline at end of file diff --git a/config/config.go b/config/config.go index 5c49c23..b0a4e9b 100644 --- a/config/config.go +++ b/config/config.go @@ -57,7 +57,6 @@ func InitConfig() { viper.SetDefault("errlimit", 5) viper.SetDefault("bindmax", 5) viper.SetDefault("goroutine", 10) - viper.SetDefault("bindmax", 5) BindMaxNum = viper.GetInt("bindmax") MaxErrTimes = viper.GetInt("errlimit") diff --git a/go.mod b/go.mod index e8fc8a3..52b4f31 100644 --- a/go.mod +++ b/go.mod @@ -10,11 +10,10 @@ require ( github.com/spf13/viper v1.6.2 github.com/tidwall/gjson v1.6.0 github.com/tidwall/pretty v1.0.1 // indirect - go.uber.org/automaxprocs v1.4.0 go.uber.org/zap v1.10.0 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/tucnak/telebot.v2 v2.0.0-20200328014118-dd123e949ee1 - gorm.io/driver/sqlite v1.1.4 - gorm.io/gorm v1.21.3 + gorm.io/driver/mysql v1.1.1 + gorm.io/gorm v1.21.9 ) diff --git a/go.sum b/go.sum index 18e9135..e511291 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= +github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= @@ -29,6 +31,8 @@ github.com/gin-gonic/gin v1.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwv github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= +github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= @@ -37,6 +41,8 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -57,7 +63,10 @@ github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= @@ -67,8 +76,9 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= +github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -95,6 +105,8 @@ github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGw github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615 h1:/mD+ABZyXD39BzJI2XyRJlqdZG11gXFo0SSynL+OFeU= +github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615/go.mod h1:Ad7oeElCZqA1Ufj0U9/liOF4BtVepxRcTvr2ey7zTvM= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= @@ -121,6 +133,10 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E= github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/shirou/gopsutil v2.19.11+incompatible h1:lJHR0foqAjI4exXqWsU3DbH7bX1xvdhGdnXTIARA9W4= +github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U= +github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -164,8 +180,6 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0= -go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= @@ -191,6 +205,7 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -229,9 +244,11 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gorm.io/driver/mysql v1.1.1 h1:yr1bpyqiwuSPJ4aGGUX9nu46RHXlF8RASQVb1QQNcvo= +gorm.io/driver/mysql v1.1.1/go.mod h1:KdrTanmfLPPyAOeYGyG+UpDys7/7eeWT1zCq+oekYnU= gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM= gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw= gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= -gorm.io/gorm v1.21.3 h1:qDFi55ZOsjZTwk5eN+uhAmHi8GysJ/qCTichM/yO7ME= -gorm.io/gorm v1.21.3/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/gorm v1.21.9 h1:INieZtn4P2Pw6xPJ8MzT0G4WUOsHq3RhfuDF1M6GW0E= +gorm.io/gorm v1.21.9/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=