Merge pull request #887 from colinin/resolve-some-problems

Resolve some problems
colinin · Oct 9, 2023 · 574802e · 574802e
2 parents 07f2daa + 9f275dc
commit 574802e
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 20 deletions.
diff --git a/...modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/UserIdentifier.cs b/...modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/UserIdentifier.cs
@@ -16,6 +16,11 @@ public class UserIdentifier
         /// </summary>
         public string UserName { get; set; }
 
+        public UserIdentifier()
+        {
+
+        }
+
         public UserIdentifier(Guid userId, string userName)
         {
             UserId = userId;

diff --git a/...tityServer.SmsValidator/LINGYUN/Abp/IdentityServer/SmsValidator/SmsTokenGrantValidator.cs b/...tityServer.SmsValidator/LINGYUN/Abp/IdentityServer/SmsValidator/SmsTokenGrantValidator.cs
@@ -114,9 +114,6 @@ public async Task ValidateAsync(ExtensionGrantValidationContext context)
 
             await EventService.RaiseAsync(new UserLoginSuccessEvent(currentUser.UserName, phoneNumber, null));
 
-            // 登录之后需要更新安全令牌
-            (await UserManager.UpdateSecurityStampAsync(currentUser)).CheckErrors();
-
             await SetSuccessResultAsync(context, currentUser);
         }
 

diff --git a/...tityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/WeChatWorkGrantValidator.cs b/...tityServer.WeChat.Work/LINGYUN/Abp/IdentityServer/WeChat/Work/WeChatWorkGrantValidator.cs
@@ -123,9 +123,6 @@ public async virtual Task ValidateAsync(ExtensionGrantValidationContext context)
 
             await EventService.RaiseAsync(new UserLoginSuccessEvent(AbpWeChatWorkGlobalConsts.ProviderName, userInfo.UserId, null));
 
-            // 登录之后需要更新安全令牌
-            (await UserManager.UpdateSecurityStampAsync(currentUser)).CheckErrors();
-
             await SetSuccessResultAsync(context, currentUser);
         }
         catch (AbpWeChatWorkException wwe)

diff --git a/...penIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs b/...penIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN/Abp/OpenIddict/Sms/SmsTokenExtensionGrant.cs
@@ -116,8 +116,6 @@ public async virtual Task<IActionResult> HandleAsync(ExtensionGrantContext conte
             return Forbid(properties, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
         }
 
-        (await userManager.UpdateSecurityStampAsync(currentUser)).CheckErrors();
-
         return await SetSuccessResultAsync(context, currentUser, logger);
     }
 

diff --git a/...penIddict.WeChat.Work/LINGYUN/Abp/OpenIddict/WeChat/Work/WeChatWorkTokenExtensionGrant.cs b/...penIddict.WeChat.Work/LINGYUN/Abp/OpenIddict/WeChat/Work/WeChatWorkTokenExtensionGrant.cs
@@ -119,9 +119,6 @@ protected async virtual Task<IActionResult> HandleWeChatAsync(ExtensionGrantCont
                 return Forbid(properties, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
             }
 
-            // 登录之后需要更新安全令牌
-            (await userManager.UpdateSecurityStampAsync(currentUser)).CheckErrors();
-
             return await SetSuccessResultAsync(context, currentUser, userInfo.UserId, logger);
         }
         catch (AbpWeChatWorkException wwe)

diff --git a/.../LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/WeChatTokenExtensionGrant.cs b/.../LINGYUN.Abp.OpenIddict.WeChat/LINGYUN/Abp/OpenIddict/WeChat/WeChatTokenExtensionGrant.cs
@@ -132,9 +132,6 @@ protected async virtual Task<IActionResult> HandleWeChatAsync(ExtensionGrantCont
             return Forbid(properties, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
         }
 
-        // 登录之后需要更新安全令牌
-        (await userManager.UpdateSecurityStampAsync(currentUser)).CheckErrors();
-
         return await SetSuccessResultAsync(context, currentUser, wechatOpenId, logger);
     }
 

