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

Developer #2629

Merged
merged 7 commits into from
May 3, 2022
Merged

Developer #2629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e996a9
Merge pull request #44 from JeffreySu/master
mc7246 Apr 18, 2022
8cab077
Merge pull request #45 from JeffreySu/master
mc7246 May 2, 2022
9dd1806
小程序隐私接口权限申请及事件推送
mc7246 May 2, 2022
ac23724
事件之隐私权限审核结果推送
mc7246 May 2, 2022
8e7258b
MP v16.18.1 公众号菜单添加 article_id、article_view_limited 类型 #2621 感谢 @niu…
JeffreySu May 3, 2022
47232c5
Merge pull request #2628 from mc7246/master
JeffreySu May 3, 2022
ce7368f
Open v4.14.2 & WxOpen v3.15.2 添加小程序隐私接口 #2628 感谢 @mc7246
JeffreySu May 3, 2022
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
2 changes: 1 addition & 1 deletion ...es/All/Senparc.Weixin.Sample.CommonService/Senparc.Weixin.Net6Sample.CommonService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="2.1.0" />
<PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
Expand Down
6 changes: 3 additions & 3 deletions Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/Senparc.Weixin.Sample.Net6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>6.5.13</Version>
<Version>6.5.14</Version>
<UserSecretsId>35e58786-0820-4cde-b1ff-f4c6198d00f7</UserSecretsId>
<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
</PropertyGroup>
Expand Down Expand Up @@ -40,8 +40,8 @@

<ItemGroup>
<PackageReference Include="Senparc.CO2NET.WebApi" Version="1.2.0" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.1.0" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.0" />
<PackageReference Include="Senparc.NeuChar.App" Version="1.1.1.1" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.1.1" />

<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
Expand Down
6 changes: 6 additions & 0 deletions Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/Views/Menu/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@
<input type="hidden" class="control-input" name="@(namePrefix).appid" id="@(idPrefix)_appid" />
<input type="hidden" class="control-input" name="@(namePrefix).pagepath" id="@(idPrefix)_pagepath" />
<input type="hidden" class="control-input" name="@(namePrefix).media_id" id="@(idPrefix)_mediaid" />
<input type="hidden" class="control-input" name="@(namePrefix).article_id" id="@(idPrefix)_articleid" />
<input type="text" class="control-input txtButton" name="@(namePrefix).name" id="@(idPrefix)_name" data-i="@i" data-j="@j" @Html.Raw(isRootMenu ? string.Format(@"data-root=""{0}""", j) : "") />
</td>
}
Expand All @@ -418,6 +419,8 @@
<option value="scancode_waitmsg">扫码推事件且弹出“消息接收中”提示框</option>
<option value="media_id">下发消息（除文本消息）</option>
<option value="view_limited">跳转图文消息URL</option>
<option value="article_id">article_id</option>
<option value="article_view_limited">article_view_limited</option>
</select>
</p>
<p id="buttonDetails_key_area">
Expand All @@ -435,6 +438,9 @@
<p id="buttonDetails_mediaId_area">
MediaId：<input id="buttonDetails_mediaId" class="control-input txtButtonDetails" type="text" />
</p>
<p id="buttonDetails_articleId_area">
ArticleId：<input id="buttonDetails_articleId" class="control-input txtButtonDetails" type="text" />
</p>

