From 4ce9c47f62604e8e8d69b32079ea400914ed8f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= Date: Tue, 13 Aug 2024 11:26:46 +0800 Subject: [PATCH 1/2] 2 --- .gitattributes | 69 +++++++++++++++++++ .idea/.idea.NDSD-Screwdriver/.idea/.gitignore | 13 ++++ .idea/.idea.NDSD-Screwdriver/.idea/.name | 1 + NDSD-TouchSocket/NDSD-TouchSocket.csproj | 6 +- 4 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 .gitattributes create mode 100644 .idea/.idea.NDSD-Screwdriver/.idea/.gitignore create mode 100644 .idea/.idea.NDSD-Screwdriver/.idea/.name diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..42a55b4 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,69 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto +/.idea/.idea.NDSD-Screwdriver/.idea/encodings.xml +/.idea/.idea.NDSD-Screwdriver/.idea/indexLayout.xml +/.idea/.idea.NDSD-Screwdriver/.idea/vcs.xml +/.idea/.idea.NDSD-Screwdriver/.idea/.name +/.idea/.idea.NDSD-Screwdriver/.idea/encodings.xml +/.idea/.idea.NDSD-Screwdriver/.idea/indexLayout.xml +/.idea/.idea.NDSD-Screwdriver/.idea/vcs.xml +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.idea/.idea.NDSD-Screwdriver/.idea/.gitignore b/.idea/.idea.NDSD-Screwdriver/.idea/.gitignore new file mode 100644 index 0000000..254272c --- /dev/null +++ b/.idea/.idea.NDSD-Screwdriver/.idea/.gitignore @@ -0,0 +1,13 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# Rider 忽略的文件 +/modules.xml +/contentModel.xml +/projectSettingsUpdater.xml +/.idea.NDSD-Screwdriver.iml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.NDSD-Screwdriver/.idea/.name b/.idea/.idea.NDSD-Screwdriver/.idea/.name new file mode 100644 index 0000000..327fd25 --- /dev/null +++ b/.idea/.idea.NDSD-Screwdriver/.idea/.name @@ -0,0 +1 @@ +NDSD-Screwdriver \ No newline at end of file diff --git a/NDSD-TouchSocket/NDSD-TouchSocket.csproj b/NDSD-TouchSocket/NDSD-TouchSocket.csproj index 23c28e7..bbe7c9f 100644 --- a/NDSD-TouchSocket/NDSD-TouchSocket.csproj +++ b/NDSD-TouchSocket/NDSD-TouchSocket.csproj @@ -59,10 +59,10 @@ - ..\NDSD-Screwdriver\packages\TouchSocket.2.1.0-rc.9\lib\net472\TouchSocket.dll + ..\packages\TouchSocket.2.1.0-rc.9\lib\net472\TouchSocket.dll - ..\NDSD-Screwdriver\packages\TouchSocket.Core.2.1.0-rc.9\lib\net472\TouchSocket.Core.dll + ..\packages\TouchSocket.Core.2.1.0-rc.9\lib\net472\TouchSocket.Core.dll @@ -77,7 +77,7 @@ - + \ No newline at end of file From 9bec9cb4e1d63dcb73e2b722b0fb93bba17deb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= Date: Tue, 13 Aug 2024 13:46:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NDSD-Screwdriver/App.config | 21 ++++++++++++++++++++- NDSD-Screwdriver/AppTool.cs | 11 +++++++++++ NDSD-Screwdriver/NDSD_Screwdriver.csproj | 4 ++++ NDSD-Screwdriver/ScrewdriverTest.cs | 3 ++- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 NDSD-Screwdriver/AppTool.cs diff --git a/NDSD-Screwdriver/App.config b/NDSD-Screwdriver/App.config index 193aecc..709e1f1 100644 --- a/NDSD-Screwdriver/App.config +++ b/NDSD-Screwdriver/App.config @@ -1,6 +1,25 @@ - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NDSD-Screwdriver/AppTool.cs b/NDSD-Screwdriver/AppTool.cs new file mode 100644 index 0000000..7c03543 --- /dev/null +++ b/NDSD-Screwdriver/AppTool.cs @@ -0,0 +1,11 @@ +namespace NDSD_Screwdriver +{ + using System.Configuration; + public class AppTool + { + public static string GetIp() + { + return ConfigurationManager.AppSettings["ip"].ToString(); + } + } +} \ No newline at end of file diff --git a/NDSD-Screwdriver/NDSD_Screwdriver.csproj b/NDSD-Screwdriver/NDSD_Screwdriver.csproj index 91b319d..f8eb75c 100644 --- a/NDSD-Screwdriver/NDSD_Screwdriver.csproj +++ b/NDSD-Screwdriver/NDSD_Screwdriver.csproj @@ -33,8 +33,11 @@ 4 + + + @@ -46,6 +49,7 @@ + diff --git a/NDSD-Screwdriver/ScrewdriverTest.cs b/NDSD-Screwdriver/ScrewdriverTest.cs index ab33ab9..0da303b 100644 --- a/NDSD-Screwdriver/ScrewdriverTest.cs +++ b/NDSD-Screwdriver/ScrewdriverTest.cs @@ -9,6 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; + namespace NDSD_Screwdriver { public partial class ScrewdriverTest : Form @@ -18,7 +19,7 @@ namespace NDSD_Screwdriver public ScrewdriverTest() { InitializeComponent(); - DOperate = new DOperate(); + } private void DOpenButton_Click(object sender, EventArgs e)