Merge branch 'refs/heads/abp' into digital-collectibles

2024-12-21 15:06:15 +08:00
parent 723ce1bd5d 48dc89c43d
commit 1c7637d28b
19 changed files with 303 additions and 212 deletions
--- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/YiFrameworkSqlSugarCoreModule.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/YiFrameworkSqlSugarCoreModule.cs
@@ -9,6 +9,7 @@ using SqlSugar;
 using Volo.Abp.Data;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Guids;
 using Yi.Framework.SqlSugarCore.Abstractions;
 using Yi.Framework.SqlSugarCore.Repositories;
 using Yi.Framework.SqlSugarCore.Uow;
@@ -24,7 +25,32 @@ namespace Yi.Framework.SqlSugarCore
            var configuration = service.GetConfiguration();
            var section = configuration.GetSection("DbConnOptions");
            Configure<DbConnOptions>(section);
+            var dbConnOptions = new DbConnOptions();
+            section.Bind(dbConnOptions);

+            //很多人遗漏了这一点，不同的数据库，对于主键的使用规约不一样，需要根据数据库进行判断
+            SequentialGuidType guidType;
+            switch (dbConnOptions.DbType)
+            {
+                case DbType.MySql:
+                case DbType.PostgreSQL:
+                    guidType= SequentialGuidType.SequentialAsString;
+                    break;
+                case DbType.SqlServer:
+                    guidType = SequentialGuidType.SequentialAtEnd;
+                    break;
+                case DbType.Oracle:
+                    guidType = SequentialGuidType.SequentialAsBinary;
+                    break;
+                default:
+                    guidType = SequentialGuidType.SequentialAtEnd;
+                    break;
+            }
+            Configure<AbpSequentialGuidGeneratorOptions>(options =>
+            {
+                options.DefaultSequentialGuidType = guidType;
+            });
+            
            service.TryAddScoped<ISqlSugarDbContext, SqlSugarDbContextFactory>();

            //不开放sqlsugarClient
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Operlog/OperLogGlobalAttribute.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Operlog/OperLogGlobalAttribute.cs
@@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Uow;
 using Volo.Abp.Users;
 using Yi.Framework.Core.Extensions;
 using Yi.Framework.Core.Helper;
@@ -18,12 +19,15 @@ namespace Yi.Framework.Rbac.Domain.Operlog
        private ILogger<OperLogGlobalAttribute> _logger;
        private IRepository<OperationLogEntity> _repository;
        private ICurrentUser _currentUser;
+
+        private IUnitOfWorkManager _unitOfWorkManager;
        //注入一个日志服务
-        public OperLogGlobalAttribute(ILogger<OperLogGlobalAttribute> logger, IRepository<OperationLogEntity> repository, ICurrentUser currentUser)
+        public OperLogGlobalAttribute(ILogger<OperLogGlobalAttribute> logger, IRepository<OperationLogEntity> repository, ICurrentUser currentUser, IUnitOfWorkManager unitOfWorkManager)
        {
            _logger = logger;
            _repository = repository;
            _currentUser = currentUser;
+            _unitOfWorkManager = unitOfWorkManager;
        }

        public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
@@ -35,8 +39,9 @@ namespace Yi.Framework.Rbac.Domain.Operlog
            if (resultContext.ActionDescriptor is not ControllerActionDescriptor controllerActionDescriptor) return;

            //查找标签，获取标签对象
-            OperLogAttribute? operLogAttribute = controllerActionDescriptor.MethodInfo.GetCustomAttributes(inherit: true)
-                  .FirstOrDefault(a => a.GetType().Equals(typeof(OperLogAttribute))) as OperLogAttribute;
+            OperLogAttribute? operLogAttribute = controllerActionDescriptor.MethodInfo
+                .GetCustomAttributes(inherit: true)
+                .FirstOrDefault(a => a.GetType().Equals(typeof(OperLogAttribute))) as OperLogAttribute;
            //空对象直接返回
            if (operLogAttribute is null) return;

@@ -48,7 +53,7 @@ namespace Yi.Framework.Rbac.Domain.Operlog
            //获取Ip
            string ip = resultContext.HttpContext.GetClientIp();

-             //根据ip获取地址
+            //根据ip获取地址
            string location = "";
            try
            {
@@ -78,6 +83,7 @@ namespace Yi.Framework.Rbac.Domain.Operlog
                {
                    logEntity.RequestResult = result.Content?.Replace("\r\n", "").Trim();
                }
+
                if (resultContext.Result is JsonResult result2)
                {
                    logEntity.RequestResult = result2.Value?.ToString();
@@ -92,14 +98,13 @@ namespace Yi.Framework.Rbac.Domain.Operlog

            if (operLogAttribute.IsSaveRequestData)
            {
-                //不建议保存，吃性能
-                //保存请求参数
                logEntity.RequestParam = JsonConvert.SerializeObject(context.ActionArguments);
            }

-            await _repository.InsertAsync(logEntity);
-
-
+            using (var uow = _unitOfWorkManager.Begin())
+            {
+                await _repository.InsertAsync(logEntity);
+            }
        }

    }
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile
@@ -8,6 +8,8 @@ EXPOSE 8080
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
+
+COPY ./common.props ./
 COPY ["src/Yi.Abp.Web/Yi.Abp.Web.csproj", "src/Yi.Abp.Web/"]
 COPY ["framework/Yi.Framework.AspNetCore.Authentication.OAuth/Yi.Framework.AspNetCore.Authentication.OAuth.csproj", "framework/Yi.Framework.AspNetCore.Authentication.OAuth/"]
 COPY ["framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj", "framework/Yi.Framework.AspNetCore/"]
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md
@@ -0,0 +1,22 @@
+# Docker 构建说明
+
+## 执行命令
+
+```shell
+# 在Yi.Abp.Net8 目录下执行
+docker build -t admin-server:${BUILD_NUMBER} -f ./src/Yi.Abp.Web/Dockerfile . 
+
+```
+
+## 注意
+
+NuGet 源国内访问有时候会报错，可以考虑切换成华为源，加上参数
+
+```shell
+RUN dotnet restore --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./src/Yi.Abp.Web/./Yi.Abp.Web.csproj"
+
+RUN dotnet build --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./Yi.Abp.Web.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+RUN dotnet publish --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./Yi.Abp.Web.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+```
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
@@ -10,6 +10,10 @@
  <ItemGroup>
    <PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
    <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
+    <!-- 解决 docker 构建冲突问题，冲突版本信息如下 -->
+    <!-- Yi.Abp.Web -> Hangfire.Redis.StackExchange 1.9.4 -> Hangfire.Core (>= 1.8.7)  -->
+    <!-- Yi.Abp.Web -> Yi.Abp.Application -> Yi.Framework.Rbac.Application -> Volo.Abp.BackgroundJobs.HangFire 0.4.1 -> Volo.Abp.HangFire 0.4.1 -> Hangfire.AspNetCore 1.6.19 -> Hangfire.Core (= 1.6.19). -->
+    <PackageReference Include="Hangfire.Core" Version="1.8.14" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.3" />
    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Text;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -103,10 +103,10 @@ namespace Yi.Abp.Web
            var service = context.Services;

            //请求日志
-            Configure<AbpAuditingOptions>(optios =>
+            Configure<AbpAuditingOptions>(options =>
            {
                //默认关闭，开启会有大量的审计日志
-                optios.IsEnabled = true;
+                options.IsEnabled = true;
            });
            //忽略审计日志路径
            Configure<AbpAspNetCoreAuditingOptions>(options =>