项目结构调整

ConsoleStarter/ConsoleStarter.csproj

@@ -10,7 +10,7 @@
     <ItemGroup>
       <ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" />
       <ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj" />
-      <ProjectReference Include="..\HybirdFrameworkEntity\HybirdFrameworkEntity.csproj" />
+      <ProjectReference Include="..\Entity\Entity.csproj" />
     </ItemGroup>
 
     <ItemGroup>

Entity/Common/IPageList.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace HybirdFrameworkEntity.Common
+namespace Entity.Common
 {
     public interface IPageList<T> : IList<T>
     {

Entity/Common/PageList.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace HybirdFrameworkEntity.Common
+namespace Entity.Common
 {
     /// <summary>
     ///     分页组件实体类

Entity/DbModel/sysBatteryReplaceLog.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     [SugarTable("sys_battery_replace_log")]
     public class sysBatteryReplaceLog

Entity/DbModel/sysDataSource.cs

@@ -6,7 +6,7 @@ using System.Security.Principal;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     public partial class sysDataSource
     {

Entity/DbModel/sysDicData.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Text;
 using SqlSugar;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     ///<summary>
     ///

Entity/DbModel/sysDicType.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Text;
 using SqlSugar;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     ///<summary>
     ///

Entity/DbModel/sysMenu.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Security.Principal;
 using System.Text;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     ///<summary>
     ///

Entity/DbModel/sysMessage.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Text;
 using SqlSugar;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     ///<summary>
     ///

Entity/DbModel/sysRole.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Text;
 using SqlSugar;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     ///<summary>
     ///

Entity/DbModel/sysRoleMenu.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Text;
 using SqlSugar;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     ///<summary>
     ///

Entity/DbModel/sysUser.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Security.Principal;
 using System.Text;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     ///<summary>
     ///

Entity/DbModel/sysUserRole.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Text;
 using SqlSugar;
 
-namespace HybirdFrameworkEntity.DbModel
+namespace Entity.DbModel
 {
     ///<summary>
     ///

HybirdFrameworkCore/Autofac/AutofacModuleRegister.cs

@@ -16,9 +16,9 @@ namespace HybirdFrameworkCore.Autofac
 
             #region 带有接口层的服务注入
 
-            var repositoryDllFile = Path.Combine(basePath, "HybirdFrameworkRepository.dll");
+            var repositoryDllFile = Path.Combine(basePath, "Repository.dll");
             var driverDllFile = Path.Combine(basePath, "HybirdFrameworkDriver.dll");
-            var servicesDllFile = Path.Combine(basePath, "HybirdFrameworkServices.dll");
+            var servicesDllFile = Path.Combine(basePath, "Service.dll");
 
             if (!(File.Exists(servicesDllFile) && File.Exists(repositoryDllFile)))
             {

HybirdFrameworkEntity/obj/Debug/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs

@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]

HybirdFrameworkEntity/obj/Debug/net6.0/HybirdFrameworkEntity.GlobalUsings.g.cs

@@ -1,8 +0,0 @@
-// <auto-generated/>
-global using global::System;
-global using global::System.Collections.Generic;
-global using global::System.IO;
-global using global::System.Linq;
-global using global::System.Net.Http;
-global using global::System.Threading;
-global using global::System.Threading.Tasks;

HybirdFrameworkEntity/obj/HybirdFrameworkEntity.csproj.nuget.g.targets

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" />
-  </ImportGroup>
-</Project>

HybirdFrameworkRepository/obj/Debug/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs

@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]

HybirdFrameworkRepository/obj/Debug/net6.0/HybirdFrameworkRepository.GlobalUsings.g.cs

@@ -1,8 +0,0 @@
-// <auto-generated/>
-global using global::System;
-global using global::System.Collections.Generic;
-global using global::System.IO;
-global using global::System.Linq;
-global using global::System.Net.Http;
-global using global::System.Threading;
-global using global::System.Threading.Tasks;

HybirdFrameworkRepository/obj/HybirdFrameworkRepository.csproj.nuget.g.targets

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets')" />
-    <Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" />
-  </ImportGroup>
-</Project>

HybirdFrameworkServices/obj/Debug/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs

@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]

HybirdFrameworkServices/obj/Debug/net6.0/HybirdFrameworkServices.GlobalUsings.g.cs

@@ -1,8 +0,0 @@
-// <auto-generated/>
-global using global::System;
-global using global::System.Collections.Generic;
-global using global::System.IO;
-global using global::System.Linq;
-global using global::System.Net.Http;
-global using global::System.Threading;
-global using global::System.Threading.Tasks;

HybirdFrameworkServices/obj/HybirdFrameworkServices.csproj.nuget.g.targets

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets')" />
-    <Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" />
-  </ImportGroup>
-</Project>

Repository/BaseRepository.cs

@@ -1,9 +1,9 @@
 using System.Linq.Expressions;
 using SqlSugar;
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkEntity.Common;
+using Entity.Common;
 
-namespace HybirdFrameworkRepository
+namespace Repository
 {
     public abstract class BaseRepository<T> where T : class, new()
     {

Repository/Repository.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" />
-    <ProjectReference Include="..\HybirdFrameworkEntity\HybirdFrameworkEntity.csproj" />
+    <ProjectReference Include="..\Entity\Entity.csproj" />
   </ItemGroup>
 
 </Project>

Repository/SqlSugarExtensions.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace HybirdFrameworkRepository
+namespace Repository
 {
     internal static class SqlSugarExtensions
     {

Repository/System/Class1.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     internal class Class1
     {

Repository/System/SysBatteryReplaceLogRepository.cs

@@ -1,4 +1,4 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     public class SysBatteryReplaceLogRepository : BaseRepository<sysBatteryReplaceLog>
     {

Repository/System/SysDataSourceRepository.cs

@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     public class SysDataSourceRepository : BaseRepository<sysDataSource>
     {

Repository/System/SysDicDataRepository.cs

@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     public class sysDicDataRepository : BaseRepository<sysDicData>
     {

Repository/System/SysDicTypeRepository.cs

@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     public class sysDicTypeRepository : BaseRepository<sysDicType>
     {

Repository/System/SysMenuRepository.cs

@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     public class SysMenuRepository : BaseRepository<sysMenu>
     {

Repository/System/SysMessageRepository.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     public class sysMessageRepository : BaseRepository<sysMessage>
     {

Repository/System/SysRoleMenuRepository.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     public class sysRoleMenuRepository : BaseRepository<sysRoleMenu>
     {

Repository/System/SysRoleRepository.cs

@@ -1,7 +1,7 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     public class sysRoleRepository : BaseRepository<sysRole>
     {

Repository/System/SysUserRepository.cs

@@ -1,9 +1,9 @@
 using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     [Scope("SingleInstance")]
     public class SysUserRepository : BaseRepository<sysUser>

Repository/System/SysUserRoleRepository.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
 using SqlSugar;
 
 
-namespace HybirdFrameworkRepository.System
+namespace Repository.System
 {
     public class sysUserRoleRepository : BaseRepository<sysUserRole>
     {

Repository/UnitOfWork/Class1.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace HybirdFrameworkRepository.UnitOfWork
+namespace Repository.UnitOfWork
 {
     internal class Class1
     {

Repository/UnitOfWork/UnitOfWork.cs

@@ -1,7 +1,7 @@
 using HybirdFrameworkCore.Autofac.Attribute;
 using SqlSugar;
 
-namespace HybirdFrameworkRepository.UnitOfWork
+namespace Repository.UnitOfWork
 {
     [Scope("SingleInstance")]
     public class UnitOfWork

Service/BaseServices.cs

@@ -1,5 +1,5 @@
-using HybirdFrameworkEntity.Common;
+using Entity.Common;
-using HybirdFrameworkRepository;
+using Repository;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace HybirdFrameworkServices
+namespace Service
 {
     public class BaseServices<T> where T : class, new()
     {

Service/Charger/Client/ChargerClient.cs

@@ -1,10 +1,10 @@
 using HybirdFrameworkCore.Autofac.Attribute;
 using HybirdFrameworkDriver.Session;
 using HybirdFrameworkDriver.TcpClient;
-using HybirdFrameworkServices.Charger.Codec;
+using Service.Charger.Codec;
-using HybirdFrameworkServices.Charger.Handler;
+using Service.Charger.Handler;
 
-namespace HybirdFrameworkServices.Charger.Client;
+namespace Service.Charger.Client;
 
 /// <summary>
 /// 示例程序

Service/Charger/Client/ChargerServer.cs

@@ -1,9 +1,9 @@
 using HybirdFrameworkCore.Autofac.Attribute;
 using HybirdFrameworkDriver.TcpServer;
-using HybirdFrameworkServices.Charger.Codec;
+using Service.Charger.Codec;
-using HybirdFrameworkServices.Charger.Handler;
+using Service.Charger.Handler;
 
-namespace HybirdFrameworkServices.Charger.Client;
+namespace Service.Charger.Client;
 
 /// <summary>
 /// 示例程序

Service/Charger/Client/ClientMgr.cs

@@ -2,9 +2,9 @@
 using Autofac;
 using HybirdFrameworkCore.Autofac;
 using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkServices.Charger.Msg.Host.Req;
+using Service.Charger.Msg.Host.Req;
 
-namespace HybirdFrameworkServices.Charger.Client;
+namespace Service.Charger.Client;
 
 /// <summary>
 /// 示例程序

Service/Charger/Codec/Decoder.cs

@@ -1,9 +1,9 @@
 using DotNetty.Buffers;
 using DotNetty.Codecs;
 using DotNetty.Transport.Channels;
-using HybirdFrameworkServices.Charger.Msg.Charger.Req;
+using Service.Charger.Msg.Charger.Req;
 
-namespace HybirdFrameworkServices.Charger.Codec;
+namespace Service.Charger.Codec;
 
 public class Decoder : ByteToMessageDecoder
 {

Service/Charger/Codec/Encoder.cs

@@ -3,7 +3,7 @@ using DotNetty.Codecs;
 using DotNetty.Transport.Channels;
 using HybirdFrameworkDriver.Common;
 
-namespace HybirdFrameworkServices.Charger.Codec;
+namespace Service.Charger.Codec;
 
 public class Encoder : MessageToByteEncoder<IToBytes>
 {

Service/Charger/Common/ChargerConst.cs

@@ -1,4 +1,4 @@
-namespace HybirdFrameworkServices.Charger.Common;
+namespace Service.Charger.Common;
 
 public class ChargerConst
 {

Service/Charger/Handler/AuthResHandler.cs

@@ -1,10 +1,10 @@
 using DotNetty.Transport.Channels;
 using HybirdFrameworkCore.Autofac.Attribute;
 using HybirdFrameworkDriver.Session;
-using HybirdFrameworkServices.Charger.Msg.Charger.Resp;
 using log4net;
+using Service.Charger.Msg.Charger.Resp;
 
-namespace HybirdFrameworkServices.Charger.Handler
+namespace Service.Charger.Handler
 {
     /// <summary>
     /// 接收到鉴权帧

Service/Charger/Handler/IBaseHandler.cs

@@ -1,6 +1,6 @@
 using DotNetty.Transport.Channels;
 
-namespace HybirdFrameworkServices.Charger.Handler;
+namespace Service.Charger.Handler;
 
 public interface IBaseHandler : IChannelHandler
 {

Service/Charger/Handler/LoginHandler.cs

@@ -1,11 +1,11 @@
 using DotNetty.Transport.Channels;
 using HybirdFrameworkCore.Autofac.Attribute;
 using HybirdFrameworkDriver.Session;
-using HybirdFrameworkServices.Charger.Msg.Charger.Req;
-using HybirdFrameworkServices.Charger.Msg.Host.Resp;
 using log4net;
+using Service.Charger.Msg.Charger.Req;
+using Service.Charger.Msg.Host.Resp;
 
-namespace HybirdFrameworkServices.Charger.Handler
+namespace Service.Charger.Handler
 {
     /// <summary>
     /// 3.3.3 充放电机登陆签到

Service/Charger/Msg/APCI.cs

@@ -1,7 +1,7 @@
 using HybirdFrameworkDriver.Common;
-using HybirdFrameworkServices.Charger.Common;
+using Service.Charger.Common;
 
-namespace HybirdFrameworkServices.Charger.Msg
+namespace Service.Charger.Msg
 {
     public abstract class APCI : IToBytes
     {

Service/Charger/Msg/ASDU.cs

@@ -1,8 +1,8 @@
 using DotNetty.Buffers;
 using HybirdFrameworkCore.Utils;
-using HybirdFrameworkServices.Charger.Common;
+using Service.Charger.Common;
 
-namespace HybirdFrameworkServices.Charger.Msg
+namespace Service.Charger.Msg
 {
     public class ASDU : APCI
     {

Service/Charger/Msg/Charger/Req/Login.cs

@@ -1,6 +1,6 @@
 using HybirdFrameworkCore.Autofac.Attribute;
 
-namespace HybirdFrameworkServices.Charger.Msg.Charger.Req
+namespace Service.Charger.Msg.Charger.Req
 {
     /// <summary>
     /// 3.3.3 充放电机登陆签到

Service/Charger/Msg/Charger/Resp/AuthRes.cs

@@ -1,6 +1,6 @@
 using HybirdFrameworkCore.Autofac.Attribute;
 
-namespace HybirdFrameworkServices.Charger.Msg.Charger.Resp
+namespace Service.Charger.Msg.Charger.Resp
 {
     /// <summary>
     /// 3.3.2 充放电机应答鉴权认证

Service/Charger/Msg/Host/Req/Auth.cs

@@ -1,6 +1,6 @@
 using HybirdFrameworkCore.Autofac.Attribute;
 
-namespace HybirdFrameworkServices.Charger.Msg.Host.Req
+namespace Service.Charger.Msg.Host.Req
 {
     /// <summary>
     /// 3.3.1 监控平台鉴权认证

Service/Charger/Msg/Host/Resp/LogSignMessage.cs

@@ -1,6 +1,6 @@
 using HybirdFrameworkCore.Autofac.Attribute;
 
-namespace HybirdFrameworkServices.Charger.Msg.Host.Resp
+namespace Service.Charger.Msg.Host.Resp
 {
     /// <summary>
     /// 3.3.4 监控平台应答充电设备登录签到报文

Service/Service.csproj

@@ -20,8 +20,8 @@
   <ItemGroup>
     <ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" />
     <ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj" />
-    <ProjectReference Include="..\HybirdFrameworkEntity\HybirdFrameworkEntity.csproj" />
+    <ProjectReference Include="..\Entity\Entity.csproj" />
-    <ProjectReference Include="..\HybirdFrameworkRepository\HybirdFrameworkRepository.csproj" />
+    <ProjectReference Include="..\Repository\Repository.csproj" />
   </ItemGroup>
 
 </Project>

Service/System/SysBatteryReplaceLogServices.cs

@@ -1,10 +1,10 @@
 using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     [Scope("SingleInstance")]
     public class SysBatteryReplaceLogServices : BaseServices<sysBatteryReplaceLog>

Service/System/SysDataSourceServices.cs

@@ -1,9 +1,9 @@
 using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     [Scope("SingleInstance")]
     public class SysDataSourceServices : BaseServices<sysDataSource>

Service/System/SysDicDataServices.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     public class sysDicDataServices : BaseServices<sysDicData>
     {

Service/System/SysDicTypeServices.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     public class sysDicTypeServices : BaseServices<sysDicType>
     {

Service/System/SysMenuServices.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     public class SysMenuServices : BaseServices<sysMenu>
     {

Service/System/SysMessageServices.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     public class sysMessageServices : BaseServices<sysMessage>
     {

Service/System/SysRoleMenuServices.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     public class sysRoleMenuServices : BaseServices<sysRoleMenu>
     {

Service/System/SysRoleServices.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     public class sysRoleServices : BaseServices<sysRole>
     {

Service/System/SysUserRoleServices.cs

@@ -1,8 +1,8 @@
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     public class sysUserRoleServices : BaseServices<sysUserRole>
     {

Service/System/SysUserServices.cs

@@ -1,9 +1,9 @@
 using HybirdFrameworkCore.Autofac.Attribute;
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkRepository.System;
+using Repository.System;
-using HybirdFrameworkRepository.UnitOfWork;
+using Repository.UnitOfWork;
 
-namespace HybirdFrameworkServices.System
+namespace Service.System
 {
     [Scope("SingleInstance")]
     public class SysUserServices : BaseServices<sysUser>

WebStarter/Controllers/WeatherForecastController.cs

@@ -1,6 +1,6 @@
-using HybirdFrameworkServices.System;
+using Entity.DbModel;
 using Microsoft.AspNetCore.Mvc;
-using HybirdFrameworkEntity.DbModel;
+using Service.System;
 
 namespace WebStarter.Controllers
 {

WebStarter/WebStarter.csproj

@@ -16,8 +16,8 @@
   <ItemGroup>
     <ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" />
     <ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj" />
-    <ProjectReference Include="..\HybirdFrameworkRepository\HybirdFrameworkRepository.csproj" />
+    <ProjectReference Include="..\Repository\Repository.csproj" />
-    <ProjectReference Include="..\HybirdFrameworkServices\HybirdFrameworkServices.csproj" />
+    <ProjectReference Include="..\Service\Service.csproj" />
   </ItemGroup>
 
   <ItemGroup>

WinFormStarter/WinFormStarter.csproj

@@ -17,9 +17,9 @@
     <ItemGroup>
       <ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" />
       <ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj" />
-      <ProjectReference Include="..\HybirdFrameworkEntity\HybirdFrameworkEntity.csproj" />
+      <ProjectReference Include="..\Entity\Entity.csproj" />
-      <ProjectReference Include="..\HybirdFrameworkRepository\HybirdFrameworkRepository.csproj" />
+      <ProjectReference Include="..\Repository\Repository.csproj" />
-      <ProjectReference Include="..\HybirdFrameworkServices\HybirdFrameworkServices.csproj" />
+      <ProjectReference Include="..\Service\Service.csproj" />
     </ItemGroup>
 
     <ItemGroup>

WpfStarter/MainWindow.xaml.cs

@@ -2,8 +2,8 @@
 using System.Windows;
 using Autofac;
 using HybirdFrameworkCore.Autofac;
-using HybirdFrameworkEntity.DbModel;
+using Entity.DbModel;
-using HybirdFrameworkServices.System;
+using Service.System;
 using log4net;
 
 namespace WpfStarter

WpfStarter/WpfStarter.csproj

@@ -27,9 +27,9 @@
     <ItemGroup>
       <ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" />
       <ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj" />
-      <ProjectReference Include="..\HybirdFrameworkEntity\HybirdFrameworkEntity.csproj" />
+      <ProjectReference Include="..\Entity\Entity.csproj" />
-      <ProjectReference Include="..\HybirdFrameworkRepository\HybirdFrameworkRepository.csproj" />
+      <ProjectReference Include="..\Repository\Repository.csproj" />
-      <ProjectReference Include="..\HybirdFrameworkServices\HybirdFrameworkServices.csproj" />
+      <ProjectReference Include="..\Service\Service.csproj" />
     </ItemGroup>
 
 </Project>

hybirdMyFrame.sln

@@ -3,27 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34701.34
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Core", "HybirdFramework.Core", "{0E784680-8280-4C47-8D2D-6405AC892164}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Entity", "HybirdFramework.Entity", "{6203689E-8261-4814-BFC2-013188AED6A1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Repository", "HybirdFramework.Repository", "{348F9459-2A59-47EB-B801-0CF907DFD8EC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Services", "HybirdFramework.Services", "{5F67ED42-6437-4FC6-86D2-0495DE990BC4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebStarter", "WebStarter\WebStarter.csproj", "{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkCore", "HybirdFrameworkCore\HybirdFrameworkCore.csproj", "{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkRepository", "HybirdFrameworkRepository\HybirdFrameworkRepository.csproj", "{01D2CC15-F1FD-4E22-845A-2D2473662860}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository", "Repository\Repository.csproj", "{01D2CC15-F1FD-4E22-845A-2D2473662860}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkServices", "HybirdFrameworkServices\HybirdFrameworkServices.csproj", "{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Service", "Service\Service.csproj", "{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinFormStarter", "WinFormStarter\WinFormStarter.csproj", "{A6757DAD-EF5A-41FD-9323-F3FCF05ED777}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkEntity", "HybirdFrameworkEntity\HybirdFrameworkEntity.csproj", "{C2380814-15D4-491D-ADF2-ADC68617C3FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entity", "Entity\Entity.csproj", "{C2380814-15D4-491D-ADF2-ADC68617C3FA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Driver", "HybirdFramework.Driver", "{EF6B2DEC-ADAA-4A6D-AE93-0F98A555B265}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HybirdFrameworkDriver", "HybirdFrameworkDriver\HybirdFrameworkDriver.csproj", "{6ACFA707-E72E-4BA1-8262-9F2E5B758D46}"
 EndProject
@@ -33,6 +23,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Starter", "Starter", "{E0B9
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfStarter", "WpfStarter\WpfStarter.csproj", "{17044C11-3794-4938-BA80-C061BD871AE0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Business", "Business", "{C9515084-B676-4C33-9FE7-E0B860493A4F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -80,15 +74,15 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A} = {0E784680-8280-4C47-8D2D-6405AC892164}
-		{01D2CC15-F1FD-4E22-845A-2D2473662860} = {348F9459-2A59-47EB-B801-0CF907DFD8EC}
-		{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC} = {5F67ED42-6437-4FC6-86D2-0495DE990BC4}
-		{C2380814-15D4-491D-ADF2-ADC68617C3FA} = {6203689E-8261-4814-BFC2-013188AED6A1}
-		{6ACFA707-E72E-4BA1-8262-9F2E5B758D46} = {EF6B2DEC-ADAA-4A6D-AE93-0F98A555B265}
 		{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8} = {E0B949DC-17FE-414D-8898-937A317BB853}
 		{17044C11-3794-4938-BA80-C061BD871AE0} = {E0B949DC-17FE-414D-8898-937A317BB853}
 		{61B1609B-97EE-48E4-ADA6-4F1A832B8D33} = {E0B949DC-17FE-414D-8898-937A317BB853}
 		{A6757DAD-EF5A-41FD-9323-F3FCF05ED777} = {E0B949DC-17FE-414D-8898-937A317BB853}
+		{6ACFA707-E72E-4BA1-8262-9F2E5B758D46} = {D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}
+		{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A} = {D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}
+		{C2380814-15D4-491D-ADF2-ADC68617C3FA} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
+		{01D2CC15-F1FD-4E22-845A-2D2473662860} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
+		{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E10BF3D-9914-44B1-A6AA-FCF013C3F155}