Merge pull request #1491 from colinin/fix-issues

fix: Fix some issues

Author: colinin

aspnet-core/migrations/LY.MicroService.Applications.Single.EntityFrameworkCore.MySql/SingleMigrationsEntityFrameworkCoreMySqlModule.cs

@@ -8,6 +8,8 @@
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Guids;
 using Volo.Abp.Modularity;
+using Volo.Abp.OpenIddict.EntityFrameworkCore;
+using Volo.Abp.OpenIddict.Tokens;
 
 namespace LY.MicroService.Applications.Single.EntityFrameworkCore.MySql;
 
@@ -64,6 +66,11 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                     options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsString;
                 }
             });
+
+            context.Services.AddAbpDbContext<OpenIddictDbContext>(options =>
+            {
+                options.AddRepository<OpenIddictToken, EfCoreMySqlOpenIddictTokenRepository>();
+            });
         }
     }
 }

aspnet-core/migrations/LY.MicroService.Applications.Single.EntityFrameworkCore.MySql/Volo/Abp/OpenIddict/Tokens/EfCoreMySqlOpenIddictTokenRepository.cs

@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore;
+using OpenIddict.Abstractions;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.OpenIddict.Authorizations;
+using Volo.Abp.OpenIddict.EntityFrameworkCore;
+
+namespace Volo.Abp.OpenIddict.Tokens;
+
+public class EfCoreMySqlOpenIddictTokenRepository : EfCoreOpenIddictTokenRepository
+{
+    public EfCoreMySqlOpenIddictTokenRepository(
+        IDbContextProvider<IOpenIddictDbContext> dbContextProvider) 
+        : base(dbContextProvider)
+    {
+    }
+
+    public async override Task<long> PruneAsync(DateTime date, CancellationToken cancellationToken = default)
+    {
+        var dbContext = await GetDbContextAsync();
+        var tokens = await (from token in dbContext.Set<OpenIddictToken>()
+                            join authorization in dbContext.Set<OpenIddictAuthorization>()
+                                on token.AuthorizationId equals authorization.Id into tokenAuthorizations
+                            from tokenAuthorization in tokenAuthorizations.DefaultIfEmpty()
+                            where token.CreationDate < date
+                            where (token.Status != OpenIddictConstants.Statuses.Inactive && token.Status != OpenIddictConstants.Statuses.Valid) ||
+                                  (tokenAuthorization != null && tokenAuthorization.Status != OpenIddictConstants.Statuses.Valid) ||
+                                  token.ExpirationDate < DateTime.UtcNow
+                            select token)
+                            .ToListAsync(GetCancellationToken(cancellationToken));
+
+        await DeleteManyAsync(tokens, cancellationToken: GetCancellationToken(cancellationToken));
+
+        return tokens.Count;
+    }
+}

aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/MyProfileAppService.cs

@@ -140,7 +140,7 @@ public async virtual Task SendChangePhoneNumberCodeAsync(SendChangePhoneNumberCo
         var interval = await SettingProvider.GetAsync(Identity.Settings.IdentitySettingNames.User.SmsRepetInterval, 1);
         if (securityTokenCacheItem != null)
         {
-            throw new UserFriendlyException(L["SendRepeatPhoneVerifyCode", interval]);
+            throw new UserFriendlyException(L["SendRepeatSmsVerifyCode", interval]);
         }
 
         // 是否已有用户使用手机号绑定