From 4d3ad778a626f1997bc13f77e1c4dc5da6992ecc Mon Sep 17 00:00:00 2001
From: next-autumn <next-autumn@google.com>
Date: Wed, 10 Mar 2021 10:50:34 +0800
Subject: [PATCH] merge

---
 ProxySU_Core/ViewModels/Developers/Project.cs     | 6 +++---
 ProxySU_Core/ViewModels/Developers/XrayProject.cs | 6 ++++++
 ProxySU_Core/Views/ClientInfoWindow.xaml.cs       | 2 ++
 ProxySU_Core/Views/MainWindow.xaml                | 4 ++--
 ProxySU_Core/Views/TerminalWindow.xaml            | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ProxySU_Core/ViewModels/Developers/Project.cs b/ProxySU_Core/ViewModels/Developers/Project.cs
index 73057f8..8b78a5e 100644
--- a/ProxySU_Core/ViewModels/Developers/Project.cs
+++ b/ProxySU_Core/ViewModels/Developers/Project.cs
@@ -530,15 +530,15 @@ namespace ProxySU_Core.ViewModels.Developers
         {
             if (CmdType == CmdType.Apt)
             {
-                return "echo y | apt-get update ";
+                return "apt-get update";
             }
             else if (CmdType == CmdType.Dnf)
             {
-                return "echo y | dnf update ";
+                return "dnf clean all;dnf makecache";
             }
             else if (CmdType == CmdType.Yum)
             {
-                return "echo y | yum update ";
+                return "yum clean all;yum makecache";
             }
 
             throw new Exception("未识别的系统");
diff --git a/ProxySU_Core/ViewModels/Developers/XrayProject.cs b/ProxySU_Core/ViewModels/Developers/XrayProject.cs
index 802bc3e..17900f1 100644
--- a/ProxySU_Core/ViewModels/Developers/XrayProject.cs
+++ b/ProxySU_Core/ViewModels/Developers/XrayProject.cs
@@ -35,7 +35,9 @@ namespace ProxySU_Core.ViewModels.Developers
             EnsureSystemEnv();
             this.InstallCertToXray();
             RunCmd("systemctl restart xray");
+            WriteOutput("************");
             WriteOutput("安装证书完成");
+            WriteOutput("************");
         }
 
         public void UploadWeb(Stream stream)
@@ -51,7 +53,9 @@ namespace ProxySU_Core.ViewModels.Developers
             RunCmd("unzip /usr/share/caddy/caddy.zip -d /usr/share/caddy");
             RunCmd("chmod -R 777 /usr/share/caddy");
             RunCmd("systemctl restart caddy");
+            WriteOutput("************");
             WriteOutput("上传网站模板完成");
+            WriteOutput("************");
         }
 
         public void ReinstallCaddy()
@@ -60,7 +64,9 @@ namespace ProxySU_Core.ViewModels.Developers
             EnsureSystemEnv();
             InstallCaddy();
             UploadCaddyFile();
+            WriteOutput("************");
             WriteOutput("重装Caddy完成");
+            WriteOutput("************");
         }
 
 
diff --git a/ProxySU_Core/Views/ClientInfoWindow.xaml.cs b/ProxySU_Core/Views/ClientInfoWindow.xaml.cs
index 600d0cb..a0cf9b7 100644
--- a/ProxySU_Core/Views/ClientInfoWindow.xaml.cs
+++ b/ProxySU_Core/Views/ClientInfoWindow.xaml.cs
@@ -26,6 +26,8 @@ namespace ProxySU_Core.Views
         public ClientInfoWindow(Record record)
         {
             InitializeComponent();
+            ResizeMode = ResizeMode.NoResize;
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
 
             Settings = new XraySettingsViewModel(record.Settings);
             DataContext = this;
diff --git a/ProxySU_Core/Views/MainWindow.xaml b/ProxySU_Core/Views/MainWindow.xaml
index 8e0d241..9fe598d 100644
--- a/ProxySU_Core/Views/MainWindow.xaml
+++ b/ProxySU_Core/Views/MainWindow.xaml
@@ -108,9 +108,9 @@
             <TabItem    
                 Width="160"          
                 Style="{StaticResource MaterialDesignNavigationRailTabItem}"
-                Header="V2ray">
+                Header="其他功能">
                 <StackPanel>
-                    <TextBox />
+                    <TextBlock Text="还不知道要点啥...看大家建议？" />
                 </StackPanel>
             </TabItem>
         </TabControl>
diff --git a/ProxySU_Core/Views/TerminalWindow.xaml b/ProxySU_Core/Views/TerminalWindow.xaml
index 89d9b7c..1bfd9f3 100644
--- a/ProxySU_Core/Views/TerminalWindow.xaml
+++ b/ProxySU_Core/Views/TerminalWindow.xaml
@@ -56,7 +56,7 @@
         </StackPanel>
 
         <StackPanel Margin="10,0,0,0">
-            <Label Content="静态网页模版（感谢网友推荐）" />
+            <Label Content="静态网页模版（感谢网友推荐），将网站压缩包上传到服务区即可。" />
             <TextBlock>
                 <Hyperlink NavigateUri="https://www.themezy.com" Click="OpenLink">Themezy</Hyperlink>
             </TextBlock>