From 318cfb5fe28351057149872203651d18e0cfbb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Thu, 12 Jan 2023 15:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=84=E5=B1=82=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

领域层不能依赖sqlsugar层
sqlsugar层依赖领域层
---
 .../Student/IStudentService.cs                  |  1 -
 .../Student/StudentService.cs                   |  2 +-
 .../Yi.Framework.Core.Sqlsugar.csproj           |  1 +
 .../Student/IRepository/IStudentRepository.cs   | 15 ---------------
 .../Student/Entities/StudentEntity.cs           |  4 +---
 .../Student/IRepository/IStudentRepository.cs   | 17 +++++++++++++++++
 .../Student/StudentManager.cs                   |  2 +-
 .../Yi.Framework.Domain.csproj                  |  1 -
 .../Student/StudentRepository.cs                | 13 ++++++++++---
 .../Yi.Framework.Sqlsugar.csproj                |  2 +-
 .../YiFrameworkSqlsugarModule.cs                |  2 +-
 .../Yi.Framework.Web/Yi.Framework.Web.csproj    |  1 +
 12 files changed, 34 insertions(+), 27 deletions(-)
 delete mode 100644 src/Yi.Framework/Yi.Framework.Domain.Shared/Student/IRepository/IStudentRepository.cs
 create mode 100644 src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs

diff --git a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/IStudentService.cs b/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/IStudentService.cs
index f02c2faa..aca3f0be 100644
--- a/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/IStudentService.cs
+++ b/src/Yi.Framework/Yi.Framework.Application.Contracts/Student/IStudentService.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Yi.Framework.Domain.Shared.Student.IRepository;
 
 namespace Yi.Framework.Application.Contracts.Student
 {
diff --git a/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs b/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs
index aa2e73c9..48e590ed 100644
--- a/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs
+++ b/src/Yi.Framework/Yi.Framework.Application/Student/StudentService.cs
@@ -6,8 +6,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Yi.Framework.Application.Contracts.Student;
-using Yi.Framework.Domain.Shared.Student.IRepository;
 using Yi.Framework.Domain.Student;
+using Yi.Framework.Domain.Student.IRepository;
 
 namespace Yi.Framework.Application.Student
 {
diff --git a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj b/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj
index d0550922..07cf7472 100644
--- a/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj
+++ b/src/Yi.Framework/Yi.Framework.Core.Sqlsugar/Yi.Framework.Core.Sqlsugar.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <Folder Include="Options\" />
+    <Folder Include="Uow\" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/IRepository/IStudentRepository.cs b/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/IRepository/IStudentRepository.cs
deleted file mode 100644
index cfad4e33..00000000
--- a/src/Yi.Framework/Yi.Framework.Domain.Shared/Student/IRepository/IStudentRepository.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Yi.Framework.Domain.Shared.Student.IRepository
-{
-    /// <summary>
-    /// 仓储抽象
-    /// </summary>
-    public interface IStudentRepository
-    {
-    }
-}
diff --git a/src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs b/src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs
index f850ab2f..1d532d26 100644
--- a/src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs
+++ b/src/Yi.Framework/Yi.Framework.Domain/Student/Entities/StudentEntity.cs
@@ -1,5 +1,4 @@
-using SqlSugar;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -10,7 +9,6 @@ namespace Yi.Framework.Domain.Student.Entities
     /// <summary>
     /// 实体
     /// </summary>
-    [SugarTable("Student")]
     public class StudentEntity
     {
         public long Id { get; set; }
diff --git a/src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs b/src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs
new file mode 100644
index 00000000..e31bd2e1
--- /dev/null
+++ b/src/Yi.Framework/Yi.Framework.Domain/Student/IRepository/IStudentRepository.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Ddd.Repository;
+using Yi.Framework.Domain.Student.Entities;
+
+namespace Yi.Framework.Domain.Student.IRepository
+{
+    /// <summary>
+    /// 仓储抽象
+    /// </summary>
+    public interface IStudentRepository:IRepository<StudentEntity>
+    {
+    }
+}
diff --git a/src/Yi.Framework/Yi.Framework.Domain/Student/StudentManager.cs b/src/Yi.Framework/Yi.Framework.Domain/Student/StudentManager.cs
index eeecd72c..ab48018c 100644
--- a/src/Yi.Framework/Yi.Framework.Domain/Student/StudentManager.cs
+++ b/src/Yi.Framework/Yi.Framework.Domain/Student/StudentManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Yi.Framework.Domain.Shared.Student.IRepository;
+using Yi.Framework.Domain.Student.IRepository;
 
 namespace Yi.Framework.Domain.Student
 {
diff --git a/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj b/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj
index 5a36f2d6..b1d51c1d 100644
--- a/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj
+++ b/src/Yi.Framework/Yi.Framework.Domain/Yi.Framework.Domain.csproj
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Yi.Framework.Domain.Shared\Yi.Framework.Domain.Shared.csproj" />
-    <ProjectReference Include="..\Yi.Framework.Sqlsugar\Yi.Framework.Sqlsugar.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs b/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs
index b5ecac07..5ba9c262 100644
--- a/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs
+++ b/src/Yi.Framework/Yi.Framework.Sqlsugar/Student/StudentRepository.cs
@@ -1,16 +1,23 @@
-using System;
+using SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Yi.Framework.Domain.Shared.Student.IRepository;
+using Yi.Framework.Core.Sqlsugar.Repository;
+using Yi.Framework.Ddd.Repository;
+using Yi.Framework.Domain.Student.Entities;
+using Yi.Framework.Domain.Student.IRepository;
 
 namespace Yi.Framework.Sqlsugar.Student
 {
     /// <summary>
     /// 仓储实现方式
     /// </summary>
-    public class StudentRepository: IStudentRepository
+    public class StudentRepository : SqlsugarRepository<StudentEntity> ,IStudentRepository
     {
+        public StudentRepository(ISqlSugarClient context) : base(context)
+        {
+        }
     }
 }
diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj b/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj
index 82b959f4..11db2576 100644
--- a/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj
+++ b/src/Yi.Framework/Yi.Framework.Sqlsugar/Yi.Framework.Sqlsugar.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Yi.Framework.Core.Sqlsugar\Yi.Framework.Core.Sqlsugar.csproj" />
-    <ProjectReference Include="..\Yi.Framework.Domain.Shared\Yi.Framework.Domain.Shared.csproj" />
+    <ProjectReference Include="..\Yi.Framework.Domain\Yi.Framework.Domain.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs b/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs
index 444aa1a3..169c09fc 100644
--- a/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs
+++ b/src/Yi.Framework/Yi.Framework.Sqlsugar/YiFrameworkSqlsugarModule.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Yi.Framework.Domain.Shared.Student.IRepository;
+using Yi.Framework.Domain.Student.IRepository;
 using Yi.Framework.Sqlsugar.Student;
 
 namespace Yi.Framework.Sqlsugar
diff --git a/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj b/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj
index 9cb6d744..f9cd981f 100644
--- a/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj
+++ b/src/Yi.Framework/Yi.Framework.Web/Yi.Framework.Web.csproj
@@ -9,6 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Yi.Framework.Application\Yi.Framework.Application.csproj" />
     <ProjectReference Include="..\Yi.Framework.Core.Autofac\Yi.Framework.Core.Autofac.csproj" />
+    <ProjectReference Include="..\Yi.Framework.Sqlsugar\Yi.Framework.Sqlsugar.csproj" />
   </ItemGroup>
 
 </Project>