From 678a1a39369d9bfe8520722e5213f0829f6d5067 Mon Sep 17 00:00:00 2001 From: LuckyPuppy514 <122154133@qq.com> Date: Sat, 8 Apr 2023 23:38:02 +0800 Subject: [PATCH] =?UTF-8?q?v3.0.6=20=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20TMDB=20=E6=A0=87=E9=A2=98=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en_US.md | 306 +++++++++--------- README.md | 306 +++++++++--------- changelog.en_US.md | 4 + changelog.md | 4 + pom.xml | 2 +- .../controller/TmdbTitleController.java | 188 ++++++----- .../service/impl/TmdbTitleServiceImpl.java | 285 ++++++++-------- .../dist/assets/default-layout.4dcaa9c1.js.gz | Bin 31613 -> 0 bytes ...4dcaa9c1.js => default-layout.a1920cc9.js} | 2 +- .../dist/assets/default-layout.a1920cc9.js.gz | Bin 0 -> 31612 bytes .../dist/assets/index.0932d157.js.gz | Bin 2895 -> 0 bytes .../{index.9af01336.js => index.0a1796c6.js} | 2 +- .../dist/assets/index.0a1796c6.js.gz | Bin 0 -> 2905 bytes .../{index.e693f56f.js => index.0a2c9a7d.js} | 2 +- .../dist/assets/index.0a2c9a7d.js.gz | Bin 0 -> 1994 bytes .../dist/assets/index.1b9b1f3d.js.gz | Bin 1924 -> 0 bytes .../resources/dist/assets/index.2f3b8d9d.js | 1 + .../dist/assets/index.2f3b8d9d.js.gz | Bin 0 -> 2470 bytes .../dist/assets/index.3a8b2155.js.gz | Bin 929 -> 0 bytes .../dist/assets/index.3b366cce.js.gz | Bin 71549 -> 0 bytes .../dist/assets/index.455162db.js.gz | Bin 1985 -> 0 bytes .../resources/dist/assets/index.5aa988d7.js | 1 - .../dist/assets/index.5aa988d7.js.gz | Bin 2456 -> 0 bytes .../resources/dist/assets/index.5db1da66.js | 1 - .../dist/assets/index.5db1da66.js.gz | Bin 1882 -> 0 bytes .../resources/dist/assets/index.602c2d69.css | 1 + .../resources/dist/assets/index.660b57c5.css | 1 - .../{index.1b9b1f3d.js => index.68aa383b.js} | 2 +- .../dist/assets/index.68aa383b.js.gz | Bin 0 -> 1925 bytes .../{index.ff4f63f0.js => index.76af748c.js} | 2 +- .../{index.e771bc5c.js => index.8384be2b.js} | 2 +- .../dist/assets/index.8384be2b.js.gz | Bin 0 -> 1186 bytes .../{index.e977d627.js => index.8920573f.js} | 2 +- .../dist/assets/index.8920573f.js.gz | Bin 0 -> 1996 bytes .../dist/assets/index.9af01336.js.gz | Bin 2906 -> 0 bytes .../{index.b7ace07f.js => index.9ec925d8.js} | 2 +- .../dist/assets/index.9ec925d8.js.gz | Bin 0 -> 1702 bytes .../{index.0932d157.js => index.9fb5edc3.js} | 2 +- .../dist/assets/index.9fb5edc3.js.gz | Bin 0 -> 2895 bytes .../{index.455162db.js => index.aeb65e1c.js} | 2 +- .../dist/assets/index.aeb65e1c.js.gz | Bin 0 -> 1984 bytes .../{index.3a8b2155.js => index.afba7141.js} | 2 +- .../dist/assets/index.afba7141.js.gz | Bin 0 -> 930 bytes .../resources/dist/assets/index.b27bcf7a.js | 1 + .../dist/assets/index.b27bcf7a.js.gz | Bin 0 -> 1944 bytes .../dist/assets/index.b7ace07f.js.gz | Bin 1704 -> 0 bytes .../{index.b948aacd.js => index.c5f54dd6.js} | 2 +- .../dist/assets/index.e693f56f.js.gz | Bin 1994 -> 0 bytes .../dist/assets/index.e771bc5c.js.gz | Bin 1186 -> 0 bytes .../dist/assets/index.e977d627.js.gz | Bin 1993 -> 0 bytes .../{index.3b366cce.js => index.e97c30ca.js} | 6 +- .../dist/assets/index.e97c30ca.js.gz | Bin 0 -> 71557 bytes ...vue_type_style_index_0_lang.a1b9bcbd.js.gz | Bin 675 -> 0 bytes ...e_vue_type_style_index_0_lang.bae9fc64.js} | 2 +- ...vue_type_style_index_0_lang.bae9fc64.js.gz | Bin 0 -> 7220 bytes ...e_vue_type_style_index_0_lang.c748276f.js} | 2 +- ...vue_type_style_index_0_lang.c748276f.js.gz | Bin 0 -> 675 bytes ...vue_type_style_index_0_lang.ecd76a42.js.gz | Bin 7220 -> 0 bytes ...{radarr.a1bba0fa.js => radarr.3a1f2f18.js} | 2 +- .../dist/assets/radarr.3a1f2f18.js.gz | Bin 0 -> 344 bytes .../dist/assets/radarr.a1bba0fa.js.gz | Bin 344 -> 0 bytes ...{sonarr.d42d2b89.js => sonarr.37499ada.js} | 2 +- .../dist/assets/sonarr.37499ada.js.gz | Bin 0 -> 347 bytes .../dist/assets/sonarr.d42d2b89.js.gz | Bin 346 -> 0 bytes .../{user.5fc1e945.js => user.72847996.js} | 2 +- src/main/resources/dist/index.html | 2 +- wiki.en_US.md | 304 ++++++++--------- wiki.md | 306 +++++++++--------- 68 files changed, 897 insertions(+), 856 deletions(-) delete mode 100644 src/main/resources/dist/assets/default-layout.4dcaa9c1.js.gz rename src/main/resources/dist/assets/{default-layout.4dcaa9c1.js => default-layout.a1920cc9.js} (99%) create mode 100644 src/main/resources/dist/assets/default-layout.a1920cc9.js.gz delete mode 100644 src/main/resources/dist/assets/index.0932d157.js.gz rename src/main/resources/dist/assets/{index.9af01336.js => index.0a1796c6.js} (97%) create mode 100644 src/main/resources/dist/assets/index.0a1796c6.js.gz rename src/main/resources/dist/assets/{index.e693f56f.js => index.0a2c9a7d.js} (96%) create mode 100644 src/main/resources/dist/assets/index.0a2c9a7d.js.gz delete mode 100644 src/main/resources/dist/assets/index.1b9b1f3d.js.gz create mode 100644 src/main/resources/dist/assets/index.2f3b8d9d.js create mode 100644 src/main/resources/dist/assets/index.2f3b8d9d.js.gz delete mode 100644 src/main/resources/dist/assets/index.3a8b2155.js.gz delete mode 100644 src/main/resources/dist/assets/index.3b366cce.js.gz delete mode 100644 src/main/resources/dist/assets/index.455162db.js.gz delete mode 100644 src/main/resources/dist/assets/index.5aa988d7.js delete mode 100644 src/main/resources/dist/assets/index.5aa988d7.js.gz delete mode 100644 src/main/resources/dist/assets/index.5db1da66.js delete mode 100644 src/main/resources/dist/assets/index.5db1da66.js.gz create mode 100644 src/main/resources/dist/assets/index.602c2d69.css delete mode 100644 src/main/resources/dist/assets/index.660b57c5.css rename src/main/resources/dist/assets/{index.1b9b1f3d.js => index.68aa383b.js} (97%) create mode 100644 src/main/resources/dist/assets/index.68aa383b.js.gz rename src/main/resources/dist/assets/{index.ff4f63f0.js => index.76af748c.js} (92%) rename src/main/resources/dist/assets/{index.e771bc5c.js => index.8384be2b.js} (95%) create mode 100644 src/main/resources/dist/assets/index.8384be2b.js.gz rename src/main/resources/dist/assets/{index.e977d627.js => index.8920573f.js} (96%) create mode 100644 src/main/resources/dist/assets/index.8920573f.js.gz delete mode 100644 src/main/resources/dist/assets/index.9af01336.js.gz rename src/main/resources/dist/assets/{index.b7ace07f.js => index.9ec925d8.js} (96%) create mode 100644 src/main/resources/dist/assets/index.9ec925d8.js.gz rename src/main/resources/dist/assets/{index.0932d157.js => index.9fb5edc3.js} (97%) create mode 100644 src/main/resources/dist/assets/index.9fb5edc3.js.gz rename src/main/resources/dist/assets/{index.455162db.js => index.aeb65e1c.js} (97%) create mode 100644 src/main/resources/dist/assets/index.aeb65e1c.js.gz rename src/main/resources/dist/assets/{index.3a8b2155.js => index.afba7141.js} (98%) create mode 100644 src/main/resources/dist/assets/index.afba7141.js.gz create mode 100644 src/main/resources/dist/assets/index.b27bcf7a.js create mode 100644 src/main/resources/dist/assets/index.b27bcf7a.js.gz delete mode 100644 src/main/resources/dist/assets/index.b7ace07f.js.gz rename src/main/resources/dist/assets/{index.b948aacd.js => index.c5f54dd6.js} (90%) delete mode 100644 src/main/resources/dist/assets/index.e693f56f.js.gz delete mode 100644 src/main/resources/dist/assets/index.e771bc5c.js.gz delete mode 100644 src/main/resources/dist/assets/index.e977d627.js.gz rename src/main/resources/dist/assets/{index.3b366cce.js => index.e97c30ca.js} (94%) create mode 100644 src/main/resources/dist/assets/index.e97c30ca.js.gz delete mode 100644 src/main/resources/dist/assets/index.vue_vue_type_style_index_0_lang.a1b9bcbd.js.gz rename src/main/resources/dist/assets/{index.vue_vue_type_style_index_0_lang.ecd76a42.js => index.vue_vue_type_style_index_0_lang.bae9fc64.js} (99%) create mode 100644 src/main/resources/dist/assets/index.vue_vue_type_style_index_0_lang.bae9fc64.js.gz rename src/main/resources/dist/assets/{index.vue_vue_type_style_index_0_lang.a1b9bcbd.js => index.vue_vue_type_style_index_0_lang.c748276f.js} (95%) create mode 100644 src/main/resources/dist/assets/index.vue_vue_type_style_index_0_lang.c748276f.js.gz delete mode 100644 src/main/resources/dist/assets/index.vue_vue_type_style_index_0_lang.ecd76a42.js.gz rename src/main/resources/dist/assets/{radarr.a1bba0fa.js => radarr.3a1f2f18.js} (93%) create mode 100644 src/main/resources/dist/assets/radarr.3a1f2f18.js.gz delete mode 100644 src/main/resources/dist/assets/radarr.a1bba0fa.js.gz rename src/main/resources/dist/assets/{sonarr.d42d2b89.js => sonarr.37499ada.js} (93%) create mode 100644 src/main/resources/dist/assets/sonarr.37499ada.js.gz delete mode 100644 src/main/resources/dist/assets/sonarr.d42d2b89.js.gz rename src/main/resources/dist/assets/{user.5fc1e945.js => user.72847996.js} (83%) diff --git a/README.en_US.md b/README.en_US.md index c62e03c..e0a547f 100644 --- a/README.en_US.md +++ b/README.en_US.md @@ -1,148 +1,158 @@ -
- - - -
- - -[中文](https://github.com/LuckyPuppy514/jproxy/blob/main/README.md) | [English](https://github.com/LuckyPuppy514/jproxy/blob/main/README.en_US.md) - -- [🌟 Introduce](#-introduce) -- [🧱 Install](#-install) - - [Docker](#docker) - - [Windows](#windows) -- [☃️ Basic Configuration](#️-basic-configuration) -- [😘 Contributing](#-contributing) -- [👏 Related Efforts](#-related-efforts) -- [🃏 License](#-license) - -## 🌟 Introduce - -A proxy between `Sonarr / Radarr` and `Jackett / Prowlarr`, mainly used to optimize search and improve recognition rate - -```mermaid -graph LR - 1[Sonarr / Radarr] == request Jackett / Prowlarr Torznab interface ==> 2(JProxy) == proxy Sonarr / Radarr request ==> 3(Jackett / Prowlarr) - - 3(Jackett / Prowlarr) == return raw result ==> 2(JProxy) == return formatted result ==> 1(Sonarr / Radarr) - - 2(JProxy) == optimize search keywords ==> 2(JProxy) - 2(JProxy) == format search result ==> 2(JProxy) -``` - -![20230405044128](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044128.webp) -![20230406181845](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406181845.webp) -![20230406181914](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406181914.webp) - -## 🧱 Install - -### Docker - -```text -version: '3.0' -services: - jproxy: - image: luckypuppy514/jproxy:latest - container_name: jproxy - restart: unless-stopped - environment: - - PUID=1000 - - PGID=1000 - - TZ=Asia/Shanghai - - REDIS_HOST=jproxy-redis - - REDIS_PORT=6379 - - JAVA_OPTS=-Xms512m -Xmx512m - links: - - jproxy-redis - ports: - - 8117:8117 - volumes: - - /docker/jproxy/database:/app/database - - jproxy-redis: - image: redis:latest - container_name: jproxy-redis - restart: unless-stopped -``` - -If you want deploy via `docker run` ,see [docker-run.sh](https://github.com/LuckyPuppy514/jproxy/blob/main/docker/docker-run.sh) - -### Windows - -1. [Download jdk17](https://kutt.lckp.top/yrnerc), install and configure environment variables -2. [Download windows.zip](https://github.com/LuckyPuppy514/jproxy/releases) ,unzip to the installation directory - -| Filename | Explanation | Remark | -| :-: | :-: | :-: | -| startup.bat | starup script | - | -| shutdown.bat | shutdown script | - | -| startup.vbs | startup background script | hidden window running in the background | -| database | database | keep it while upgrade | -| config | configuration files | - | -| jproxy.jar | Runnable jar package | - | -| redis | redis database | - | - -## ☃️ Basic Configuration - -- URL: `http://127.0.0.1:8117/login` -- User: `jproxy` -- Password: `jproxy@2023` - -![20230406181038](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406181038.webp) - -① Fill in `Sonarr Server Url`, `API KEY`, and `Indexer Address` in `System - Configure` (Jackett or Prowlarr) - -![20230404182207](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404182207.webp) -![20230406182057](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406182057.webp) - -💡 After saving, it should normally be as shown in the picture below ✅, otherwise please check the input and network connectivity - -![20230406182207](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406182207.webp) - -② For the first use, it is recommended to manually synchronize `Series Title` and `Series Rule` once (it will be automatically synchronized later) - -![20230406182240](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406182240.webp) -![20230406182304](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406182304.webp) - -③ In `Sonarr - Indexers`, modify the `IP` and `Port` of the indexer `URL` to the `IP` and `Port` of JProxy, and append the path `/sonarr/jackett` (Prowlarr should append with `/ sonarr/prowlarr`) - -`http://192.168.6.15:9117/api/v2.0/......` ➡️ `http://192.168.6.14:8117/sonarr/jackett/api/v2.0/......` - -![20230404172541](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404172541.webp) - -💡 It is recommended to modify one first, and then modify other indexer configurations after confirming that it is normal - -![20230405044447](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044447.webp) - -[🎗️ For advanced configuration and usage, see wiki](https://github.com/LuckyPuppy514/jproxy/wiki) - -## 😘 Contributing - -Feel free to dive in![Open an issue](https://github.com/LuckyPuppy514/jproxy/issues/new/choose) or submit PRs. - -- [arco-design-pro-vue](https://github.com/arco-design/arco-design-pro-vue) -- [spring-boot](https://github.com/spring-projects/spring-boot) -- [sqlite](https://github.com/sqlite/sqlite) -- [liquibase](https://github.com/liquibase/liquibase) -- [mybatis](https://github.com/mybatis/mybatis-3) -- [mybatis-plus](https://github.com/baomidou/mybatis-plus) -- [redis](https://github.com/redis/redis) -- [knife4j](https://github.com/xiaoymin/knife4j) -- [charon](https://github.com/mkopylec/charon-spring-boot-starter) -- [jib](https://github.com/GoogleContainerTools/jib) - -## 👏 Related Efforts - -- [Sonarr](https://github.com/Sonarr/Sonarr) -- [Radarr](https://github.com/radarr/radarr) -- [Jackett](https://github.com/Jackett/Jackett) -- [Prowlarr](https://github.com/Prowlarr/Prowlarr) -- [qBittorrent](https://github.com/qbittorrent/qBittorrent) - -## 🃏 License - -[MIT](https://github.com/LuckyPuppy514/jproxy/blob/main/LICENSE) © LuckyPuppy514 ++ + + +
+ + +[中文](https://github.com/LuckyPuppy514/jproxy/blob/main/README.md) | [English](https://github.com/LuckyPuppy514/jproxy/blob/main/README.en_US.md) + +- [🌟 Introduce](#-introduce) +- [🧱 Install](#-install) + - [Docker](#docker) + - [Windows](#windows) +- [☃️ Basic Configuration](#️-basic-configuration) +- [😘 Contributing](#-contributing) +- [👏 Related Efforts](#-related-efforts) +- [🃏 License](#-license) + +## 🌟 Introduce + +A proxy between `Sonarr / Radarr` and `Jackett / Prowlarr`, mainly used to optimize search and improve recognition rate + +```mermaid +graph LR + 1[Sonarr / Radarr] == request Jackett / Prowlarr Torznab interface ==> 2(JProxy) == proxy Sonarr / Radarr request ==> 3(Jackett / Prowlarr) + + 3(Jackett / Prowlarr) == return raw result ==> 2(JProxy) == return formatted result ==> 1(Sonarr / Radarr) + + 2(JProxy) == optimize search keywords ==> 2(JProxy) + 2(JProxy) == format search result ==> 2(JProxy) +``` + +![20230405044128](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044128.webp) +![20230406181845](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406181845.webp) +![20230406181914](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406181914.webp) + +## 🧱 Install + +### Docker + +```text +version: '3.0' +services: + jproxy: + image: luckypuppy514/jproxy:latest + container_name: jproxy + restart: unless-stopped + environment: + - PUID=1000 + - PGID=1000 + - TZ=Asia/Shanghai + - REDIS_HOST=jproxy-redis + - REDIS_PORT=6379 + - JAVA_OPTS=-Xms512m -Xmx512m + links: + - jproxy-redis + ports: + - 8117:8117 + volumes: + - /docker/jproxy/database:/app/database + + jproxy-redis: + image: redis:latest + container_name: jproxy-redis + restart: unless-stopped +``` + +If you want deploy via `docker run` ,see [docker-run.sh](https://github.com/LuckyPuppy514/jproxy/blob/main/docker/docker-run.sh) + +| Parameter | Default | Description | +| :------------: | :-------: | :-----------------------------------: | +| PUID | 0 | User ID | +| PGID | 0 | Group ID | +| REDIS_HOST | 127.0.0.1 | Redis host | +| REDIS_PORT | 6379 | Redis port | +| JAVA_OPTS | - | Suggested values: -Xms512m -Xmx512m | +| REDIS_PASSWORD | - | Redis password | +| REDIS_DATABASE | 0 | Redis database | + +### Windows + +1. [Download jdk17](https://kutt.lckp.top/yrnerc), install and configure environment variables +2. [Download windows.zip](https://github.com/LuckyPuppy514/jproxy/releases) ,unzip to the installation directory + +| Filename | Explanation | Remark | +| :----------: | :-----------------------: | :-------------------------------------: | +| startup.bat | starup script | - | +| shutdown.bat | shutdown script | - | +| startup.vbs | startup background script | hidden window running in the background | +| database | database | keep it while upgrade | +| config | configuration files | - | +| jproxy.jar | Runnable jar package | - | +| redis | redis database | - | + +## ☃️ Basic Configuration + +- URL: `http://127.0.0.1:8117/login` +- User: `jproxy` +- Password: `jproxy@2023` + +![20230406181038](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406181038.webp) + +① Fill in `Sonarr Server Url`, `API KEY`, and `Indexer Address` in `System - Configure` (Jackett or Prowlarr) + +![20230404182207](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404182207.webp) +![20230406182057](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406182057.webp) + +💡 After saving, it should normally be as shown in the picture below ✅, otherwise please check the input and network connectivity + +![20230406182207](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406182207.webp) + +② For the first use, it is recommended to manually synchronize `Series Title` and `Series Rule` once (it will be automatically synchronized later) + +![20230406182240](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406182240.webp) +![20230406182304](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406182304.webp) + +③ In `Sonarr - Indexers`, modify the `IP` and `Port` of the indexer `URL` to the `IP` and `Port` of JProxy, and append the path `/sonarr/jackett` (Prowlarr should append with `/ sonarr/prowlarr`) + +`http://192.168.6.15:9117/api/v2.0/......` ➡️ `http://192.168.6.14:8117/sonarr/jackett/api/v2.0/......` + +![20230404172541](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404172541.webp) + +💡 It is recommended to modify one first, and then modify other indexer configurations after confirming that it is normal + +![20230405044447](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044447.webp) + +[🎗️ For advanced configuration and usage, see wiki](https://github.com/LuckyPuppy514/jproxy/wiki) + +## 😘 Contributing + +Feel free to dive in![Open an issue](https://github.com/LuckyPuppy514/jproxy/issues/new/choose) or submit PRs. + +- [arco-design-pro-vue](https://github.com/arco-design/arco-design-pro-vue) +- [spring-boot](https://github.com/spring-projects/spring-boot) +- [sqlite](https://github.com/sqlite/sqlite) +- [liquibase](https://github.com/liquibase/liquibase) +- [mybatis](https://github.com/mybatis/mybatis-3) +- [mybatis-plus](https://github.com/baomidou/mybatis-plus) +- [redis](https://github.com/redis/redis) +- [knife4j](https://github.com/xiaoymin/knife4j) +- [charon](https://github.com/mkopylec/charon-spring-boot-starter) +- [jib](https://github.com/GoogleContainerTools/jib) + +## 👏 Related Efforts + +- [Sonarr](https://github.com/Sonarr/Sonarr) +- [Radarr](https://github.com/radarr/radarr) +- [Jackett](https://github.com/Jackett/Jackett) +- [Prowlarr](https://github.com/Prowlarr/Prowlarr) +- [qBittorrent](https://github.com/qbittorrent/qBittorrent) + +## 🃏 License + +[MIT](https://github.com/LuckyPuppy514/jproxy/blob/main/LICENSE) © LuckyPuppy514 diff --git a/README.md b/README.md index 1020389..805055d 100644 --- a/README.md +++ b/README.md @@ -1,148 +1,158 @@ -- - - -
- - -[中文](https://github.com/LuckyPuppy514/jproxy/blob/main/README.md) | [English](https://github.com/LuckyPuppy514/jproxy/blob/main/README.en_US.md) - -- [🌟 项目简介](#-项目简介) -- [🧱 项目安装](#-项目安装) - - [Docker](#docker) - - [Windows](#windows) -- [☃️ 基础配置](#️-基础配置) -- [😘 如何贡献](#-如何贡献) -- [👏 相关仓库](#-相关仓库) -- [🃏 使用许可](#-使用许可) - -## 🌟 项目简介 - -介于 `Sonarr / Radarr` 和 `Jackett / Prowlarr` 之间的代理,主要用于优化查询和提升识别率 - -```mermaid -graph LR - 1[Sonarr / Radarr] == 请求 Jackett / Prowlarr Torznab 接口 ==> 2(JProxy) == 代理 Sonarr / Radarr 请求 ==> 3(Jackett / Prowlarr) - - 3(Jackett / Prowlarr) == 返回原始结果 ==> 2(JProxy) == 返回格式化结果 ==> 1(Sonarr / Radarr) - - 2(JProxy) == 优化查询关键字 ==> 2(JProxy) - 2(JProxy) == 格式化查询结果 ==> 2(JProxy) -``` - -![20230405044128](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044128.webp) -![20230405044054](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044054.webp) -![20230406161713](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406161713.webp) - -## 🧱 项目安装 - -### Docker - -```text -version: '3.0' -services: - jproxy: - image: luckypuppy514/jproxy:latest - container_name: jproxy - restart: unless-stopped - environment: - - PUID=1000 - - PGID=1000 - - TZ=Asia/Shanghai - - REDIS_HOST=jproxy-redis - - REDIS_PORT=6379 - - JAVA_OPTS=-Xms512m -Xmx512m - links: - - jproxy-redis - ports: - - 8117:8117 - volumes: - - /docker/jproxy/database:/app/database - - jproxy-redis: - image: redis:latest - container_name: jproxy-redis - restart: unless-stopped -``` - -如需使用 `docker run` 进行部署,请参考 [docker-run.sh](https://github.com/LuckyPuppy514/jproxy/blob/main/docker/docker-run.sh) - -### Windows - -1. [下载 jdk17](https://kutt.lckp.top/yrnerc),安装并配置好环境变量 -2. [下载 windows.zip](https://github.com/LuckyPuppy514/jproxy/releases) ,解压到安装目录 - -| 文件名 | 说明 | 备注 | -| :-: | :-: | :-: | -| startup.bat | 启动脚本 | - | -| shutdown.bat | 关闭脚本 | - | -| startup.vbs | 后台启动脚本 | 隐藏窗口后台运行 | -| database | 数据库 | 升级请保留数据库 | -| config | 配置文件 | - | -| jproxy.jar | 可执行 jar 包 | - | -| redis | redis 数据库 | - | - -## ☃️ 基础配置 - -- 地址:`http://127.0.0.1:8117/login` -- 用户:`jproxy` -- 密码:`jproxy@2023` - -![20230405202207](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405202207.webp) - -① 在 `系统配置 - 基础配置` 中填写 `Sonarr 服务地址` 和 `API 密钥`,以及 `索引器地址`(Jackett / Prowlarr 二选一即可) - -![20230404182207](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404182207.webp) -![20230404170949](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404170949.webp) - -💡 保存后,正常应如下图所示 ✅ ,否则请检查输入和网络连通性 - -![20230404171234](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404171234.webp) - -② 首次使用,建议手动同步一次 `剧集标题` 和 `剧集规则`(后续会自动同步) - -![20230404172313](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404172313.webp) -![20230404172225](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404172225.webp) - -③ 在 `Sonarr - Indexers` 中,修改索引器 `URL` 的 `IP` 和 `端口号` 为 JProxy 的 `IP` 和 `端口号`,并追加路径 `/sonarr/jackett`(Prowlarr 则追加 `/sonarr/prowlarr`) - -`http://192.168.6.15:9117/api/v2.0/......` ➡️ `http://192.168.6.14:8117/sonarr/jackett/api/v2.0/......` - -![20230404172541](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404172541.webp) - -💡 建议先修改一个,确认正常后再修改其他的索引器配置 - -![20230405044447](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044447.webp) - -[🎗️ 进阶配置和使用说明请查看 Wiki](https://github.com/LuckyPuppy514/jproxy/wiki) - -## 😘 如何贡献 - -非常欢迎你的加入![提一个 Issue](https://github.com/LuckyPuppy514/jproxy/issues/new/choose) 或者提交一个 Pull Request - -- [arco-design-pro-vue](https://github.com/arco-design/arco-design-pro-vue) -- [spring-boot](https://github.com/spring-projects/spring-boot) -- [sqlite](https://github.com/sqlite/sqlite) -- [liquibase](https://github.com/liquibase/liquibase) -- [mybatis](https://github.com/mybatis/mybatis-3) -- [mybatis-plus](https://github.com/baomidou/mybatis-plus) -- [redis](https://github.com/redis/redis) -- [knife4j](https://github.com/xiaoymin/knife4j) -- [charon](https://github.com/mkopylec/charon-spring-boot-starter) -- [jib](https://github.com/GoogleContainerTools/jib) - -## 👏 相关仓库 - -- [Sonarr](https://github.com/Sonarr/Sonarr) -- [Radarr](https://github.com/radarr/radarr) -- [Jackett](https://github.com/Jackett/Jackett) -- [Prowlarr](https://github.com/Prowlarr/Prowlarr) -- [qBittorrent](https://github.com/qbittorrent/qBittorrent) - -## 🃏 使用许可 - -[MIT](https://github.com/LuckyPuppy514/jproxy/blob/main/LICENSE) © LuckyPuppy514 ++ + + +
+ + +[中文](https://github.com/LuckyPuppy514/jproxy/blob/main/README.md) | [English](https://github.com/LuckyPuppy514/jproxy/blob/main/README.en_US.md) + +- [🌟 项目简介](#-项目简介) +- [🧱 项目安装](#-项目安装) + - [Docker](#docker) + - [Windows](#windows) +- [☃️ 基础配置](#️-基础配置) +- [😘 如何贡献](#-如何贡献) +- [👏 相关仓库](#-相关仓库) +- [🃏 使用许可](#-使用许可) + +## 🌟 项目简介 + +介于 `Sonarr / Radarr` 和 `Jackett / Prowlarr` 之间的代理,主要用于优化查询和提升识别率 + +```mermaid +graph LR + 1[Sonarr / Radarr] == 请求 Jackett / Prowlarr Torznab 接口 ==> 2(JProxy) == 代理 Sonarr / Radarr 请求 ==> 3(Jackett / Prowlarr) + + 3(Jackett / Prowlarr) == 返回原始结果 ==> 2(JProxy) == 返回格式化结果 ==> 1(Sonarr / Radarr) + + 2(JProxy) == 优化查询关键字 ==> 2(JProxy) + 2(JProxy) == 格式化查询结果 ==> 2(JProxy) +``` + +![20230405044128](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044128.webp) +![20230405044054](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044054.webp) +![20230406161713](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-06/20230406161713.webp) + +## 🧱 项目安装 + +### Docker + +```text +version: '3.0' +services: + jproxy: + image: luckypuppy514/jproxy:latest + container_name: jproxy + restart: unless-stopped + environment: + - PUID=1000 + - PGID=1000 + - TZ=Asia/Shanghai + - REDIS_HOST=jproxy-redis + - REDIS_PORT=6379 + - JAVA_OPTS=-Xms512m -Xmx512m + links: + - jproxy-redis + ports: + - 8117:8117 + volumes: + - /docker/jproxy/database:/app/database + + jproxy-redis: + image: redis:latest + container_name: jproxy-redis + restart: unless-stopped +``` + +如需使用 `docker run` 进行部署,请参考 [docker-run.sh](https://github.com/LuckyPuppy514/jproxy/blob/main/docker/docker-run.sh) + +| 参数名 | 默认值 | 说明 | +| :------------: | :-------: | :-----------------------: | +| PUID | 0 | 用户 ID | +| PGID | 0 | 组 ID | +| REDIS_HOST | 127.0.0.1 | Redis 主机地址 | +| REDIS_PORT | 6379 | Redis 端口号 | +| JAVA_OPTS | - | 建议值: -Xms512m -Xmx512m | +| REDIS_PASSWORD | - | Redis 密码 | +| REDIS_DATABASE | 0 | Redis database | + +### Windows + +1. [下载 jdk17](https://kutt.lckp.top/yrnerc),安装并配置好环境变量 +2. [下载 windows.zip](https://github.com/LuckyPuppy514/jproxy/releases) ,解压到安装目录 + +| 文件名 | 说明 | 备注 | +| :----------: | :-----------: | :--------------: | +| startup.bat | 启动脚本 | - | +| shutdown.bat | 关闭脚本 | - | +| startup.vbs | 后台启动脚本 | 隐藏窗口后台运行 | +| database | 数据库 | 升级请保留数据库 | +| config | 配置文件 | - | +| jproxy.jar | 可执行 jar 包 | - | +| redis | redis 数据库 | - | + +## ☃️ 基础配置 + +- 地址:`http://127.0.0.1:8117/login` +- 用户:`jproxy` +- 密码:`jproxy@2023` + +![20230405202207](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405202207.webp) + +① 在 `系统配置 - 基础配置` 中填写 `Sonarr 服务地址` 和 `API 密钥`,以及 `索引器地址`(Jackett / Prowlarr 二选一即可) + +![20230404182207](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404182207.webp) +![20230404170949](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404170949.webp) + +💡 保存后,正常应如下图所示 ✅ ,否则请检查输入和网络连通性 + +![20230404171234](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404171234.webp) + +② 首次使用,建议手动同步一次 `剧集标题` 和 `剧集规则`(后续会自动同步) + +![20230404172313](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404172313.webp) +![20230404172225](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404172225.webp) + +③ 在 `Sonarr - Indexers` 中,修改索引器 `URL` 的 `IP` 和 `端口号` 为 JProxy 的 `IP` 和 `端口号`,并追加路径 `/sonarr/jackett`(Prowlarr 则追加 `/sonarr/prowlarr`) + +`http://192.168.6.15:9117/api/v2.0/......` ➡️ `http://192.168.6.14:8117/sonarr/jackett/api/v2.0/......` + +![20230404172541](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-04/20230404172541.webp) + +💡 建议先修改一个,确认正常后再修改其他的索引器配置 + +![20230405044447](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-05/20230405044447.webp) + +[🎗️ 进阶配置和使用说明请查看 Wiki](https://github.com/LuckyPuppy514/jproxy/wiki) + +## 😘 如何贡献 + +非常欢迎你的加入![提一个 Issue](https://github.com/LuckyPuppy514/jproxy/issues/new/choose) 或者提交一个 Pull Request + +- [arco-design-pro-vue](https://github.com/arco-design/arco-design-pro-vue) +- [spring-boot](https://github.com/spring-projects/spring-boot) +- [sqlite](https://github.com/sqlite/sqlite) +- [liquibase](https://github.com/liquibase/liquibase) +- [mybatis](https://github.com/mybatis/mybatis-3) +- [mybatis-plus](https://github.com/baomidou/mybatis-plus) +- [redis](https://github.com/redis/redis) +- [knife4j](https://github.com/xiaoymin/knife4j) +- [charon](https://github.com/mkopylec/charon-spring-boot-starter) +- [jib](https://github.com/GoogleContainerTools/jib) + +## 👏 相关仓库 + +- [Sonarr](https://github.com/Sonarr/Sonarr) +- [Radarr](https://github.com/radarr/radarr) +- [Jackett](https://github.com/Jackett/Jackett) +- [Prowlarr](https://github.com/Prowlarr/Prowlarr) +- [qBittorrent](https://github.com/qbittorrent/qBittorrent) + +## 🃏 使用许可 + +[MIT](https://github.com/LuckyPuppy514/jproxy/blob/main/LICENSE) © LuckyPuppy514 diff --git a/changelog.en_US.md b/changelog.en_US.md index e1a0ebe..3290ca9 100644 --- a/changelog.en_US.md +++ b/changelog.en_US.md @@ -3,6 +3,10 @@ # Change Logs +## v3.0.6 2023-04-08 + +1. Added the function to modify the TMDB title + ## v3.0.5 2023-04-08 1. Fix the downloaded bug diff --git a/changelog.md b/changelog.md index 059737d..bf1bfe0 100644 --- a/changelog.md +++ b/changelog.md @@ -3,6 +3,10 @@ # 变更日志 +## v3.0.6 2023-04-08 + +1. 新增修改 TMDB 标题的功能 + ## v3.0.5 2023-04-08 1. 修复部分数据无法下载的问题 diff --git a/pom.xml b/pom.xml index 7bedb60..3efb933 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@- * TMDB 标题 - *
- * - * @author LuckyPuppy514 - * @date 2023-03-26 - */ -@Tag(name = "TMDB 标题") -@RequestMapping("/api/tmdb/title") -@RestController -@RequiredArgsConstructor -public class TmdbTitleController { - - private final ITmdbTitleService tmdbTitleService; - - private final ISonarrTitleService sonarrTitleService; - - private final ISystemConfigService systemConfigService; - - private final ISystemCacheService systemCacheService; - - private final MessageSource messageSource; - - @Operation(summary = "同步") - @PostMapping("/sync") - public ResponseEntity+ * TMDB 标题 + *
+ * + * @author LuckyPuppy514 + * @date 2023-03-26 + */ +@Tag(name = "TMDB 标题") +@RequestMapping("/api/tmdb/title") +@RestController +@RequiredArgsConstructor +public class TmdbTitleController { + + private final ITmdbTitleService tmdbTitleService; + + private final ISonarrTitleService sonarrTitleService; + + private final ISystemConfigService systemConfigService; + + private final ISystemCacheService systemCacheService; + + private final MessageSource messageSource; + + @Operation(summary = "同步") + @PostMapping("/sync") + public ResponseEntity- * TmdbTitle 服务实现类 - *
- * - * @author LuckyPuppy514 - * @since 2023-03-19 - */ -@Service -@RequiredArgsConstructor -public class TmdbTitleServiceImpl extends ServiceImpl