From 0763cbf2631c4c948cb74c3f65dcde58473e8aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Fri, 1 Mar 2024 09:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BB=84=E9=A1=B9=E7=9B=AE=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SJZY.Track.Api.sln.DotSettings                        |  2 ++
 .../SJZY.Track.Application.csproj                     | 11 ++++++-----
 .../Enums/EnumPropertyEnums.cs}                       |  2 +-
 src/SJZY.Track.Domain/IBasicRepository.cs             |  2 +-
 .../{ => Queries}/BasicQuery.cs                       |  2 +-
 .../Repositories/BasicRepository.cs                   |  3 ++-
 .../Repositories/TrackTemplateRepository.cs           |  2 +-
 .../SJZYTrackInfrastructureModule.cs                  |  1 +
 8 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 SJZY.Track.Api.sln.DotSettings
 rename src/{SJZY.Track.Infrastructure/Enum/Enums.cs => SJZY.Track.Domain/Enums/EnumPropertyEnums.cs} (83%)
 rename src/SJZY.Track.Infrastructure/{ => Queries}/BasicQuery.cs (95%)

diff --git a/SJZY.Track.Api.sln.DotSettings b/SJZY.Track.Api.sln.DotSettings
new file mode 100644
index 00000000..2363a683
--- /dev/null
+++ b/SJZY.Track.Api.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=SJZY/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/SJZY.Track.Application/SJZY.Track.Application.csproj
index 76ef0752..ccc853da 100644
--- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj
+++ b/src/SJZY.Track.Application/SJZY.Track.Application.csproj
@@ -17,15 +17,16 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="SJZY.Expand.AliyunOSS" Version="7.0.10" />
-		<PackageReference Include="SJZY.Expand.Excel" Version="7.0.5" />
-		<PackageReference Include="Volo.Abp.Http.Client" Version="7.0.2" />
-		<PackageReference Include="Volo.Abp.FluentValidation" Version="7.0.2" />
+		<PackageReference Include="SJZY.Expand.AliyunOSS" Version="7.0.10"/>
+		<PackageReference Include="SJZY.Expand.Excel" Version="7.0.5"/>
+		<PackageReference Include="Volo.Abp.Http.Client" Version="7.0.2"/>
+		<PackageReference Include="Volo.Abp.FluentValidation" Version="7.0.2"/>
+		<PackageReference Include="SJZY.UserCenter.HttpApi" Version="3.0.3-alpha8"/>
+		<PackageReference Include="SJZY.Expand.CAP" Version="7.8.0"/>
 	</ItemGroup>
 
 	<ItemGroup>
 	  <ProjectReference Include="..\SJZY.Track.Domain\SJZY.Track.Domain.csproj" />
 	  <ProjectReference Include="..\SJZY.Track.HttpApi\SJZY.Track.HttpApi.csproj" />
-	  <ProjectReference Include="..\SJZY.Track.Infrastructure\SJZY.Track.Infrastructure.csproj"/>
 	</ItemGroup>
 </Project>
diff --git a/src/SJZY.Track.Infrastructure/Enum/Enums.cs b/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs
similarity index 83%
rename from src/SJZY.Track.Infrastructure/Enum/Enums.cs
rename to src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs
index a2246eed..e1c08aaf 100644
--- a/src/SJZY.Track.Infrastructure/Enum/Enums.cs
+++ b/src/SJZY.Track.Domain/Enums/EnumPropertyEnums.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace SJZY.Track.Infrastructure.Enum;
+namespace SJZY.Track.Domain.Enums;
 
 /// <summary>
 /// 枚举属性
diff --git a/src/SJZY.Track.Domain/IBasicRepository.cs b/src/SJZY.Track.Domain/IBasicRepository.cs
index 71bc3175..8e9baed2 100644
--- a/src/SJZY.Track.Domain/IBasicRepository.cs
+++ b/src/SJZY.Track.Domain/IBasicRepository.cs
@@ -35,7 +35,7 @@ public interface IBasicRepository<T> : IBasicQuery<T> where T : IAggregateRoot
     /// <param name="entities"></param>
     /// <param name="updateColumns">要更新的列</param>
     /// <returns></returns>
