yanh
/
CNAS
1
0
포크 0
코드 이슈 0 풀 리퀘스트 0 릴리즈 0 위키 활동
소스 검색

授权中心脱离平台数据库

final
OCEAN 4 달 전
부모
bf2af9f7fe
커밋
2030694054
26개의 변경된 파일과 595개의 추가작업 그리고 97개의 파일을 삭제
분할 보기
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      AuthorizeDll.zip
  2. +48
    -0
      AuthorizeDll/App.config
  3. BIN
      AuthorizeDll/AuthorizeDll.zip
  4. BIN
      AuthorizeDll/CNAS.db
  5. +21
    -0
      AuthorizeDll/CNAS_Authorize.application
  6. BIN
      AuthorizeDll/CNAS_Authorize.exe
  7. +48
    -0
      AuthorizeDll/CNAS_Authorize.exe.config
  8. +77
    -0
      AuthorizeDll/CNAS_Authorize.exe.manifest
  9. BIN
      AuthorizeDll/System.Data.SQLite.dll
  10. BIN
      AuthorizeDll/app.publish/CNAS_Authorize.exe
  11. +21
    -8
      CNAS_Authorize/App.config
  12. +48
    -22
      CNAS_Authorize/CNAS_Authorize.csproj
  13. +90
    -22
      CNAS_Authorize/MachineAuth.cs
  14. +59
    -25
      CNAS_Authorize/MainWindow.xaml.cs
  15. +17
    -2
      WF-ChangeGUID/App.config
  16. +2
    -0
      WF-ChangeGUID/WF-ChangeGUID.csproj
  17. +7
    -0
      create_table.sql
  18. +21
    -8
      dll/App.config
  19. BIN
      dll/CNAS.db
  20. +21
    -0
      dll/CNAS_Authorize.application
  21. BIN
      dll/CNAS_Authorize.exe
  22. +21
    -8
      dll/CNAS_Authorize.exe.config
  23. +77
    -0
      dll/CNAS_Authorize.exe.manifest
  24. BIN
      dll/System.Data.SQLite.dll
  25. +17
    -2
      dll/WF-ChangeGUID.exe.config
  26. BIN
      dll/app.publish/CNAS_Authorize.exe

BIN
AuthorizeDll.zip 파일 보기


+ 48
- 0
AuthorizeDll/App.config 파일 보기

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="TargetDBType" value="Oracle" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="StartWebApiUrl" value="0" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>

BIN
AuthorizeDll/AuthorizeDll.zip 파일 보기


BIN
AuthorizeDll/CNAS.db 파일 보기


+ 21
- 0
AuthorizeDll/CNAS_Authorize.application 파일 보기

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="CNAS_Authorize.application" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="CNAS_Authorize" asmv2:product="CNAS_Authorize" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
</compatibleFrameworks>
<dependency>
<dependentAssembly dependencyType="install" codebase="CNAS_Authorize.exe.manifest" size="4148">
<assemblyIdentity name="CNAS_Authorize.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>L5xNjTgh0dTkAQRbTZCFp78DqTJkq1K4UQdhB+a8xaQ=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
</asmv1:assembly>

BIN
AuthorizeDll/CNAS_Authorize.exe 파일 보기


+ 48
- 0
AuthorizeDll/CNAS_Authorize.exe.config 파일 보기

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="TargetDBType" value="Oracle" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="StartWebApiUrl" value="0" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>

+ 77
- 0
AuthorizeDll/CNAS_Authorize.exe.manifest 파일 보기

@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<asmv1:assemblyIdentity name="CNAS_Authorize.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
<application />
<entryPoint>
<assemblyIdentity name="CNAS_Authorize" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
<commandLine file="CNAS_Authorize.exe" parameters="" />
</entryPoint>
<trustInfo>
<security>
<applicationRequestMinimum>
<PermissionSet Unrestricted="true" ID="Custom" SameSite="site" />
<defaultAssemblyRequest permissionSetReference="Custom" />
</applicationRequestMinimum>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!--
UAC 清单选项
如果要更改 Windows 用户帐户控制级别，请用以下节点之一替换
requestedExecutionLevel 节点。

