From 1e05cacd3accaf9e0f01dc9373aac116cfc8e45c Mon Sep 17 00:00:00 2001 From: gekoukate <1670391937@qq.com> Date: Wed, 17 May 2023 18:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Images/calendar.png | Bin 0 -> 3934 bytes StartServerWPF.Modules.Main/JsonParser.cs | 17 ++-- .../StartServerWPF.Modules.Main.csproj | 6 ++ .../ViewModels/MainViewModel.cs | 91 ++++++++++-------- .../ViewModels/SetParamDialogViewModel.cs | 37 ++++--- .../Views/MainView.xaml | 10 +- .../Views/SetParamDialog.xaml | 12 ++- .../Views/SetParamDialog.xaml.cs | 36 +++++++ StartServerWPF/Views/MainWindow.xaml | 2 +- 9 files changed, 135 insertions(+), 76 deletions(-) create mode 100644 StartServerWPF.Modules.Main/Images/calendar.png diff --git a/StartServerWPF.Modules.Main/Images/calendar.png b/StartServerWPF.Modules.Main/Images/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..58733c63860a844f6280f7710d6ef5ac699c9d66 GIT binary patch literal 3934 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 literal 0 HcmV?d00001 diff --git a/StartServerWPF.Modules.Main/JsonParser.cs b/StartServerWPF.Modules.Main/JsonParser.cs index 58fda2a..24081cc 100644 --- a/StartServerWPF.Modules.Main/JsonParser.cs +++ b/StartServerWPF.Modules.Main/JsonParser.cs @@ -10,8 +10,14 @@ using StartServerWPF.Modules.Main.Model; namespace StartServerWPF.Modules.Main { - public static class JsonParser + public class JsonParser { + // public static string zyProPath = @"\serverprogram"; + + public static string systemConfigPath = "SystemConfig.json"; + public static string systemLogFileName; + public static string serverVision = "20230517"; + public static SystemConfig ReadSystemJsonFile(string jsonFile) { //try @@ -93,15 +99,6 @@ namespace StartServerWPF.Modules.Main { string str = JsonConvert.SerializeObject(sc, Formatting.Indented); File.WriteAllText(jsonFile, str); - //using (StreamWriter sw = new StreamWriter(jsonFile)) - //{ - // JsonSerializer js = new JsonSerializer(); - // JsonWriter jw = new JsonTextWriter(sw); - - // js.Serialize(jw, sc); - // jw.Close(); - // sw.Close(); - //} } public static void UpdateApmsJson(string apmsJsonPath, string savePath) diff --git a/StartServerWPF.Modules.Main/StartServerWPF.Modules.Main.csproj b/StartServerWPF.Modules.Main/StartServerWPF.Modules.Main.csproj index 70b599b..25de221 100644 --- a/StartServerWPF.Modules.Main/StartServerWPF.Modules.Main.csproj +++ b/StartServerWPF.Modules.Main/StartServerWPF.Modules.Main.csproj @@ -4,6 +4,9 @@ true True + + + @@ -15,4 +18,7 @@ ..\StartServerWPF\DotRas.dll + + + \ No newline at end of file diff --git a/StartServerWPF.Modules.Main/ViewModels/MainViewModel.cs b/StartServerWPF.Modules.Main/ViewModels/MainViewModel.cs index e21c894..89b1160 100644 --- a/StartServerWPF.Modules.Main/ViewModels/MainViewModel.cs +++ b/StartServerWPF.Modules.Main/ViewModels/MainViewModel.cs @@ -23,8 +23,8 @@ namespace StartServerWPF.Modules.Main.ViewModels public MainViewModel(IDialogService dialogService) { Message = "View A from your Prism Module"; - Console.WriteLine(System.Environment.CurrentDirectory + "\\" + systemConfigPath); - sc = JsonParser.ReadSystemJsonFile(systemConfigPath); + Console.WriteLine(System.Environment.CurrentDirectory + "\\" + JsonParser.systemConfigPath); + sc = JsonParser.ReadSystemJsonFile(JsonParser.systemConfigPath); int moniTimeInd = sc.proMonitor.ProParams.IndexOf("-btime"); string moniTimeStr = sc.proMonitor.ProParams.Substring(moniTimeInd + 7); int moniTimeIndEnd = moniTimeStr.IndexOf(">"); @@ -54,30 +54,47 @@ namespace StartServerWPF.Modules.Main.ViewModels } private DateTime startTime; private DateTime moniStartTime; - public DateTime StartTime { get => startTime; set => startTime = value; } - public DateTime MoniStartTime { get => moniStartTime; set => moniStartTime = value; } + public DateTime StartTime { get => startTime; set => SetProperty(ref startTime, value); } + public DateTime MoniStartTime { get => moniStartTime; set => SetProperty(ref moniStartTime, value); } private string runTime; public string RunTime { get { return runTime; } - set { runTime = value; } + set { SetProperty(ref runTime, value); } } private string vPNStatus; public string VPNStatus { get { return vPNStatus; } - set { vPNStatus = value; } + set { SetProperty(ref vPNStatus, value); + } } private string vpnIP; public string VpnIP { get { return vpnIP; } - set { vpnIP = value; } + set { SetProperty(ref vpnIP, value); } + } + private string vPNStatusForeColor; + + public string VPNStatusForeColor + { + get { return vPNStatusForeColor; } + set { SetProperty(ref vPNStatusForeColor, value); } } + private bool vPNIsConnect; + + public bool VPNIsConnect + { + get { return vPNIsConnect; } + set { SetProperty(ref vPNIsConnect, value); } + } + + private ObservableCollection reciveDataSource=new ObservableCollection(); @@ -99,7 +116,7 @@ namespace StartServerWPF.Modules.Main.ViewModels public int SelectedIndex { get { return selectedIndex; } - set { selectedIndex = value; } + set { SetProperty(ref selectedIndex, value); } } private bool isEnabledStart; @@ -107,12 +124,12 @@ namespace StartServerWPF.Modules.Main.ViewModels public bool IsEnabledStart { get { return isEnabledStart; } - set { isEnabledStart = value; } + set { SetProperty(ref isEnabledStart, value); } } private int proMonInterval = 10; public int ProMonInterval { get => proMonInterval; - set => proMonInterval = value; + set => SetProperty(ref proMonInterval, value); } #endregion @@ -144,7 +161,7 @@ namespace StartServerWPF.Modules.Main.ViewModels KillProcess(sc.proApms); KillProcess(sc.proMonitor); string logStr = DateTime.Now.ToString("s") + "\t程序关闭"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); //switch (kserindex) //{ // case -1: @@ -179,7 +196,7 @@ namespace StartServerWPF.Modules.Main.ViewModels vpn.ConnectVPN(sc.vpnInfo.VpnName, sc.vpnInfo.VpnUserName, sc.vpnInfo.VpnPsw); Thread.Sleep(1000); string logStr = DateTime.Now.ToString("s") + "\tVPN手动连接"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); SetControlstatus(); } @@ -192,7 +209,7 @@ namespace StartServerWPF.Modules.Main.ViewModels SetControlstatus(); Thread.Sleep(100); string logStr = DateTime.Now.ToString("s") + "\tVPN手动断开"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); } } @@ -268,7 +285,7 @@ namespace StartServerWPF.Modules.Main.ViewModels // labelStartTime.Text = "启动时间：" + StartTime.ToString(); RunTime = "运行时间：" + DateDiff(DateTime.Now, StartTime); string logStr = StartTime.ToString("s") + "\t服务器程序启动"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); // progressBar1.Style = ProgressBarStyle.Marquee; IsEnabledStart = false; @@ -320,7 +337,7 @@ namespace StartServerWPF.Modules.Main.ViewModels timer1.Stop(); // progressBar1.Style = ProgressBarStyle.Continuous; string logStr = DateTime.Now.ToString("s") + "\t服务器程序关闭"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); // labelStartTime.Text = "启动时间："; StartTime = new DateTime(); @@ -427,14 +444,6 @@ namespace StartServerWPF.Modules.Main.ViewModels [DllImport("shell32.dll")] public static extern int ShellExecute(IntPtr hwnd, StringBuilder lpszOp, StringBuilder lpszFile, StringBuilder lpszParams, StringBuilder lpszDir, int FsShowCmd); - public string proPath; - public string zyProPath = @"\serverprogram"; - - public string systemConfigPath = "SystemConfig.json"; - public string systemLogFileName; - - public int showState = 0; - public string serverVision = "20210629"; public VPNHelper vpn; @@ -449,7 +458,7 @@ namespace StartServerWPF.Modules.Main.ViewModels public void InitializeParams() { timer1.Interval = ProMonInterval * 1000; - this.Message = "服务器版本：" + serverVision; + this.Message = "服务器版本：" + JsonParser.serverVision; IntervalTimesSource.Add(5); IntervalTimesSource.Add(10); IntervalTimesSource.Add(15); @@ -457,9 +466,9 @@ namespace StartServerWPF.Modules.Main.ViewModels IntervalTimesSource.Add(30); IntervalTimesSource.Add(60); SelectedIndex = 1; - systemLogFileName = "SerLog_" + DateTime.Now.ToString("yyyyMMdd") + ".txt"; + JsonParser.systemLogFileName = "SerLog_" + DateTime.Now.ToString("yyyyMMdd") + ".txt"; string logStr = DateTime.Now.ToString("s") + "\t程序启动"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); //CheckIp(); } #region 方法 @@ -582,7 +591,7 @@ namespace StartServerWPF.Modules.Main.ViewModels Thread.Sleep(20); ReciveDataSource.Add("服务器程序重启成功"); string logStr = DateTime.Now.ToString("s") + "\t服务器程序" + sc.proServer.ProName + "重启"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); } sfp = FindProcess(sc.proRecv); if (sfp == 0) @@ -597,7 +606,7 @@ namespace StartServerWPF.Modules.Main.ViewModels Thread.Sleep(20); ReciveDataSource.Add("接收数据程序重启成功"); string logStr = DateTime.Now.ToString("s") + "\t接收数据程序" + sc.proRecv.ProName + "重启"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); } sfp = FindProcess(sc.proApms); if (sfp == 0) @@ -612,7 +621,7 @@ namespace StartServerWPF.Modules.Main.ViewModels Thread.Sleep(20); ReciveDataSource.Add("自动识别程序重启成功"); string logStr = DateTime.Now.ToString("s") + "\t自动识别程序" + sc.proApms.ProName + "重启"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); } sfp = FindProcess(sc.proMonitor); if (sfp == 0) @@ -627,7 +636,7 @@ namespace StartServerWPF.Modules.Main.ViewModels Thread.Sleep(20); ReciveDataSource.Add("网页服务程序重启成功"); string logStr = DateTime.Now.ToString("s") + "\t网页服务程序" + sc.proMonitor.ProName + "重启"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); } RunTime = "运行时间：" + DateDiff(DateTime.Now, StartTime); vpnStatus = vpn.CheckVpnStatus(sc.vpnInfo.VpnName); @@ -636,7 +645,7 @@ namespace StartServerWPF.Modules.Main.ViewModels vpn.ConnectVPN(sc.vpnInfo.VpnName, sc.vpnInfo.VpnUserName, sc.vpnInfo.VpnPsw); Thread.Sleep(1000); string logStr = DateTime.Now.ToString("s") + "\tVPN断开，重连"; - WriteSerLog(sc.vpnInfo.SystemLogPath + systemLogFileName, logStr); + WriteSerLog(sc.vpnInfo.SystemLogPath + JsonParser.systemLogFileName, logStr); } } public void GetLocalIp() @@ -664,20 +673,24 @@ namespace StartServerWPF.Modules.Main.ViewModels if (vpnStatus) { //gbServerControl.Enabled = true; - // buttonConnectVPN.Enabled = false; + // buttonConnectVPN.Enabled = false; - // buttonDisconnectVPN.Enabled = true; - // labelVPNstatus.ForeColor = Color.Blue; + // buttonDisconnectVPN.Enabled = true; + // labelVPNstatus.ForeColor = Color.Blue; + VPNIsConnect = true; + VPNStatusForeColor = "#FF0000FF"; VPNStatus = "VPN已连接"; - VpnIP = "本机IP：" + vpn.GetLocalIp(); + VpnIP = vpn.GetLocalIp(); } else { - // gbServerControl.Enabled = false; - // buttonConnectVPN.Enabled = true; + // gbServerControl.Enabled = false; + // buttonConnectVPN.Enabled = true; - // buttonDisconnectVPN.Enabled = false; - // labelVPNstatus.ForeColor = Color.Red; + // buttonDisconnectVPN.Enabled = false; + // labelVPNstatus.ForeColor = Color.Red; + VPNIsConnect = false; + VPNStatusForeColor = "#FFFF0000"; VPNStatus = "VPN未连接"; } } diff --git a/StartServerWPF.Modules.Main/ViewModels/SetParamDialogViewModel.cs b/StartServerWPF.Modules.Main/ViewModels/SetParamDialogViewModel.cs index 6c54b69..e796609 100644 --- a/StartServerWPF.Modules.Main/ViewModels/SetParamDialogViewModel.cs +++ b/StartServerWPF.Modules.Main/ViewModels/SetParamDialogViewModel.cs @@ -33,11 +33,13 @@ namespace StartServerWPF.Modules.Main.ViewModels { // _title = "编辑" + _title; var _type = parameters.GetValue("type"); - // _title = (_type == 0 ? "新增" : "修改") + _title; - MainModel = parameters.GetValue("model"); + // _title = (_type == 0 ? "新增" : "修改") + _title; + _systemConfig = parameters.GetValue("model"); + MainModel= _systemConfig.vpnInfo; MoniTime= parameters.GetValue("moniTime"); } + private SystemConfig _systemConfig; private VpnInfo _mainModel = new VpnInfo(); public VpnInfo MainModel { @@ -53,12 +55,17 @@ namespace StartServerWPF.Modules.Main.ViewModels public DelegateCommand FilePathSaveCommand=> new(()=> { + updateJson = false; System.Windows.Forms.FolderBrowserDialog fbd = new System.Windows.Forms.FolderBrowserDialog(); fbd.SelectedPath = MainModel.DataSavePath; fbd.ShowNewFolderButton = true; if (fbd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { MainModel.DataSavePath = fbd.SelectedPath; + if (MainModel.DataSavePath != _systemConfig.vpnInfo.DataSavePath) + { + updateJson = true; + } } }); public DelegateCommand LogPathSaveCommand=> new(() => @@ -75,6 +82,7 @@ namespace StartServerWPF.Modules.Main.ViewModels MainModel.SystemLogPath = fbd.SelectedPath; } }); + bool updateJson = false; public ICommand ConfirmCommand { get => new DelegateCommand(() => @@ -83,29 +91,20 @@ namespace StartServerWPF.Modules.Main.ViewModels // 数据校验（关键字段不能为空、年龄做数字区间的校验、做UserName的唯一检查（自定义特性检查） if (string.IsNullOrEmpty(MainModel.VpnName) || string.IsNullOrEmpty(MainModel.VpnIP)) { - MessageBox.Show("内容不能为空", "提示", System.Windows.MessageBoxButton.OK); + MessageBox.Show("内容不能为空", "提示", MessageBoxButton.OK); return; } if (MessageBox.Show("确认修改？", "参数设置", MessageBoxButton.OKCancel, MessageBoxImage.Exclamation) == MessageBoxResult.OK) { - //if (updateSysConfig) - //{ - // JsonParser.WriteSystemConfigFile(fm.systemConfigPath, fsc); - //} - //if (updateJson) - //{ - // JsonParser.UpdateRecvJson(fm.sc.proRecv.ProPath + fm.sc.proRecv.JsonPath, fm.sc.DataSavePath); - // JsonParser.UpdateApmsJson(fm.sc.proApms.ProPath + fm.sc.proApms.JsonPath, fm.sc.DataSavePath); - //} - //var device = _deviceInfoModel.deviceInfoModelList.Where(device => device.Index == MainModel.Index).FirstOrDefault(); - //if (device != null) - //{ - // _deviceInfoModel.deviceInfoModelList.Remove(device); - // _deviceInfoModel.deviceInfoModelList.Add(MainModel); - // _deviceInfoModel.Save(); - //} + + JsonParser.WriteSystemConfigFile(JsonParser.systemConfigPath, _systemConfig); + if (updateJson) + { + JsonParser.UpdateRecvJson(_systemConfig.proRecv.ProPath + _systemConfig.proRecv.JsonPath, _systemConfig.vpnInfo.DataSavePath); + JsonParser.UpdateApmsJson(_systemConfig.proApms.ProPath + _systemConfig.proApms.JsonPath, _systemConfig.vpnInfo.DataSavePath); + } RequestClose?.Invoke(new DialogResult(ButtonResult.OK)); } }); diff --git a/StartServerWPF.Modules.Main/Views/MainView.xaml b/StartServerWPF.Modules.Main/Views/MainView.xaml index 02775b3..4bf0968 100644 --- a/StartServerWPF.Modules.Main/Views/MainView.xaml +++ b/StartServerWPF.Modules.Main/Views/MainView.xaml @@ -39,15 +39,15 @@ - + - -