From 119873afc69e86a08def18c4ec6dcf763c2b25c6 Mon Sep 17 00:00:00 2001 From: Gaojianli Date: Fri, 10 Jan 2025 11:18:20 +0800 Subject: [PATCH 01/28] =?UTF-8?q?Revert=20"=E5=8E=BB=E6=8E=89=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=A7=A3=E5=B0=81=E5=85=A8=E9=83=A8=20IP=20=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit dad2df567b763311f4d5c17c29d37e5266ccdbb7. --- install4j/project.install4j~ | 14 ++++++-------- webui/src/locale/en-US.ts | 2 +- webui/src/locale/zh-CN.ts | 3 ++- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/install4j/project.install4j~ b/install4j/project.install4j~ index d327b09c7..5e362a4e6 100644 --- a/install4j/project.install4j~ +++ b/install4j/project.install4j~ @@ -1,7 +1,7 @@ - + @@ -12,8 +12,6 @@ - - @@ -39,7 +37,7 @@ - + @@ -53,7 +51,7 @@ - + @@ -67,7 +65,7 @@ - + @@ -81,7 +79,7 @@ - + @@ -95,7 +93,7 @@ - + diff --git a/webui/src/locale/en-US.ts b/webui/src/locale/en-US.ts index 1d0c4ff97..18ccd89cd 100644 --- a/webui/src/locale/en-US.ts +++ b/webui/src/locale/en-US.ts @@ -31,7 +31,7 @@ export default { 'changeLogModel.updateNow': 'Update Now', 'globalPauseModel.title': 'Are you sure to enable global pause mode?', 'globalPauseModel.description': - 'This will pause all ban and check operations of all downloaders until the next restart or cancel pause.', + 'This will pause all ban and check operations of all downloaders until the next restart or cancel pause. IPs in banlist will be unbanned immediately.', 'global.pause.pauseAll': 'Pause', 'global.pause.pauseAll.tips': "This will stop PeerBanhelper's all functions and unban all Peers, suitable for modifying downloader configuration", diff --git a/webui/src/locale/zh-CN.ts b/webui/src/locale/zh-CN.ts index 4f597f2e6..7d3795a12 100644 --- a/webui/src/locale/zh-CN.ts +++ b/webui/src/locale/zh-CN.ts @@ -32,7 +32,8 @@ export default { 'changeLogModel.notNow': '不是现在', 'changeLogModel.updateNow': '立即更新', 'globalPauseModel.title': '确定启用全局暂停模式吗?', - 'globalPauseModel.description': '这将暂停所有下载器的封禁和检查操作,直至下次重启或者取消暂停。', + 'globalPauseModel.description': + '这将暂停所有下载器的封禁和检查操作,直至下次重启或者取消暂停。已封禁的 IP 地址将全部立刻解除封禁。', 'global.pause.pauseAll': '暂停', 'global.pause.pauseAll.tips': '这将停止 PeerBanhelper 的全部功能并解封全部 Peer,适用于修改下载器配置等场景', From c24815e65042a19a509b1e6e00bbeeca42e70244 Mon Sep 17 00:00:00 2001 From: Gaojianli Date: Fri, 10 Jan 2025 11:19:17 +0800 Subject: [PATCH 02/28] bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8159cb7fc..0be51f904 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.ghostchu.peerbanhelper peerbanhelper - 7.3.0 + 7.4.0-snapshot jar PeerBanHelper From 93fd07f822a430e3314dafc7fc8fccb965bda702 Mon Sep 17 00:00:00 2001 From: Gaojianli Date: Fri, 10 Jan 2025 11:28:16 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E7=9A=84=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule-management/components/subscribe/logModal.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webui/src/views/rule-management/components/subscribe/logModal.vue b/webui/src/views/rule-management/components/subscribe/logModal.vue index 207334984..c673af7e1 100644 --- a/webui/src/views/rule-management/components/subscribe/logModal.vue +++ b/webui/src/views/rule-management/components/subscribe/logModal.vue @@ -3,8 +3,7 @@ v-model:visible="showModal" :title="t('page.rule_management.ruleSubscribe.updateLog')" unmount-on-close - width="auto" - :modal-style="{ width: '35vw' }" + :modal-style="{ width: '30vw' }" >