<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />

如果要利用文件和注册表虚拟化提供
向后兼容性，请删除 requestedExecutionLevel 节点。
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<dependency>
<dependentOS>
<osVersionInfo>
<os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
</osVersionInfo>
</dependentOS>
</dependency>
<dependency>
<dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
<assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="CNAS_Authorize.exe" size="25008">
<assemblyIdentity name="CNAS_Authorize" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>I4IqDuMxBr51Z6oX2d/YkvprGq44LkHsOXT43OvA0b8=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="System.Data.SQLite.dll" size="393520">
<assemblyIdentity name="System.Data.SQLite" version="1.0.115.5" publicKeyToken="DB937BC2D44FF139" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>X6xanpuLva1s9mHb8xh+OVkUzXE540tyWQbvu2ASLA0=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<file name="CNAS_Authorize.exe.config" size="2554">
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>qmdIROPHgqvrcwUwlaxoJeAzUhkInxx6DrCrZKLyuFE=</dsig:DigestValue>
</hash>
</file>
</asmv1:assembly>

BIN
AuthorizeDll/System.Data.SQLite.dll 파일 보기


BIN
AuthorizeDll/app.publish/CNAS_Authorize.exe 파일 보기


+ 21
- 8
CNAS_Authorize/App.config 파일 보기

@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="TargetDBType" value="Oracle" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="StartWebApiUrl" value="0" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<appSettings>
<add key="TargetDBType" value="Oracle" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="StartWebApiUrl" value="0" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -32,4 +33,16 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>

+ 48
- 22
CNAS_Authorize/CNAS_Authorize.csproj 파일 보기

@@ -3,7 +3,7 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProjectGuid>{9B4A6989-A7A6-41C0-ADFE-D470EB972D79}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -14,13 +14,29 @@
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\dll\</OutputPath>
<OutputPath>..\AuthorizeDll\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -34,9 +50,23 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>D4700213673D28F8D81D62BAEC309A35964BA214</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>CNAS_Authorize_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
@@ -99,25 +129,21 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CnasSynchronousCommon\CnasSynchronousCommon.csproj">
<Project>{8E0E5F2E-2BA2-4952-9F31-34C072CD86B3}</Project>
<Name>CnasSynchronousCommon</Name>
</ProjectReference>
<ProjectReference Include="..\CnasSynchronusClient\CnasSynchronusBLL.csproj">
<Project>{CB9B6D92-3CC4-46C6-92E8-A6FD0AD48041}</Project>
<Name>CnasSynchronusBLL</Name>
</ProjectReference>
<ProjectReference Include="..\CnasSynchrousModel\CnasSynchrousModel.csproj">
<Project>{0C3243F5-729E-409C-B406-C6DE56E632E0}</Project>
<Name>CnasSynchrousModel</Name>
</ProjectReference>
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Stub.System.Data.SQLite.Core.NetFramework" Version="1.0.115.5">
<GeneratePathProperty>true</GeneratePathProperty>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

+ 90
- 22
CNAS_Authorize/MachineAuth.cs 파일 보기

@@ -1,12 +1,11 @@
using CnasSynchronusClient;
using CnasSynchrousModel;
using System;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Data.SQLite;

