diff --git a/ProxySuper.Core/Models/Hosts/Host.cs b/ProxySuper.Core/Models/Hosts/Host.cs
index eb0b2c6..75432df 100644
--- a/ProxySuper.Core/Models/Hosts/Host.cs
+++ b/ProxySuper.Core/Models/Hosts/Host.cs
@@ -28,6 +28,8 @@ namespace ProxySuper.Core.Models.Hosts
public string PrivateKeyPath { get; set; }
+ public string PrivateKeyPassPhrase { get; set; }
+
public LocalProxy Proxy { get; set; }
public LoginSecretType SecretType { get; set; }
diff --git a/ProxySuper.Core/Services/MTProtoGoService.cs b/ProxySuper.Core/Services/MTProtoGoService.cs
index b6992c4..ce67bc2 100644
--- a/ProxySuper.Core/Services/MTProtoGoService.cs
+++ b/ProxySuper.Core/Services/MTProtoGoService.cs
@@ -42,7 +42,10 @@ namespace ProxySuper.Core.Services
Progress.Percentage = 50;
Progress.Step = "5. 生成密钥";
- Settings.SecretText = RunCmd($"docker run nineseconds/mtg generate-secret {Settings.Cleartext}").TrimEnd('\n');
+ //RunCmd("docker pull nineseconds/mtg:2"); //拉取v2版本命令,但是似乎不用也可以。
+ //下面的命令是v1版本的命令格式。可以保留。将来如启用v1,可用。
+ //Settings.SecretText = RunCmd($"docker run nineseconds/mtg:1 generate-secret -c {Settings.Cleartext} tls").TrimEnd('\n');
+ Settings.SecretText = RunCmd($"docker run nineseconds/mtg:2 generate-secret {Settings.Cleartext}").TrimEnd('\n');
Progress.Percentage = 65;
Progress.Step = "6. 生成配置文件";
@@ -55,7 +58,7 @@ namespace ProxySuper.Core.Services
Progress.Percentage = 80;
Progress.Step = "7. 启动MTProto服务";
- RunCmd($"docker run -d -v /etc/mtg.toml:/config.toml --name=mtg --restart=always -p {Settings.Port + ":" + Settings.Port} nineseconds/mtg");
+ RunCmd($"docker run -d -v /etc/mtg.toml:/config.toml --name=mtg --restart=always -p {Settings.Port + ":" + Settings.Port} nineseconds/mtg:2");
Progress.Desc = "设置自启动MTProto服务";
Progress.Step = "安装完成";
@@ -116,7 +119,8 @@ namespace ProxySuper.Core.Services
Progress.Percentage = 50;
Progress.Desc = "生成密钥";
- Settings.SecretText = RunCmd($"docker run nineseconds/mtg generate-secret {Settings.Cleartext}").TrimEnd('\n');
+ //Settings.SecretText = RunCmd($"docker run nineseconds/mtg:1 generate-secret -c {Settings.Cleartext} tls").TrimEnd('\n'); //v1版本
+ Settings.SecretText = RunCmd($"docker run nineseconds/mtg:2 generate-secret {Settings.Cleartext}").TrimEnd('\n');
Progress.Percentage = 65;
Progress.Desc = "修改配置文件";
diff --git a/ProxySuper.Core/Services/ServiceBase.cs b/ProxySuper.Core/Services/ServiceBase.cs
index 3a290dd..cf21daf 100644
--- a/ProxySuper.Core/Services/ServiceBase.cs
+++ b/ProxySuper.Core/Services/ServiceBase.cs
@@ -802,13 +802,13 @@ namespace ProxySuper.Core.Services
if (_host.SecretType == LoginSecretType.PrivateKey)
{
PrivateKeyFile keyFile;
- if (string.IsNullOrEmpty(_host.Password))
+ if (string.IsNullOrEmpty(_host.PrivateKeyPassPhrase))
{
keyFile = new PrivateKeyFile(_host.PrivateKeyPath);
}
else
{
- keyFile = new PrivateKeyFile(_host.PrivateKeyPath, _host.Password);
+ keyFile = new PrivateKeyFile(_host.PrivateKeyPath, _host.PrivateKeyPassPhrase);
}
authMethods.Add(new PrivateKeyAuthenticationMethod(_host.UserName, keyFile));
}
diff --git a/ProxySuper.WPF/Controls/HostControl.xaml b/ProxySuper.WPF/Controls/HostControl.xaml
index 0825885..caeda7a 100644
--- a/ProxySuper.WPF/Controls/HostControl.xaml
+++ b/ProxySuper.WPF/Controls/HostControl.xaml
@@ -17,7 +17,7 @@
-
+
@@ -36,6 +36,7 @@
+
@@ -105,7 +106,18 @@
Converter={StaticResource SecretTypeConverter},
ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
}"
- Content="{DynamicResource HostUploadSecretKey}" />
+ Content="{DynamicResource HostUploadSecretKey}" />
+
+
+
diff --git a/ProxySuper.WPF/Controls/V2raySettingsControl.xaml b/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
index 3043116..2ef43b9 100644
--- a/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
@@ -116,29 +116,28 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -153,6 +152,12 @@
VerticalAlignment="Center" />
+
+
+
+
+
+
@@ -437,13 +442,6 @@
-
-
-
-
-
-
-
diff --git a/ProxySuper.WPF/Controls/XraySettingsControl.xaml b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
index cabed7c..666f892 100644
--- a/ProxySuper.WPF/Controls/XraySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
@@ -145,7 +145,7 @@
-
+
diff --git a/ProxySuper.WPF/MainWindow.xaml b/ProxySuper.WPF/MainWindow.xaml
index 236ff23..a5fe412 100644
--- a/ProxySuper.WPF/MainWindow.xaml
+++ b/ProxySuper.WPF/MainWindow.xaml
@@ -8,7 +8,7 @@
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
Icon="/Resources/ProxySU.ico"
- Title="ProxySU" Height="600" Width="1000">
+ Title="ProxySU v4.1.10" Height="600" Width="1000">
diff --git a/ProxySuper.WPF/Properties/AssemblyInfo.cs b/ProxySuper.WPF/Properties/AssemblyInfo.cs
index 69453d3..3616ea4 100644
--- a/ProxySuper.WPF/Properties/AssemblyInfo.cs
+++ b/ProxySuper.WPF/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.1.6.0")]
-[assembly: AssemblyFileVersion("4.1.6.0")]
+[assembly: AssemblyVersion("4.1.10.0")]
+[assembly: AssemblyFileVersion("4.1.10.0")]
diff --git a/ProxySuper.WPF/Resources/Languages/en.xaml b/ProxySuper.WPF/Resources/Languages/en.xaml
index e2ab589..eeac2db 100644
--- a/ProxySuper.WPF/Resources/Languages/en.xaml
+++ b/ProxySuper.WPF/Resources/Languages/en.xaml
@@ -22,7 +22,7 @@
English
中文
正體
- Fr
+ فارسی
Helper
Github
@@ -40,7 +40,7 @@
ViewConfig
Delete
Up
- Done
+ Down
@@ -54,6 +54,7 @@
UploadKey
Password
PrivateKey
+ PKPassword
Proxy
@@ -118,6 +119,7 @@
v2ray Port
xray Port
default port is 443
+ More Parameters
Install
diff --git a/ProxySuper.WPF/Resources/Languages/fa_IR.xaml b/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
index b62eeaf..6fe5aea 100644
--- a/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
+++ b/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
@@ -3,44 +3,44 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib">
- Random
+ تصادفی
ذخیره
ذخیره و نصب
ذخیره به عنوان
نصب
تنظیمات
- The following is a static web page connection provided by netizens, please check whether there is an index.html file by yourself
+ موارد زیر یک اتصال صفحه وب ثابت است که توسط کاربران اینترنتی ارائه شده است، لطفاً بررسی کنید که آیا فایل index.html توسط خودتان وجود دارد یا خیر.
- Add Host
- Actions
- Export Settings
- Export Subscribe
- Get Root
+ میزبان اضافه کنید
+ عمل کنند
+ پیکربندی صادرات
+ اشتراک صادرات
+ اکانت روت را فعال کنید
- زبان
+ زبان(Language)
English
中文
正體
- Fr
+ فارسی
- Helper
+ یاور
Github
- UseRoot
- CertQuestion
- PrivateKey
+ اکانت روت را فعال کنید
+ در مورد گواهینامه
+ در مورد سوال
برچسب
آدرس
نوع
- Action
+ عمل کنند
نصب
ویرایش
- ViewConfig
- Delete
- Up
- Done
+ مشاهده پیکربندی
+ حذف
+ بالاا
+ پایین
@@ -50,10 +50,11 @@
نام کاربری
رمز عبور
پورت
- SecretType
- UploadKey
+ نوع تأیید ورود
+ کلید آپلود
رمز عبور
- PrivateKey
+ کلید خصوصی
+ رمز عبور PK
پروکسی
@@ -90,8 +91,8 @@
UUID
Flow
uTLS
- Multi User
- Multi Id split with ","
+ چند کاربره
+ چند شناسه تقسیم با ","
VLESS WS Path
VLESS KCP Seed
VLESS KCP Type
@@ -115,9 +116,10 @@
SS Port
Trojan Pwd
پورت تروجان
- v2ray Port
- xray Port
- default port is 443
+ v2ray بندر
+ xray بندر
+ پورت پیش فرض 443 است
+ پارامترهای بیشتر
نصب
diff --git a/ProxySuper.WPF/Resources/Languages/tw_cn.xaml b/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
index c2bfbcc..b734e33 100644
--- a/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
+++ b/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
@@ -22,7 +22,7 @@
English
中文
正體
- 法语
+ فارسی
幫助
Github
@@ -55,6 +55,7 @@
上傳Key
密碼
私鑰
+ 私鑰密碼
代理
IP/地址
@@ -119,6 +120,7 @@
V2ray端口
XRAY端口
默認端口443,不建議修改
+ 更多參數
一鍵安裝
diff --git a/ProxySuper.WPF/Resources/Languages/zh_cn.xaml b/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
index c9d3d73..56d1fac 100644
--- a/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
+++ b/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
@@ -22,7 +22,7 @@
English
中文
正體
- 法语
+ فارسی
帮助
Github
@@ -56,6 +56,7 @@
上传Key
密码
私钥
+ 私钥密码
代理
IP/地址
@@ -120,6 +121,7 @@
V2ray端口
XRAY端口
默认端口443,不建议修改
+ 更多参数
一键安装
diff --git a/ProxySuper.WPF/Views/Brook/BrookEditorView.xaml b/ProxySuper.WPF/Views/Brook/BrookEditorView.xaml
index c371f43..a8875e8 100644
--- a/ProxySuper.WPF/Views/Brook/BrookEditorView.xaml
+++ b/ProxySuper.WPF/Views/Brook/BrookEditorView.xaml
@@ -11,7 +11,7 @@
BorderBrush="#eee"
Icon="/Resources/ProxySU.ico"
WindowStartupLocation="CenterScreen"
- Title="BrookEditorView" Height="600" Width="1000">
+ Title="BrookEditorView" Height="640" Width="1000">
diff --git a/ProxySuper.WPF/Views/HomeView.xaml b/ProxySuper.WPF/Views/HomeView.xaml
index 063487a..10732c0 100644
--- a/ProxySuper.WPF/Views/HomeView.xaml
+++ b/ProxySuper.WPF/Views/HomeView.xaml
@@ -87,7 +87,10 @@
-
+
+
+
+
diff --git a/ProxySuper.WPF/Views/Hysteria/HysteriaEditorView.xaml b/ProxySuper.WPF/Views/Hysteria/HysteriaEditorView.xaml
index dd63cec..614a0cd 100644
--- a/ProxySuper.WPF/Views/Hysteria/HysteriaEditorView.xaml
+++ b/ProxySuper.WPF/Views/Hysteria/HysteriaEditorView.xaml
@@ -11,7 +11,7 @@
BorderBrush="#eee"
Icon="/Resources/ProxySU.ico"
WindowStartupLocation="CenterScreen"
- Title="Hysteria编辑配置" Height="600" Width="1000">
+ Title="Hysteria编辑配置" Height="640" Width="1000">
diff --git a/ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml b/ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml
index 4aa4dcc..720941c 100644
--- a/ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml
+++ b/ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml
@@ -11,7 +11,7 @@
BorderBrush="#eee"
Icon="/Resources/ProxySU.ico"
WindowStartupLocation="CenterScreen"
- Title="MTProto-Go编辑配置" Height="600" Width="1000">
+ Title="MTProto-Go编辑配置" Height="640" Width="1000">
diff --git a/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
index 2a51884..b9442a1 100644
--- a/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
+++ b/ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
@@ -11,7 +11,7 @@
BorderBrush="#eee"
Icon="/Resources/ProxySU.ico"
WindowStartupLocation="CenterScreen"
- Title="NaiveProxy编辑配置" Height="600" Width="1000">
+ Title="NaiveProxy编辑配置" Height="640" Width="1000">
diff --git a/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml b/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml
index 4ecee5b..59357b2 100644
--- a/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml
+++ b/ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml
@@ -11,7 +11,7 @@
BorderBrush="#eee"
Icon="/Resources/ProxySU.ico"
WindowStartupLocation="CenterScreen"
- Title="Trojan-Go编辑配置" Height="600" Width="1000">
+ Title="Trojan-Go编辑配置" Height="640" Width="1000">
diff --git a/README.md b/README.md
index eafa613..0d0aae7 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,14 @@ ProxySU调用[SSH.NET](https://github.com/sshnet/SSH.NET)库登录远程主机
* RSA in OpenSSL PEM and ssh.com format
* DSA in OpenSSL PEM and ssh.com format
* ECDSA 256/384/521 in OpenSSL PEM format
-* ED25519 in OpenSSH key format
+* ECDSA 256/384/521, ED25519 and RSA in OpenSSH key format
+可以使用以下密码方法之一对私钥进行加密:
+* DES-EDE3-CBC
+* DES-EDE3-CFB
+* DES-CBC
+* AES-128-CBC
+* AES-192-CBC
+* AES-256-CBC
见官方说明:
https://github.com/sshnet/SSH.NET#public-key-authentication
如果当前拥有的密钥格式不是以上几种,可以下载[puttygen](https://www.puttygen.com/)工具,将其转换成上面的格式。
@@ -108,7 +115,7 @@ Microsoft [.NET Framework 4.8](https://dotnet.microsoft.com/download/dotnet-fram
在使用遇到问题时,请先看一下[常见问题集锦](https://github.com/proxysu/windows/wiki/CommonError),如果还不能解决,可以到以上平台询问,个人精力有限,尽力解答。
-下版本添加 【Hysteria】
+