<p id="rootButtonNotice">
如果还有下级菜单请忽略上述Type和Key、Url等参数。<br />
Expand Down
27 changes: 25 additions & 2 deletions Samples/All/net6-mvc/Senparc.Weixin.Sample.Net6/wwwroot/Scripts/senparc.menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ senparc.menu = {
var nameId = idPrefix + "_name";
var typeId = idPrefix + "_type";
var urlId = idPrefix + "_url";
var mediaIdId = idPrefix + "_mediaid";
var mediaId = idPrefix + "_mediaid";
var articleId = idPrefix + "_articleid";
var appidId = idPrefix + "_appid";
var pagepathId = idPrefix + "_pagepath";

Expand All @@ -30,13 +31,15 @@ senparc.menu = {
var ddlDetailsType = $('#buttonDetails_type');
var txtDetailsUrl = $('#buttonDetails_url');
var txtMediaId = $('#buttonDetails_mediaId');
var txtArticleId = $('#buttonDetails_articleId');
var txtDetailsAppid = $('#buttonDetails_miniprogram_appid');
var txtDetailsPagepath = $('#buttonDetails_miniprogram_pagepath');

var hiddenButtonKey = $('#' + keyId);
var hiddenButtonType = $('#' + typeId);
var hiddenButtonUrl = $('#' + urlId);
var hiddenButtonMediaId = $('#' + mediaIdId);
var hiddenButtonMediaId = $('#' + mediaId);
var hiddenButtonArticleId = $('#' + articleId);
var hiddenButtonAppid = $('#' + appidId);
var hiddenButtonPagepath = $('#' + pagepathId);

Expand All @@ -45,6 +48,7 @@ senparc.menu = {
ddlDetailsType.val(hiddenButtonType.val());
txtDetailsUrl.val(hiddenButtonUrl.val());
txtMediaId.val(hiddenButtonMediaId.val());
txtArticleId.val(hiddenButtonArticleId.val());
txtDetailsAppid.val(hiddenButtonAppid.val());
txtDetailsPagepath.val(hiddenButtonPagepath.val());

Expand All @@ -62,6 +66,9 @@ senparc.menu = {
txtMediaId.unbind('blur').blur(function () {
hiddenButtonMediaId.val($(this).val());
});
txtArticleId.unbind('blur').blur(function () {
hiddenButtonArticleId.val($(this).val());
});
txtDetailsAppid.unbind('blur').blur(function () {
hiddenButtonAppid.val($(this).val());
});
Expand Down Expand Up @@ -120,6 +127,7 @@ senparc.menu = {
$('#menu_button' + i + '_appid').val(button.appid);
$('#menu_button' + i + '_pagepath').val(button.pagepath);
$('#menu_button' + i + '_mediaid').val(button.media_id);
$('#menu_button' + i + '_articleid').val(button.article_id);

if (button.sub_button && button.sub_button.length > 0) {
//二级菜单
Expand All @@ -133,6 +141,7 @@ senparc.menu = {
$(idPrefix + "_appid").val(subButton.appid);
$(idPrefix + "_pagepath").val(subButton.pagepath);
$(idPrefix + "_mediaid").val(subButton.media_id);
$(idPrefix + "_articleid").val(subButton.article_id);
}
} else {
//底部菜单
Expand Down Expand Up @@ -231,20 +240,23 @@ senparc.menu = {
$('#buttonDetails_miniprogram_appid_area').slideUp(100);
$('#buttonDetails_miniprogram_pagepath_area').slideUp(100);
$('#buttonDetails_mediaId_area').slideUp(100);
$('#buttonDetails_articleId_area').slideUp(100);
break;
case 'VIEW':
$('#buttonDetails_key_area').slideUp(100);
$('#buttonDetails_url_area').slideDown(100);
$('#buttonDetails_miniprogram_appid_area').slideUp(100);
$('#buttonDetails_miniprogram_pagepath_area').slideUp(100);
$('#buttonDetails_mediaId_area').slideUp(100);
$('#buttonDetails_articleId_area').slideUp(100);
break;
case 'MINIPROGRAM':
$('#buttonDetails_key_area').slideUp(100);
$('#buttonDetails_url_area').slideDown(100);
$('#buttonDetails_miniprogram_appid_area').slideDown(100);
$('#buttonDetails_miniprogram_pagepath_area').slideDown(100);
$('#buttonDetails_mediaId_area').slideUp(100);
$('#buttonDetails_articleId_area').slideUp(100);
break;
case 'MEDIA_ID':
case 'VIEW_LIMITED':
Expand All @@ -253,13 +265,24 @@ senparc.menu = {
$('#buttonDetails_miniprogram_appid_area').slideUp(100);
$('#buttonDetails_miniprogram_pagepath_area').slideUp(100);
$('#buttonDetails_mediaId_area').slideDown(100);
$('#buttonDetails_articleId_area').slideUp(100);
break;
case 'ARTICLE_ID':
case 'ARTICLE_VIEW_LIMITED':
$('#buttonDetails_key_area').slideUp(100);
$('#buttonDetails_url_area').slideUp(100);
$('#buttonDetails_miniprogram_appid_area').slideUp(100);
$('#buttonDetails_miniprogram_pagepath_area').slideUp(100);
$('#buttonDetails_mediaId_area').slideUp(100);
$('#buttonDetails_articleId_area').slideDown(100);
break;
default:
$('#buttonDetails_key_area').slideDown(100);
$('#buttonDetails_url_area').slideUp(100);
$('#buttonDetails_miniprogram_appid_area').slideUp(100);
$('#buttonDetails_miniprogram_pagepath_area').slideUp(100);
$('#buttonDetails_mediaId_area').slideUp(100);
$('#buttonDetails_articleId_area').slideUp(100);
break;
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.net6.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;netcoreapp3.1;net6.0</TargetFrameworks>
<Version>0.17</Version>
<Version>0.17.1</Version>
<AssemblyName>Senparc.WebSocket</AssemblyName>
<RootNamespace>Senparc.WebSocket</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.net6.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;netcoreapp3.1;net6.0</TargetFrameworks>
<Version>0.8</Version>
<Version>0.8.1</Version>
<AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
<RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -75,7 +75,7 @@
<!--<FrameworkReference Include="Microsoft.AspNetCore.App" />-->
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.0" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net6.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion ...enparc.Weixin.Cache/Senparc.Weixin.Cache.CsRedis/Senparc.Weixin.Cache.CsRedis.net6.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>0.8</Version>
<Version>0.8.1</Version>
<AssemblyName>Senparc.Weixin.Cache.CsRedis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.CsRedis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
2 changes: 1 addition & 1 deletion ...rc.Weixin.Cache/Senparc.Weixin.Cache.Memcached/Senparc.Weixin.Cache.Memcached.net6.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>2.13</Version>
<Version>2.13.1</Version>
<AssemblyName>Senparc.Weixin.Cache.Memcached</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Memcached</RootNamespace>
<Description>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.Cache/Senparc.Weixin.Cache.Redis/Senparc.Weixin.Cache.Redis.net6.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>2.15</Version>
<Version>2.15.1</Version>
<AssemblyName>Senparc.Weixin.Cache.Redis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Redis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.net6.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;netcoreapp3.1;net6.0</TargetFrameworks>
<Version>0.8</Version>
<Version>0.8.1</Version>
<AssemblyName>Senparc.Weixin.MP.Middleware</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.Middleware</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -70,7 +70,7 @@
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.0" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="1.1.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.net6.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions ...MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.net6.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;netcoreapp3.1;net6.0</TargetFrameworks>
<Version>7.12</Version>
<Version>7.12.1</Version>
<AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -147,7 +147,7 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="2.1.0" />
<PackageReference Include="Senparc.NeuChar" Version="2.1.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin.AspNet\Senparc.Weixin.AspNet.net6.csproj" />
Expand Down
57 changes: 52 additions & 5 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 @@ -51,6 +51,9 @@ and limitations under the License.
修改标识：Senparc - 20170419
修改描述：v14.4.13 修复二级菜单小程序无法设置的问题

修改标识：Senparc - 20220503
修改描述：v16.18.1 添加 article_id 类型按钮

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

/*
Expand Down Expand Up @@ -194,7 +197,7 @@ private static void GetButtonGroup(List<MenuFull_RootButton> rootButtonList, But
}
else if (rootButton.type.Equals("MEDIA_ID", StringComparison.OrdinalIgnoreCase))
{
//扫码推事件
//下发消息（除文本消息）按钮
buttonGroup.button.Add(new SingleMediaIdButton()
{
name = rootButton.name,
Expand All @@ -204,14 +207,34 @@ private static void GetButtonGroup(List<MenuFull_RootButton> rootButtonList, But
}
else if (rootButton.type.Equals("VIEW_LIMITED", StringComparison.OrdinalIgnoreCase))
{
//扫码推事件
//永久素材
buttonGroup.button.Add(new SingleViewLimitedButton()
{
name = rootButton.name,
media_id = rootButton.media_id,
type = rootButton.type
});
}
else if (rootButton.type.Equals("ARTICLE_ID", StringComparison.OrdinalIgnoreCase))
{
//article_id 按钮
buttonGroup.button.Add(new SingleArticleIdButton()
{
name = rootButton.name,
article_id = rootButton.article_id,
type = rootButton.type
});
}
else if (rootButton.type.Equals("ARTICLE_VIEW_LIMITED", StringComparison.OrdinalIgnoreCase))
{
//article_view_limited 按钮
buttonGroup.button.Add(new SingleArticleViewLimitedButton()
{
name = rootButton.name,
article_id = rootButton.article_id,
type = rootButton.type
});
}
else
{
throw new WeixinMenuException("菜单类型无法处理：" + rootButton.type);
Expand Down Expand Up @@ -325,7 +348,7 @@ private static void GetButtonGroup(List<MenuFull_RootButton> rootButtonList, But
}
else if (subSubButton.type.Equals("MEDIA_ID", StringComparison.OrdinalIgnoreCase))
{
//扫码推事件
//下发消息（除文本消息）按钮
subButton.sub_button.Add(new SingleMediaIdButton()
{
name = subSubButton.name,
Expand All @@ -335,15 +358,15 @@ private static void GetButtonGroup(List<MenuFull_RootButton> rootButtonList, But
}
else if (subSubButton.type.Equals("VIEW_LIMITED", StringComparison.OrdinalIgnoreCase))
{
//扫码推事件
//永久素材按钮
subButton.sub_button.Add(new SingleViewLimitedButton()
{
name = subSubButton.name,
media_id = subSubButton.media_id,
type = subSubButton.type
});
}
else
if (subSubButton.type.Equals("SCANCODE_WAITMSG", StringComparison.OrdinalIgnoreCase))
{
//扫码推事件且弹出“消息接收中”提示框
subButton.sub_button.Add(new SingleScancodeWaitmsgButton()
Expand All @@ -353,6 +376,30 @@ private static void GetButtonGroup(List<MenuFull_RootButton> rootButtonList, But
type = subSubButton.type
});
}
else if (subSubButton.type.Equals("ARTICLE_ID", StringComparison.OrdinalIgnoreCase))
{
//article_id 按钮
subButton.sub_button.Add(new SingleArticleIdButton()
{
name = subSubButton.name,
article_id = subSubButton.article_id,
type = subSubButton.type
});
}
else if (subSubButton.type.Equals("ARTICLE_VIEW_LIMITED", StringComparison.OrdinalIgnoreCase))
{
//article_view_limited 按钮
subButton.sub_button.Add(new SingleArticleViewLimitedButton()
{
name = subSubButton.name,
article_id = subSubButton.article_id,
type = subSubButton.type
});
}
else
{
throw new WeixinMenuException("菜单类型无法处理（二级菜单）：" + subSubButton.type);
}
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions 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 @@ -76,6 +76,9 @@ public class MenuFull_RootButton

public string media_id { get; set; }

public string article_id { get; set; }


public List<MenuFull_RootButton> sub_button { get; set; }
}
#endregion
Expand Down
Loading