namespace CNAS_Authorize
{
@@ -69,31 +68,43 @@ namespace CNAS_Authorize
m_pageSize = 10;
m_pageIndex = 1;
}
DataBaseInfo targetDataBase = new DataBaseInfo();
public void Load()
{
//加载CNAS数据库配置
targetDataBase = FileOperation.GetLocalCnasDB();
if (!CnasDataOperationFact.CnasDataOperation().TestConnect(targetDataBase))
{
MessageBox.Show("CNAS数据库无法正常连接...", "提示");
return;
}


InitializeDatabase();
m_machines = new List<Machine>();
////1.加载数据
DataTable dtmacaddressinfo = CnasDataOperationFact.CnasDataOperation().GetTableData(targetDataBase, "select * from macaddress");
if (dtmacaddressinfo != null && dtmacaddressinfo.Rows.Count > 0)
string dbPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "CNAS.db");
string connectionString = $"Data Source={dbPath};Version=3;";
try
{
List<string> lstCnasTables = new List<string>();
foreach (DataRow dr in dtmacaddressinfo.Rows)
using (var connection = new SQLiteConnection(connectionString))
{
Machine m = new Machine( dr["PLANTCODE"].ToString(), dr["MAC_ADDRESS"].ToString(), dr["CREATETIME"].ToString(), true);
m_machines.Add(m);
lstCnasTables.Add(dr["MAC_ADDRESS"].ToString());
connection.Open();
using (var command = new SQLiteCommand(connection))
{
command.CommandText = "SELECT PLANTCODE, MAC_ADDRESS, CREATETIME FROM macaddress";
using (var reader = command.ExecuteReader())
{
while (reader.Read())
{
Machine m = new Machine(
reader["PLANTCODE"].ToString(),
reader["MAC_ADDRESS"].ToString(),
reader["CREATETIME"].ToString(),
true
);
m_machines.Add(m);
}
}
}
}
}
catch (Exception ex)
{
MessageBox.Show($"加载数据失败: {ex.Message}", "错误");
}

m_rangle = new List<Machine>();
m_rangle.AddRange(m_machines);
@@ -103,7 +114,6 @@ namespace CNAS_Authorize
m_pageCount = (m_rangle.Count / m_pageSize) + (m_rangle.Count % m_pageSize == 0 ? 0 : 1);

m_page = getPageData(m_pageIndex);

}

public int PageSize
@@ -238,6 +248,64 @@ namespace CNAS_Authorize

}

private void InitializeDatabase()
{
try
{
string dbPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "CNAS.db");
string connectionString = $"Data Source={dbPath};Version=3;";
// 确保数据库目录存在
string dbDirectory = System.IO.Path.GetDirectoryName(dbPath);
if (!System.IO.Directory.Exists(dbDirectory))
{
System.IO.Directory.CreateDirectory(dbDirectory);
}

using (var connection = new SQLiteConnection(connectionString))
{
connection.Open();
using (var command = new SQLiteCommand(connection))
{
command.CommandText = @"
CREATE TABLE IF NOT EXISTS macaddress (
id INTEGER PRIMARY KEY AUTOINCREMENT,
MAC_ADDRESS TEXT,
PLANTCODE TEXT,
CREATETIME TEXT,
FACILITY_STYLE TEXT
);";
command.ExecuteNonQuery();
}
}
}
catch (Exception ex)
{
MessageBox.Show($"初始化数据库失败: {ex.Message}", "错误");
}
}

private void InsertTestData()
{
string connectionString = "Data Source=|DataDirectory|\\CNAS.db;Version=3;";
using (var connection = new SQLiteConnection(connectionString))
{
connection.Open();
using (var command = new SQLiteCommand(connection))
{
command.CommandText = @"
INSERT INTO macaddress (MAC_ADDRESS, PLANTCODE, CREATETIME, FACILITY_STYLE)
VALUES (@mac, @plant, @time, @style)";
command.Parameters.AddWithValue("@mac", "00:11:22:33:44:55");
command.Parameters.AddWithValue("@plant", "PLANT001");
command.Parameters.AddWithValue("@time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
command.Parameters.AddWithValue("@style", "Style A");
command.ExecuteNonQuery();
}
}
}

}
}

+ 59
- 25
CNAS_Authorize/MainWindow.xaml.cs 파일 보기

@@ -1,5 +1,4 @@
using CnasSynchronousCommon;
using CnasSynchronusClient;

