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 #2384

Merged
merged 10 commits into from
Jun 19, 2021
Merged

Developer #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
05d653d
.NET Core 3.1 项目默认不生成 nguet 包，生成操作集中到 .NET 6.
JeffreySu Jun 9, 2021
09cf020
更新 .NET Core 3.0 Demo
JeffreySu Jun 9, 2021
2efc817
Sample v6.0.1
JeffreySu Jun 17, 2021
66e7f0e
添加CLI
JeffreySu Jun 17, 2021
33fd832
开始添加“客户标签管理”
JeffreySu Jun 17, 2021
7c5db15
添加 Senparc.Weixin.CLI 项目，提供命令行工具
JeffreySu Jun 17, 2021
31b1947
modify
JeffreySu Jun 17, 2021
b6d79a4
modify
JeffreySu Jun 17, 2021
bac18e0
更新文档下载
JeffreySu Jun 19, 2021
1c301cd
*.500 更改 IList 或 IEnumerable -> List
JeffreySu Jun 19, 2021
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 ...Senparc.Weixin.MP.Sample.CommonService/Senparc.Weixin.NetCore3Sample.CommonService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Senparc.NeuChar" Version="1.4.100.6-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.NeuChar" Version="1.4.400" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
</ItemGroup>

Expand Down
6 changes: 4 additions & 2 deletions Samples/net6-mvc/Senparc.Weixin.Sample.Net6/App_Data/Document/Config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Config>
<QrCodeId>76717</QrCodeId>
<DownloadCount>49926</DownloadCount>
<QrCodeId>132841</QrCodeId>
<DownloadCount>66301</DownloadCount>
<Versions>
<Version>16.12.400</Version>
<Version>16.9.0</Version>
<Version>16.7.9</Version>
<Version>14.3.132</Version>
Expand All @@ -20,6 +21,7 @@
<Version>13.6.2</Version>
</Versions>
<WebVersions>
<Version>16.12.400</Version>
<Version>16.9.0</Version>
<Version>16.7.9</Version>
<Version>14.3.132</Version>
Expand Down
2 changes: 1 addition & 1 deletion Samples/net6-mvc/Senparc.Weixin.Sample.Net6/Controllers/HomeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public IActionResult Index()
var neucharGroup = new Home_IndexVD_GroupInfo()
{
Title = "跨平台支持库：Senparc.NeuChar",
Description = "NeuChar 是盛派提供的一套跨平台服务的标准（例如跨微信公众号、微信小程序、丁丁、QQ小程序、百度小程序，等等），<br />" +
Description = "NeuChar 是盛派提供的一套跨平台服务的标准（例如跨微信公众号、微信小程序、钉钉、QQ小程序、百度小程序，等等），<br />" +
"使用一套代码，同时服务多平台。目前 Senparc.Weixin SDK 就是基于 NeuChar 标准在微信领域内的一个实现分支，<br />" +
"您也可以使用 NeuChar 扩展到更多的平台。<br />" +
"<a href=\"https://www.neuchar.com\" target=\"_blank\">https://www.neuchar.com</a> 是盛派官方提供的一个基于 NeuChar 标准实现的可视化跨平台配置操作平台。"
Expand Down
2 changes: 1 addition & 1 deletion Samples/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.0.0.9-preview3</Version>
<Version>6.0.1</Version>
<UserSecretsId>35e58786-0820-4cde-b1ff-f4c6198d00f7</UserSecretsId>
<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Samples/net6-mvc/Senparc.Weixin.Sample.Net6/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
<a href="http://weibo.com/jeffreysu1984" target="_blank">@@苏震巍</a>*@
@*QQ:<a href="javascript:;">498977166</a>*@

当前框架：<a href="https://github.com/JeffreySu/WeiXinMPSDK/tree/Developer/Samples/netcore3.0-mvc" target="_blank">.NET Core 3.1</a> |
当前框架：<a href="https://github.com/JeffreySu/WeiXinMPSDK/tree/Developer/Samples/net6-mvc" target="_blank">.NET 6.0</a> |
<a href="http://net45.sdk.weixin.senparc.com/">切换至 .NET Framework 4.5 Sample</a> |
当前缓存策略：@ViewData["CacheType"]
</p>
Expand Down
2 changes: 1 addition & 1 deletion Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Controllers/BaseController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected string AppId
{
get
{
return Config.SenparcWeixinSetting.WeixinAppId;//与微信公众账号后台的AppId设置保持一致，区分大小写。
return Senparc.Weixin.Config.SenparcWeixinSetting.WeixinAppId;//与微信公众账号后台的AppId设置保持一致，区分大小写。
}
}

Expand Down
4 changes: 2 additions & 2 deletions Samples/netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3/Senparc.Weixin.Sample.NetCore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.4" />
<PackageReference Include="Senparc.NeuChar.App" Version="0.10.100.7-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.4.100.10-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.NeuChar.App" Version="0.10.400" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.4.400" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
<PackageReference Include="ZXing.Net" Version="0.16.4" />
Expand Down
2 changes: 1 addition & 1 deletion Samples/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

## 帮你选择

> 如果你希望学习并使用最新的 .NET 6（preview）框架，并且已经安装了 VS2019（v16.9以上），并且希望调试 .NET 6.0 及以上版本，那么请打开：net6-mvc/Senparc.Weixin.Sample.Net6.sln 解决方案
> 如果你希望学习并使用最新的 .NET 6（preview）框架，并且已经安装了 VS2019（v16.9 以上），并且希望调试 .NET 6.0 及以上版本，那么请打开：net6-mvc/Senparc.Weixin.Sample.Net6.sln 解决方案

> 如果你已经安装了 VS2019（v16.3以上），并且希望调试 .NET Core 3.0 及以上版本，那么请打开：netcore3.0-mvc/Senparc.Weixin.Sample.NetCore3.vs2019.sln 解决方案

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>net45;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
<Version>0.12.400</Version>
<Version>0.12.500</Version>
<AssemblyName>Senparc.WebSocket</AssemblyName>
<RootNamespace>Senparc.WebSocket</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
4 changes: 2 additions & 2 deletions ...nparc.WebSocket/src/Senparc.WebSocket/Senparc.WebSocket/Senparc.WebSocket.netcore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Version>0.11.400</Version>
<AssemblyName>Senparc.WebSocket</AssemblyName>
<RootNamespace>Senparc.WebSocket</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<!-- <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->
<Description>
微信公众账号 - WebSocket 模块

Expand Down Expand Up @@ -123,7 +123,7 @@
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET" Version="1.4.300.3-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.CO2NET" Version="1.4.400" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion 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>net45;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
<Version>0.3.400</Version>
<Version>0.3.500</Version>
<AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
<RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.AspNet/Senparc.Weixin.AspNet.netcore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Version>0.2.400</Version>
<AssemblyName>Senparc.Weixin.AspNet</AssemblyName>
<RootNamespace>Senparc.Weixin.AspNet</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<!-- <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->
<Description>
微信公众账号 - Senparc.Weixin.AspNet 模块

Expand Down Expand Up @@ -82,7 +82,7 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.4.100.10-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.4.400" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.netcore3.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.AspNet/WeixinRegister.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static IRegisterService UseSenparcWeixin(this IApplicationBuilder app,
#endif
SenparcSetting senparcSetting, SenparcWeixinSetting senparcWeixinSetting, Action<IRegisterService> globalRegisterConfigure, Action<IRegisterService> weixinRegisterConfigure,
//CO2NET 全局设置
bool autoScanExtensionCacheStrategies = false, Func<IList<IDomainExtensionCacheStrategy>> extensionCacheStrategiesFunc = null
bool autoScanExtensionCacheStrategies = false, Func<List<IDomainExtensionCacheStrategy>> extensionCacheStrategiesFunc = null
)
{
//注册 CO2NET 全局
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>net45;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>0.3.400</Version>
<Version>0.3.500</Version>
<AssemblyName>Senparc.Weixin.Cache.CsRedis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.CsRedis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
4 changes: 2 additions & 2 deletions ...rc.Weixin.Cache/Senparc.Weixin.Cache.CsRedis/Senparc.Weixin.Cache.CsRedis.netcore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Version>0.2.400</Version>
<AssemblyName>Senparc.Weixin.Cache.CsRedis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.CsRedis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<!-- <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->
<Description>
微信公众账号 - Redis 模块

Expand Down Expand Up @@ -63,7 +63,7 @@
<ItemGroup>
<!--<PackageReference Include="Senparc.Weixin.Cache.Redis.RedLock" Version="0.1.0" />-->
<PackageReference Include="BinaryFormatter" Version="2.1.4" />
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="0.4.300.3-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.CO2NET.Cache.CsRedis" Version="0.4.400" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
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>net45;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>2.8.400</Version>
<Version>2.8.500</Version>
<AssemblyName>Senparc.Weixin.Cache.Memcached</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Memcached</RootNamespace>
<Description>微信公众账号 - Memcached 模块
Expand Down
4 changes: 2 additions & 2 deletions ...eixin.Cache/Senparc.Weixin.Cache.Memcached/Senparc.Weixin.Cache.Memcached.netcore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Senparc.Weixin SDK 开源项目：
https://github.com/JeffreySu/WeiXinMPSDK</Description>
<Copyright>Senparc Copyright © 2004~2020</Copyright>
<PackageTags>微信,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,微信支付,分布式,小程序,Cache,Memcached</PackageTags>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<!-- <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->
<Authors>Jeffrey Su</Authors>
<Owners>Senparc</Owners>
<PackageLicenseUrl>https://github.com/JeffreySu/WeiXinMPSDK/blob/master/license.md</PackageLicenseUrl>
Expand Down Expand Up @@ -148,7 +148,7 @@ https://github.com/JeffreySu/WeiXinMPSDK</Description>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.CO2NET.Cache.Memcached" Version="3.8.300.3-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.CO2NET.Cache.Memcached" Version="3.8.400" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.netcore3.csproj" />
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>net45;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>2.10.400</Version>
<Version>2.10.500</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 ...enparc.Weixin.Cache/Senparc.Weixin.Cache.Redis/Senparc.Weixin.Cache.Redis.netcore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Version>2.9.400</Version>
<AssemblyName>Senparc.Weixin.Cache.Redis</AssemblyName>
<RootNamespace>Senparc.Weixin.Cache.Redis</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<!-- <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->
<Description>
微信公众账号 - Redis 模块

Expand Down Expand Up @@ -133,7 +133,7 @@
<ItemGroup>
<!--<PackageReference Include="Senparc.Weixin.Cache.Redis.RedLock" Version="0.1.0" />-->
<PackageReference Include="BinaryFormatter" Version="2.1.4" />
<PackageReference Include="Senparc.CO2NET.Cache.Redis" Version="3.10.300.3-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.CO2NET.Cache.Redis" Version="3.10.400" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<PackageReference Include="StackExchange.Redis" Version="1.2.6" />
Expand Down
2 changes: 1 addition & 1 deletion 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>net45;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
<Version>0.3.400</Version>
<Version>0.3.500</Version>
<AssemblyName>Senparc.Weixin.MP.Middleware</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.Middleware</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.MP.Middleware/Senparc.Weixin.MP.Middleware.netcore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Version>0.2.400</Version>
<AssemblyName>Senparc.Weixin.MP.Middleware</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.Middleware</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<!-- <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->
<Description>
微信公众账号 - Senparc.Weixin.MP.Middleware 模块

Expand Down Expand Up @@ -82,7 +82,7 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.4.100.10-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.NeuChar.AspNet" Version="0.4.400" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.netcore3.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion ...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>net45;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
<Version>7.7.400</Version>
<Version>7.7.500</Version>
<AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
4 changes: 2 additions & 2 deletions ...vcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.netcore3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Version>7.6.400</Version>
<AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
<!-- <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->
<Description>
微信公众账号 - Senparc.Weixin.MP.MvcExtension 模块

Expand Down Expand Up @@ -163,7 +163,7 @@
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="1.4.100.6-preview2.net6p.3.21201.4" />
<PackageReference Include="Senparc.NeuChar" Version="1.4.400" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Senparc.Weixin.AspNet\Senparc.Weixin.AspNet.netcore3.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Wxa/MerchantJson/DistrictResultJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class DistrictResultJson : WxJsonResult
/// <summary>
/// result[0]是省 result[1]是市 result[2]是区
/// </summary>
public IEnumerable<District>[] result { get; set; }
public List<District>[] result { get; set; }
}