diff --git a/...s/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN.Abp.WeChat.SettingManagement.csproj b/...s/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN.Abp.WeChat.SettingManagement.csproj
@@ -25,6 +25,7 @@
 	  <ProjectReference Include="..\..\settings\LINGYUN.Abp.SettingManagement.Application.Contracts\LINGYUN.Abp.SettingManagement.Application.Contracts.csproj" />
 	  <ProjectReference Include="..\LINGYUN.Abp.WeChat.MiniProgram\LINGYUN.Abp.WeChat.MiniProgram.csproj" />
 	  <ProjectReference Include="..\LINGYUN.Abp.WeChat.Official\LINGYUN.Abp.WeChat.Official.csproj" />
+	  <ProjectReference Include="..\LINGYUN.Abp.WeChat.Work\LINGYUN.Abp.WeChat.Work.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/...ettingManagement/LINGYUN/Abp/WeChat/SettingManagement/AbpWeChatSettingManagementModule.cs b/...ettingManagement/LINGYUN/Abp/WeChat/SettingManagement/AbpWeChatSettingManagementModule.cs
@@ -1,6 +1,8 @@
 using LINGYUN.Abp.WeChat.Localization;
 using LINGYUN.Abp.WeChat.MiniProgram;
 using LINGYUN.Abp.WeChat.Official;
+using LINGYUN.Abp.WeChat.Work;
+using LINGYUN.Abp.WeChat.Work.Localization;
 using Localization.Resources.AbpUi;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc;
@@ -13,6 +15,7 @@ namespace LINGYUN.Abp.WeChat.SettingManagement
     [DependsOn(
         typeof(AbpWeChatOfficialModule),
         typeof(AbpWeChatMiniProgramModule),
+        typeof(AbpWeChatWorkModule),
         typeof(AbpAspNetCoreMvcModule))]
     public class AbpWeChatSettingManagementModule : AbpModule
     {
@@ -43,7 +46,8 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                 options.Resources
                     .Get<WeChatResource>()
                     .AddBaseTypes(
-                        typeof(AbpUiResource)
+                        typeof(AbpUiResource),
+                        typeof(WeChatWorkResource)
                     );
             });
         }

diff --git a/...hat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/Localization/Resources/en.json b/...hat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/Localization/Resources/en.json
@@ -2,6 +2,7 @@
   "culture": "en",
   "texts": {
     "Permission:WeChat.Official": "Official",
-    "Permission:WeChat.MiniProgram": "Mini Program"
+    "Permission:WeChat.MiniProgram": "Mini Program",
+    "Permission:WeChat.Work": "Work"
   }
 }
diff --git a/...ettingManagement/LINGYUN/Abp/WeChat/SettingManagement/Localization/Resources/zh-Hans.json b/...ettingManagement/LINGYUN/Abp/WeChat/SettingManagement/Localization/Resources/zh-Hans.json
@@ -2,6 +2,7 @@
   "culture": "zh-Hans",
   "texts": {
     "Permission:WeChat.Official": "公众平台",
-    "Permission:WeChat.MiniProgram": "小程序"
+    "Permission:WeChat.MiniProgram": "小程序",
+    "Permission:WeChat.Work": "企业微信"
   }
 }
diff --git a/....WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs b/....WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs
@@ -3,6 +3,7 @@
 using LINGYUN.Abp.WeChat.MiniProgram.Settings;
 using LINGYUN.Abp.WeChat.Official.Settings;
 using LINGYUN.Abp.WeChat.Settings;