using System;
using System.Collections.Generic;
using System.Data;
@@ -16,6 +15,7 @@ using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Data.SQLite;

namespace CNAS_Authorize
{
@@ -106,35 +106,69 @@ namespace CNAS_Authorize

private void ConfirmImport_Click(object sender, RoutedEventArgs e)
{
//加载CNAS数据库配置
var targetDataBase = FileOperation.GetLocalCnasDB();
if (!CnasDataOperationFact.CnasDataOperation().TestConnect(targetDataBase))
string macAddress = edtMachine.Text.Trim();
string plantCode = edtFactory.Text.Trim();
if (string.IsNullOrEmpty(macAddress) || string.IsNullOrEmpty(plantCode))
{
MessageBox.Show("CNAS数据库无法正常连接...", "提示");
MessageBox.Show("MAC地址和工厂代码不能为空！", "提示");
return;
}

var existData = CnasDataOperationFact.CnasDataOperation().GetTableData(targetDataBase, $"select * from macaddress where MAC_ADDRESS='{edtMachine.Text.Trim()}'");
if(existData!=null&& existData.Rows.Count > 0)
string connectionString = "Data Source=|DataDirectory|\\CNAS.db;Version=3;";
using (var connection = new SQLiteConnection(connectionString))
{
MessageBox.Show("已经导入!");
return;
}
StringBuilder sb = new StringBuilder();
sb.AppendFormat($"insert into macaddress(MAC_ADDRESS,PLANTCODE,CREATETIME,FACILITY_STYLE) VALUES('{edtMachine.Text.Trim()}','{edtFactory.Text.Trim()}',now(),'999')");
try
{
connection.Open();
// 检查是否已存在
using (var checkCommand = new SQLiteCommand(connection))
{
checkCommand.CommandText = "SELECT COUNT(*) FROM macaddress WHERE MAC_ADDRESS = @mac";
checkCommand.Parameters.AddWithValue("@mac", macAddress);
int count = Convert.ToInt32(checkCommand.ExecuteScalar());
if (count > 0)
{
MessageBox.Show("已经导入!", "提示");
return;
}
}

//1.加载数据
var flag = CnasDataOperationFact.CnasDataOperation().InsertTableData(targetDataBase, sb.ToString());
if (flag)
{
AppLog.ServiceInfo("导入成功");
MessageBox.Show("导入成功...", "提示");
this.LoadData();
}
else
{
MessageBox.Show("导入失败...", "提示");
// 插入新记录
using (var insertCommand = new SQLiteCommand(connection))
{
insertCommand.CommandText = @"
INSERT INTO macaddress (
MAC_ADDRESS,
PLANTCODE,
CREATETIME,
FACILITY_STYLE
) VALUES (
@mac,
@plant,
@time,
@style
)";

insertCommand.Parameters.AddWithValue("@mac", macAddress);
insertCommand.Parameters.AddWithValue("@plant", plantCode);
insertCommand.Parameters.AddWithValue("@time", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
insertCommand.Parameters.AddWithValue("@style", "999");

insertCommand.ExecuteNonQuery();
//AppLog.ServiceInfo("导入成功");
MessageBox.Show("导入成功...", "提示");
this.LoadData();
}
}
catch (Exception ex)
{
MessageBox.Show($"导入失败: {ex.Message}", "提示");
//AppLog.ServiceError($"导入失败: {ex.Message}");
}
}
}



+ 17
- 2
WF-ChangeGUID/App.config 파일 보기

@@ -3,8 +3,11 @@
<appSettings>
<add key="TargetDBType" value="MYSQL" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -29,4 +32,16 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>

+ 2
- 0
WF-ChangeGUID/WF-ChangeGUID.csproj 파일 보기

@@ -36,7 +36,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />


+ 7
- 0
create_table.sql 파일 보기

@@ -0,0 +1,7 @@
CREATE TABLE IF NOT EXISTS macaddress (
id INTEGER PRIMARY KEY AUTOINCREMENT,
MAC_ADDRESS TEXT,
PLANTCODE TEXT,
CREATETIME TEXT,
FACILITY_STYLE TEXT
);

+ 21
- 8
dll/App.config 파일 보기

@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="TargetDBType" value="Oracle" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="StartWebApiUrl" value="0" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<appSettings>
<add key="TargetDBType" value="Oracle" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="StartWebApiUrl" value="0" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -32,4 +33,16 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>

BIN
dll/CNAS.db 파일 보기


+ 21
- 0
dll/CNAS_Authorize.application 파일 보기

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<assemblyIdentity name="CNAS_Authorize.application" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
<description asmv2:publisher="CNAS_Authorize" asmv2:product="CNAS_Authorize" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
</compatibleFrameworks>
<dependency>
<dependentAssembly dependencyType="install" codebase="CNAS_Authorize.exe.manifest" size="4148">
<assemblyIdentity name="CNAS_Authorize.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>cKvo+SG3kukqmQ2mBgqRv3fEL6oAg8Zg9rpcw+OtH8Q=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
</asmv1:assembly>

BIN
dll/CNAS_Authorize.exe 파일 보기


+ 21
- 8
dll/CNAS_Authorize.exe.config 파일 보기

@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="TargetDBType" value="Oracle" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="StartWebApiUrl" value="0" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<appSettings>
<add key="TargetDBType" value="Oracle" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="StartWebApiUrl" value="0" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -32,4 +33,16 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>

+ 77
- 0
dll/CNAS_Authorize.exe.manifest 파일 보기

@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
<asmv1:assemblyIdentity name="CNAS_Authorize.exe" version="1.0.0.2" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
<application />
<entryPoint>
<assemblyIdentity name="CNAS_Authorize" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
<commandLine file="CNAS_Authorize.exe" parameters="" />
</entryPoint>
<trustInfo>
<security>
<applicationRequestMinimum>
<PermissionSet Unrestricted="true" ID="Custom" SameSite="site" />
<defaultAssemblyRequest permissionSetReference="Custom" />
</applicationRequestMinimum>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!--
UAC 清单选项
如果要更改 Windows 用户帐户控制级别，请用以下节点之一替换
requestedExecutionLevel 节点。

<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />

如果要利用文件和注册表虚拟化提供
向后兼容性，请删除 requestedExecutionLevel 节点。
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<dependency>
<dependentOS>
<osVersionInfo>
<os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
</osVersionInfo>
</dependentOS>
</dependency>
<dependency>
<dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
<assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="CNAS_Authorize.exe" size="25008">
<assemblyIdentity name="CNAS_Authorize" version="1.0.0.0" language="neutral" processorArchitecture="x86" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>xG66i3py1dV/xiSubMXegK/WeFJrYo9kBmZXXdhFrHg=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="System.Data.SQLite.dll" size="393520">
<assemblyIdentity name="System.Data.SQLite" version="1.0.115.5" publicKeyToken="DB937BC2D44FF139" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>X6xanpuLva1s9mHb8xh+OVkUzXE540tyWQbvu2ASLA0=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<file name="CNAS_Authorize.exe.config" size="2554">
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>qmdIROPHgqvrcwUwlaxoJeAzUhkInxx6DrCrZKLyuFE=</dsig:DigestValue>
</hash>
</file>
</asmv1:assembly>

BIN
dll/System.Data.SQLite.dll 파일 보기


+ 17
- 2
dll/WF-ChangeGUID.exe.config 파일 보기

@@ -3,8 +3,11 @@
<appSettings>
<add key="TargetDBType" value="MYSQL" />
<add key="InitalOperationPwd" value="zIU7s3Rawog=" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -29,4 +32,16 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>

BIN
dll/app.publish/CNAS_Authorize.exe 파일 보기


쓰기 미리보기
불러오는 중...
취소
저장