/// <summary>
Expand All @@ -46,15 +46,15 @@ public class District
/// <summary>
/// 拼音
/// </summary>
public IEnumerable<string> pinyin { get; set; }
public List<string> pinyin { get; set; }
/// <summary>
/// 经纬度
/// </summary>
public Location location { get; set; }
/// <summary>
/// 下级的地区id
/// </summary>
public IEnumerable<int> cidx { get; set; }
public List<int> cidx { get; set; }
}

public class Location
Expand Down
8 changes: 4 additions & 4 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Wxa/MerchantJson/MerchatResultJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class CateGoryCollection
/// <summary>
/// 类目信息集合
/// </summary>
public IEnumerable<MerchantCategory> categories { get; set; }
public List<MerchantCategory> categories { get; set; }
}
/// <summary>
/// 类目信息
Expand All @@ -53,7 +53,7 @@ public class MerchantCategory
/// <summary>
/// 子级类目id
/// </summary>
public IEnumerable<int> children { get; set; }
public List<int> children { get; set; }
/// <summary>
/// 父级类目Id
/// </summary>
Expand All @@ -80,12 +80,12 @@ public class QualifyValue

public class QualifyInner_list
{
public IEnumerable<QualifyValue> inner_list { get; set; }
public List<QualifyValue> inner_list { get; set; }
}

