diff --git a/ProxySU_Core/Models/ShareLink.cs b/ProxySU_Core/Models/ShareLink.cs
index 8036caf..8c606a4 100644
--- a/ProxySU_Core/Models/ShareLink.cs
+++ b/ProxySU_Core/Models/ShareLink.cs
@@ -43,7 +43,7 @@ namespace ProxySU_Core.Models
var _port = settings.ShadowSocksPort;
var base64URL = Base64.Encode($"{_method}:{_password}@{_server}:{_port}");
- return "ss://" + base64URL;
+ return "ss://" + base64URL + "#ShadowSocks";
}
private static string BuildVmessShareLink(XrayType xrayType, XraySettings settings)
@@ -156,7 +156,7 @@ namespace ProxySU_Core.Models
if (xrayType != XrayType.Trojan_TCP)
{
// 4.3 传输层相关段
- parametersURL = $"?type={_type}&encryption={_encryption}&security={_security}&host={_host}&path={HttpUtility.UrlEncode(_path)}&headerType={_headerType}";
+ parametersURL = $"?type={_type}&encryption={_encryption}&security={_security}&path={HttpUtility.UrlEncode(_path)}&headerType={_headerType}";
// kcp
if (xrayType == XrayType.VLESS_KCP)
diff --git a/ProxySU_Core/Templates/xray/server/05_inbounds/VLESS_gRPC.json b/ProxySU_Core/Templates/xray/server/05_inbounds/VLESS_gRPC.json
index 9ae0b21..319888d 100644
--- a/ProxySU_Core/Templates/xray/server/05_inbounds/VLESS_gRPC.json
+++ b/ProxySU_Core/Templates/xray/server/05_inbounds/VLESS_gRPC.json
@@ -13,7 +13,13 @@
"streamSettings": {
"network": "grpc",
"grpcSettings": {
- "serviceName": ""
+ "serviceName": "",
+ "certificates": [
+ {
+ "certificateFile": "/usr/local/etc/xray/ssl/xray_ssl.crt",
+ "keyFile": "/usr/local/etc/xray/ssl/xray_ssl.key"
+ }
+ ]
}
}
}
diff --git a/ProxySU_Core/Views/ClientInfo/ClientInfoWindow.xaml b/ProxySU_Core/Views/ClientInfo/ClientInfoWindow.xaml
index 701f8d7..a367561 100644
--- a/ProxySU_Core/Views/ClientInfo/ClientInfoWindow.xaml
+++ b/ProxySU_Core/Views/ClientInfo/ClientInfoWindow.xaml
@@ -16,113 +16,94 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ BorderThickness="1,0,1,0"
+ BorderBrush="#DDD"
+ TabStripPlacement="Left"
+ SelectionChanged="BuildQrCode">
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ProxySU_Core/Views/ClientInfo/ClientInfoWindow.xaml.cs b/ProxySU_Core/Views/ClientInfo/ClientInfoWindow.xaml.cs
index 2eed951..f69f4f8 100644
--- a/ProxySU_Core/Views/ClientInfo/ClientInfoWindow.xaml.cs
+++ b/ProxySU_Core/Views/ClientInfo/ClientInfoWindow.xaml.cs
@@ -36,12 +36,27 @@ namespace ProxySU_Core.Views.ClientInfo
DataContext = this;
}
+ private void SelectDefault(object sender, SelectionChangedEventArgs e)
+ {
+ var tabControl = e.Source as TabControl;
+ var item = (tabControl.SelectedItem as TabItem);
+ var itemControl = item.Content as ContentControl;
+ if (itemControl == null) return;
+ Console.WriteLine(itemControl.Tag);
+ }
+
private void BuildQrCode(object sender, SelectionChangedEventArgs e)
{
var tabControl = e.Source as TabControl;
var item = (tabControl.SelectedItem as TabItem);
+ if (item == null) return;
var type = (XrayType)item.Tag;
+ if (type == null) return;
+ BuildQrCode(type);
+ }
+ private void BuildQrCode(XrayType type)
+ {
string shareLink = string.Empty;
switch (type)
{