+using LINGYUN.Abp.WeChat.Work.Settings;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization.Permissions;
@@ -127,6 +128,32 @@ protected async virtual Task<SettingGroupResult> GetAllForProviderAsync(string p
 
             settingGroups.AddGroup(wechatSettingGroup);
 
+            if (await PermissionChecker.IsGrantedAsync(WeChatSettingPermissionNames.Work))
+            {
+                #region 企业微信
+                var wechatWorkSettingGroup = new SettingGroupDto(L["DisplayName:WeChatWork"], L["Description:WeChatWork"]);
+
+                var workLoginSetting = wechatWorkSettingGroup.AddSetting(L["UserLogin"], L["UserLogin"]);
+                workLoginSetting.AddDetail(
+                    SettingDefinitionManager.Get(WeChatWorkSettingNames.EnabledQuickLogin),
+                    StringLocalizerFactory,
+                    await SettingManager.GetOrNullAsync(WeChatWorkSettingNames.EnabledQuickLogin, providerName, providerKey),
+                    ValueType.Boolean,
+                    providerName);
+
+                var workConnectionSetting = wechatWorkSettingGroup.AddSetting(L["DisplayName:Connection"], L["Description:Connection"]);
+
+                workConnectionSetting.AddDetail(
+                    SettingDefinitionManager.Get(WeChatWorkSettingNames.Connection.CorpId),
+                    StringLocalizerFactory,
+                    await SettingManager.GetOrNullAsync(WeChatWorkSettingNames.Connection.CorpId, providerName, providerKey),
+                    ValueType.String,
+                    providerName);
+
+                settingGroups.AddGroup(wechatWorkSettingGroup);
+                #endregion
+            }
+
             return settingGroups;
         }
     }

diff --git a/...agement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingPermissionDefinitionProvider.cs b/...agement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingPermissionDefinitionProvider.cs
@@ -1,5 +1,9 @@
 using LINGYUN.Abp.WeChat.Localization;
+using LINGYUN.Abp.WeChat.MiniProgram.Features;
+using LINGYUN.Abp.WeChat.Official.Features;
+using LINGYUN.Abp.WeChat.Work.Features;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Features;
 using Volo.Abp.Localization;
 
 namespace LINGYUN.Abp.WeChat.SettingManagement
@@ -13,10 +17,16 @@ public override void Define(IPermissionDefinitionContext context)
                 L("Permission:WeChat"));
 
             wechatGroup.AddPermission(
-                WeChatSettingPermissionNames.Official, L("Permission:WeChat.Official"));
+                WeChatSettingPermissionNames.Official, L("Permission:WeChat.Official"))
+                .RequireFeatures(WeChatOfficialFeatures.Enable);
 
             wechatGroup.AddPermission(
-                WeChatSettingPermissionNames.MiniProgram, L("Permission:WeChat.MiniProgram"));
+                WeChatSettingPermissionNames.MiniProgram, L("Permission:WeChat.MiniProgram"))
+                .RequireFeatures(WeChatMiniProgramFeatures.Enable);
+
+            wechatGroup.AddPermission(
+                WeChatSettingPermissionNames.Work, L("Permission:WeChat.Work"))
+                .RequireFeatures(WeChatWorkFeatureNames.Enable);
         }
 
         protected LocalizableString L(string name)

diff --git a/...at.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingPermissionNames.cs b/...at.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingPermissionNames.cs
@@ -6,5 +6,6 @@ public class WeChatSettingPermissionNames
 
         public const string Official = GroupName + ".Official";
         public const string MiniProgram = GroupName + ".MiniProgram";
+        public const string Work = GroupName + ".Work";
     }
 }
diff --git a/...les/wechat/LINGYUN.Abp.WeChat.Work/LINGYUN/Abp/WeChat/Work/Localization/Resources/en.json b/...les/wechat/LINGYUN.Abp.WeChat.Work/LINGYUN/Abp/WeChat/Work/Localization/Resources/en.json
@@ -18,6 +18,10 @@
     "Features:AppChatMessage.LimitDesc": "设置以限制企业微信群聊消息推送上限.",
     "Features:AppChatMessage.LimitInterval": "企业微信群聊消息限制周期",
     "Features:AppChatMessage.LimitIntervalDesc": "设置企业微信群聊消息限制周期(时间刻度: 分).每企业所有应用发送群消息不可超过2万人次/分，不可超过30万人次/小时.",
