From b4ad1bde74f51e1e0b7cdf583fc8026c7072e9bb Mon Sep 17 00:00:00 2001
From: next-autumn <next-autumn@google.com>
Date: Mon, 19 Apr 2021 16:02:13 +0800
Subject: [PATCH] add shareLink to qrcode

---
 ProxySU_Core/Models/ShareLink.cs              |   4 +-
 .../xray/server/05_inbounds/VLESS_gRPC.json   |   8 +-
 .../Views/ClientInfo/ClientInfoWindow.xaml    | 181 ++++++++----------
 .../Views/ClientInfo/ClientInfoWindow.xaml.cs |  15 ++
 4 files changed, 105 insertions(+), 103 deletions(-)

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 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="200" />
         </Grid.ColumnDefinitions>
-        
-        <TabControl Grid.Column="0" BorderThickness="0,1,0,0" BorderBrush="#DDD">
-            <TabItem metro:HeaderedControlHelper.HeaderFontSize="20" Padding="10,5,10,5" Header="VLESS">
-                <TabControl 
-                    Background="#fff"
-                    SelectionChanged="BuildQrCode"
-                    Style="{StaticResource MaterialDesignNavigatilRailTabControl}"
-                    Padding="10">
-                    <TabItem Width="200"
-                             Tag="{x:Static models:XrayType.VLESS_TCP_XTLS}"
-                             IsEnabled="{Binding Settings.Checked_VLESS_TCP_XTLS}"
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}"
-                             Header="VLESS-TCP-XTLS">
-                        <local:VLESS_XTLS_Control />
-                    </TabItem>
 
-                    <TabItem Width="200" 
-                             Tag="{x:Static models:XrayType.VLESS_TCP}"
-                             IsEnabled="{Binding Settings.Checked_VLESS_TCP}" 
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
-                             Header="VLESS-TCP-TLS">
-                        <local:VLESS_TCP_TLS_Control />
-                    </TabItem>
-
-                    <TabItem Width="200"
-                             Tag="{x:Static models:XrayType.VLESS_WS}"
-                             IsEnabled="{Binding Settings.Checked_VLESS_WS}" 
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
-                             Header="VLESS-WebSocket-TLS">
-                        <local:VLESS_WS_TLS_Control />
-                    </TabItem>
-
-                    <TabItem Width="200"
-                             Tag="{x:Static models:XrayType.VLESS_KCP}"
-                             IsEnabled="{Binding Settings.Checked_VLESS_KCP}" 
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
-                             Header="VLESS-mKCP">
-                        <local:VLESS_KCP_Control />
-                    </TabItem>
-                    
-                    <!--<TabItem Width="200"
-                             IsEnabled="{Binding Settings.Checked_VLESS_gRPC}" 
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
-                             Header="VLESS-gRPC">
-                        <local:VLESS_gRPC_Control />
-                    </TabItem>-->
-                </TabControl>
-            </TabItem>
-
-            <TabItem metro:HeaderedControlHelper.HeaderFontSize="20" Padding="10,5,10,5" Header="VMESS">
-                <TabControl 
-                    SelectionChanged="BuildQrCode"
+        <TabControl Grid.Column="0"
                     Padding="10"
-                    Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
-                    <TabItem Width="200"     
-                             Tag="{x:Static models:XrayType.VMESS_TCP}"                 
-                             IsEnabled="{Binding Settings.Checked_VMESS_TCP}"
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
-                             Header="VMESS-TCP-TLS">
-                        <local:VMESS_TCP_TLS_Control />
-                    </TabItem>
-                    <TabItem Width="200" 
-                             Tag="{x:Static models:XrayType.VMESS_WS}"
-                             IsEnabled="{Binding Settings.Checked_VMESS_WS}"
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}"
-                             Header="VMESS-WebSocket-TLS">
-                        <local:VMESS_WS_TLS_Control />
-                    </TabItem>
-                    <TabItem Width="200" 
-                             Tag="{x:Static models:XrayType.VMESS_KCP}"
-                             IsEnabled="{Binding Settings.Checked_VMESS_KCP}"
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}"
-                             Header="VMESS-mKCP">
-                        <local:VMESS_KCP_Control />
-                    </TabItem>
-                </TabControl>
+                    BorderThickness="1,0,1,0" 
+                    BorderBrush="#DDD" 
+                    TabStripPlacement="Left"
+                    SelectionChanged="BuildQrCode">
+            <TabItem Width="200" Height="40"
+                     Tag="{x:Static models:XrayType.VLESS_TCP_XTLS}"
+                     IsEnabled="{Binding Settings.Checked_VLESS_TCP_XTLS}"
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}"
+                     Header="VLESS-TCP-XTLS">
+                <local:VLESS_XTLS_Control />
             </TabItem>
 
