From fd375ce501d8ac3968331fa12dc5767b825aa36e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Wed, 24 Apr 2024 10:34:54 +0800
Subject: [PATCH] mege

---
 SlnMesnac.Plc/SlnMesnac.Plc.csproj |  7 +------
 SlnMesnac.WPF/Startup.cs           |  6 ++++++
 SlnMesnac.WPF/appsettings.json     | 21 ++-------------------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/SlnMesnac.Plc/SlnMesnac.Plc.csproj b/SlnMesnac.Plc/SlnMesnac.Plc.csproj
index ad32bdb..476d7b6 100644
--- a/SlnMesnac.Plc/SlnMesnac.Plc.csproj
+++ b/SlnMesnac.Plc/SlnMesnac.Plc.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="HslCommunication" Version="11.8.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
   </ItemGroup>
@@ -15,10 +16,4 @@
     <ProjectReference Include="..\SlnMesnac.Config\SlnMesnac.Config.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="HslCommunication">
-      <HintPath>..\SlnMesnac.Library\HslCommunication.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/SlnMesnac.WPF/Startup.cs b/SlnMesnac.WPF/Startup.cs
index d75cffc..2629088 100644
--- a/SlnMesnac.WPF/Startup.cs
+++ b/SlnMesnac.WPF/Startup.cs
@@ -39,6 +39,12 @@ namespace SlnMesnac.WPF
             //注册ORM
             services.AddSqlSugarSetup();
 
+            if (!HslCommunication.Authorization.SetAuthorizationCode("b980977c-3323-4876-b633-c0bef93d75c1"))
+            {
+                Console.WriteLine( "active failed" );
+                Console.ReadLine( );
+            }
+            
             //注册PLC工厂
             services.AddPlcFactorySetup();
 
diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json
index 9346894..13189e7 100644
--- a/SlnMesnac.WPF/appsettings.json
+++ b/SlnMesnac.WPF/appsettings.json
@@ -8,7 +8,6 @@
   },
   "AllowedHosts": "*",
   "AppConfig": {
-    "logPath": "E:\\桌面\\SlnMesnac\\SlnMesnac.WPF\\bin\\Debug\\net6.0-windows",
     "SqlConfig": [
       {
         "configId": "mes",
@@ -38,23 +37,7 @@
         "plcKey": "cwss",
         "isFlage": true
       }
-    ],
-    "RfidConfig": [
-      {
-        "configId": 1,
-        "equipIp": "127.0.0.1",
-        "equipPort": 6003,
-        "equipKey": "test1",
-        "isFlage": true
-      },
-      {
-        "configId": 2,
-        "equipIp": "127.0.0.1",
-        "equipPort": 6004,
-        "equipKey": "test2",
-        "isFlage": true
-      }
-    ],
-    "redisConfig": "175.27.215.92:6379,password=redis@2023"
+    ]
+    
   }
 }