From 5489012a5196f17df57e4680c1c18cbc80370327 Mon Sep 17 00:00:00 2001 From: 17860779768 <3219079380@qq.com> Date: Fri, 24 Mar 2023 17:17:10 +0800 Subject: [PATCH] 20230324Change1 --- CopyCode.sln => XKRS2023.sln | 6 +++--- {CopyCode => src/XKRS.Common.Model}/App.config | 0 .../XKRS.Common.Model}/Authority/AuthorityCheck.cs | 0 .../XKRS.Common.Model}/Exception/ExceptionHelper.cs | 0 .../XKRS.Common.Model}/Factory/FactoryHelper.cs | 0 .../XKRS.Common.Model}/Factory/ProcessFactory.cs | 0 .../XKRS.Common.Model}/Factory/UIFactory.cs | 0 .../XKRS.Common.Model}/Helper/AttributeHelper.cs | 0 .../XKRS.Common.Model}/Helper/EnumHelper.cs | 0 .../XKRS.Common.Model}/Helper/SettingHelper.cs | 0 .../XKRS.Common.Model}/Interface/IDevice.cs | 0 .../XKRS.Common.Model}/Interface/IExceptionHandler.cs | 0 .../XKRS.Common.Model}/Interface/ILogger.cs | 0 .../XKRS.Common.Model}/Interface/IMenuNode.cs | 0 .../XKRS.Common.Model}/Interface/IProcess.cs | 0 .../XKRS.Common.Model}/Interface/IRunCtrl.cs | 0 .../XKRS.Common.Model}/XKRS.Common.Model.csproj | 0 {CopyCode => src/XKRS.UI.Main}/AdvancedPwdFrm.Designer.cs | 0 {CopyCode => src/XKRS.UI.Main}/AdvancedPwdFrm.cs | 0 {CopyCode => src/XKRS.UI.Main}/AdvancedPwdFrm.resx | 0 {XKRS.Common.Model => src/XKRS.UI.Main}/App.config | 0 {CopyCode => src/XKRS.UI.Main}/MainFrm.Designer.cs | 0 {CopyCode => src/XKRS.UI.Main}/MainFrm.cs | 0 {CopyCode => src/XKRS.UI.Main}/MainFrm.resx | 0 {CopyCode => src/XKRS.UI.Main}/Program.cs | 1 + {CopyCode => src/XKRS.UI.Main}/Properties/AssemblyInfo.cs | 0 .../XKRS.UI.Main}/Properties/Resources.Designer.cs | 0 {CopyCode => src/XKRS.UI.Main}/Properties/Resources.resx | 0 .../XKRS.UI.Main}/Properties/Settings.Designer.cs | 0 {CopyCode => src/XKRS.UI.Main}/Properties/Settings.settings | 0 {CopyCode => src/XKRS.UI.Main}/XKRS.UI.Main.csproj | 0 {CopyCode => src/XKRS.UI.Main}/packages.config | 0 .../XKRS.UI.Model.Winform}/App.config | 0 .../XKRS.UI.Model.Winform}/Helper/AttributeHelper.cs | 0 .../XKRS.UI.Model.Winform}/Helper/MenuFormFactory.cs | 0 .../UI/DockContent/DeviceRunFrmBase.Designer.cs | 0 .../UI/DockContent/DeviceRunFrmBase.cs | 0 .../UI/DockContent/DeviceRunFrmBase.resx | 0 .../UI/DockContent/MenuFrmBase.Designer.cs | 0 .../XKRS.UI.Model.Winform}/UI/DockContent/MenuFrmBase.cs | 0 .../XKRS.UI.Model.Winform}/UI/DockContent/MenuFrmBase.resx | 0 .../XKRS.UI.Model.Winform}/XKRS.UI.Model.Winform.csproj | 0 .../XKRS.UI.Model.Winform}/packages.config | 0 43 files changed, 4 insertions(+), 3 deletions(-) rename CopyCode.sln => XKRS2023.sln (88%) rename {CopyCode => src/XKRS.Common.Model}/App.config (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Authority/AuthorityCheck.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Exception/ExceptionHelper.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Factory/FactoryHelper.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Factory/ProcessFactory.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Factory/UIFactory.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Helper/AttributeHelper.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Helper/EnumHelper.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Helper/SettingHelper.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Interface/IDevice.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Interface/IExceptionHandler.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Interface/ILogger.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Interface/IMenuNode.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Interface/IProcess.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/Interface/IRunCtrl.cs (100%) rename {XKRS.Common.Model => src/XKRS.Common.Model}/XKRS.Common.Model.csproj (100%) rename {CopyCode => src/XKRS.UI.Main}/AdvancedPwdFrm.Designer.cs (100%) rename {CopyCode => src/XKRS.UI.Main}/AdvancedPwdFrm.cs (100%) rename {CopyCode => src/XKRS.UI.Main}/AdvancedPwdFrm.resx (100%) rename {XKRS.Common.Model => src/XKRS.UI.Main}/App.config (100%) rename {CopyCode => src/XKRS.UI.Main}/MainFrm.Designer.cs (100%) rename {CopyCode => src/XKRS.UI.Main}/MainFrm.cs (100%) rename {CopyCode => src/XKRS.UI.Main}/MainFrm.resx (100%) rename {CopyCode => src/XKRS.UI.Main}/Program.cs (97%) rename {CopyCode => src/XKRS.UI.Main}/Properties/AssemblyInfo.cs (100%) rename {CopyCode => src/XKRS.UI.Main}/Properties/Resources.Designer.cs (100%) rename {CopyCode => src/XKRS.UI.Main}/Properties/Resources.resx (100%) rename {CopyCode => src/XKRS.UI.Main}/Properties/Settings.Designer.cs (100%) rename {CopyCode => src/XKRS.UI.Main}/Properties/Settings.settings (100%) rename {CopyCode => src/XKRS.UI.Main}/XKRS.UI.Main.csproj (100%) rename {CopyCode => src/XKRS.UI.Main}/packages.config (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/App.config (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/Helper/AttributeHelper.cs (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/Helper/MenuFormFactory.cs (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/UI/DockContent/DeviceRunFrmBase.Designer.cs (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/UI/DockContent/DeviceRunFrmBase.cs (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/UI/DockContent/DeviceRunFrmBase.resx (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/UI/DockContent/MenuFrmBase.Designer.cs (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/UI/DockContent/MenuFrmBase.cs (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/UI/DockContent/MenuFrmBase.resx (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/XKRS.UI.Model.Winform.csproj (100%) rename {XKRS.UI.Model.Winform => src/XKRS.UI.Model.Winform}/packages.config (100%) diff --git a/CopyCode.sln b/XKRS2023.sln similarity index 88% rename from CopyCode.sln rename to XKRS2023.sln index a328905..2b89395 100644 --- a/CopyCode.sln +++ b/XKRS2023.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.33027.164 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XKRS.UI.Main", "CopyCode\XKRS.UI.Main.csproj", "{9E42B387-BB80-4808-B9AB-4CE5F819A675}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XKRS.UI.Main", "src\XKRS.UI.Main\XKRS.UI.Main.csproj", "{9E42B387-BB80-4808-B9AB-4CE5F819A675}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{A4083DEF-5596-46B5-8100-E67DCFFA14DA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XKRS.Common.Model", "XKRS.Common.Model\XKRS.Common.Model.csproj", "{46D35E44-A2B1-403C-9E12-93759F91143F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XKRS.Common.Model", "src\XKRS.Common.Model\XKRS.Common.Model.csproj", "{46D35E44-A2B1-403C-9E12-93759F91143F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{116AB5E1-0706-4E01-A99C-3F2B103961BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XKRS.UI.Model.Winform", "XKRS.UI.Model.Winform\XKRS.UI.Model.Winform.csproj", "{0EABA88A-9DB3-46EA-B810-4F4FA6D2DFEA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XKRS.UI.Model.Winform", "src\XKRS.UI.Model.Winform\XKRS.UI.Model.Winform.csproj", "{0EABA88A-9DB3-46EA-B810-4F4FA6D2DFEA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/CopyCode/App.config b/src/XKRS.Common.Model/App.config similarity index 100% rename from CopyCode/App.config rename to src/XKRS.Common.Model/App.config diff --git a/XKRS.Common.Model/Authority/AuthorityCheck.cs b/src/XKRS.Common.Model/Authority/AuthorityCheck.cs similarity index 100% rename from XKRS.Common.Model/Authority/AuthorityCheck.cs rename to src/XKRS.Common.Model/Authority/AuthorityCheck.cs diff --git a/XKRS.Common.Model/Exception/ExceptionHelper.cs b/src/XKRS.Common.Model/Exception/ExceptionHelper.cs similarity index 100% rename from XKRS.Common.Model/Exception/ExceptionHelper.cs rename to src/XKRS.Common.Model/Exception/ExceptionHelper.cs diff --git a/XKRS.Common.Model/Factory/FactoryHelper.cs b/src/XKRS.Common.Model/Factory/FactoryHelper.cs similarity index 100% rename from XKRS.Common.Model/Factory/FactoryHelper.cs rename to src/XKRS.Common.Model/Factory/FactoryHelper.cs diff --git a/XKRS.Common.Model/Factory/ProcessFactory.cs b/src/XKRS.Common.Model/Factory/ProcessFactory.cs similarity index 100% rename from XKRS.Common.Model/Factory/ProcessFactory.cs rename to src/XKRS.Common.Model/Factory/ProcessFactory.cs diff --git a/XKRS.Common.Model/Factory/UIFactory.cs b/src/XKRS.Common.Model/Factory/UIFactory.cs similarity index 100% rename from XKRS.Common.Model/Factory/UIFactory.cs rename to src/XKRS.Common.Model/Factory/UIFactory.cs diff --git a/XKRS.Common.Model/Helper/AttributeHelper.cs b/src/XKRS.Common.Model/Helper/AttributeHelper.cs similarity index 100% rename from XKRS.Common.Model/Helper/AttributeHelper.cs rename to src/XKRS.Common.Model/Helper/AttributeHelper.cs diff --git a/XKRS.Common.Model/Helper/EnumHelper.cs b/src/XKRS.Common.Model/Helper/EnumHelper.cs similarity index 100% rename from XKRS.Common.Model/Helper/EnumHelper.cs rename to src/XKRS.Common.Model/Helper/EnumHelper.cs diff --git a/XKRS.Common.Model/Helper/SettingHelper.cs b/src/XKRS.Common.Model/Helper/SettingHelper.cs similarity index 100% rename from XKRS.Common.Model/Helper/SettingHelper.cs rename to src/XKRS.Common.Model/Helper/SettingHelper.cs diff --git a/XKRS.Common.Model/Interface/IDevice.cs b/src/XKRS.Common.Model/Interface/IDevice.cs similarity index 100% rename from XKRS.Common.Model/Interface/IDevice.cs rename to src/XKRS.Common.Model/Interface/IDevice.cs diff --git a/XKRS.Common.Model/Interface/IExceptionHandler.cs b/src/XKRS.Common.Model/Interface/IExceptionHandler.cs similarity index 100% rename from XKRS.Common.Model/Interface/IExceptionHandler.cs rename to src/XKRS.Common.Model/Interface/IExceptionHandler.cs diff --git a/XKRS.Common.Model/Interface/ILogger.cs b/src/XKRS.Common.Model/Interface/ILogger.cs similarity index 100% rename from XKRS.Common.Model/Interface/ILogger.cs rename to src/XKRS.Common.Model/Interface/ILogger.cs diff --git a/XKRS.Common.Model/Interface/IMenuNode.cs b/src/XKRS.Common.Model/Interface/IMenuNode.cs similarity index 100% rename from XKRS.Common.Model/Interface/IMenuNode.cs rename to src/XKRS.Common.Model/Interface/IMenuNode.cs diff --git a/XKRS.Common.Model/Interface/IProcess.cs b/src/XKRS.Common.Model/Interface/IProcess.cs similarity index 100% rename from XKRS.Common.Model/Interface/IProcess.cs rename to src/XKRS.Common.Model/Interface/IProcess.cs diff --git a/XKRS.Common.Model/Interface/IRunCtrl.cs b/src/XKRS.Common.Model/Interface/IRunCtrl.cs similarity index 100% rename from XKRS.Common.Model/Interface/IRunCtrl.cs rename to src/XKRS.Common.Model/Interface/IRunCtrl.cs diff --git a/XKRS.Common.Model/XKRS.Common.Model.csproj b/src/XKRS.Common.Model/XKRS.Common.Model.csproj similarity index 100% rename from XKRS.Common.Model/XKRS.Common.Model.csproj rename to src/XKRS.Common.Model/XKRS.Common.Model.csproj diff --git a/CopyCode/AdvancedPwdFrm.Designer.cs b/src/XKRS.UI.Main/AdvancedPwdFrm.Designer.cs similarity index 100% rename from CopyCode/AdvancedPwdFrm.Designer.cs rename to src/XKRS.UI.Main/AdvancedPwdFrm.Designer.cs diff --git a/CopyCode/AdvancedPwdFrm.cs b/src/XKRS.UI.Main/AdvancedPwdFrm.cs similarity index 100% rename from CopyCode/AdvancedPwdFrm.cs rename to src/XKRS.UI.Main/AdvancedPwdFrm.cs diff --git a/CopyCode/AdvancedPwdFrm.resx b/src/XKRS.UI.Main/AdvancedPwdFrm.resx similarity index 100% rename from CopyCode/AdvancedPwdFrm.resx rename to src/XKRS.UI.Main/AdvancedPwdFrm.resx diff --git a/XKRS.Common.Model/App.config b/src/XKRS.UI.Main/App.config similarity index 100% rename from XKRS.Common.Model/App.config rename to src/XKRS.UI.Main/App.config diff --git a/CopyCode/MainFrm.Designer.cs b/src/XKRS.UI.Main/MainFrm.Designer.cs similarity index 100% rename from CopyCode/MainFrm.Designer.cs rename to src/XKRS.UI.Main/MainFrm.Designer.cs diff --git a/CopyCode/MainFrm.cs b/src/XKRS.UI.Main/MainFrm.cs similarity index 100% rename from CopyCode/MainFrm.cs rename to src/XKRS.UI.Main/MainFrm.cs diff --git a/CopyCode/MainFrm.resx b/src/XKRS.UI.Main/MainFrm.resx similarity index 100% rename from CopyCode/MainFrm.resx rename to src/XKRS.UI.Main/MainFrm.resx diff --git a/CopyCode/Program.cs b/src/XKRS.UI.Main/Program.cs similarity index 97% rename from CopyCode/Program.cs rename to src/XKRS.UI.Main/Program.cs index 49b7335..1cad95b 100644 --- a/CopyCode/Program.cs +++ b/src/XKRS.UI.Main/Program.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; +using XKRS.Common.Model.Authority; namespace XKRS.UI.Main { diff --git a/CopyCode/Properties/AssemblyInfo.cs b/src/XKRS.UI.Main/Properties/AssemblyInfo.cs similarity index 100% rename from CopyCode/Properties/AssemblyInfo.cs rename to src/XKRS.UI.Main/Properties/AssemblyInfo.cs diff --git a/CopyCode/Properties/Resources.Designer.cs b/src/XKRS.UI.Main/Properties/Resources.Designer.cs similarity index 100% rename from CopyCode/Properties/Resources.Designer.cs rename to src/XKRS.UI.Main/Properties/Resources.Designer.cs diff --git a/CopyCode/Properties/Resources.resx b/src/XKRS.UI.Main/Properties/Resources.resx similarity index 100% rename from CopyCode/Properties/Resources.resx rename to src/XKRS.UI.Main/Properties/Resources.resx diff --git a/CopyCode/Properties/Settings.Designer.cs b/src/XKRS.UI.Main/Properties/Settings.Designer.cs similarity index 100% rename from CopyCode/Properties/Settings.Designer.cs rename to src/XKRS.UI.Main/Properties/Settings.Designer.cs diff --git a/CopyCode/Properties/Settings.settings b/src/XKRS.UI.Main/Properties/Settings.settings similarity index 100% rename from CopyCode/Properties/Settings.settings rename to src/XKRS.UI.Main/Properties/Settings.settings diff --git a/CopyCode/XKRS.UI.Main.csproj b/src/XKRS.UI.Main/XKRS.UI.Main.csproj similarity index 100% rename from CopyCode/XKRS.UI.Main.csproj rename to src/XKRS.UI.Main/XKRS.UI.Main.csproj diff --git a/CopyCode/packages.config b/src/XKRS.UI.Main/packages.config similarity index 100% rename from CopyCode/packages.config rename to src/XKRS.UI.Main/packages.config diff --git a/XKRS.UI.Model.Winform/App.config b/src/XKRS.UI.Model.Winform/App.config similarity index 100% rename from XKRS.UI.Model.Winform/App.config rename to src/XKRS.UI.Model.Winform/App.config diff --git a/XKRS.UI.Model.Winform/Helper/AttributeHelper.cs b/src/XKRS.UI.Model.Winform/Helper/AttributeHelper.cs similarity index 100% rename from XKRS.UI.Model.Winform/Helper/AttributeHelper.cs rename to src/XKRS.UI.Model.Winform/Helper/AttributeHelper.cs diff --git a/XKRS.UI.Model.Winform/Helper/MenuFormFactory.cs b/src/XKRS.UI.Model.Winform/Helper/MenuFormFactory.cs similarity index 100% rename from XKRS.UI.Model.Winform/Helper/MenuFormFactory.cs rename to src/XKRS.UI.Model.Winform/Helper/MenuFormFactory.cs diff --git a/XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.Designer.cs b/src/XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.Designer.cs similarity index 100% rename from XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.Designer.cs rename to src/XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.Designer.cs diff --git a/XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.cs b/src/XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.cs similarity index 100% rename from XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.cs rename to src/XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.cs diff --git a/XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.resx b/src/XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.resx similarity index 100% rename from XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.resx rename to src/XKRS.UI.Model.Winform/UI/DockContent/DeviceRunFrmBase.resx diff --git a/XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.Designer.cs b/src/XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.Designer.cs similarity index 100% rename from XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.Designer.cs rename to src/XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.Designer.cs diff --git a/XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.cs b/src/XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.cs similarity index 100% rename from XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.cs rename to src/XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.cs diff --git a/XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.resx b/src/XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.resx similarity index 100% rename from XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.resx rename to src/XKRS.UI.Model.Winform/UI/DockContent/MenuFrmBase.resx diff --git a/XKRS.UI.Model.Winform/XKRS.UI.Model.Winform.csproj b/src/XKRS.UI.Model.Winform/XKRS.UI.Model.Winform.csproj similarity index 100% rename from XKRS.UI.Model.Winform/XKRS.UI.Model.Winform.csproj rename to src/XKRS.UI.Model.Winform/XKRS.UI.Model.Winform.csproj diff --git a/XKRS.UI.Model.Winform/packages.config b/src/XKRS.UI.Model.Winform/packages.config similarity index 100% rename from XKRS.UI.Model.Winform/packages.config rename to src/XKRS.UI.Model.Winform/packages.config