-            <TabItem metro:HeaderedControlHelper.HeaderFontSize="20" Padding="10,5,10,5" Header="Trojan">
-                <TabControl 
-                    SelectionChanged="BuildQrCode"
-                    Padding="10"
-                    Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
-                    <TabItem Width="200" 
-                             Tag="{x:Static models:XrayType.Trojan_TCP}"
-                             IsEnabled="{Binding Settings.Checked_Trojan_TCP}"
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}"
-                             Header="Trojan-TCP">
-                        <local:Trojan_TCP_Control />
-                    </TabItem>
-                </TabControl>
+            <TabItem Width="200" Height="40"
+                     Tag="{x:Static models:XrayType.VLESS_TCP}"
+                     IsEnabled="{Binding Settings.Checked_VLESS_TCP}" 
+                     metro:HeaderedControlHelper.HeaderMargin="0"
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
+                     Header="VLESS-TCP-TLS">
+                <local:VLESS_TCP_TLS_Control />
             </TabItem>
 
-            <TabItem metro:HeaderedControlHelper.HeaderFontSize="20" Padding="10,5,10,5" Header="ShadowSocks">
-                <TabControl 
-                    SelectionChanged="BuildQrCode"
-                    Padding="10"
-                    Style="{StaticResource MaterialDesignNavigatilRailTabControl}">
-                    <TabItem Width="200"
-                             Tag="{x:Static models:XrayType.ShadowsocksAEAD}"
-                             IsEnabled="{Binding Settings.CheckedShadowSocks}"
-                             Style="{StaticResource MaterialDesignNavigationRailTabItem}"
-                             Header="ShadowSocks">
-                        <local:ShadowSocksControl />
-                    </TabItem>
-                </TabControl>
+            <TabItem Width="200" Height="40"
+                     Tag="{x:Static models:XrayType.VLESS_WS}"
+                     IsEnabled="{Binding Settings.Checked_VLESS_WS}" 
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
+                     Header="VLESS-WebSocket-TLS">
+                <local:VLESS_WS_TLS_Control />
             </TabItem>
+
+            <TabItem Width="200" Height="40"
+                     Tag="{x:Static models:XrayType.VLESS_KCP}"
+                     IsEnabled="{Binding Settings.Checked_VLESS_KCP}" 
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
+                     Header="VLESS-mKCP">
+                <local:VLESS_KCP_Control />
+            </TabItem>
+
+            <!--<TabItem Width="200"
+                     Tag="{x:Static models:XrayType.VLESS_gRPC}"
+                     IsEnabled="{Binding Settings.Checked_VLESS_gRPC}" 
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
+                     Header="VLESS-gRPC">
+                <local:VLESS_gRPC_Control />
+            </TabItem>-->
+            
+            <TabItem Width="200" Height="40"     
+                     Tag="{x:Static models:XrayType.VMESS_TCP}"                 
+                     IsEnabled="{Binding Settings.Checked_VMESS_TCP}"
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}" 
+                     Header="VMESS-TCP-TLS">
+                <local:VMESS_TCP_TLS_Control />
+            </TabItem>
+
+            <TabItem Width="200" Height="40"     
+                     Tag="{x:Static models:XrayType.VMESS_WS}"
+                     IsEnabled="{Binding Settings.Checked_VMESS_WS}"
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}"
+                     Header="VMESS-WebSocket-TLS">
+                <local:VMESS_WS_TLS_Control />
+            </TabItem>
+
+            <TabItem Width="200" Height="40"     
+                     Tag="{x:Static models:XrayType.VMESS_KCP}"
+                     IsEnabled="{Binding Settings.Checked_VMESS_KCP}"
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}"
+                     Header="VMESS-mKCP">
+                <local:VMESS_KCP_Control />
+            </TabItem>
+
+            <TabItem Width="200" Height="40"     
+                     Tag="{x:Static models:XrayType.Trojan_TCP}"
+                     IsEnabled="{Binding Settings.Checked_Trojan_TCP}"
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}"
+                     Header="Trojan-TCP">
+                <local:Trojan_TCP_Control />
+            </TabItem>
+
+            <TabItem Width="200" Height="40"     
+                     Tag="{x:Static models:XrayType.ShadowsocksAEAD}"
+                     IsEnabled="{Binding Settings.CheckedShadowSocks}"
+                     Style="{StaticResource MaterialDesignNavigationRailTabItem}"
+                     Header="ShadowSocks">
+                <local:ShadowSocksControl />
+            </TabItem>
+
         </TabControl>
 
         <Image Grid.Column="1" Width="150" Height="150" x:Name="QrImage" />
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)
             {