From e43811d665f1dc67ba40a5db9a9e7c3f575423ce Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 7 Jun 2025 18:23:54 +0800 Subject: [PATCH 1/2] feat(wechat): remove unnecessary feature definitions - remove feature: `WeChatOfficialFeatures.EnableAuthorization` --- .../WeChatOfficialFeatureDefinitionProvider.cs | 12 ++++++------ .../Official/Features/WeChatOfficialFeatures.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Features/WeChatOfficialFeatureDefinitionProvider.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Features/WeChatOfficialFeatureDefinitionProvider.cs index 3a62bcc8d..e918233c4 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Features/WeChatOfficialFeatureDefinitionProvider.cs +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Features/WeChatOfficialFeatureDefinitionProvider.cs @@ -19,12 +19,12 @@ public class WeChatOfficialFeatureDefinitionProvider : FeatureDefinitionProvider description: L("Features:WeChat.Official.EnableDesc"), valueType: new ToggleStringValueType(new BooleanValueValidator())); - officialEnableFeature.CreateChild( - name: WeChatOfficialFeatures.EnableAuthorization, - defaultValue: true.ToString(), - displayName: L("Features:WeChat.Official.EnableAuthorization"), - description: L("Features:WeChat.Official.EnableAuthorizationDesc"), - valueType: new ToggleStringValueType(new BooleanValueValidator())); + //officialEnableFeature.CreateChild( + // name: WeChatOfficialFeatures.EnableAuthorization, + // defaultValue: true.ToString(), + // displayName: L("Features:WeChat.Official.EnableAuthorization"), + // description: L("Features:WeChat.Official.EnableAuthorizationDesc"), + // valueType: new ToggleStringValueType(new BooleanValueValidator())); } protected LocalizableString L(string name) diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Features/WeChatOfficialFeatures.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Features/WeChatOfficialFeatures.cs index 5ff03e252..ec87536ca 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Features/WeChatOfficialFeatures.cs +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Features/WeChatOfficialFeatures.cs @@ -8,5 +8,5 @@ public static class WeChatOfficialFeatures public const string Enable = GroupName + ".Enable"; - public const string EnableAuthorization = GroupName + ".EnableAuthorization"; + //public const string EnableAuthorization = GroupName + ".EnableAuthorization"; } From 3b2eab30f0fb9f7367542c991001d28c3302aaf9 Mon Sep 17 00:00:00 2001 From: colin Date: Sat, 7 Jun 2025 18:24:57 +0800 Subject: [PATCH 2/2] feat(wechat): add the missing enterprise wechat setting - The settings service returns more wecom setting --- .../WeChatSettingAppService.cs | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs index 80fbadfc5..f157733d6 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs @@ -161,6 +161,30 @@ public class WeChatSettingAppService : ApplicationService, IWeChatSettingAppServ await SettingManager.GetOrNullAsync(WeChatWorkSettingNames.Connection.CorpId, providerName, providerKey), ValueType.String, providerName); + workConnectionSetting.AddDetail( + await SettingDefinitionManager.GetAsync(WeChatWorkSettingNames.Connection.AgentId), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(WeChatWorkSettingNames.Connection.AgentId, providerName, providerKey), + ValueType.String, + providerName); + workConnectionSetting.AddDetail( + await SettingDefinitionManager.GetAsync(WeChatWorkSettingNames.Connection.Secret), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(WeChatWorkSettingNames.Connection.Secret, providerName, providerKey), + ValueType.String, + providerName); + workConnectionSetting.AddDetail( + await SettingDefinitionManager.GetAsync(WeChatWorkSettingNames.Connection.Token), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(WeChatWorkSettingNames.Connection.Token, providerName, providerKey), + ValueType.String, + providerName); + workConnectionSetting.AddDetail( + await SettingDefinitionManager.GetAsync(WeChatWorkSettingNames.Connection.EncodingAESKey), + StringLocalizerFactory, + await SettingManager.GetOrNullAsync(WeChatWorkSettingNames.Connection.EncodingAESKey, providerName, providerKey), + ValueType.String, + providerName); settingGroups.AddGroup(wechatWorkSettingGroup); #endregion