Merge branch 'master' of http://175.27.215.92:3000/wangsr/NDSD-RFIDLight

# Conflicts:
#	NDSD-Screwdriver/ScrewdriverTest.cs

.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

.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

.idea/.idea.NDSD-Screwdriver/.idea/.name

@@ -0,0 +1 @@
+NDSD-Screwdriver

NDSD-Screwdriver/App.config

@@ -1,6 +1,25 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
+   <appSettings>
+	   <add key="ip" value="http" />
+   </appSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

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();
+        }
+    }
+}

NDSD-Screwdriver/NDSD_Screwdriver.csproj

@@ -33,8 +33,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="mscorlib" />
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -46,6 +49,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AppTool.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScrewdriverTest.cs">

NDSD-Screwdriver/ScrewdriverTest.cs

@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
 
+
 namespace NDSD_Screwdriver
 {
     public partial class ScrewdriverTest : Form

NDSD-TouchSocket/NDSD_TouchSocket.csproj

@@ -59,10 +59,10 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="TouchSocket, Version=2.1.0.0, Culture=neutral, PublicKeyToken=5f39d7da98dac6a9, processorArchitecture=MSIL">
-      <HintPath>..\NDSD-Screwdriver\packages\TouchSocket.2.1.0-rc.9\lib\net472\TouchSocket.dll</HintPath>
+      <HintPath>..\packages\TouchSocket.2.1.0-rc.9\lib\net472\TouchSocket.dll</HintPath>
     </Reference>
     <Reference Include="TouchSocket.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=d6c415a2f58eda72, processorArchitecture=MSIL">
-      <HintPath>..\NDSD-Screwdriver\packages\TouchSocket.Core.2.1.0-rc.9\lib\net472\TouchSocket.Core.dll</HintPath>
+      <HintPath>..\packages\TouchSocket.Core.2.1.0-rc.9\lib\net472\TouchSocket.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -77,7 +77,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\NDSD-Screwdriver\packages\TouchSocket.Core.2.1.0-rc.9\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
+    <Analyzer Include="..\packages\TouchSocket.Core.2.1.0-rc.9\analyzers\dotnet\cs\TouchSocket.Core.SourceGenerator.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>