Skip to content

Commit

Permalink
Merge pull request #21 from JeffreySu/master
Browse files Browse the repository at this point in the history
同步最新
  • Loading branch information
mc7246 committed May 29, 2019
2 parents 8bc01c3 + b38bf95 commit b11ea1e
Show file tree
Hide file tree
Showing 71 changed files with 239 additions and 1,395 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ public ActionResult Post(PostModel postModel)

try
{

/* 如果需要添加消息去重功能,只需打开OmitRepeatedMessage功能,SDK会自动处理。
* 收到重复消息通常是因为微信服务器没有及时收到响应,会持续发送2-5条不等的相同内容的RequestMessage*/
messageHandler.OmitRepeatedMessage = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AspNetCoreModuleName>AspNetCoreModule</AspNetCoreModuleName>
<!--<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>-->

<Version>3.4.10</Version>
<Version>3.4.11</Version>
<!--<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>-->
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
Expand All @@ -19,7 +19,7 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.0.2105168" />
<PackageReference Include="Senparc.CO2NET" Version="0.8.1-preview1" />
<PackageReference Include="Senparc.NeuChar.App" Version="0.4.1-preview1" />
<PackageReference Include="Senparc.NeuChar.App" Version="0.5.0-preview1" />
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
<PackageReference Include="ZXing.Net" Version="0.16.4" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
using Senparc.Weixin.TenPay;//DPBMARK TenPay DPBMARK_END
using Senparc.Weixin.Work;//DPBMARK Work DPBMARK_END
using Senparc.Weixin.WxOpen;//DPBMARK MiniProgram DPBMARK_END
using Senparc.CO2NET.Utilities;
using Senparc.CO2NET.Utilities;
using System;

namespace Senparc.Weixin.MP.CoreSample
{
Expand Down Expand Up @@ -154,6 +155,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, IOptions

#endregion

CO2NET.APM.Config.DataExpire = TimeSpan.FromMinutes(60);//测试APM缓存过期时间(默认情况下可以不用设置)

#endregion

#region 微信相关配置
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,6 @@ public CustomWxOpenMessageHandler(Stream inputStream, PostModel postModel, int m
};
}

public override XDocument ResponseDocument
{
get { return new XDocument(); }//暂时没有需要输出的XML格式内容
}

public override XDocument FinalResponseDocument
{
get { return new XDocument(); }//暂时没有需要输出的XML格式内容
}

public override void OnExecuting()
{
Expand Down Expand Up @@ -118,6 +109,12 @@ public override IResponseMessageBase OnTextRequest(RequestMessageText requestMes
Senparc.Weixin.WxOpen.AdvancedAPIs.CustomApi.SendMiniProgramPage(appId, OpenId, "欢迎使用 Senparc.Weixin SDK", "pages/websocket/websocket",
uploadResult.media_id);
}
else if (contentUpper == "客服")
{
Senparc.Weixin.WxOpen.AdvancedAPIs.CustomApi.SendText(appId, OpenId, "您即将进入客服");
var responseMessage = base.CreateResponseMessage<ResponseMessageTransfer_Customer_Service>();
return responseMessage;
}
else
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="0.7.1-preview1" />
<PackageReference Include="Senparc.NeuChar" Version="0.7.2-preview1" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,26 @@
<HintPath>..\packages\BinaryFormatter.2.1.4\lib\netstandard1.1\BinaryFormatter.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET, Version=0.7.3.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.7.3.1-preview2\lib\net45\Senparc.CO2NET.dll</HintPath>
<Reference Include="Senparc.CO2NET, Version=0.8.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.8.1-preview1\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.APM, Version=0.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.3.1-preview1\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
<Reference Include="Senparc.CO2NET.APM, Version=0.4.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.4.1.1-preview1\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=2.2.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.2.1.1-preview1\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.6.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.6.9-preview1\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.7.2-preview1\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar.App, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.App.0.5.0-preview1\lib\net45\Senparc.NeuChar.App.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand All @@ -86,6 +92,24 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BinaryFormatter" version="2.1.4" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.7.3.1-preview2" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.3.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.8.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.4.1.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="2.2.1.1-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.6.9-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.7.2-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar.App" version="0.5.0-preview1" targetFramework="net45" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net45" />
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,20 @@
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET, Version=0.7.3.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.7.3.1-preview2\lib\net45\Senparc.CO2NET.dll</HintPath>
<Reference Include="Senparc.CO2NET, Version=0.8.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.8.1-preview1\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.APM, Version=0.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.3.1-preview1\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
<Reference Include="Senparc.CO2NET.APM, Version=0.4.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.4.1.1-preview1\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=2.2.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.2.1.1-preview1\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.6.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.6.9-preview1\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.7.2-preview1\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar.App, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.App.0.5.0-preview1\lib\net45\Senparc.NeuChar.App.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
<package id="Moq" version="4.10.1" targetFramework="net45" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.7.3.1-preview2" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.3.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.8.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.4.1.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="2.2.1.1-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.6.9-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.7.2-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar.App" version="0.5.0-preview1" targetFramework="net45" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net45" />
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,26 +81,26 @@
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Senparc.CO2NET, Version=0.7.3.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.7.3.1-preview2\lib\net45\Senparc.CO2NET.dll</HintPath>
<Reference Include="Senparc.CO2NET, Version=0.8.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.0.8.1-preview1\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.APM, Version=0.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.3.1-preview1\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
<Reference Include="Senparc.CO2NET.APM, Version=0.4.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.APM.0.4.1.1-preview1\lib\net45\Senparc.CO2NET.APM.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Memcached, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Memcached.3.3.1-preview1\lib\net45\Senparc.CO2NET.Cache.Memcached.dll</HintPath>
<Reference Include="Senparc.CO2NET.Cache.Memcached, Version=3.3.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Memcached.3.3.2-preview1\lib\net45\Senparc.CO2NET.Cache.Memcached.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis, Version=3.5.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.3.5.1.1-preview1\lib\net45\Senparc.CO2NET.Cache.Redis.dll</HintPath>
<Reference Include="Senparc.CO2NET.Cache.Redis, Version=3.5.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.3.5.2-preview1\lib\net45\Senparc.CO2NET.Cache.Redis.dll</HintPath>
</Reference>
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=2.2.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.2.2.1.1-preview1\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.6.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.6.9-preview1\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.7.2-preview1\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar.App, Version=0.3.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.App.0.3.8-preview1\lib\net45\Senparc.NeuChar.App.dll</HintPath>
<Reference Include="Senparc.NeuChar.App, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.App.0.5.0-preview1\lib\net45\Senparc.NeuChar.App.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.7.3.1-preview2" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.3.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Memcached" version="3.3.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis" version="3.5.1.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.8.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.APM" version="0.4.1.1-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Memcached" version="3.3.2-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis" version="3.5.2-preview1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="2.2.1.1-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.6.9-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar.App" version="0.3.8-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.7.2-preview1" targetFramework="net45" />
<package id="Senparc.NeuChar.App" version="0.5.0-preview1" targetFramework="net45" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net45" />
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
Expand Down
3 changes: 3 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ test_script:
- cmd: dotnet test -c Release Samples\Senparc.Weixin.MP.Sample.vs2017\Senparc.Weixin.MP.Sample.vs2017.sln
artifacts:
- path: '**\*.nupkg'
name: nupkg
- path: '**\*.snupkg'
name: snupkg
nuget:
disable_publish_on_pr: true
#deploy:
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Senparc.Weixin SDK 是目前使用率最高的微信 .NET SDK,也是国内最
如果你喜欢并希望我们继续优化这个项目,请给我们一个 ★Star :)

## 公告
> :trophy:[2018 年度盛派微信 SDK 优秀贡献者入围名单](https://github.com/JeffreySu/WeiXinMPSDK/issues/1584)》公布,请注意查看并登记信息 :smile:
> :trophy:[2018-2019 年度盛派微信 SDK 优秀贡献者入围名单](https://github.com/JeffreySu/WeiXinMPSDK/issues/1584)》公布,请注意查看并登记信息 :smile:

<!-- _1. 为了将 Demo 和源代码隔离,并让大家更方便地找到 Demo,现已将 Senparc.Weixin.MP.Sample 等文件夹转移到 [/Samples/](Samples/) 文件夹下。_<br> -->
Expand Down
Loading

0 comments on commit b11ea1e

Please sign in to comment.