From 380c2d4212bcfa45c7079704ce23a6572cfbf931 Mon Sep 17 00:00:00 2001 From: BennyThink Date: Fri, 11 Jun 2021 17:08:30 +0800 Subject: [PATCH] change code structure and github-linguist --- .gitattributes | 28 ++++++++-------- .gitignore | 6 ++-- DEVELOPMENT.md | 30 ++++++++++++++---- docker-compose.yml | 2 +- {BagAndDrag => tools/BagAndDrag}/README.md | 0 {BagAndDrag => tools/BagAndDrag}/bag.py | 0 {BagAndDrag => tools/BagAndDrag}/cfkv.py | 0 .../BagAndDrag}/convert_db.py | 0 {BagAndDrag => tools/BagAndDrag}/create_db.py | 0 {BagAndDrag => tools/BagAndDrag}/drag.py | 0 {BagAndDrag => tools/BagAndDrag}/sample.json | 0 .../BagAndDrag}/zimuxia/convert_db.py | 0 .../BagAndDrag}/zimuxia/zimuxia.py | 0 {healthcheck => tools/healthcheck}/check.py | 0 {management => tools/management}/format.json | 0 {management => tools/management}/ui.py | 0 {worker => tools/worker}/.cargo-ok | 0 {worker => tools/worker}/README.md | 0 {worker => tools/worker}/public/404.html | 0 .../worker/public}/css/3rd/animate.css | 0 .../worker/public}/css/3rd/icons.css | 0 .../worker/public}/css/3rd/widgets.css | 0 {web => tools/worker/public}/css/aYin.css | 0 .../worker/public}/css/bootstrap.min.css | 0 {web => tools/worker/public}/css/data.json | 0 .../worker/public}/css/down-list-20180530.css | 0 .../worker/public}/css/font-awesome.min.css | 0 {web => tools/worker/public}/css/index.json | 0 .../public}/css/jquery.mCustomScrollbar.css | 0 {web => tools/worker/public}/favicon.ico | Bin .../public}/fonts/fontawesome-webfont.woff2 | Bin {web => tools/worker/public}/fonts/test.txt | 0 .../img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png | Bin .../public}/img/200-wrangler-ferris.gif | Bin .../public}/img/404-wrangler-ferris.gif | Bin {web => tools/worker/public}/img/grid16.png | Bin .../worker/public}/img/yyetsTrans.png | Bin {worker => tools/worker}/public/index.html | 0 {web => tools/worker/public}/js/aYin.js | 0 .../worker/public}/js/bootstrap.min.js | 0 .../public}/js/jquery.mCustomScrollbar.min.js | 0 .../worker}/public/js/jquery.min.js | 0 .../public}/js/jquery.mousewheel.min.js | 0 {web => tools/worker/public}/js/rshare.js | 0 {worker => tools/worker}/public/js/search.js | 0 {web => tools/worker/public}/js/vue.js | 0 {worker => tools/worker}/public/resource.html | 0 {worker => tools/worker}/public/search.html | 0 .../worker}/workers-site/index.js | 0 .../worker}/workers-site/package-lock.json | 0 .../worker}/workers-site/package.json | 0 {worker => tools/worker}/wrangler.toml | 0 {web => yyetsweb}/404.html | 0 {web => yyetsweb}/README.md | 0 {web => yyetsweb}/YYeTs-grafana.json | 0 .../public => yyetsweb}/css/3rd/animate.css | 0 {worker/public => yyetsweb}/css/3rd/icons.css | 0 .../public => yyetsweb}/css/3rd/widgets.css | 0 {worker/public => yyetsweb}/css/aYin.css | 0 .../public => yyetsweb}/css/bootstrap.min.css | 0 {worker/public => yyetsweb}/css/data.json | 0 .../css/down-list-20180530.css | 0 .../css/font-awesome.min.css | 0 {worker/public => yyetsweb}/css/index.json | 0 .../css/jquery.mCustomScrollbar.css | 0 {web => yyetsweb}/css/normalize.min.css | 0 {web => yyetsweb}/css/noty.css | 0 {web => yyetsweb}/data/yyets_mongo.gz | 0 {web => yyetsweb}/data/yyets_mysql.zip | 0 {web => yyetsweb}/data/yyets_sqlite.zip | 0 {worker/public => yyetsweb}/favicon.ico | Bin .../fonts/fontawesome-webfont.woff2 | Bin {worker/public => yyetsweb}/fonts/test.txt | 0 {web => yyetsweb}/help.html | 0 .../img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png | Bin .../img/200-wrangler-ferris.gif | Bin .../img/404-wrangler-ferris.gif | Bin {web => yyetsweb}/img/afdian.png | Bin {web => yyetsweb}/img/default-green.png | Bin {worker/public => yyetsweb}/img/grid16.png | Bin .../public => yyetsweb}/img/yyetsTrans.png | Bin {web => yyetsweb}/index.html | 0 {worker/public => yyetsweb}/js/aYin.js | 0 {web => yyetsweb}/js/axios.min.js | 0 .../public => yyetsweb}/js/bootstrap.min.js | 0 {web => yyetsweb}/js/common.js | 0 .../js/jquery.mCustomScrollbar.min.js | 0 {web => yyetsweb}/js/jquery.min.js | 0 .../js/jquery.mousewheel.min.js | 0 {web => yyetsweb}/js/noty.min.js | 0 {worker/public => yyetsweb}/js/rshare.js | 0 {worker/public => yyetsweb}/js/vue.js | 0 {web => yyetsweb}/migration/add_year.py | 0 .../migration/prepare/convert_db.py | 0 .../migration/prepare/dump_kv.py | 0 .../migration/prepare/load_from_kv.py | 0 {web => yyetsweb}/resource.html | 0 {web => yyetsweb}/search.html | 0 {web => yyetsweb}/server.py | 25 ++++++++++++++- {web => yyetsweb}/test.py | 0 {web => yyetsweb}/utils/format_order.py | 0 {web => yyetsweb}/utils/grafana_test_data.py | 0 102 files changed, 65 insertions(+), 26 deletions(-) rename {BagAndDrag => tools/BagAndDrag}/README.md (100%) rename {BagAndDrag => tools/BagAndDrag}/bag.py (100%) rename {BagAndDrag => tools/BagAndDrag}/cfkv.py (100%) rename {BagAndDrag => tools/BagAndDrag}/convert_db.py (100%) rename {BagAndDrag => tools/BagAndDrag}/create_db.py (100%) rename {BagAndDrag => tools/BagAndDrag}/drag.py (100%) rename {BagAndDrag => tools/BagAndDrag}/sample.json (100%) rename {BagAndDrag => tools/BagAndDrag}/zimuxia/convert_db.py (100%) rename {BagAndDrag => tools/BagAndDrag}/zimuxia/zimuxia.py (100%) rename {healthcheck => tools/healthcheck}/check.py (100%) rename {management => tools/management}/format.json (100%) rename {management => tools/management}/ui.py (100%) rename {worker => tools/worker}/.cargo-ok (100%) rename {worker => tools/worker}/README.md (100%) rename {worker => tools/worker}/public/404.html (100%) rename {web => tools/worker/public}/css/3rd/animate.css (100%) rename {web => tools/worker/public}/css/3rd/icons.css (100%) rename {web => tools/worker/public}/css/3rd/widgets.css (100%) rename {web => tools/worker/public}/css/aYin.css (100%) rename {web => tools/worker/public}/css/bootstrap.min.css (100%) rename {web => tools/worker/public}/css/data.json (100%) rename {web => tools/worker/public}/css/down-list-20180530.css (100%) rename {web => tools/worker/public}/css/font-awesome.min.css (100%) rename {web => tools/worker/public}/css/index.json (100%) rename {web => tools/worker/public}/css/jquery.mCustomScrollbar.css (100%) rename {web => tools/worker/public}/favicon.ico (100%) rename {web => tools/worker/public}/fonts/fontawesome-webfont.woff2 (100%) rename {web => tools/worker/public}/fonts/test.txt (100%) rename {web => tools/worker/public}/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png (100%) rename {web => tools/worker/public}/img/200-wrangler-ferris.gif (100%) rename {web => tools/worker/public}/img/404-wrangler-ferris.gif (100%) rename {web => tools/worker/public}/img/grid16.png (100%) rename {web => tools/worker/public}/img/yyetsTrans.png (100%) rename {worker => tools/worker}/public/index.html (100%) rename {web => tools/worker/public}/js/aYin.js (100%) rename {web => tools/worker/public}/js/bootstrap.min.js (100%) rename {web => tools/worker/public}/js/jquery.mCustomScrollbar.min.js (100%) rename {worker => tools/worker}/public/js/jquery.min.js (100%) rename {web => tools/worker/public}/js/jquery.mousewheel.min.js (100%) rename {web => tools/worker/public}/js/rshare.js (100%) rename {worker => tools/worker}/public/js/search.js (100%) rename {web => tools/worker/public}/js/vue.js (100%) rename {worker => tools/worker}/public/resource.html (100%) rename {worker => tools/worker}/public/search.html (100%) rename {worker => tools/worker}/workers-site/index.js (100%) rename {worker => tools/worker}/workers-site/package-lock.json (100%) rename {worker => tools/worker}/workers-site/package.json (100%) rename {worker => tools/worker}/wrangler.toml (100%) rename {web => yyetsweb}/404.html (100%) rename {web => yyetsweb}/README.md (100%) rename {web => yyetsweb}/YYeTs-grafana.json (100%) rename {worker/public => yyetsweb}/css/3rd/animate.css (100%) rename {worker/public => yyetsweb}/css/3rd/icons.css (100%) rename {worker/public => yyetsweb}/css/3rd/widgets.css (100%) rename {worker/public => yyetsweb}/css/aYin.css (100%) rename {worker/public => yyetsweb}/css/bootstrap.min.css (100%) rename {worker/public => yyetsweb}/css/data.json (100%) rename {worker/public => yyetsweb}/css/down-list-20180530.css (100%) rename {worker/public => yyetsweb}/css/font-awesome.min.css (100%) rename {worker/public => yyetsweb}/css/index.json (100%) rename {worker/public => yyetsweb}/css/jquery.mCustomScrollbar.css (100%) rename {web => yyetsweb}/css/normalize.min.css (100%) rename {web => yyetsweb}/css/noty.css (100%) rename {web => yyetsweb}/data/yyets_mongo.gz (100%) rename {web => yyetsweb}/data/yyets_mysql.zip (100%) rename {web => yyetsweb}/data/yyets_sqlite.zip (100%) rename {worker/public => yyetsweb}/favicon.ico (100%) rename {worker/public => yyetsweb}/fonts/fontawesome-webfont.woff2 (100%) rename {worker/public => yyetsweb}/fonts/test.txt (100%) rename {web => yyetsweb}/help.html (100%) rename {worker/public => yyetsweb}/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png (100%) rename {worker/public => yyetsweb}/img/200-wrangler-ferris.gif (100%) rename {worker/public => yyetsweb}/img/404-wrangler-ferris.gif (100%) rename {web => yyetsweb}/img/afdian.png (100%) rename {web => yyetsweb}/img/default-green.png (100%) rename {worker/public => yyetsweb}/img/grid16.png (100%) rename {worker/public => yyetsweb}/img/yyetsTrans.png (100%) rename {web => yyetsweb}/index.html (100%) rename {worker/public => yyetsweb}/js/aYin.js (100%) rename {web => yyetsweb}/js/axios.min.js (100%) rename {worker/public => yyetsweb}/js/bootstrap.min.js (100%) rename {web => yyetsweb}/js/common.js (100%) rename {worker/public => yyetsweb}/js/jquery.mCustomScrollbar.min.js (100%) rename {web => yyetsweb}/js/jquery.min.js (100%) rename {worker/public => yyetsweb}/js/jquery.mousewheel.min.js (100%) rename {web => yyetsweb}/js/noty.min.js (100%) rename {worker/public => yyetsweb}/js/rshare.js (100%) rename {worker/public => yyetsweb}/js/vue.js (100%) rename {web => yyetsweb}/migration/add_year.py (100%) rename {web => yyetsweb}/migration/prepare/convert_db.py (100%) rename {web => yyetsweb}/migration/prepare/dump_kv.py (100%) rename {web => yyetsweb}/migration/prepare/load_from_kv.py (100%) rename {web => yyetsweb}/resource.html (100%) rename {web => yyetsweb}/search.html (100%) rename {web => yyetsweb}/server.py (97%) rename {web => yyetsweb}/test.py (100%) rename {web => yyetsweb}/utils/format_order.py (100%) rename {web => yyetsweb}/utils/grafana_test_data.py (100%) diff --git a/.gitattributes b/.gitattributes index a910ddd..f3c5dbf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,18 +1,18 @@ -worker/public/css/** linguist-vendored -worker/public/fonts/* linguist-vendored -worker/public/img/* linguist-vendored -worker/public/js/* linguist-vendored -worker/public/js/search.js -linguist-vendored -worker/public/404.html linguist-vendored -worker/public/resource.html linguist-vendored +tools/worker/public/css/** linguist-vendored +tools/worker/public/fonts/* linguist-vendored +tools/worker/public/img/* linguist-vendored +tools/worker/public/js/* linguist-vendored +tools/worker/public/js/search.js -linguist-vendored +tools/worker/public/404.html linguist-vendored +tools/worker/public/resource.html linguist-vendored -web/css/** linguist-vendored -web/fonts/* linguist-vendored -web/img/* linguist-vendored -web/js/* linguist-vendored -web/404.html linguist-vendored -web/resource.html linguist-vendored +yyetsweb/css/** linguist-vendored +yyetsweb/fonts/* linguist-vendored +yyetsweb/img/* linguist-vendored +yyetsweb/js/* linguist-vendored +yyetsweb/404.html linguist-vendored +yyetsweb/resource.html linguist-vendored -web/js/common.js -linguist-vendored +yyetsweb/js/common.js -linguist-vendored tests/data/* linguist-vendored diff --git a/.gitignore b/.gitignore index 3c9fcbb..987bd85 100644 --- a/.gitignore +++ b/.gitignore @@ -115,7 +115,7 @@ venv.bak/ yyetsbot/data/ health_check/client.session -/worker/.idea/ -/worker/workers-site/node_modules/* -/worker/workers-site/worker/script.js +/tools/worker/.idea/ +/tools/worker/workers-site/node_modules/* +/tools/worker/workers-site/worker/script.js /health_check/client-hc.session diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 895ba02..bb03247 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -7,7 +7,7 @@ * 参见 [这里](https://github.com/tgbot-collection/BotsRunner) * 本目录下的 `docker-compose.yml` 也可以作为参考 * nginx reverse proxy可以[参考这里](https://github.com/BennyThink/WebsiteRunner) -* [参考这里获取数据库](web/README.md) +* [参考这里获取数据库](yyetsweb/README.md) ```shell # 启动数据库 @@ -93,11 +93,7 @@ python /path/to/YYeTsBot/yyetsbot/bot.py 网站使用referer验证请求 -### 2. 加密headers - -使用headers `ne1` 进行加密验证，详细信息可以[参考这里](https://t.me/mikuri520/726) - -### 3. rate limit +### 2. rate limit 404的访问会被计数，超过10次会被拉入黑名单，持续3600秒，再次访问会持续叠加。 @@ -162,7 +158,7 @@ API 返回字符串，形如 `data:image/png;base64,iVBORw0KGgoAAA....` POST `/api/comments` 只有登录用户才可以发表评论，检查cookie `username` 是否为空来判断是否为登录用户；未登录用户提示“请登录后发表评论” -body `resource_id` 从URL中获取，id是上一步验证码的那个id， `captcha` 是用户输入的验证码 +body `resource_id` 从URL中获取，id是上一步验证码的那个随机字符串id， `captcha` 是用户输入的验证码 ```json { "resource_id": 39301, @@ -178,4 +174,24 @@ body `resource_id` 从URL中获取，id是上一步验证码的那个id， `capt { "message": "评论成功/评论失败/etc" } +``` + +# 获取备份数据库信息 +GET `http://127.0.0.1:8888/api/db_dump` +```json +{ + "yyets_mongo.gz": { + "checksum": "b32e9d8e24c607a9f29889a926c15179d9179791", + "date": "2021-04-15 22:11:08" + }, + "yyets_mysql.zip": { + "checksum": "6b24ae7cb7cef42951f7e2df183f0825512029e0", + "date": "2021-04-15 22:11:08" + }, + "yyets_sqlite.zip": { + "checksum": "7e1659ab5cbc98b21155c3debce3015c39f1ec05", + "date": "2021-04-15 22:11:08" + } +} + ``` \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b33a14f..528febc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: restart: unless-stopped environment: - mongo=mongo - working_dir: /YYeTsBot/web/ + working_dir: /YYeTsBot/yyetsweb/ command: [ "python3","server.py","-h=0.0.0.0" ] ports: - 0.0.0.0:8888:8888 diff --git a/BagAndDrag/README.md b/tools/BagAndDrag/README.md similarity index 100% rename from BagAndDrag/README.md rename to tools/BagAndDrag/README.md diff --git a/BagAndDrag/bag.py b/tools/BagAndDrag/bag.py similarity index 100% rename from BagAndDrag/bag.py rename to tools/BagAndDrag/bag.py diff --git a/BagAndDrag/cfkv.py b/tools/BagAndDrag/cfkv.py similarity index 100% rename from BagAndDrag/cfkv.py rename to tools/BagAndDrag/cfkv.py diff --git a/BagAndDrag/convert_db.py b/tools/BagAndDrag/convert_db.py similarity index 100% rename from BagAndDrag/convert_db.py rename to tools/BagAndDrag/convert_db.py diff --git a/BagAndDrag/create_db.py b/tools/BagAndDrag/create_db.py similarity index 100% rename from BagAndDrag/create_db.py rename to tools/BagAndDrag/create_db.py diff --git a/BagAndDrag/drag.py b/tools/BagAndDrag/drag.py similarity index 100% rename from BagAndDrag/drag.py rename to tools/BagAndDrag/drag.py diff --git a/BagAndDrag/sample.json b/tools/BagAndDrag/sample.json similarity index 100% rename from BagAndDrag/sample.json rename to tools/BagAndDrag/sample.json diff --git a/BagAndDrag/zimuxia/convert_db.py b/tools/BagAndDrag/zimuxia/convert_db.py similarity index 100% rename from BagAndDrag/zimuxia/convert_db.py rename to tools/BagAndDrag/zimuxia/convert_db.py diff --git a/BagAndDrag/zimuxia/zimuxia.py b/tools/BagAndDrag/zimuxia/zimuxia.py similarity index 100% rename from BagAndDrag/zimuxia/zimuxia.py rename to tools/BagAndDrag/zimuxia/zimuxia.py diff --git a/healthcheck/check.py b/tools/healthcheck/check.py similarity index 100% rename from healthcheck/check.py rename to tools/healthcheck/check.py diff --git a/management/format.json b/tools/management/format.json similarity index 100% rename from management/format.json rename to tools/management/format.json diff --git a/management/ui.py b/tools/management/ui.py similarity index 100% rename from management/ui.py rename to tools/management/ui.py diff --git a/worker/.cargo-ok b/tools/worker/.cargo-ok similarity index 100% rename from worker/.cargo-ok rename to tools/worker/.cargo-ok diff --git a/worker/README.md b/tools/worker/README.md similarity index 100% rename from worker/README.md rename to tools/worker/README.md diff --git a/worker/public/404.html b/tools/worker/public/404.html similarity index 100% rename from worker/public/404.html rename to tools/worker/public/404.html diff --git a/web/css/3rd/animate.css b/tools/worker/public/css/3rd/animate.css similarity index 100% rename from web/css/3rd/animate.css rename to tools/worker/public/css/3rd/animate.css diff --git a/web/css/3rd/icons.css b/tools/worker/public/css/3rd/icons.css similarity index 100% rename from web/css/3rd/icons.css rename to tools/worker/public/css/3rd/icons.css diff --git a/web/css/3rd/widgets.css b/tools/worker/public/css/3rd/widgets.css similarity index 100% rename from web/css/3rd/widgets.css rename to tools/worker/public/css/3rd/widgets.css diff --git a/web/css/aYin.css b/tools/worker/public/css/aYin.css similarity index 100% rename from web/css/aYin.css rename to tools/worker/public/css/aYin.css diff --git a/web/css/bootstrap.min.css b/tools/worker/public/css/bootstrap.min.css similarity index 100% rename from web/css/bootstrap.min.css rename to tools/worker/public/css/bootstrap.min.css diff --git a/web/css/data.json b/tools/worker/public/css/data.json similarity index 100% rename from web/css/data.json rename to tools/worker/public/css/data.json diff --git a/web/css/down-list-20180530.css b/tools/worker/public/css/down-list-20180530.css similarity index 100% rename from web/css/down-list-20180530.css rename to tools/worker/public/css/down-list-20180530.css diff --git a/web/css/font-awesome.min.css b/tools/worker/public/css/font-awesome.min.css similarity index 100% rename from web/css/font-awesome.min.css rename to tools/worker/public/css/font-awesome.min.css diff --git a/web/css/index.json b/tools/worker/public/css/index.json similarity index 100% rename from web/css/index.json rename to tools/worker/public/css/index.json diff --git a/web/css/jquery.mCustomScrollbar.css b/tools/worker/public/css/jquery.mCustomScrollbar.css similarity index 100% rename from web/css/jquery.mCustomScrollbar.css rename to tools/worker/public/css/jquery.mCustomScrollbar.css diff --git a/web/favicon.ico b/tools/worker/public/favicon.ico similarity index 100% rename from web/favicon.ico rename to tools/worker/public/favicon.ico diff --git a/web/fonts/fontawesome-webfont.woff2 b/tools/worker/public/fonts/fontawesome-webfont.woff2 similarity index 100% rename from web/fonts/fontawesome-webfont.woff2 rename to tools/worker/public/fonts/fontawesome-webfont.woff2 diff --git a/web/fonts/test.txt b/tools/worker/public/fonts/test.txt similarity index 100% rename from web/fonts/test.txt rename to tools/worker/public/fonts/test.txt diff --git a/web/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png b/tools/worker/public/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png similarity index 100% rename from web/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png rename to tools/worker/public/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png diff --git a/web/img/200-wrangler-ferris.gif b/tools/worker/public/img/200-wrangler-ferris.gif similarity index 100% rename from web/img/200-wrangler-ferris.gif rename to tools/worker/public/img/200-wrangler-ferris.gif diff --git a/web/img/404-wrangler-ferris.gif b/tools/worker/public/img/404-wrangler-ferris.gif similarity index 100% rename from web/img/404-wrangler-ferris.gif rename to tools/worker/public/img/404-wrangler-ferris.gif diff --git a/web/img/grid16.png b/tools/worker/public/img/grid16.png similarity index 100% rename from web/img/grid16.png rename to tools/worker/public/img/grid16.png diff --git a/web/img/yyetsTrans.png b/tools/worker/public/img/yyetsTrans.png similarity index 100% rename from web/img/yyetsTrans.png rename to tools/worker/public/img/yyetsTrans.png diff --git a/worker/public/index.html b/tools/worker/public/index.html similarity index 100% rename from worker/public/index.html rename to tools/worker/public/index.html diff --git a/web/js/aYin.js b/tools/worker/public/js/aYin.js similarity index 100% rename from web/js/aYin.js rename to tools/worker/public/js/aYin.js diff --git a/web/js/bootstrap.min.js b/tools/worker/public/js/bootstrap.min.js similarity index 100% rename from web/js/bootstrap.min.js rename to tools/worker/public/js/bootstrap.min.js diff --git a/web/js/jquery.mCustomScrollbar.min.js b/tools/worker/public/js/jquery.mCustomScrollbar.min.js similarity index 100% rename from web/js/jquery.mCustomScrollbar.min.js rename to tools/worker/public/js/jquery.mCustomScrollbar.min.js diff --git a/worker/public/js/jquery.min.js b/tools/worker/public/js/jquery.min.js similarity index 100% rename from worker/public/js/jquery.min.js rename to tools/worker/public/js/jquery.min.js diff --git a/web/js/jquery.mousewheel.min.js b/tools/worker/public/js/jquery.mousewheel.min.js similarity index 100% rename from web/js/jquery.mousewheel.min.js rename to tools/worker/public/js/jquery.mousewheel.min.js diff --git a/web/js/rshare.js b/tools/worker/public/js/rshare.js similarity index 100% rename from web/js/rshare.js rename to tools/worker/public/js/rshare.js diff --git a/worker/public/js/search.js b/tools/worker/public/js/search.js similarity index 100% rename from worker/public/js/search.js rename to tools/worker/public/js/search.js diff --git a/web/js/vue.js b/tools/worker/public/js/vue.js similarity index 100% rename from web/js/vue.js rename to tools/worker/public/js/vue.js diff --git a/worker/public/resource.html b/tools/worker/public/resource.html similarity index 100% rename from worker/public/resource.html rename to tools/worker/public/resource.html diff --git a/worker/public/search.html b/tools/worker/public/search.html similarity index 100% rename from worker/public/search.html rename to tools/worker/public/search.html diff --git a/worker/workers-site/index.js b/tools/worker/workers-site/index.js similarity index 100% rename from worker/workers-site/index.js rename to tools/worker/workers-site/index.js diff --git a/worker/workers-site/package-lock.json b/tools/worker/workers-site/package-lock.json similarity index 100% rename from worker/workers-site/package-lock.json rename to tools/worker/workers-site/package-lock.json diff --git a/worker/workers-site/package.json b/tools/worker/workers-site/package.json similarity index 100% rename from worker/workers-site/package.json rename to tools/worker/workers-site/package.json diff --git a/worker/wrangler.toml b/tools/worker/wrangler.toml similarity index 100% rename from worker/wrangler.toml rename to tools/worker/wrangler.toml diff --git a/web/404.html b/yyetsweb/404.html similarity index 100% rename from web/404.html rename to yyetsweb/404.html diff --git a/web/README.md b/yyetsweb/README.md similarity index 100% rename from web/README.md rename to yyetsweb/README.md diff --git a/web/YYeTs-grafana.json b/yyetsweb/YYeTs-grafana.json similarity index 100% rename from web/YYeTs-grafana.json rename to yyetsweb/YYeTs-grafana.json diff --git a/worker/public/css/3rd/animate.css b/yyetsweb/css/3rd/animate.css similarity index 100% rename from worker/public/css/3rd/animate.css rename to yyetsweb/css/3rd/animate.css diff --git a/worker/public/css/3rd/icons.css b/yyetsweb/css/3rd/icons.css similarity index 100% rename from worker/public/css/3rd/icons.css rename to yyetsweb/css/3rd/icons.css diff --git a/worker/public/css/3rd/widgets.css b/yyetsweb/css/3rd/widgets.css similarity index 100% rename from worker/public/css/3rd/widgets.css rename to yyetsweb/css/3rd/widgets.css diff --git a/worker/public/css/aYin.css b/yyetsweb/css/aYin.css similarity index 100% rename from worker/public/css/aYin.css rename to yyetsweb/css/aYin.css diff --git a/worker/public/css/bootstrap.min.css b/yyetsweb/css/bootstrap.min.css similarity index 100% rename from worker/public/css/bootstrap.min.css rename to yyetsweb/css/bootstrap.min.css diff --git a/worker/public/css/data.json b/yyetsweb/css/data.json similarity index 100% rename from worker/public/css/data.json rename to yyetsweb/css/data.json diff --git a/worker/public/css/down-list-20180530.css b/yyetsweb/css/down-list-20180530.css similarity index 100% rename from worker/public/css/down-list-20180530.css rename to yyetsweb/css/down-list-20180530.css diff --git a/worker/public/css/font-awesome.min.css b/yyetsweb/css/font-awesome.min.css similarity index 100% rename from worker/public/css/font-awesome.min.css rename to yyetsweb/css/font-awesome.min.css diff --git a/worker/public/css/index.json b/yyetsweb/css/index.json similarity index 100% rename from worker/public/css/index.json rename to yyetsweb/css/index.json diff --git a/worker/public/css/jquery.mCustomScrollbar.css b/yyetsweb/css/jquery.mCustomScrollbar.css similarity index 100% rename from worker/public/css/jquery.mCustomScrollbar.css rename to yyetsweb/css/jquery.mCustomScrollbar.css diff --git a/web/css/normalize.min.css b/yyetsweb/css/normalize.min.css similarity index 100% rename from web/css/normalize.min.css rename to yyetsweb/css/normalize.min.css diff --git a/web/css/noty.css b/yyetsweb/css/noty.css similarity index 100% rename from web/css/noty.css rename to yyetsweb/css/noty.css diff --git a/web/data/yyets_mongo.gz b/yyetsweb/data/yyets_mongo.gz similarity index 100% rename from web/data/yyets_mongo.gz rename to yyetsweb/data/yyets_mongo.gz diff --git a/web/data/yyets_mysql.zip b/yyetsweb/data/yyets_mysql.zip similarity index 100% rename from web/data/yyets_mysql.zip rename to yyetsweb/data/yyets_mysql.zip diff --git a/web/data/yyets_sqlite.zip b/yyetsweb/data/yyets_sqlite.zip similarity index 100% rename from web/data/yyets_sqlite.zip rename to yyetsweb/data/yyets_sqlite.zip diff --git a/worker/public/favicon.ico b/yyetsweb/favicon.ico similarity index 100% rename from worker/public/favicon.ico rename to yyetsweb/favicon.ico diff --git a/worker/public/fonts/fontawesome-webfont.woff2 b/yyetsweb/fonts/fontawesome-webfont.woff2 similarity index 100% rename from worker/public/fonts/fontawesome-webfont.woff2 rename to yyetsweb/fonts/fontawesome-webfont.woff2 diff --git a/worker/public/fonts/test.txt b/yyetsweb/fonts/test.txt similarity index 100% rename from worker/public/fonts/test.txt rename to yyetsweb/fonts/test.txt diff --git a/web/help.html b/yyetsweb/help.html similarity index 100% rename from web/help.html rename to yyetsweb/help.html diff --git a/worker/public/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png b/yyetsweb/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png similarity index 100% rename from worker/public/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png rename to yyetsweb/img/11bcd4d0f2daf8b02fecc72bc8ca38ab.png diff --git a/worker/public/img/200-wrangler-ferris.gif b/yyetsweb/img/200-wrangler-ferris.gif similarity index 100% rename from worker/public/img/200-wrangler-ferris.gif rename to yyetsweb/img/200-wrangler-ferris.gif diff --git a/worker/public/img/404-wrangler-ferris.gif b/yyetsweb/img/404-wrangler-ferris.gif similarity index 100% rename from worker/public/img/404-wrangler-ferris.gif rename to yyetsweb/img/404-wrangler-ferris.gif diff --git a/web/img/afdian.png b/yyetsweb/img/afdian.png similarity index 100% rename from web/img/afdian.png rename to yyetsweb/img/afdian.png diff --git a/web/img/default-green.png b/yyetsweb/img/default-green.png similarity index 100% rename from web/img/default-green.png rename to yyetsweb/img/default-green.png diff --git a/worker/public/img/grid16.png b/yyetsweb/img/grid16.png similarity index 100% rename from worker/public/img/grid16.png rename to yyetsweb/img/grid16.png diff --git a/worker/public/img/yyetsTrans.png b/yyetsweb/img/yyetsTrans.png similarity index 100% rename from worker/public/img/yyetsTrans.png rename to yyetsweb/img/yyetsTrans.png diff --git a/web/index.html b/yyetsweb/index.html similarity index 100% rename from web/index.html rename to yyetsweb/index.html diff --git a/worker/public/js/aYin.js b/yyetsweb/js/aYin.js similarity index 100% rename from worker/public/js/aYin.js rename to yyetsweb/js/aYin.js diff --git a/web/js/axios.min.js b/yyetsweb/js/axios.min.js similarity index 100% rename from web/js/axios.min.js rename to yyetsweb/js/axios.min.js diff --git a/worker/public/js/bootstrap.min.js b/yyetsweb/js/bootstrap.min.js similarity index 100% rename from worker/public/js/bootstrap.min.js rename to yyetsweb/js/bootstrap.min.js diff --git a/web/js/common.js b/yyetsweb/js/common.js similarity index 100% rename from web/js/common.js rename to yyetsweb/js/common.js diff --git a/worker/public/js/jquery.mCustomScrollbar.min.js b/yyetsweb/js/jquery.mCustomScrollbar.min.js similarity index 100% rename from worker/public/js/jquery.mCustomScrollbar.min.js rename to yyetsweb/js/jquery.mCustomScrollbar.min.js diff --git a/web/js/jquery.min.js b/yyetsweb/js/jquery.min.js similarity index 100% rename from web/js/jquery.min.js rename to yyetsweb/js/jquery.min.js diff --git a/worker/public/js/jquery.mousewheel.min.js b/yyetsweb/js/jquery.mousewheel.min.js similarity index 100% rename from worker/public/js/jquery.mousewheel.min.js rename to yyetsweb/js/jquery.mousewheel.min.js diff --git a/web/js/noty.min.js b/yyetsweb/js/noty.min.js similarity index 100% rename from web/js/noty.min.js rename to yyetsweb/js/noty.min.js diff --git a/worker/public/js/rshare.js b/yyetsweb/js/rshare.js similarity index 100% rename from worker/public/js/rshare.js rename to yyetsweb/js/rshare.js diff --git a/worker/public/js/vue.js b/yyetsweb/js/vue.js similarity index 100% rename from worker/public/js/vue.js rename to yyetsweb/js/vue.js diff --git a/web/migration/add_year.py b/yyetsweb/migration/add_year.py similarity index 100% rename from web/migration/add_year.py rename to yyetsweb/migration/add_year.py diff --git a/web/migration/prepare/convert_db.py b/yyetsweb/migration/prepare/convert_db.py similarity index 100% rename from web/migration/prepare/convert_db.py rename to yyetsweb/migration/prepare/convert_db.py diff --git a/web/migration/prepare/dump_kv.py b/yyetsweb/migration/prepare/dump_kv.py similarity index 100% rename from web/migration/prepare/dump_kv.py rename to yyetsweb/migration/prepare/dump_kv.py diff --git a/web/migration/prepare/load_from_kv.py b/yyetsweb/migration/prepare/load_from_kv.py similarity index 100% rename from web/migration/prepare/load_from_kv.py rename to yyetsweb/migration/prepare/load_from_kv.py diff --git a/web/resource.html b/yyetsweb/resource.html similarity index 100% rename from web/resource.html rename to yyetsweb/resource.html diff --git a/web/search.html b/yyetsweb/search.html similarity index 100% rename from web/search.html rename to yyetsweb/search.html diff --git a/web/server.py b/yyetsweb/server.py similarity index 97% rename from web/server.py rename to yyetsweb/server.py index 787bb43..545c572 100644 --- a/web/server.py +++ b/yyetsweb/server.py @@ -33,7 +33,6 @@ from tornado.concurrent import run_on_executor from passlib.hash import pbkdf2_sha256 from captcha.image import ImageCaptcha - enable_pretty_logging() mongo_host = os.getenv("mongo") or "localhost" @@ -653,6 +652,29 @@ class HelpHandler(BaseHandler): self.render("help.html", data=self.file_info((live, mysql, sqlite))) +class DBDumpHandler(HelpHandler): + executor = ThreadPoolExecutor(10) + + @run_on_executor() + def get_hash(self): + file_list = ["data/yyets_mongo.gz", "data/yyets_mysql.zip", "data/yyets_sqlite.zip"] + result = {} + data = self.file_info(file_list) + for file, value in data.items(): + filename = os.path.basename(file) + result[filename] = { + "checksum": value[0], + "date": value[1] + } + + return result + + @gen.coroutine + def get(self): + resp = yield self.get_hash() + self.write(resp) + + class RunServer: root_path = os.path.dirname(__file__) static_path = os.path.join(root_path, '') @@ -669,6 +691,7 @@ class RunServer: (r'/api/grafana/query', GrafanaQueryHandler), (r'/api/blacklist', BlacklistHandler), (r'/help.html', HelpHandler), + (r'/api/db_dump', DBDumpHandler), (r'/', IndexHandler), (r'/(.*\.html|.*\.js|.*\.css|.*\.png|.*\.jpg|.*\.ico|.*\.gif|.*\.woff2|.*\.gz|.*\.zip)', web.StaticFileHandler, {'path': static_path}), diff --git a/web/test.py b/yyetsweb/test.py similarity index 100% rename from web/test.py rename to yyetsweb/test.py diff --git a/web/utils/format_order.py b/yyetsweb/utils/format_order.py similarity index 100% rename from web/utils/format_order.py rename to yyetsweb/utils/format_order.py diff --git a/web/utils/grafana_test_data.py b/yyetsweb/utils/grafana_test_data.py similarity index 100% rename from web/utils/grafana_test_data.py rename to yyetsweb/utils/grafana_test_data.py