mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-22 05:06:08 +03:00
Code Issues Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
next-autumn 2021-03-10 10:50:34 +08:00
parent 25f322d35c
commit 4d3ad778a6
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ProxySU_Core/ViewModels/Developers/Project.cs
View File

@ -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("未识别的系统");

6
ProxySU_Core/ViewModels/Developers/XrayProject.cs
View File

@ -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("************");
}

2
ProxySU_Core/Views/ClientInfoWindow.xaml.cs
View File

@ -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;

4
ProxySU_Core/Views/MainWindow.xaml
View File

@ -108,9 +108,9 @@
<TabItem
Width="160"
Style="{StaticResource MaterialDesignNavigationRailTabItem}"
Header="V2ray">
Header="其他功能">
<StackPanel>
<TextBox />
<TextBlock Text="还不知道要点啥...看大家建议？" />
</StackPanel>
</TabItem>
</TabControl>

2
ProxySU_Core/Views/TerminalWindow.xaml
View File

@ -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>