Merge pull request #929 from colinin/rel-8.0.3

Rel 8.0.3

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
         - "**.csproj"
 
 env:
-  DOTNET_VERSION: "8.0.100"
+  DOTNET_VERSION: "8.0.200"
 
 jobs:
   build:

.github/workflows/publish.yml

@@ -0,0 +1,31 @@
+name: "Publish"
+
+on:
+  push:
+    branches: [ rel-8.0.3 ]
+env:
+  DOTNET_VERSION: "8.0.200"
+
+jobs:
+  publish:
+    name: "Publish"
+    runs-on: "windows-latest"
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+    - name: Install NuGet
+      uses: nuget/setup-nuget@v1
+      with:
+        nuget-version: '5.x'
+    - name: Pack All Packages
+      run: .\build-aspnetcore-publish-sln.ps1 -f
+      working-directory: .\build
+      shell: powershell
+    - name: Publish Packages
+      run:
+        dotnet nuget push *.nupkg --api-key ${{ secrets.NUGETKEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols
+      working-directory: .\aspnet-core\LocalNuget
+

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: "Tagged Release"
 
 on:
   push:
-    branches: [ rel-8.0.0 ]
+    branches: [ rel-8.0.3 ]
 
 jobs:
   tagged-release:
@@ -14,4 +14,4 @@ jobs:
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         prerelease: false
-        automatic_release_tag: "8.0.0"
+        automatic_release_tag: "8.0.3"

README.md

@@ -306,4 +306,4 @@ yarn test:unit
 
 ## Thanks
 
-![JetBrains Logo (Main) logo](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png)
+![JetBrains Logo (Main) logo](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)

apps/vue/package.json

@@ -44,7 +44,7 @@
     "@vueuse/core": "^8.3.0",
     "@vueuse/shared": "^8.3.0",
     "@zxcvbn-ts/core": "^2.0.1",
-    "ant-design-vue": "^3.2.15",
+    "ant-design-vue": "3.2.15",
     "axios": "^0.26.1",
     "codemirror": "^5.65.3",
     "cropperjs": "^1.5.12",
@@ -70,7 +70,7 @@
     "sortablejs": "^1.15.0",
     "tinymce": "^5.10.7",
     "vditor": "^3.8.13",
-    "vue": "^3.2.45",
+    "vue": "3.2.45",
     "vue-cookies": "^1.8.1",
     "vue-i18n": "^9.1.9",
     "vue-json-pretty": "^2.0.6",

apps/vue/src/components/Table/src/hooks/useTableForm.ts

@@ -9,7 +9,7 @@ import { isFunction } from '/@/utils/is';
 export function useTableForm(
   propsRef: ComputedRef<BasicTableProps>,
   slots: Slots,
-  fetch: (opt?: FetchParams | undefined) => Promise<void>,
+  fetch: (opt?: FetchParams | undefined) => Promise<Recordable<any>[] | undefined | void>,
   getLoading: ComputedRef<boolean | undefined>,
   setFieldsValue: (values: Recordable) => Promise<void>,
 ) {

apps/vue/src/components/Table/src/types/table.ts

@@ -84,7 +84,7 @@ export interface GetColumnsParams {
 export type SizeType = 'default' | 'middle' | 'small' | 'large';
 
 export interface TableActionType {
-  reload: (opt?: FetchParams) => Promise<void>;
+  reload: (opt?: FetchParams) => Promise<Recordable<any>[] | undefined | void>;
   setSelectedRows: (rows: Recordable[]) => void;
   getSelectRows: <T = Recordable>() => T[];
   clearSelectedRowKeys: () => void;

apps/vue/src/views/realtime/notifications/definitions/notifications/components/NotificationDefinitionTable.vue

@@ -247,6 +247,7 @@
           groupData.notifications.push(...definitionGroup[gk]);
           definitionGroupData.push(groupData);
         });
+        console.log(definitionGroupData);
         setTableData(definitionGroupData);
       }).finally(() => {
         setLoading(false);

apps/vue/vite.config.ts

@@ -53,6 +53,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
     base: VITE_PUBLIC_PATH,
     root,
     resolve: {
+      dedupe: ['vue'],
       alias: [
         {
           find: 'vue-i18n',

aspnet-core/.gitignore

@@ -1,5 +1,6 @@
 .vs
 LocalNuget
+Publish
 *.DotSettings.user
 **/*.csproj.user
 nupkg

aspnet-core/Directory.Build.props

@@ -1,12 +1,12 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>8.0.0</VoloAbpPackageVersion>
+		<VoloAbpPackageVersion>8.0.3</VoloAbpPackageVersion>
 		<VoloAbpLeptonXThemePackageVersion>3.0.0</VoloAbpLeptonXThemePackageVersion>
-		<LINGYUNAbpPackageVersion>8.0.0</LINGYUNAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>8.0.3</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.12.0</DaprPackageVersion>
 		<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion>
 		<DotNetCoreCAPPackageVersion>8.0.0</DotNetCoreCAPPackageVersion>
-		<ElsaPackageVersion>2.11.0</ElsaPackageVersion>
+		<ElsaPackageVersion>2.14.1</ElsaPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
 		<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
 		<TencentCloudSDKPackageVersion>3.0.712</TencentCloudSDKPackageVersion>

aspnet-core/LINGYUN.MicroService.All.sln

@@ -527,6 +527,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{F3E04039-7BEE-46F8-B33B-FE13E977DCCA}"
 	ProjectSection(SolutionItems) = preProject
 		..\.github\workflows\build.yml = ..\.github\workflows\build.yml
+		..\.github\workflows\publish.yml = ..\.github\workflows\publish.yml
 		..\.github\workflows\release.yml = ..\.github\workflows\release.yml
 	EndProjectSection
 EndProject

aspnet-core/LINGYUN.MicroService.Common.sln

@@ -196,10 +196,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OpenApi", "fram
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OpenApi.Authorization", "framework\open-api\LINGYUN.Abp.OpenApi.Authorization\LINGYUN.Abp.OpenApi.Authorization.csproj", "{3CE350AF-5574-46EC-8120-8542350AED20}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApi.Sdk", "framework\open-api\OpenApi.Sdk\OpenApi.Sdk.csproj", "{108192F3-3780-423F-9871-A1BBE323413E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OpenApi.Tests", "tests\LINGYUN.Abp.OpenApi.Tests\LINGYUN.Abp.OpenApi.Tests.csproj", "{6C75799E-4B46-434D-BE1B-4AD71DF49686}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cli", "cli", "{FE372F22-80A2-4859-9330-949C27CA94ED}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Cli", "framework\cli\LINGYUN.Abp.Cli\LINGYUN.Abp.Cli.csproj", "{33007EF7-BC1D-4B32-ACDA-6B9117200FAD}"
@@ -631,14 +627,6 @@ Global
 		{3CE350AF-5574-46EC-8120-8542350AED20}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3CE350AF-5574-46EC-8120-8542350AED20}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CE350AF-5574-46EC-8120-8542350AED20}.Release|Any CPU.Build.0 = Release|Any CPU
-		{108192F3-3780-423F-9871-A1BBE323413E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{108192F3-3780-423F-9871-A1BBE323413E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{108192F3-3780-423F-9871-A1BBE323413E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{108192F3-3780-423F-9871-A1BBE323413E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33007EF7-BC1D-4B32-ACDA-6B9117200FAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33007EF7-BC1D-4B32-ACDA-6B9117200FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33007EF7-BC1D-4B32-ACDA-6B9117200FAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -933,8 +921,6 @@ Global
 		{8C688427-DD35-4F0B-86DA-6F536D3852D5} = {02EA4E78-5891-43BC-944F-3E52FEE032E4}
 		{2C8A6B4C-D6B2-44FE-9EF5-EC7480D2A6B2} = {8C688427-DD35-4F0B-86DA-6F536D3852D5}
 		{3CE350AF-5574-46EC-8120-8542350AED20} = {8C688427-DD35-4F0B-86DA-6F536D3852D5}
-		{108192F3-3780-423F-9871-A1BBE323413E} = {8C688427-DD35-4F0B-86DA-6F536D3852D5}
-		{6C75799E-4B46-434D-BE1B-4AD71DF49686} = {B86C21A4-73B7-471E-B73A-B4B905EC9435}
 		{FE372F22-80A2-4859-9330-949C27CA94ED} = {02EA4E78-5891-43BC-944F-3E52FEE032E4}
 		{33007EF7-BC1D-4B32-ACDA-6B9117200FAD} = {FE372F22-80A2-4859-9330-949C27CA94ED}
 		{B9592989-9F76-413C-8612-96E8C0CFA041} = {7FDFB22F-1BFF-4E05-9427-78B7A8461D50}

aspnet-core/common.props

@@ -1,20 +1,22 @@
 <Project>
-  <PropertyGroup>
-    <LangVersion>latest</LangVersion>
-    <Version>8.0.0</Version>
-    <Authors>colin</Authors>
-    <NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
-    <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
+	<PropertyGroup>
+		<LangVersion>latest</LangVersion>
+		<Version>8.0.3</Version>
+		<Authors>colin</Authors>
+		<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
+		<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
+		<PackageOutputPath>$(SolutionDir)LocalNuget</PackageOutputPath>
+		<PackageVersion>8.0.3</PackageVersion>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<RepositoryType>git</RepositoryType>
+		<RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>
+		<GeneratePackageOnBuild Condition="$(AssemblyName.StartsWith('LINGYUN'))">true</GeneratePackageOnBuild>
+	</PropertyGroup>
 
-  <ItemGroup>
-	  <Compile Remove="LocalNuget\**" />
-	  <EmbeddedResource Remove="LocalNuget\**" />
-	  <None Remove="LocalNuget\**" />
+	<ItemGroup>
+		<Compile Remove="LocalNuget\**" />
+		<EmbeddedResource Remove="LocalNuget\**" />
+		<None Remove="LocalNuget\**" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -23,14 +25,14 @@
 		<None Remove="Logs\**" />
 	</ItemGroup>
 
-  <ItemGroup>
-	  <Compile Remove="Modules\**" />
-	  <EmbeddedResource Remove="Modules\**" />
-	  <None Remove="Modules\**" />
+	<ItemGroup>
+		<Compile Remove="Modules\**" />
+		<EmbeddedResource Remove="Modules\**" />
+		<None Remove="Modules\**" />
 	</ItemGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>$(SolutionDir)LocalNuget</OutputPath>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<OutputPath>$(SolutionDir)LocalNuget</OutputPath>
+	</PropertyGroup>
 
 </Project>

aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.QQ/Microsoft/AspNetCore/Authentication/QQ/QQConnectOAuthHandler.cs

@@ -24,9 +24,8 @@ public QQConnectOAuthHandler(
             IOptionsMonitor<QQConnectOAuthOptions> options,
             AbpTencentQQOptionsFactory tencentQQOptionsFactory,
             ILoggerFactory logger, 
-            UrlEncoder encoder, 
-            ISystemClock clock) 
-            : base(options, logger, encoder, clock)
+            UrlEncoder encoder) 
+            : base(options, logger, encoder)
         {
             TencentQQOptionsFactory = tencentQQOptionsFactory;
         }
@@ -39,6 +38,7 @@ protected override async Task InitializeHandlerAsync()
             Options.ClientId = options.AppId;
             Options.ClientSecret = options.AppKey;
             Options.IsMobile = options.IsMobile;
+            Options.TimeProvider ??= TimeProvider.System;
 
             await base.InitializeHandlerAsync();
         }

aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.WeChat/Microsoft/AspNetCore/Authentication/WeChat/Official/WeChatOfficialOAuthHandler.cs

@@ -28,9 +28,8 @@ public WeChatOfficialOAuthHandler(
             IOptionsMonitor<WeChatOfficialOAuthOptions> options,
             AbpWeChatOfficialOptionsFactory weChatOfficialOptionsFactory,
             ILoggerFactory logger, 
-            UrlEncoder encoder, 
-            ISystemClock clock) 
-            : base(options, logger, encoder, clock)
+            UrlEncoder encoder) 
+            : base(options, logger, encoder)
         {
             WeChatOfficialOptionsFactory = weChatOfficialOptionsFactory;
         }
@@ -42,6 +41,7 @@ protected override async Task InitializeHandlerAsync()
             // 用配置项重写
             Options.ClientId = weChatOfficialOptions.AppId;
             Options.ClientSecret = weChatOfficialOptions.AppSecret;
+            Options.TimeProvider ??= TimeProvider.System;
 
             await base.InitializeHandlerAsync();
         }
@@ -276,7 +276,7 @@ protected async override Task<HandleRequestResult> HandleRemoteAuthenticateAsync
                     {
                         // https://www.w3.org/TR/xmlschema-2/#dateTime
                         // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx
-                        var expiresAt = Clock.UtcNow + TimeSpan.FromSeconds(value);
+                        var expiresAt = Options.TimeProvider.GetUtcNow() + TimeSpan.FromSeconds(value);
                         authTokens.Add(new AuthenticationToken
                         {
                             Name = "expires_at",

aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj

@@ -5,7 +5,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>7.3.2</Version>
+		<Version>8.0.3</Version>
 		<Copyright>colin</Copyright>
 		<Description>Use LINGYUN.MicroService.Templates command line</Description>
 		<PackAsTool>true</PackAsTool>

aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Wrapper/LINGYUN/Abp/AspNetCore/Wrapper/AbpExceptionHandlingWrapperMiddleware.cs

@@ -110,7 +110,7 @@ await httpContext.RequestServices.GetRequiredService<IAbpAuthorizationExceptionH
 
             httpContext.Response.Clear();
             httpContext.Response.OnStarting(_clearCacheHeadersDelegate, httpContext.Response);
-            httpContext.Response.Headers.Add("Content-Type", "application/json");
+            httpContext.Response.Headers.Append("Content-Type", "application/json");
 
             var wrapResult = new WrapResult(
                 exceptionWrapContext.ErrorInfo.Code,

aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Wrapper/LINGYUN/Abp/AspNetCore/Wrapper/DefaultHttpResponseWrapper.cs

@@ -1,4 +1,5 @@
 using LINGYUN.Abp.Wrapper;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 
@@ -22,13 +23,13 @@ public virtual void Wrap(HttpResponseWrapperContext context)
             {
                 if (!context.HttpContext.Response.Headers.ContainsKey(header.Key))
                 {
-                    context.HttpContext.Response.Headers.Add(header.Key, header.Value);
+                    context.HttpContext.Response.Headers.Append(header.Key, header.Value);
                 }
             }
         }
         if (!context.HttpContext.Response.Headers.ContainsKey(AbpHttpWrapConsts.AbpWrapResult))
         {
-            context.HttpContext.Response.Headers.Add(AbpHttpWrapConsts.AbpWrapResult, "true");
+            context.HttpContext.Response.Headers.Append(AbpHttpWrapConsts.AbpWrapResult, "true");
         }
     }
 }

aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN/Abp/Features/LimitValidation/Redis/RedisRequiresLimitFeatureChecker.cs

@@ -87,7 +87,7 @@ private async Task<int> EvaluateAsync(string luaScriptFilePath, RequiresLimitFea
             var keys = new RedisKey[1] { NormalizeKey(context) };
             var values = new RedisValue[] { context.GetEffectTicks(_clock.Now) };
             var result = await _redis.ScriptEvaluateAsync(luaSha1, keys, values);
-            if (result.Type == ResultType.Error)
+            if (result.Resp2Type == ResultType.Error)
             {
                 throw new AbpException($"Script evaluate error: {result}");
             }

aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs

@@ -1,13 +1,10 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Threading.Tasks;
-using Volo.Abp;
-using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Localization;
@@ -32,11 +29,11 @@ public ResourceAppService(
         public virtual async Task<ListResultDto<ResourceDto>> GetListAsync(GetResourceWithFilterDto input)
         {
             var externalResources = (await _externalLocalizationStore.GetResourcesAsync())
-                .WhereIf(!input.Filter.IsNullOrWhiteSpace(), x => x.ResourceName.IndexOf(input.Filter, StringComparison.OrdinalIgnoreCase) >= 0);
+                .WhereIf(!input.Filter.IsNullOrWhiteSpace(), x => x.ResourceName.Contains(input.Filter, StringComparison.OrdinalIgnoreCase));
 
             var resources = _localizationOptions
                 .Resources
-                .WhereIf(!input.Filter.IsNullOrWhiteSpace(), x => x.Value.ResourceName.IndexOf(input.Filter, StringComparison.OrdinalIgnoreCase) >= 0)
+                .WhereIf(!input.Filter.IsNullOrWhiteSpace(), x => x.Value.ResourceName.Contains(input.Filter, StringComparison.OrdinalIgnoreCase))
                 .Select(x => new ResourceDto
                 {
                     Name = x.Value.ResourceName,

aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Idempotent/LINGYUN/Abp/AspNetCore/Mvc/Idempotent/AbpIdempotentActionFilter.cs

@@ -104,10 +104,10 @@ protected virtual void WrapGrantException(IdempotentWrapContext context)
             StatusCode = context.IdempotentOptions.HttpStatusCode,
         };
 
-        context.ExecutingContext.HttpContext.Response.Headers.Add(
+        context.ExecutingContext.HttpContext.Response.Headers.Append(
             context.IdempotentOptions.IdempotentTokenName,
             context.GrantResult.IdempotentKey);
-        context.ExecutingContext.HttpContext.Response.Headers.Add(AbpHttpConsts.AbpErrorFormat, "true");
-        context.ExecutingContext.HttpContext.Response.Headers.Add("Content-Type", "application/json");
+        context.ExecutingContext.HttpContext.Response.Headers.Append(AbpHttpConsts.AbpErrorFormat, "true");
+        context.ExecutingContext.HttpContext.Response.Headers.Append("Content-Type", "application/json");
     }
 }

aspnet-core/framework/open-api/LINGYUN.Abp.OpenApi.Authorization/LINGYUN/Abp/OpenApi/Authorization/OpenApiAuthorizationService.cs

@@ -206,8 +206,8 @@ protected async virtual Task Unauthorized(HttpContext context, Exception excepti
 
                     context.Response.Clear();
                     context.Response.StatusCode = (int)HttpStatusCode.OK;
-                    context.Response.Headers.Add(AbpHttpWrapConsts.AbpWrapResult, "true");
-                    context.Response.Headers.Add("Content-Type", "application/json");
+                    context.Response.Headers.Append(AbpHttpWrapConsts.AbpWrapResult, "true");
+                    context.Response.Headers.Append("Content-Type", "application/json");
 
                     await context.Response.WriteAsync(jsonSerializer.Serialize(wrapResult));
                     return;