-    Task<bool> UpdateRangeAsync(List<T> entities, Expression<Func<T, object>> updateColumns = null);
+    Task<bool> UpdateRangeAsync(List<T> entities, Expression<Func<T, object>>? updateColumns = null);
 
     /// <summary>
     /// 软删
diff --git a/src/SJZY.Track.Infrastructure/BasicQuery.cs b/src/SJZY.Track.Infrastructure/Queries/BasicQuery.cs
similarity index 95%
rename from src/SJZY.Track.Infrastructure/BasicQuery.cs
rename to src/SJZY.Track.Infrastructure/Queries/BasicQuery.cs
index 75ee80b2..fbb511c7 100644
--- a/src/SJZY.Track.Infrastructure/BasicQuery.cs
+++ b/src/SJZY.Track.Infrastructure/Queries/BasicQuery.cs
@@ -2,7 +2,7 @@
 using SJZY.Track.Domain.Queries;
 using SJZY.Track.Domain.SeedWork;
 
-namespace SJZY.Track.Infrastructure;
+namespace SJZY.Track.Infrastructure.Queries;
 
 #pragma warning disable CS8613
 public class BasicQuery<T> : SimpleClient<T>, IBasicQuery<T> where T : class, IEntity, new()
diff --git a/src/SJZY.Track.Infrastructure/Repositories/BasicRepository.cs b/src/SJZY.Track.Infrastructure/Repositories/BasicRepository.cs
index 48c7f89c..a776fd88 100644
--- a/src/SJZY.Track.Infrastructure/Repositories/BasicRepository.cs
+++ b/src/SJZY.Track.Infrastructure/Repositories/BasicRepository.cs
@@ -1,6 +1,7 @@
 using System.Linq.Expressions;
 using SJZY.Track.Domain;
 using SJZY.Track.Domain.SeedWork;
+using SJZY.Track.Infrastructure.Queries;
 using Volo.Abp;
 
 namespace SJZY.Track.Infrastructure.Repositories;
@@ -32,7 +33,7 @@ public class BasicRepository<T> : BasicQuery<T>, IBasicRepository<T> where T : c
             .ExecuteCommandHasChangeAsync();
     }
 
-    public async Task<bool> UpdateRangeAsync(List<T> entities, Expression<Func<T, object>> columns = null)
+    public async Task<bool> UpdateRangeAsync(List<T> entities, Expression<Func<T, object>>? columns = null)
     {
         return await Context.Updateable(entities)
             .UpdateColumnsIF(columns != null, columns)
diff --git a/src/SJZY.Track.Infrastructure/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Infrastructure/Repositories/TrackTemplateRepository.cs
index c3e3a9c0..d4ae27a6 100644
--- a/src/SJZY.Track.Infrastructure/Repositories/TrackTemplateRepository.cs
+++ b/src/SJZY.Track.Infrastructure/Repositories/TrackTemplateRepository.cs
@@ -5,8 +5,8 @@ using SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
 using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
 using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
 using SJZY.Track.Domain.Dtos.TrackTemplate;
+using SJZY.Track.Domain.Enums;
 using SJZY.Track.Domain.VEntities;
-using SJZY.Track.Infrastructure.Enum;
 
 namespace SJZY.Track.Infrastructure.Repositories;
 
diff --git a/src/SJZY.Track.Infrastructure/SJZYTrackInfrastructureModule.cs b/src/SJZY.Track.Infrastructure/SJZYTrackInfrastructureModule.cs
index 7f18046a..c412b69c 100644
--- a/src/SJZY.Track.Infrastructure/SJZYTrackInfrastructureModule.cs
+++ b/src/SJZY.Track.Infrastructure/SJZYTrackInfrastructureModule.cs
@@ -4,6 +4,7 @@ using SJZY.Expand.ABP.Core.SqlSugar.Options;
 using SJZY.Expand.ElasticSearch;
 using SJZY.Track.Domain;
 using SJZY.Track.Domain.Queries;
+using SJZY.Track.Infrastructure.Queries;
 using SJZY.Track.Infrastructure.Repositories;
 using Volo.Abp.Autofac;
 using Volo.Abp.Modularity;