Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v7.3.0 to mainline #855

Closed
wants to merge 105 commits into from
Closed
Show file tree
Hide file tree
Changes from 104 commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
a3f9d91
Update default to v3.5.4 (#802)
renovate[bot] Dec 9, 2024
18cc9a2
Update dependency org.springframework:spring-context to v6.2.1
renovate[bot] Dec 16, 2024
c149723
Merge pull request #821 from PBH-BTN/renovate/default
Gaojianli Dec 16, 2024
441a865
Update dependency io.javalin:javalin to v6.4.0
renovate[bot] Dec 17, 2024
10ba509
Merge pull request #825 from PBH-BTN/renovate/io.javalin-javalin-6.x
Gaojianli Dec 23, 2024
73d3762
Update pom.xml
Gaojianli Dec 24, 2024
38c5b0b
允许暂停下载器 #833
Ghost-chu Dec 26, 2024
a06b86e
Use dnsjava/dnsjava as DNS Provider, also add it's experiment in lab,…
Ghost-chu Dec 26, 2024
e999eb1
自动 VACUUM DB 文件 #843
Ghost-chu Dec 26, 2024
f1fa966
允许全量 VACUUM #843
Ghost-chu Dec 26, 2024
4fbf0d4
Merge branch 'refs/heads/master' into dev
Ghost-chu Dec 27, 2024
1ec950f
bump version
Ghost-chu Dec 27, 2024
1d7b1ea
排除 install4j output 目录
Ghost-chu Dec 27, 2024
1c0e387
Add PTRBlacklist #834
Ghost-chu Dec 27, 2024
2ac28ee
Downgrade log level from info to debug
Ghost-chu Dec 27, 2024
c558b93
Merge branch 'refs/heads/master' into dev
Ghost-chu Dec 27, 2024
1005c46
update Tor Exit Nodes list, closed #845
Ghost-chu Dec 27, 2024
1661ef3
Update dependency com.github.mizosoft.methanol:methanol to v1.8.0
renovate[bot] Dec 27, 2024
0d8f3ab
查询支持 PTR 记录
Ghost-chu Dec 27, 2024
9887963
怎么有两个 BtnNetwork
Ghost-chu Dec 28, 2024
e00e0c0
Revert "怎么有两个 BtnNetwork"
Ghost-chu Dec 28, 2024
427ac8a
提前初始化 AV 脚本引擎
Ghost-chu Dec 28, 2024
28711c1
Reapply "怎么有两个 BtnNetwork"
Ghost-chu Dec 28, 2024
42c294c
DNS 反查在 populate 中启用
Ghost-chu Dec 28, 2024
fd2c2db
检查配置文件
Ghost-chu Dec 28, 2024
1518f7c
检查配置文件
Ghost-chu Dec 28, 2024
2aad41b
修复Telegram的配置文件升级的漏网之鱼
Ghost-chu Dec 28, 2024
064cf26
添加 BTN 的 ConfigResult
Ghost-chu Dec 29, 2024
3e921a7
是否握手交给 Peer 判断
Ghost-chu Dec 29, 2024
6a1d5fa
Register PTRBlacklist module #834
Ghost-chu Dec 29, 2024
0c16693
Merge pull request #846 from PBH-BTN/renovate/com.github.mizosoft.met…
Ghost-chu Dec 29, 2024
1291ef4
Update dependency @octokit/request-error to v6.1.6 (#835)
renovate[bot] Dec 29, 2024
7d18ca9
图标干掉自动刷新 fix #829
Gaojianli Dec 30, 2024
cef6880
修复倒计时可能为空的问题
Gaojianli Dec 30, 2024
6c8d371
修复滚动 fix #847
Gaojianli Dec 30, 2024
ecced76
fixed size
Gaojianli Dec 30, 2024
f6c79bc
调整一下样式避免出现滚动条
Gaojianli Dec 30, 2024
0f06875
Update dependency @formatjs/intl-durationformat to ^0.7.0
renovate[bot] Dec 30, 2024
2eedef5
Update dependency @vueuse/core to v12.2.0
renovate[bot] Dec 30, 2024
e249c94
Update dependency echarts to v5.6.0
renovate[bot] Dec 30, 2024
6cb2269
Update dependency vue-i18n to v11
renovate[bot] Dec 30, 2024
abb94f4
Merge pull request #861 from PBH-BTN/renovate/vue-i18n-11.x
Gaojianli Dec 30, 2024
8294e74
Merge pull request #858 from PBH-BTN/renovate/formatjs-monorepo
Gaojianli Dec 30, 2024
d96dc12
Merge pull request #860 from PBH-BTN/renovate/echarts-5.x-lockfile
Gaojianli Dec 30, 2024
3fee7ce
Merge pull request #859 from PBH-BTN/renovate/vueuse-monorepo
Gaojianli Dec 30, 2024
d18779a
upgrade desp
Gaojianli Dec 30, 2024
e6d07fe
upgrade deps
Gaojianli Dec 30, 2024
4250153
cleanup
Ghost-chu Dec 30, 2024
65f33c5
支持 DOH
Ghost-chu Dec 30, 2024
bdddb30
暂停状态
Ghost-chu Dec 30, 2024
036288a
Fix NPE bug
Ghost-chu Dec 31, 2024
3ec3528
IP 黑名单列表封禁允许显示封禁原因(行尾注释)
Ghost-chu Dec 31, 2024
dfabc2f
支持规则前单行、多行注释
Ghost-chu Dec 31, 2024
a322e55
支持规则前单行、多行注释
Ghost-chu Dec 31, 2024
aba4a84
fix build
Ghost-chu Dec 31, 2024
22e553d
支持 i18n
Ghost-chu Dec 31, 2024
7f12faa
翻译文本
Ghost-chu Dec 31, 2024
da6a0a1
忽略 webui/vite.config.ts.timestamp-xxx 文件
Ghost-chu Jan 1, 2025
f25d198
添加解封全部按钮
Ghost-chu Jan 1, 2025
6da6f7d
支持下载器暂停功能
Ghost-chu Jan 1, 2025
c7d6adf
pcb 适配 Peer 手动解除封禁
Ghost-chu Jan 1, 2025
432b756
PCB 解除封禁时归零给定记录数据
Ghost-chu Jan 1, 2025
052a791
全局暂停功能
Ghost-chu Jan 1, 2025
119fc94
Update dependency org.json:json to v20241224
renovate[bot] Jan 1, 2025
8751fb8
Merge pull request #864 from PBH-BTN/renovate/org.json-json-20241224.x
Ghost-chu Jan 2, 2025
b96d2ab
Revert "添加解封全部按钮"
Gaojianli Jan 3, 2025
96c02c8
添加解封全部按钮
Ghost-chu Jan 1, 2025
962f699
修改暂停功能,解决编译错误
Gaojianli Jan 3, 2025
7066bd5
fix format
Gaojianli Jan 3, 2025
2df9a55
微调颜色
Gaojianli Jan 3, 2025
aaa0e1c
add globla pause status
Gaojianli Jan 3, 2025
2cb5e7d
finish global pause mode
Gaojianli Jan 3, 2025
454ad78
warning
Gaojianli Jan 3, 2025
317d016
add dns settings
Gaojianli Jan 3, 2025
a04d310
add btn config result
Gaojianli Jan 3, 2025
e3d161c
fix #867
Gaojianli Jan 3, 2025
c5564f6
bump version
Ghost-chu Jan 3, 2025
5fa39b6
remove useless console.log
Gaojianli Jan 3, 2025
ce516cb
列表为空时禁用“解封全部”按钮
Gaojianli Jan 3, 2025
f9f5fd0
Merge remote-tracking branch 'origin/dev' into dev
Ghost-chu Jan 3, 2025
37cc3fc
final 一下该 final 的
Ghost-chu Jan 3, 2025
8db370a
添加 -Xms16M 参数
Ghost-chu Jan 3, 2025
5d3bbc0
添加全局暂停按钮
Ghost-chu Jan 3, 2025
93a49e3
clean code
Gaojianli Jan 3, 2025
fa7a6e2
标准化 IP 地址 #849
Ghost-chu Jan 3, 2025
fc5c68a
本地化 BTN 状态响应信息
Ghost-chu Jan 3, 2025
2f1aeac
打印额外的提示信息
Ghost-chu Jan 3, 2025
4f5b5a7
打印额外的提示信息
Ghost-chu Jan 3, 2025
2d339d9
打印额外的提示信息用作调试,需要删除!
Ghost-chu Jan 3, 2025
2026fb7
打印额外的提示信息用作调试,需要删除!
Ghost-chu Jan 3, 2025
a7edb0b
删了
Ghost-chu Jan 3, 2025
4438627
修复快照不封禁 Peer 的问题
Ghost-chu Jan 3, 2025
36b0adc
撤销debug更改
Ghost-chu Jan 3, 2025
de565d1
finish ptr profie
Gaojianli Jan 4, 2025
8b20324
修复 Hacky 的配置文件处理
Ghost-chu Jan 4, 2025
6e3f4e0
Merge remote-tracking branch 'origin/dev' into dev
Ghost-chu Jan 4, 2025
0e37437
fix lint
Gaojianli Jan 4, 2025
a3f2a81
适配真正的search
Gaojianli Jan 4, 2025
9c39692
我搜索怎么没了
Ghost-chu Jan 4, 2025
8ec3951
Merge remote-tracking branch 'origin/dev' into dev
Ghost-chu Jan 4, 2025
90383aa
新添加的在最前面
Gaojianli Jan 4, 2025
25410ba
修复 IPBlackRuleList 不起作用的问题
Ghost-chu Jan 6, 2025
1a07d6c
bump webui version
Gaojianli Jan 6, 2025
f6034ac
修复搜索为空的时候导致的无限循环问题
Gaojianli Jan 6, 2025
8225026
upgrade deps
Gaojianli Jan 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@ dependency-reduced-pom.xml

PeerBanHelper.jar
*.pkg
install4j/output
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
USER 0
EXPOSE 9898
ENV TZ=UTC
ENV JAVA_OPTS="-Dpbh.release=docker -Djava.awt.headless=true -Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps"
ENV JAVA_OPTS="-Dpbh.release=docker -Djava.awt.headless=true -Xmx512M -Xms16M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps"
WORKDIR /app
VOLUME /tmp
COPY --from=build build/target/libraries /app/libraries
COPY --from=build build/target/PeerBanHelper.jar /app/PeerBanHelper.jar
ENV PATH="${JAVA_HOME}/bin:${PATH}"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-Release
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ COPY target/PeerBanHelper.jar /app/PeerBanHelper.jar
USER 0
EXPOSE 9898
ENV TZ=UTC
ENV JAVA_OPTS="-Dpbh.release=docker -Djava.awt.headless=true -Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps"
ENV JAVA_OPTS="-Dpbh.release=docker -Djava.awt.headless=true -Xmx512M -Xms16M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps"
WORKDIR /app
VOLUME /tmp
ENTRYPOINT ${JAVA_HOME}/bin/java ${JAVA_OPTS} -jar PeerBanHelper.jar
10 changes: 5 additions & 5 deletions install4j/project.install4j
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<executable name="PeerBanHelper-GUI" iconSet="true" executableDir="." redirectStdout="true" executableMode="gui" changeWorkingDirectory="false" singleInstance="true" checkConsoleParameter="true">
<versionInfo include="true" fileDescription="${i18n:peerbanhelper.description}" legalCopyright="PBH-BTN Community - Licensed under GPLv3 licenses. https://www.gnu.org/licenses/quick-guide-gplv3.en.html" internalName="peerbanhelper" />
</executable>
<java mainClass="com.ghostchu.peerbanhelper.MainJumpLoader" vmParameters="-Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Dlauncher.directory=${launcher:sys.launcherDirectory}">
<java mainClass="com.ghostchu.peerbanhelper.MainJumpLoader" vmParameters="-Xmx512M -Xms16M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Dlauncher.directory=${launcher:sys.launcherDirectory}">
<classPath>
<scanDirectory location="libraries" failOnError="false" />
<archive location="PeerBanHelper.jar" failOnError="false" />
Expand All @@ -51,7 +51,7 @@
<executable name="PeerBanHelper-GUI-Silent" iconSet="true" executableDir="." redirectStdout="true" executableMode="gui" singleInstance="true" checkConsoleParameter="true">
<versionInfo include="true" fileDescription="${i18n:peerbanhelper.description}" legalCopyright="PBH-BTN Community - Licensed under GPLv3 licenses. https://www.gnu.org/licenses/quick-guide-gplv3.en.html" internalName="peerbanhelper" />
</executable>
<java mainClass="com.ghostchu.peerbanhelper.MainJumpLoader" vmParameters="-Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Dlauncher.directory=${launcher:sys.launcherDirectory}" arguments="silent">
<java mainClass="com.ghostchu.peerbanhelper.MainJumpLoader" vmParameters="-Xmx512M -Xms16M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Dlauncher.directory=${launcher:sys.launcherDirectory}" arguments="silent">
<classPath>
<scanDirectory location="libraries" failOnError="false" />
<archive location="PeerBanHelper.jar" failOnError="false" />
Expand All @@ -65,7 +65,7 @@
<executable name="PeerBanHelper-NoGUI" iconSet="true" executableDir="." redirectStderr="false" executableMode="console" singleInstance="true" checkConsoleParameter="true">
<versionInfo include="true" fileDescription="${i18n:peerbanhelper.description}" legalCopyright="PBH-BTN Community - Licensed under GPLv3 licenses. https://www.gnu.org/licenses/quick-guide-gplv3.en.html" internalName="peerbanhelper" />
</executable>
<java mainClass="com.ghostchu.peerbanhelper.MainJumpLoader" vmParameters="-Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Djava.awt.headless=true -Dlauncher.directory=${launcher:sys.launcherDirectory}" arguments="nogui">
<java mainClass="com.ghostchu.peerbanhelper.MainJumpLoader" vmParameters="-Xmx512M -Xms16M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Djava.awt.headless=true -Dlauncher.directory=${launcher:sys.launcherDirectory}" arguments="nogui">
<classPath>
<scanDirectory location="libraries" failOnError="false" />
<archive location="PeerBanHelper.jar" failOnError="false" />
Expand All @@ -79,7 +79,7 @@
<executable name="PeerBanHelper-Service" iconSet="true" executableDir="." redirectStderr="false" stderrFile="~/PeerBanHelper/error.log" stdoutFile="~/PeerBanHelper/output.log" executableMode="service" singleInstance="true" checkConsoleParameter="true">
<versionInfo include="true" fileDescription="${i18n:peerbanhelper.description}" legalCopyright="PBH-BTN Community - Licensed under GPLv3 licenses. https://www.gnu.org/licenses/quick-guide-gplv3.en.html" internalName="peerbanhelper" />
</executable>
<java mainClass="com.ghostchu.peerbanhelper.MainJumpLoader" vmParameters="-Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Djava.awt.headless=true -Dlauncher.directory=${launcher:sys.launcherDirectory}" arguments="nogui">
<java mainClass="com.ghostchu.peerbanhelper.MainJumpLoader" vmParameters="-Xmx512M -Xms16M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Djava.awt.headless=true -Dlauncher.directory=${launcher:sys.launcherDirectory}" arguments="nogui">
<classPath>
<scanDirectory location="libraries" failOnError="false" />
<archive location="PeerBanHelper.jar" failOnError="false" />
Expand All @@ -93,7 +93,7 @@
<executable name="PeerBanHelper-Updater" iconSet="true" executableDir="." failOnStderrOutput="false" executableMode="gui" singleInstance="true" checkConsoleParameter="true">
<versionInfo include="true" fileDescription="${i18n:peerbanhelper.description}" legalCopyright="PBH-BTN Community - Licensed under GPLv3 licenses. https://www.gnu.org/licenses/quick-guide-gplv3.en.html" internalName="peerbanhelper" />
</executable>
<java mainClass="com.ghostchu.peerbanhelper.MainEmpty" vmParameters="-Xmx512M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Dlauncher.directory=${launcher:sys.launcherDirectory}">
<java mainClass="com.ghostchu.peerbanhelper.MainEmpty" vmParameters="-Xmx512M -Xms16M -Xss512k -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j -Dlauncher.directory=${launcher:sys.launcherDirectory}">
<classPath>
<scanDirectory location="libraries" failOnError="false" />
<archive location="PeerBanHelper.jar" failOnError="false" />
Expand Down
Loading
Loading