juewuy
|
cf35708a2a
|
Merge pull request #1243 from abcfy2/dev
检测端口冲突时区分 tcp 和 udp 端口，防止误报
|
2026-03-22 20:41:16 -07:00 |
|
Feng Yu
|
b750469047
|
除 UI 端口之外，其余端口采用 TCP + UDP 端口检测方式检测
|
2026-03-23 11:19:37 +08:00 |
|
Feng Yu
|
96f04a2225
|
修复 gateway 端口设置缺少配置端口重复检查的问题
在 7_gateway.sh 中设置 vms_port 和 sss_port 时，只检查了端口范围
和系统占用，未检查与 mix_port/redir_port/dns_port/db_port 的冲突。
当 CrashCore 停止时可能导致保存冲突端口配置，启动时绑定失败。
|
2026-03-23 00:26:12 +08:00 |
|
Feng Yu
|
b734fc6e1d
|
修复 tproxy 端口冲突检查遗漏 UDP 的问题
tproxy_port (redir_port + 1) 在 TProxy 模式下同时用于 TCP 和 UDP，
端口冲突检查应使用 all 而非 tcp
|
2026-03-23 00:00:16 +08:00 |
|
Feng Yu
|
c61c637e0d
|
修复端口重复检查逻辑，保持函数职责单一
- check_port 函数只负责检查端口范围和占用，移除重复检查逻辑
- 端口重复检查移到 inputport 函数中，只排除当前编辑的端口变量
- 修复编辑端口时错误地跳过所有已配置端口重复检查的 bug
|
2026-03-22 23:52:58 +08:00 |
|
Feng Yu
|
7ed66026be
|
检测端口冲突时区分 tcp 和 udp 端口，防止误报
Fix #1242
|
2026-03-22 23:22:33 +08:00 |
|
juewuy
|
21c4f8400b
|
~i18h
|
2026-03-22 21:38:10 +08:00 |
|
juewuy
|
75609fbc26
|
~i18
|
2026-03-22 21:11:32 +08:00 |
|
juewuy
|
c8dfb3780a
|
~i18
|
2026-03-22 20:53:55 +08:00 |
|
juewuy
|
373c9aacbd
|
Merge branch 'dev' of github.com:juewuy/ShellCrash into dev
|
2026-03-22 20:14:59 +08:00 |
|
juewuy
|
5f5ea62159
|
Merge pull request #1241 from abcfy2/dev
使用兼容性更强的 `rm -fr` 代替 `rm -d` 删除锁目录
|
2026-03-22 05:14:38 -07:00 |
|
Feng Yu
|
a9ddbba9fe
|
使用兼容性更强的 rm -fr 代替 rm -d 删除锁目录
Fix #1238
|
2026-03-22 20:12:38 +08:00 |
|
juewuy
|
2e71e78a9d
|
Merge pull request #1230 from cyxc1124/feature/pushdeer-self-hosted-support
feat: 增加 PushDeer 自建服务器支持
|
2026-03-22 05:06:40 -07:00 |
|
juewuy
|
c0e3992d40
|
已修改 scripts/lang/chs/7_gateway.lang
|
2026-03-22 20:03:54 +08:00 |
|
juewuy
|
1a00022ea2
|
已修改 scripts/lang/chs/7_gateway.lang
已修改 scripts/lang/en/7_gateway.lang
已修改 scripts/menus/7_gateway.sh
|
2026-03-14 04:37:49 -07:00 |
|
juewuy
|
8f781874e3
|
~同步上游改动
|
2026-03-14 03:52:28 -07:00 |
|
juewuy
|
b4363195f3
|
Merge pull request #1234 from juewuy/codex/implement-localization-in-menus-directory-la67cz
Add i18n language files and replace hardcoded UI strings across menus
|
2026-03-11 19:39:36 +08:00 |
|
juewuy
|
8bcaac1f66
|
feat(i18n): localize settings and dns menu leftovers
|
2026-03-11 19:39:05 +08:00 |
|
juewuy
|
e84bca30b9
|
Merge pull request #1233 from juewuy/codex/implement-localization-in-menus-directory-inwhs3
Introduce i18n support and add English/Chinese language files; replace hardcoded UI strings
|
2026-03-11 18:39:13 +08:00 |
|
juewuy
|
81d6b36c51
|
feat(i18n): localize set_crashdir and bot_tg menus
|
2026-03-11 18:38:54 +08:00 |
|
juewuy
|
0f96cc8c0e
|
Merge pull request #1232 from juewuy/codex/implement-localization-in-menus-directory
feat(i18n): localize uninstall and subconverter menus
|
2026-03-11 18:00:01 +08:00 |
|
juewuy
|
c5da0da08a
|
feat(i18n): localize uninstall and subconverter menus
|
2026-03-11 17:56:55 +08:00 |
|
cyxc1124
|
270dbd4299
|
feat: 增加 PushDeer 自建服务器支持
|
2026-03-05 23:44:23 +08:00 |
|
juewuy
|
ed635b871a
|
Merge pull request #1229 from DustinWin/dev
删除 games（GEOIP）和 gamesip 规则集
|
2026-03-04 17:38:31 +08:00 |
|
DustinWin
|
a32b05a391
|
删除 games（GEOIP）和 gamesip 规则集
|
2026-03-04 17:27:21 +08:00 |
|
juewuy
|
9e78370c5c
|
Merge pull request #1225 from DustinWin/dev
优化配置文件中的名称，避免歧义
|
2026-03-03 09:03:50 +08:00 |
|
DustinWin
|
c66c642ca2
|
优化配置文件中的名称，避免歧义
|
2026-03-03 01:52:05 +08:00 |
|
juewuy
|
bd9abee53f
|
更新 core_easy_update.yaml
|
2026-03-01 08:51:04 +08:00 |
|
juewuy
|
4f9b066015
|
更新 core_easy_update.yaml
|
2026-03-01 08:44:09 +08:00 |
|
juewuy
|
2c9eda6cc6
|
Merge pull request #1219 from DustinWin/dev
优化配置文件
|
2026-02-25 16:31:31 +08:00 |
|
DustinWin
|
a6cc498cbd
|
Merge branch 'dev' into dev
|
2026-02-25 15:33:57 +08:00 |
|
DustinWin
|
d032742984
|
优化配置文件
|
2026-02-25 15:31:22 +08:00 |
|
juewuy
|
c373b0b7b0
|
更新 DustinWin_RS_Full_NoAds.yaml
|
2026-02-20 13:46:26 +08:00 |
|
juewuy
|
31bf9915c6
|
~修复小闪存模式部分情况下启动报错的bug
|
2026-02-15 20:37:11 +08:00 |
|
juewuy
|
cae9613225
|
Merge branch 'master' into dev
|
2026-02-14 21:15:57 +08:00 |
|
juewuy
|
02a342cbd1
|
Merge branch 'master' of https://github.com/juewuy/ShellCrash into master
# Conflicts:
# scripts/starts/start_legacy_wd.sh
|
2026-02-14 21:15:43 +08:00 |
|
juewuy
|
1fbade025a
|
~优化保守模式守护进程
|
2026-02-14 21:14:13 +08:00 |
|
juewuy
|
65244e51da
|
~版本回退改为使用api链接
|
2026-02-14 20:48:52 +08:00 |
|
juewuy
|
1087f57893
|
Merge branch 'master' into dev
|
2026-02-14 20:31:11 +08:00 |
|
juewuy
|
f5394120e1
|
~优化保守模式守护进程
|
2026-02-14 20:30:53 +08:00 |
|
juewuy
|
0a52ef2531
|
cn-lite.mrs>cn.mrs
|
2026-02-11 18:07:51 +08:00 |
|
juewuy
|
24fc10a59f
|
~1.9.5a11 pkg
|
2026-02-10 20:14:26 +08:00 |
|
juewuy
|
5d4fcc2271
|
~修复singboxr本地生成失败的bug
|
2026-02-10 20:09:22 +08:00 |
|
juewuy
|
8083166256
|
~fix
|
2026-02-10 20:05:45 +08:00 |
|
juewuy
|
a15b431e97
|
Merge branch 'master' into dev
# Conflicts:
# ShellCrash.tar.gz
# bin/version
# version
|
2026-02-10 20:00:23 +08:00 |
|
juewuy
|
0589bc7881
|
~1.9.4rc7.1 pkg
|
2026-02-10 19:57:07 +08:00 |
|
juewuy
|
3b578c7988
|
~修复TG-BOT因守护进程错乱导致的各种bug
|
2026-02-10 19:56:38 +08:00 |
|
juewuy
|
7f73133657
|
Merge branch 'master' of https://github.com/juewuy/ShellCrash into master
# Conflicts:
# ShellCrash.tar.gz
|
2026-02-10 19:44:36 +08:00 |
|
juewuy
|
952e1a8f63
|
~1.9.4rc7 pkg
|
2026-02-10 19:44:11 +08:00 |
|
juewuy
|
2c6e23e54d
|
Merge branch 'master' into dev
# Conflicts:
# ShellCrash.tar.gz
# bin/version
# version
|
2026-02-10 19:41:35 +08:00 |
|