Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-18 20:50:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #653 from throneproj/dev

Browse Source 
upstream
This commit is contained in:
parhelia512 2025-08-14 02:36:09 -04:00 committed by GitHub
commit 003ffc8566
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build.yml vendored
View File

@ -17,28 +17,28 @@ jobs:
include:
- cross_os: public_res
cross_arch: public_res
go_version: "1.24.6"
go_version: "1.25.0"
- cross_os: windows
cross_arch: amd64
go_version: "1.24.6"
go_version: "1.25.0"
- cross_os: linux
cross_arch: amd64
go_version: "1.24.6"
go_version: "1.25.0"
- cross_os: linux
cross_arch: arm64
go_version: "1.24.6"
go_version: "1.25.0"
- cross_os: darwin
cross_arch: amd64
go_version: "1.24.6"
go_version: "1.25.0"
- cross_os: darwin
cross_arch: arm64
go_version: "1.24.6"
go_version: "1.25.0"
- cross_os: windowslegacy
cross_arch: amd64
go_version: "1.24.6"
go_version: "1.25.0"
- cross_os: windowslegacy
cross_arch: 386
go_version: "1.24.6"
go_version: "1.25.0"
fail-fast: false
runs-on: ubuntu-latest
steps:

63
include/ui/setting/dialog_manage_routes.ui
View File

@ -295,7 +295,12 @@ For more information, see the document &quot;Configuration/DNS&quot;.</string>
</property>
<item>
<property name="text">
<string>tls://8.8.8.8</string>
<string notr="true">tls://8.8.8.8</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">tls://1.1.1.1</string>
</property>
</item>
<item>
@ -305,37 +310,7 @@ For more information, see the document &quot;Configuration/DNS&quot;.</string>
</item>
<item>
<property name="text">
<string notr="true">https://8.8.8.8/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://1.0.0.1/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://1.1.1.1/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://dns.google/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://one.one.one.one/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://[2001:4860:4860::8888]/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://[2606:4700:4700::1111]/dns-query</string>
<string notr="true">1.1.1.1</string>
</property>
</item>
</widget>
@ -370,26 +345,6 @@ For more information, see the document &quot;Configuration/DNS&quot;.</string>
<string notr="true">localhost</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://223.5.5.5/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://1.12.12.12/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://dns.alidns.com/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">https://doh.pub/dns-query</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">223.5.5.5</string>
@ -402,12 +357,12 @@ For more information, see the document &quot;Configuration/DNS&quot;.</string>
</item>
<item>
<property name="text">
<string notr="true">2400:3200::1</string>
<string notr="true">178.22.122.100</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">2402:4e00::</string>
<string notr="true">77.88.8.8</string>
</property>
</item>
</widget>

2
src/ui/mainwindow.cpp
View File

@ -141,7 +141,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
QStringList args;
args.push_back("-port");
args.push_back(Int2String(Configs::dataStore->core_port));
if (Configs::dataStore->flag_debug) args.push_back("-debug");
if (Configs::dataStore->log_level == "debug") args.push_back("-debug");
// Start core
runOnThread(