public class QualifyExter_list
{
public IEnumerable<QualifyInner_list> exter_list { get; set; }
public List<QualifyInner_list> exter_list { get; set; }
}


Expand Down
6 changes: 3 additions & 3 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Wxa/MerchantJson/PoiInMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ public class PoiInMap
/// <summary>
/// 图片列表
/// </summary>
public IEnumerable<string> pic_urls { get; set; }
public List<string> pic_urls { get; set; }
/// <summary>
/// 卡券列表
/// </summary>
public IEnumerable<string> card_id_list { get; set; }
public List<string> card_id_list { get; set; }
}


public class MapPoiData
{
public IEnumerable<PoiInMap> item { get; set; }
public List<PoiInMap> item { get; set; }
}


Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Wxa/MerchantJson/StoreData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class StoreListJsonResult : WxJsonResult
/// <summary>
/// 店铺列表
/// </summary>
public IEnumerable<StoreBaseData> business_list { get; set; }
public List<StoreBaseData> business_list { get; set; }
/// <summary>
/// 店铺总数
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.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>net45;netstandard2.0;netstandard2.1</TargetFrameworks>
<Version>16.12.400</Version>
<Version>16.12.500</Version>
<AssemblyName>Senparc.Weixin.MP</AssemblyName>
<RootNamespace>Senparc.Weixin.MP</RootNamespace>
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
Expand Down
Loading