+    "DisplayName:WeChatWork": "企业微信",
+    "Description:WeChatWork": "企业微信应用集成",
+    "DisplayName:Connection": "连接参数",
+    "Description:Connection": "企业微信连接参数",
     "DisplayName:WeChatWork.Connection.CorpId": "Corp Id",
     "Description:WeChatWork.Connection.CorpId": "Each enterprise has a unique corpid, to obtain this information, you can view \"Enterprise ID\" under \"My Enterprise\" - \"Enterprise Information\" in the management background (requires administrator permissions).",
     "DisplayName:WeChatWork.EnabledQuickLogin": "Enabled Quick Login",

diff --git a/...echat/LINGYUN.Abp.WeChat.Work/LINGYUN/Abp/WeChat/Work/Localization/Resources/zh-Hans.json b/...echat/LINGYUN.Abp.WeChat.Work/LINGYUN/Abp/WeChat/Work/Localization/Resources/zh-Hans.json
@@ -18,6 +18,10 @@
     "Features:AppChatMessage.LimitDesc": "设置以限制企业微信群聊消息推送上限.",
     "Features:AppChatMessage.LimitInterval": "企业微信群聊消息限制周期",
     "Features:AppChatMessage.LimitIntervalDesc": "设置企业微信群聊消息限制周期(时间刻度: 分).每企业所有应用发送群消息不可超过2万人次/分，不可超过30万人次/小时.",
+    "DisplayName:WeChatWork": "企业微信",
+    "Description:WeChatWork": "企业微信应用集成",
+    "DisplayName:Connection": "连接参数",
+    "Description:Connection": "企业微信连接参数",
     "DisplayName:WeChatWork.Connection.CorpId": "企业Id",
     "Description:WeChatWork.Connection.CorpId": "每个企业都拥有唯一的corpid，获取此信息可在管理后台“我的企业”－“企业信息”下查看“企业ID”（需要有管理员权限）",
     "DisplayName:WeChatWork.EnabledQuickLogin": "启用快捷登录",

diff --git a/...N.Abp.WeChat.Work/LINGYUN/Abp/WeChat/Work/Settings/WeChatWorkSettingDefinitionProvider.cs b/...N.Abp.WeChat.Work/LINGYUN/Abp/WeChat/Work/Settings/WeChatWorkSettingDefinitionProvider.cs
@@ -34,7 +34,7 @@ protected virtual SettingDefinition[] GetConnectionSettings()
                     WeChatWorkSettingNames.Connection.CorpId,
                     displayName: L("DisplayName:WeChatWork.Connection.CorpId"),
                     description: L("Description:WeChatWork.Connection.CorpId"),
-                    isEncrypted: false)
+                    isEncrypted: true)
                 .WithProviders(
                     DefaultValueSettingValueProvider.ProviderName,
                     ConfigurationSettingValueProvider.ProviderName,

diff --git a/...LY.MicroService.RealtimeMessage.HttpApi.Host/BackgroundJobs/NotificationPublishJobArgs.cs b/...LY.MicroService.RealtimeMessage.HttpApi.Host/BackgroundJobs/NotificationPublishJobArgs.cs
@@ -10,6 +10,10 @@ public class NotificationPublishJobArgs
     public long NotificationId { get; set; }
     public string ProviderType { get; set; }
     public List<UserIdentifier> UserIdentifiers { get; set; }
+    public NotificationPublishJobArgs()
+    {
+        UserIdentifiers = new List<UserIdentifier>();
+    }
     public NotificationPublishJobArgs(long id, string providerType, List<UserIdentifier> userIdentifiers, Guid? tenantId = null)
     {
         NotificationId = id;