From 11542e1ddaea956358821890f9dc00f6a66cecf8 Mon Sep 17 00:00:00 2001 From: bicijinlian Date: Tue, 4 Jun 2024 00:50:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Docs/1.6.测试.ipynb | 48 ++++++++++++++++++- HttpClientStudy.Core/Utilities/CmdUtility.cs | 20 +++----- .../Utilities/DotnetCommondUtility.cs | 6 +-- .../UtilitiesTest/CmdUtilityTest.cs | 2 +- 4 files changed, 57 insertions(+), 19 deletions(-) diff --git a/Docs/1.6.测试.ipynb b/Docs/1.6.测试.ipynb index ac297bb..cbdaa72 100644 --- a/Docs/1.6.测试.ipynb +++ b/Docs/1.6.测试.ipynb @@ -33,7 +33,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "metadata": { "dotnet_interactive": { "language": "csharp" @@ -45,7 +45,51 @@ "languageId": "polyglot-notebook" } }, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + " ������ D �еľ�û�б�ǩ��\r\n", + " �������к��� BB7D-E2E7\r\n", + "\r\n", + " d:\\������Ŀ\\ѧϰ��Ŀ\\HttpClientStudy\\Docs ��Ŀ¼\r\n", + "\r\n", + "2024/05/30 23:53 .\r\n", + "2024/05/28 23:06 ..\r\n", + "2024/05/28 23:36 .vscode\r\n", + "2024/05/28 23:36 4,778 1.0��Ŀ����.dib\r\n", + "2024/05/28 23:15 7,855 1.1.����.ipynb\r\n", + "2024/05/30 23:53 27,025 1.2.ʹ��׼��.ipynb\r\n", + "2024/05/31 00:16 5,497 1.3.0.����ʹ��.�����ͻ���.ipynb\r\n", + "2024/05/26 23:55 1,053 1.3.1.����ʹ��.��������.ipynb\r\n", + "2024/05/26 23:55 965 1.3.2.����ʹ��.ʹ��������.ipynb\r\n", + "2024/05/26 23:55 965 1.3.3.����ʹ��.������Ӧ.ipynb\r\n", + "2024/05/26 23:55 965 1.3.4.����ʹ��.��������.ipynb\r\n", + "2024/05/26 23:55 965 1.3.5.����ʹ��.ʹ�ô���.ipynb\r\n", + "2024/05/26 23:55 965 1.3.6.����ʹ��.ʹ��Json.ipynb\r\n", + "2024/05/26 23:55 965 1.3.7.����ʹ��.ʹ��Cookie.ipynb\r\n", + "2024/05/26 23:55 965 1.4.0.�߼�ʹ��.����.ipynb\r\n", + "2024/05/26 23:55 965 1.4.1.�߼�ʹ��.��ʼ��.ipynb\r\n", + "2024/05/26 23:55 965 1.4.2.�߼�ʹ��.���ӳ�.ipynb\r\n", + "2024/05/26 23:55 965 1.4.3.�߼�ʹ��.�ظ�ʹ��.ipynb\r\n", + "2024/05/26 23:55 965 1.4.4.�߼�ʹ��.ʹ�ùܵ�.ipynb\r\n", + "2024/05/26 23:55 965 1.4.5.�߼�ʹ��.���ͻ��ͻ���.ipynb\r\n", + "2024/05/26 23:55 965 1.4.6..�߼�ʹ��.����ģʽ.ipynb\r\n", + "2024/05/26 23:55 965 1.4.7.�߼�ʹ��.Polly.ipynb\r\n", + "2024/05/28 00:31 1,496 1.5.�ܽ�.ipynb\r\n", + "2024/05/28 23:33 3,204 1.6.����.ipynb\r\n", + "2024/05/28 23:06 4,854 2.1.�ں��еĸ���·��.ipynb\r\n", + "2024/05/26 23:55 Assets\r\n", + "2024/05/28 01:12 Publish\r\n", + "2024/05/28 23:06 112 ѧϰ.ps1\r\n", + "2024/05/26 23:55 181 ˵��.md\r\n", + " 24 ���ļ� 69,565 �ֽ�\r\n", + " 5 ��Ŀ¼ 383,550,734,336 �����ֽ�\r\n", + "\r\n" + ] + } + ], "source": [ "//引用项目\n", "#r \"./Publish/HttpClientStudy.Core/HttpClientStudy.Core.dll\"\n", diff --git a/HttpClientStudy.Core/Utilities/CmdUtility.cs b/HttpClientStudy.Core/Utilities/CmdUtility.cs index 34c755e..0dc73cb 100644 --- a/HttpClientStudy.Core/Utilities/CmdUtility.cs +++ b/HttpClientStudy.Core/Utilities/CmdUtility.cs @@ -24,12 +24,14 @@ namespace HttpClientStudy.Core.Utilities string cmdResult = string.Empty; // 创建一个新的ProcessStartInfo对象 - ProcessStartInfo startInfo = new ProcessStartInfo("cmd", $"/c {cmd}") + ProcessStartInfo startInfo = new ProcessStartInfo() { - RedirectStandardOutput = true, // 重定向标准输出 - StandardOutputEncoding = Encoding.UTF8, - UseShellExecute = false, // 不使用系统外壳程序启动 - CreateNoWindow = true // 不创建新窗口 + FileName = "cmd.exe", + Arguments = $"/u /k start cmd.exe /u /k {cmd}", + //RedirectStandardOutput = true, // 重定向标准输出 + //StandardOutputEncoding = Encoding.UTF8, + UseShellExecute = true, // 不使用系统外壳程序启动 + CreateNoWindow = false // 不创建新窗口 }; // 启动进程 @@ -39,14 +41,6 @@ namespace HttpClientStudy.Core.Utilities { return "执行命令出错"; } - - //process.WaitForExit(); - - // 读取cmd的输出 - using (StreamReader reader = process!.StandardOutput) - { - cmdResult = reader.ReadToEnd(); - } } return cmdResult; diff --git a/HttpClientStudy.Core/Utilities/DotnetCommondUtility.cs b/HttpClientStudy.Core/Utilities/DotnetCommondUtility.cs index 1e1905f..6a65322 100644 --- a/HttpClientStudy.Core/Utilities/DotnetCommondUtility.cs +++ b/HttpClientStudy.Core/Utilities/DotnetCommondUtility.cs @@ -30,11 +30,11 @@ namespace HttpClientStudy.Core.Utilities FileName = "dotnet", Arguments = $"{command} {arguments}", RedirectStandardOutput = true, - StandardOutputEncoding = Encoding.UTF8, + //StandardOutputEncoding = Encoding.UTF8, RedirectStandardError = true, - StandardErrorEncoding = Encoding.UTF8, + //StandardErrorEncoding = Encoding.UTF8, RedirectStandardInput = false, - StandardInputEncoding = Encoding.UTF8, + //StandardInputEncoding = Encoding.UTF8, UseShellExecute = false, CreateNoWindow = false, }; diff --git a/HttpClientStudy.UnitTest/UtilitiesTest/CmdUtilityTest.cs b/HttpClientStudy.UnitTest/UtilitiesTest/CmdUtilityTest.cs index 42deb25..ca14a5e 100644 --- a/HttpClientStudy.UnitTest/UtilitiesTest/CmdUtilityTest.cs +++ b/HttpClientStudy.UnitTest/UtilitiesTest/CmdUtilityTest.cs @@ -19,7 +19,7 @@ namespace HttpClientStudy.UnitTest.UtilitiesTest [Fact] public void Test() { - string cmd = "netstat -ano | findstr 127.0.0.1"; + string cmd = "tasklist"; var result = CmdUtility.RunCmd(cmd);