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

Merged
merged 5 commits into from
Sep 9, 2018
Merged

Developer #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f876e28
优化小程序兼容性
JeffreySu Sep 8, 2018
d9312ec
优化NeuChar
JeffreySu Sep 8, 2018
e32da44
升级到NeuChar v0.0.6.24
JeffreySu Sep 8, 2018
f2c2f98
v16.2.1 UrlUtility.GenerateOAuthCallbackUrl() 方法，更好支持反向代理 #1392
JeffreySu Sep 9, 2018
63a40a2
同步版本号
JeffreySu Sep 9, 2018
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
4 changes: 2 additions & 2 deletions ...mple/Senparc.Weixin.MP.Sample.CommonService/Senparc.Weixin.MP.Sample.CommonService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.1.0.0\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.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
2 changes: 1 addition & 1 deletion Samples/Senparc.Weixin.MP.Sample/Senparc.Weixin.MP.Sample.CommonService/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.2.10" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="1.0.0" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" 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
4 changes: 2 additions & 2 deletions ...arc.Weixin.MP.Sample/Senparc.Weixin.MP.Sample.Tests/Senparc.Weixin.MP.Sample.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.1.0.0\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.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
2 changes: 1 addition & 1 deletion Samples/Senparc.Weixin.MP.Sample/Senparc.Weixin.MP.Sample.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.2.10" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="1.0.0" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" 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
4 changes: 2 additions & 2 deletions Samples/Senparc.Weixin.MP.Sample/Senparc.Weixin.MP.Sample/Senparc.Weixin.MP.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.CO2NET.Cache.Redis.RedLock.1.0.0\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.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
2 changes: 1 addition & 1 deletion Samples/Senparc.Weixin.MP.Sample/Senparc.Weixin.MP.Sample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<package id="Senparc.CO2NET.Cache.Memcached" version="3.1.3.2" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis" version="3.1.1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="1.0.0" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" 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
4 changes: 2 additions & 2 deletions ...ixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
<Reference Include="Senparc.CO2NET, Version=0.2.10.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.0.2.10\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.2.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/Senparc.Weixin.MP.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.Cache.Redis.RedLock.1.0.0\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<package id="Senparc.CO2NET" version="0.2.10" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis" version="3.1.1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="1.0.0" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" 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
16 changes: 13 additions & 3 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/MessageHandlers/Async/MessageHandlerAsync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,19 @@ public override async Task ExecuteAsync()
{
case RequestMsgType.Text:
{
var requestMessage = RequestMessage as RequestMessageText;
ResponseMessage = await messageHandlerNode.ExecuteAsync(requestMessage,this, Config.SenparcWeixinSetting.WeixinAppId) ?? (await (OnTextOrEventRequestAsync(requestMessage))
?? (await OnTextRequestAsync(requestMessage)));
try
{
var requestMessage = RequestMessage as RequestMessageText;
ResponseMessage = await messageHandlerNode.ExecuteAsync(requestMessage, this, Config.SenparcWeixinSetting.WeixinAppId)
?? ((await (OnTextOrEventRequestAsync(requestMessage))
?? (await OnTextRequestAsync(requestMessage))));
}
catch (Exception ex)
{
SenparcTrace.SendCustomLog("mp-response error", ex.Message + "\r\n|||\r\n" + (ex.InnerException != null ? ex.InnerException.ToString() : ""));

}

}
break;
case RequestMsgType.Location:
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP/Senparc.Weixin.MP/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ and limitations under the License.
// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("16.1.1.*")]
[assembly: AssemblyVersion("16.2.1.*")]
//[assembly: AssemblyInformationalVersion("13.3.1-alpha")]
//[assembly: AssemblyFileVersion("0.4.2.0")]
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<Reference Include="Senparc.CO2NET, Version=0.2.10.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.0.2.10\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.vs2017.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
<Version>16.2.0</Version>
<Version>16.2.1-preview1</Version>
<AssemblyName>Senparc.Weixin.MP</AssemblyName>
<RootNamespace>Senparc.Weixin.MP</RootNamespace>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP/Senparc.Weixin.MP/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.2.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.MP/Senparc.WeixinTests/Senparc.WeixinTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.Cache.Redis.RedLock.1.0.0\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP/Senparc.WeixinTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<package id="Senparc.CO2NET.Cache.Memcached" version="3.1.3.2" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis" version="3.1.1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="1.0.0" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" 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
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.Open/Senparc.Weixin.Open.Test/Senparc.Weixin.Open.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.Cache.Redis.RedLock.1.0.0\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.Open/Senparc.Weixin.Open.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<package id="Senparc.CO2NET" version="0.2.10" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis" version="3.1.1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="1.0.0" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" 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
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.Open/Senparc.Weixin.Open/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.1.1.*")]
[assembly: AssemblyVersion("4.1.3.*")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
<Reference Include="Senparc.CO2NET, Version=0.2.10.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.0.2.10\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.Open/Senparc.Weixin.Open/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.2.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.Work/Senparc.Weixin.Work.Test/Senparc.Weixin.Work.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
<Reference Include="Senparc.CO2NET.Cache.Redis.RedLock, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.Cache.Redis.RedLock.1.0.0\lib\net45\Senparc.CO2NET.Cache.Redis.RedLock.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\StackExchange.Redis.1.2.6\lib\net45\StackExchange.Redis.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.Work/Senparc.Weixin.Work.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<package id="Senparc.CO2NET" version="0.2.10" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis" version="3.1.1" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="1.0.0" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" 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
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.Work/Senparc.Weixin.Work/Senparc.Weixin.Work.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
<Reference Include="Senparc.CO2NET, Version=0.2.10.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.0.2.10\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.0.6.10, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.10\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.0.6.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.0.6.14\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.Work/Senparc.Weixin.Work/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
<package id="Senparc.CO2NET" version="0.2.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.10" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.0.6.14" targetFramework="net45" />
</packages>
3 changes: 3 additions & 0 deletions ...WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/AdvancedAPIs/WxOpenApiEnlighten.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Senparc.CO2NET.Trace;
using Senparc.NeuChar.ApiHandlers;


Expand All @@ -20,6 +21,8 @@ public class WxOpenApiEnlighten : ApiEnlighten
/// <returns></returns>
public override ApiResult SendText(string accessTokenOrAppId, string openId, string content)
{
SenparcTrace.SendCustomLog("wxTest-sendText", "openID：" + openId + " || appID:" + accessTokenOrAppId + "|| content:" + content);

var reuslt = CustomApi.SendText(accessTokenOrAppId, openId, content);
return new ApiResult((int)reuslt.errcode, reuslt.errmsg, reuslt);
}
Expand Down
Loading