diff --git a/ZR.Common/Extension/Extension.Convert.cs b/Infrastructure/Extensions/Extension.Convert.cs similarity index 99% rename from ZR.Common/Extension/Extension.Convert.cs rename to Infrastructure/Extensions/Extension.Convert.cs index febe6bb..4710dfd 100644 --- a/ZR.Common/Extension/Extension.Convert.cs +++ b/Infrastructure/Extensions/Extension.Convert.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Common.Extension +namespace Infrastructure.Extensions { public static partial class Extensions { diff --git a/ZR.Common/Extension/Extension.Enum.cs b/Infrastructure/Extensions/Extension.Enum.cs similarity index 98% rename from ZR.Common/Extension/Extension.Enum.cs rename to Infrastructure/Extensions/Extension.Enum.cs index d5be020..72710ff 100644 --- a/ZR.Common/Extension/Extension.Enum.cs +++ b/Infrastructure/Extensions/Extension.Enum.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; //using Newtonsoft.Json; -namespace ZR.Common.Extension +namespace Infrastructure.Extensions { public static partial class Extensions { diff --git a/ZR.Common/Extension/Extension.Exception.cs b/Infrastructure/Extensions/Extension.Exception.cs similarity index 91% rename from ZR.Common/Extension/Extension.Exception.cs rename to Infrastructure/Extensions/Extension.Exception.cs index f021439..4af781d 100644 --- a/ZR.Common/Extension/Extension.Exception.cs +++ b/Infrastructure/Extensions/Extension.Exception.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Common.Extension +namespace Infrastructure.Extensions { public static partial class Extensions { diff --git a/ZR.Common/Extension/Extension.Linq.cs b/Infrastructure/Extensions/Extension.Linq.cs similarity index 99% rename from ZR.Common/Extension/Extension.Linq.cs rename to Infrastructure/Extensions/Extension.Linq.cs index 45425ec..0c23a71 100644 --- a/ZR.Common/Extension/Extension.Linq.cs +++ b/Infrastructure/Extensions/Extension.Linq.cs @@ -5,7 +5,7 @@ using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; -namespace ZR.Common.Extension +namespace Infrastructure.Extensions { public static class LinqExtensions { diff --git a/ZR.Common/Extension/Extension.Validate.cs b/Infrastructure/Extensions/Extension.Validate.cs similarity index 96% rename from ZR.Common/Extension/Extension.Validate.cs rename to Infrastructure/Extensions/Extension.Validate.cs index 379972b..2d8c083 100644 --- a/ZR.Common/Extension/Extension.Validate.cs +++ b/Infrastructure/Extensions/Extension.Validate.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ZR.Common.Extension +namespace Infrastructure.Extensions { public static partial class Extensions { diff --git a/ZR.Common/ComputerHelper.cs b/Infrastructure/Helper/ComputerHelper.cs similarity index 98% rename from ZR.Common/ComputerHelper.cs rename to Infrastructure/Helper/ComputerHelper.cs index 041022f..b26e37b 100644 --- a/ZR.Common/ComputerHelper.cs +++ b/Infrastructure/Helper/ComputerHelper.cs @@ -1,10 +1,10 @@ -using System; +using Infrastructure.Extensions; +using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; -using ZR.Common.Extension; -namespace ZR.Common +namespace Infrastructure { public class ComputerHelper { diff --git a/ZR.Common/DateTimeHelper.cs b/Infrastructure/Helper/DateTimeHelper.cs similarity index 99% rename from ZR.Common/DateTimeHelper.cs rename to Infrastructure/Helper/DateTimeHelper.cs index 2fb05d7..a50008d 100644 --- a/ZR.Common/DateTimeHelper.cs +++ b/Infrastructure/Helper/DateTimeHelper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace ZR.Common +namespace Infrastructure { public class DateTimeHelper { diff --git a/ZR.Common/FileUtil.cs b/Infrastructure/Helper/FileUtil.cs similarity index 98% rename from ZR.Common/FileUtil.cs rename to Infrastructure/Helper/FileUtil.cs index ae0a079..9d3b3aa 100644 --- a/ZR.Common/FileUtil.cs +++ b/Infrastructure/Helper/FileUtil.cs @@ -4,7 +4,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; -namespace ZR.Common +namespace Infrastructure { public class FileUtil { diff --git a/ZR.Common/HttpHelper.cs b/Infrastructure/Helper/HttpHelper.cs similarity index 99% rename from ZR.Common/HttpHelper.cs rename to Infrastructure/Helper/HttpHelper.cs index 403a916..a42482b 100644 --- a/ZR.Common/HttpHelper.cs +++ b/Infrastructure/Helper/HttpHelper.cs @@ -4,7 +4,7 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; -namespace ZR.Common +namespace Infrastructure { public class HttpHelper { diff --git a/ZR.Common/ShellHelper.cs b/Infrastructure/Helper/ShellHelper.cs similarity index 98% rename from ZR.Common/ShellHelper.cs rename to Infrastructure/Helper/ShellHelper.cs index c5f7ce3..4ca9e78 100644 --- a/ZR.Common/ShellHelper.cs +++ b/Infrastructure/Helper/ShellHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text; -namespace ZR.Common +namespace Infrastructure { public class ShellHelper { diff --git a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs index 1a045ec..432aad4 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs @@ -9,6 +9,7 @@ using ZR.Admin.WebApi.Filters; using ZR.Common; using Infrastructure.Enums; using ZR.Service.System.IService; +using Infrastructure; namespace ZR.Admin.WebApi.Controllers.System { diff --git a/ZR.Service/System/SysOperLogService.cs b/ZR.Service/System/SysOperLogService.cs index 4fa5ec3..80a5f5f 100644 --- a/ZR.Service/System/SysOperLogService.cs +++ b/ZR.Service/System/SysOperLogService.cs @@ -1,11 +1,11 @@ using Infrastructure.Attribute; using System.Collections.Generic; -using ZR.Common; using ZR.Model; using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Repository.System; using ZR.Service.System.IService; +using Infrastructure; namespace ZR.Service.System {