Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Developer #2815

Merged
merged 3 commits into from
Apr 16, 2023
Merged

Developer #2815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de6c266
调整获取自定义菜单MenuFull_ButtonGroup模型的封装，并调整重构按钮信息的相关方法
JaneConan Apr 12, 2023
34f3073
Merge pull request #2814 from JaneConan/hotfix/#2804-FixModel_SelfMen…
JeffreySu Apr 16, 2023
2304f37
MP v16.18.10.7 修复自定义菜单实体问题 #2814 #2804 感谢 @JaneConan @funvh
JeffreySu Apr 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/CommonAPIs/Menu/CommonApi.Menu.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ and limitations under the License.

修改标识：Senparc - 20220511
修改描述：v16.18.2.1 修复二级菜单按钮判断逻辑

修改标识：JaneConan - 20230417
修改描述：v16.18.10.7 修复自定义菜单实体问题

----------------------------------------------------------------*/

Expand Down Expand Up @@ -426,7 +429,7 @@ public static GetMenuResult GetMenuFromJsonResult(GetMenuResultFull resultFull,
{
//重新整理按钮信息
ButtonGroupBase buttonGroup = buttonGroupBase; // ?? new ButtonGroup();
var rootButtonList = resultFull.menu.button;
var rootButtonList = resultFull.menu.list.subbutton;

GetButtonGroup(rootButtonList, buttonGroup);//设置默认菜单
result = new GetMenuResult(buttonGroupBase)
Expand All @@ -448,7 +451,7 @@ public static GetMenuResult GetMenuFromJsonResult(GetMenuResultFull resultFull,
conditionalButtonGroup.menuid = conditionalMenu.menuid;
//fix bug 16030701 end

GetButtonGroup(conditionalMenu.button, conditionalButtonGroup);//设置默认菜单
GetButtonGroup(conditionalMenu.list.subbutton, conditionalButtonGroup);//设置默认菜单
conditionalMenuList.Add(conditionalButtonGroup);
}
result.conditionalmenu = conditionalMenuList;
Expand Down
6 changes: 5 additions & 1 deletion src/Senparc.Weixin.MP/Senparc.Weixin.MP/CommonAPIs/Menu/CommonApi.Menu.Custom.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ and limitations under the License.

修改标识：Senparc - 20180928
修改描述：添加GetCurrentSelfMenuInfo方法

修改标识：JaneConan - 20230417
修改描述：v16.18.10.7 修复自定义菜单实体问题

----------------------------------------------------------------*/

/*
Expand Down Expand Up @@ -241,7 +245,7 @@ public static GetMenuResult GetMenu(string accessTokenOrAppId)
var jsonResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetMenuResultFull>(jsonString);
#endif

if (jsonResult.menu == null || jsonResult.menu.button.Count == 0)
if (jsonResult.menu == null || jsonResult.menu.list == null || jsonResult.menu.list.subbutton.Count == 0)
{
throw new WeixinMenuException(jsonResult.errmsg);
}
Expand Down
12 changes: 11 additions & 1 deletion src/Senparc.Weixin.MP/Senparc.Weixin.MP/Entities/JsonResult/Menu/GetMenuResultFull.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ and limitations under the License.

修改标识：Senparc - 20150303
修改描述：整理接口

修改标识：JaneConan - 20230417
修改描述：v16.18.10.7 修复自定义菜单实体问题

----------------------------------------------------------------*/

using System.Collections.Generic;
Expand All @@ -55,7 +59,13 @@ public class GetMenuResultFull : WxJsonResult

public class MenuFull_ButtonGroup
{
public List<MenuFull_RootButton> button { get; set; }
public MenuFull_ButtonList list { get; set; }
}

public class MenuFull_ButtonList
{
public List<MenuFull_RootButton> subbutton { get; set; }

}

public class MenuFull_RootButton
Expand Down
45 changes: 23 additions & 22 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.net7.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>16.18.10.6</Version>
<Version>16.18.10.7</Version>
<AssemblyName>Senparc.Weixin.MP</AssemblyName>
<RootNamespace>Senparc.Weixin.MP</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -501,27 +501,28 @@
v16.10.601 MASSSENDJOBFINISH事件增加 ArticleUrlResult 节点
v16.11.102 修正“将电子发票卡券插入用户卡包”接口 InvoiceApi.InsertCardToBag() 问题
v16.11.201 服务号订阅通知相关接口 &amp; 补充小程序[获取小程序账号的类目]接口
v16.12.101 修改“addTemplate选用模板”接口
v16.14.2
1、Register 提供对 ApiHandlerWapper 委托的设置方法
2、添加用户提交抬头后，商户会收到用户提交的事件（submit_invoice_title）

v16.15.0
1、接入微信支付 V3
2、SEnparcWeixinSetting 添加 record 能力

v16.15.500 用户信息调整：不再返回用户性别及地区信息
v16.17.1 完善永久素材上传接口
v16.17.2 优化永久素材上传接口，提供素材类型枚举：UploadForeverMediaType
v16.17.3 UserApi.Info() 接口返回值，将 headimgurl、nickname 设为过期
v16.17.8 新增草稿箱和发布能力接口
v16.18.1 公众号菜单添加 article_id、article_view_limited 类型
v16.18.2 完善客服接口
v16.18.4 完善 GetDraftResultJson 字段
v16.18.5 新增 OpenApi 接口，包括：“查询 openAPI 调用quota”“查询 rid 信息”接口
v16.18.6 OAuth 的 AccessToken 获取接口添加 is_snapshotuser 返回值
v16.18.7 OAuthApi.GetAuthorizeUrl() 方法添加 forcePopup 参数
</PackageReleaseNotes>
v16.12.101 修改“addTemplate选用模板”接口
v16.14.2
1、Register 提供对 ApiHandlerWapper 委托的设置方法
2、添加用户提交抬头后，商户会收到用户提交的事件（submit_invoice_title）

v16.15.0
1、接入微信支付 V3
2、SEnparcWeixinSetting 添加 record 能力

v16.15.500 用户信息调整：不再返回用户性别及地区信息
v16.17.1 完善永久素材上传接口
v16.17.2 优化永久素材上传接口，提供素材类型枚举：UploadForeverMediaType
v16.17.3 UserApi.Info() 接口返回值，将 headimgurl、nickname 设为过期
v16.17.8 新增草稿箱和发布能力接口
v16.18.1 公众号菜单添加 article_id、article_view_limited 类型
v16.18.2 完善客服接口
v16.18.4 完善 GetDraftResultJson 字段
v16.18.5 新增 OpenApi 接口，包括：“查询 openAPI 调用quota”“查询 rid 信息”接口
v16.18.6 OAuth 的 AccessToken 获取接口添加 is_snapshotuser 返回值
v16.18.7 OAuthApi.GetAuthorizeUrl() 方法添加 forcePopup 参数
v16.18.10.7 修复自定义菜单实体问题
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down