diff --git a/docs/README.md b/docs/README.md index 94e5b3f..48618df 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,7 +2,7 @@ + [推送参考](./push.md) + [常见问题](./problem.md) -## 使用 +## 使用 + [Windows使用](./windows/index.md) + [Linux使用](./linux/index.md) diff --git a/docs/_coverpage.md b/docs/_coverpage.md new file mode 100644 index 0000000..3e23dd3 --- /dev/null +++ b/docs/_coverpage.md @@ -0,0 +1,14 @@ + + + + +# study_xxqg + +> 一个解放双手的强国自动化助手 + +- 每日40-45分 +- cookie保存时间长 +- 支持多种推送方式 + +[GitHub](https://github.com/johlanse/study_xxqg) +[Get Started](/README) \ No newline at end of file diff --git a/docs/_sidebar.md b/docs/_sidebar.md new file mode 100644 index 0000000..ec8c30e --- /dev/null +++ b/docs/_sidebar.md @@ -0,0 +1,9 @@ +* [Study_xxqg](/README) +* [开始使用](/README) + * [Windows运行](./windows/index) + * [linux运行](./linux/index) + * [源码运行](./custom/index) +* [推送配置](./push.md) +* [配置文件](./config.md) +* [常见问题](./problem.md) +* [加群交流](https://t.me/+VWI88z6d1k45NGJl) \ No newline at end of file diff --git a/docs/config.md b/docs/config.md index faa926f..5f79348 100644 --- a/docs/config.md +++ b/docs/config.md @@ -1,4 +1,4 @@ -## 配置文件 +## 配置文件 ```yaml # 刷课模式，默认为3， # 1：只刷文章何视频 diff --git a/docs/custom/index.md b/docs/custom/index.md index 2cf3c58..cad3555 100644 --- a/docs/custom/index.md +++ b/docs/custom/index.md @@ -10,11 +10,7 @@ + 再任意终端输入一下命令 ```yaml cd study_xxqg - go mod tidy - go build ./ - ./study_xxqg - ``` \ No newline at end of file diff --git a/docs/problem.md b/docs/problem.md index ef2ac87..90e6c92 100644 --- a/docs/problem.md +++ b/docs/problem.md @@ -1,4 +1,4 @@ -## 常见问题 +## 常见问题 + ### windows打开**study_xxqg.exe**出现直接闪退 ```yaml @@ -83,7 +83,12 @@ study_xxqg进程会在运行的时候将pid输出到目录下的pid.pid文件， ``` -在debian11的系统上解决方式为： -``` -sudo apt-get install -y libx11-xcb1 && apt-get install -y libgtk-3-0 && apt-get install -y libxt6 && apt-get install -y libdbus-glib-1.2 -``` \ No newline at end of file +~~在debian11的系统上解决方式为：~~ + +使用docker可以快速解决 + +[//]: # (```) + +[//]: # (sudo apt-get install -y libx11-xcb1 && apt-get install -y libgtk-3-0 && apt-get install -y libxt6 && apt-get install -y libdbus-glib-1.2) + +[//]: # (```) \ No newline at end of file diff --git a/docs/push.md b/docs/push.md index eb97c6c..9e24e07 100644 --- a/docs/push.md +++ b/docs/push.md @@ -1,4 +1,17 @@ -## 推送配置 +## 推送配置 + +*一共有以下五种推送方式* ++ 微信公众号测试号推送 ++ 网页推送 ++ telegram推送 ++ 微信pushPlus推送 ++ 钉钉推送 + +> 其中pushPlus和钉钉推送相互冲突，因为两种推送模式都只能单方面配合定时运行功能使用，只能接收消息，不能发送消息； + +> 在公众号测试号和tg推送以及定时三种只要配置了任意一种，程序将自动卡住等待用户指令。 +> +> 若您想打开程序就运行，请关闭这三项配置；当前程序默认开启cron定时,所以新版若不想程序一直等待则关闭cron即可。 ### 微信公众号推送 配置config.yml的如下部分 diff --git a/docs/tg.md b/docs/tg.md new file mode 100644 index 0000000..e69de29 diff --git a/go.mod b/go.mod index 13c0a11..545c68b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/huoxue1/study_xxqg +module github.com/johlanse/study_xxqg go 1.17 diff --git a/lib/core.go b/lib/core.go index 32d2e88..d7078a4 100644 --- a/lib/core.go +++ b/lib/core.go @@ -26,8 +26,8 @@ import ( goqrcode "github.com/skip2/go-qrcode" "golang.org/x/image/bmp" - "github.com/huoxue1/study_xxqg/conf" - "github.com/huoxue1/study_xxqg/model" + "github.com/johlanse/study_xxqg/conf" + "github.com/johlanse/study_xxqg/model" ) // Core diff --git a/lib/respond.go b/lib/respond.go index 4a000e3..2ac95e0 100644 --- a/lib/respond.go +++ b/lib/respond.go @@ -16,8 +16,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - "github.com/huoxue1/study_xxqg/conf" - "github.com/huoxue1/study_xxqg/model" + "github.com/johlanse/study_xxqg/conf" + "github.com/johlanse/study_xxqg/model" ) const ( diff --git a/lib/study.go b/lib/study.go index 1cbf3c5..c8ea5e2 100644 --- a/lib/study.go +++ b/lib/study.go @@ -12,7 +12,7 @@ import ( "github.com/mxschmitt/playwright-go" log "github.com/sirupsen/logrus" - "github.com/huoxue1/study_xxqg/model" + "github.com/johlanse/study_xxqg/model" ) var ( diff --git a/lib/tg.go b/lib/tg.go index 9ea5a58..f99bb66 100644 --- a/lib/tg.go +++ b/lib/tg.go @@ -14,8 +14,8 @@ import ( "github.com/google/uuid" log "github.com/sirupsen/logrus" - "github.com/huoxue1/study_xxqg/conf" - "github.com/huoxue1/study_xxqg/model" + "github.com/johlanse/study_xxqg/conf" + "github.com/johlanse/study_xxqg/model" ) var ( diff --git a/lib/user.go b/lib/user.go index bad2ce4..99fcb1c 100644 --- a/lib/user.go +++ b/lib/user.go @@ -7,7 +7,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - "github.com/huoxue1/study_xxqg/model" + "github.com/johlanse/study_xxqg/model" ) // GetUserInfo diff --git a/main.go b/main.go index 3eddcba..79a791c 100644 --- a/main.go +++ b/main.go @@ -15,13 +15,13 @@ import ( log "github.com/sirupsen/logrus" easy "github.com/t-tomalak/logrus-easy-formatter" - "github.com/huoxue1/study_xxqg/conf" - // "github.com/huoxue1/study_xxqg/gui" - "github.com/huoxue1/study_xxqg/lib" - "github.com/huoxue1/study_xxqg/model" - "github.com/huoxue1/study_xxqg/push" - "github.com/huoxue1/study_xxqg/utils/update" - "github.com/huoxue1/study_xxqg/web" + "github.com/johlanse/study_xxqg/conf" + // "github.com/johlanse/study_xxqg/gui" + "github.com/johlanse/study_xxqg/lib" + "github.com/johlanse/study_xxqg/model" + "github.com/johlanse/study_xxqg/push" + "github.com/johlanse/study_xxqg/utils/update" + "github.com/johlanse/study_xxqg/web" ) var ( diff --git a/model/user.go b/model/user.go index 7251b51..45b5225 100644 --- a/model/user.go +++ b/model/user.go @@ -15,8 +15,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/tidwall/gjson" - "github.com/huoxue1/study_xxqg/conf" - "github.com/huoxue1/study_xxqg/push" + "github.com/johlanse/study_xxqg/conf" + "github.com/johlanse/study_xxqg/push" ) func init() { diff --git a/push/jpush.go b/push/jpush.go index 3feb914..a89b2fd 100644 --- a/push/jpush.go +++ b/push/jpush.go @@ -6,7 +6,7 @@ import ( "github.com/imroc/req/v3" - "github.com/huoxue1/study_xxqg/conf" + "github.com/johlanse/study_xxqg/conf" ) func PushMessage(title, content, message, pushID string) error { diff --git a/push/push.go b/push/push.go index 122530b..0f213fd 100644 --- a/push/push.go +++ b/push/push.go @@ -3,7 +3,7 @@ package push import ( log "github.com/sirupsen/logrus" - "github.com/huoxue1/study_xxqg/conf" + "github.com/johlanse/study_xxqg/conf" ) func GetPush(config conf.Config) func(kind string, message string) { diff --git a/utils/stydyState.go b/utils/stydyState.go index abfc420..125304b 100644 --- a/utils/stydyState.go +++ b/utils/stydyState.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/huoxue1/study_xxqg/lib" + "github.com/johlanse/study_xxqg/lib" ) // 该文件的方法为保存当前正在学习的用户 diff --git a/web/controller.go b/web/controller.go index a977cf0..208dead 100644 --- a/web/controller.go +++ b/web/controller.go @@ -14,11 +14,11 @@ import ( "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" - "github.com/huoxue1/study_xxqg/conf" - "github.com/huoxue1/study_xxqg/lib" - "github.com/huoxue1/study_xxqg/model" - "github.com/huoxue1/study_xxqg/push" - "github.com/huoxue1/study_xxqg/utils" + "github.com/johlanse/study_xxqg/conf" + "github.com/johlanse/study_xxqg/lib" + "github.com/johlanse/study_xxqg/model" + "github.com/johlanse/study_xxqg/push" + "github.com/johlanse/study_xxqg/utils" ) var ( diff --git a/web/router.go b/web/router.go index 4e05513..5b984fb 100644 --- a/web/router.go +++ b/web/router.go @@ -8,8 +8,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/huoxue1/study_xxqg/conf" - "github.com/huoxue1/study_xxqg/utils" + "github.com/johlanse/study_xxqg/conf" + "github.com/johlanse/study_xxqg/utils" ) // 将静态文件嵌入到可执行程序中来 diff --git a/web/wx.go b/web/wx.go index 5062088..ae3b0eb 100644 --- a/web/wx.go +++ b/web/wx.go @@ -12,9 +12,9 @@ import ( "github.com/johlanse/wechat/mp/request" log "github.com/sirupsen/logrus" - "github.com/huoxue1/study_xxqg/conf" - "github.com/huoxue1/study_xxqg/lib" - "github.com/huoxue1/study_xxqg/model" + "github.com/johlanse/study_xxqg/conf" + "github.com/johlanse/study_xxqg/lib" + "github.com/johlanse/study_xxqg/model" ) func init() {