Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed 'src/Senparc.Weixin.WxOpen/' changes from b46bde71b..d8c85736c
d8c85736c Merge pull request #42 from JeffreySu/Developer 6c68657e5 更新引用 90cc0c594 Merge pull request #41 from JeffreySu/Developer 6cdc99625 Merge branch 'Developer' of https://github.com/JeffreySu/WeiXinMPSDK into Developer 24c7cb59f 更新NET Core 2.2 sample 3abf7b7cc .net 4.5 sample 升级最新 nuget 包 fa348566c modify 4966e37a4 x.102 发布正式版 c2c000ed7 Sample v4.6.0 添加小程序订阅消息演示 6edf21b8e WxOpen v3.7.102 添加订阅消息接口 #1997 感谢 @luoxy123 4b7bd5405 x.102-preview7.8.1 小程序审核事件移动到Senparc.Weixin.WxOpen,第三方平台-扫码关注组件,小程序支付后获取unionid #1991 感谢 @mc7246 43bd27ba6 Merge pull request #1991 from mc7246/master 85fa4a979 更新Sample 1f71d8015 更新 .net core 2.2 Demo 54af590ea 使用新版本 NeuChar,提升 MessageHandler 处理效率 2 倍以上(异步方法) eeecbcf5d 小程序审核事件移动到Senparc.Weixin.WxOpen,第三方平台-扫码关注组件,小程序支付后获取unionid 251a37551 改造消息模拟器,使用异步方法,提高测试准确性 2a69c91d2 调整组测过程,避免可能出现的因为注册顺序问题导致的缓存异常 a99a68a33 preivew v7.7.8 e827adaaf 使用新版本 CO2NET 和 NeuChar 8284580bc Sample v4.5.6, 修改 OnlyAllowEcryptMessage 提示信息 1d0e76d5e preview 7.7,Sample v4.5.6,完成加密消息转发 00a307380 添加 onlyAllowEcryptMessage 属性,进一步提高安全性,同时优化了 RequestMessage 日志储存机制 30798ede2 Sample v4.5.5 使用 MessageHandler.OnlyAllowEcryptMessage 属性,进一步提高安全级别 cfab4e935 Sample v4.5.4 提高安全性 95a08f07f 使用 NeuChar v1.0.102-preview7.5,更新示例 a61d3b11a preview7.1 eda668697 更新 NeuChar v1.0.102-preview7.4.4,继续测试优化企业微信消息ji caac57d73 升级到 NeuChar v1.0.102-preview7.4.4,解决企业号等验证问题 87856aac9 新版本.102 preview7;Sample v4.5.0,,公众号、小程序、企业微信全面支持中间件消息处理,并开始以异步方法优先,进行升级 6fc01a56c 优化 Work 消息加密相关代码 2198c4722 升级NeuChar新版,更新中间件消息验证页面的提示内容 02bfd9d79 完善异步方法改写 8c9b66f5b WxOpen 部分完成异步MessageHandler改造 45ad3ad71 升级到 NeuChar 新版本,开始异步方法优先 b4cd15eb8 升级到新版本NeuChar,提供更好的验证提示 2915535c6 完成企业号MessageHandler中间件 e5f07a05f Sample v4.4.12,小程序 MessageHandler 使用中间件 f2d2999ca Sample v4.4.11,完善消息模拟器,使用新版本 MessageAgent 8e9790358 升级 NeuChar;Sample v4.4.10 590008f6d 优化 MessageHandler 中间件,完成 MP 中间件搭建,配置代码可简化到1行 07b9923e1 完成 Messagehandler 中间件升级 d8e76da7b 更新 NeuChar,升级 中间件,测试成功,继续优化 0cb372848 进一步抽象中间件,将扩展方法移植到NeuChar 6b50c7186 中间件基类移植到NeuChar,其他模块以此作为基类进行扩展 53b002625 升级到NeuChar preview3 c0cc79bbd Register 注册过程自动添加更多 SenparcSettingItem 信息 c959f6f51 提供 MP MessageHandler 中间件配置方式(测试版) 35dc1f95b 修改小程序 代码 a02d2f24a 更新小程序Demo 5745cff57 升级 Cache 相关 的 .net core 3.0 独立项目 2843ae30d 升级 .net core 3.0 独立项目 csproj 文件 b8a48d667 升级 .net core 3.0 独立项目 csproj 文件 e6d4e4218 添加 NETCOREAPP3_0 条件编译 25e3aada3 WxOpen v3.7.101 提供 .Net Core 3.0 独立版本 4d372848a 升级到最新NeuChar版本 54b874cae Merge branch 'Developer' of https://github.com/JeffreySu/WeiXinMPSDK into Developer b0b7ee1a2 修改 .NET Core 3.0 单元测试项目 2154c9e01 更新 .net 4.5 项目版本号 e5bd1e99d Senparc.Weixin SDK v6.6.0 使用最新版本 Neuchar、CO2NET,支持 .NET Core 3.0 e320a0563 fix bug:MessageContext.GetRequestEntityMappingResult() 方法可能出现的空值情况 #1929 #1930 感谢 @tangyangming @gendou b7c01e426 更新 NeuChar、CO2NET,支持 .NET Core 3.0 fd3050697 升级新版本 NeuChar,解决上下文缓存反序列化时APP状态的一个 bug b24b8eb6e .net 4.5 sample 同步新版本号 4cab1d29d Merge branch 'Developer' of https://github.com/JeffreySu/WeiXinMPSDK into Developer 5f3217f6e .net 4.5 Sample 更新 NeuChar 库 80511ef68 Merge branch 'Developer' of https://github.com/JeffreySu/WeiXinMPSDK into Developer a96421d58 .net core Sample 升级 NeuChar 包 852458a07 .net 4.5 项目完成分布式上下文升级。单元测试通过。 9306e8f58 更新 neuchar c3726feea .net 4.5 升级基础库,支持分布式上下文 84a4415f2 提供带符号的 nuget 包(.snupkg) d2db98338 preview4 a5f285007 优化 MessageHandler 的上下文记录,统一到基类中。 0009461d2 升级NeuChar库 d9d3c4b07 升级SDK 8018903f6 WxOpen完成新MessageHandler;添加备注 7871b4d7a 更新SDK,使用新的MessageHandler进行去重 97350ff60 升级 Senparc SDK;完善 MP GetResponseEntityMappingResult() 3b8377552 全面升级异步上下文消息,发布preview3 (ResponseMessage)尚未处理 e8c02f1aa 升级Senparc系列SDK 433ba51a9 全面升级 CO2NET 版本,升级 Senparc.Weixin.dll vv6.4.14 e4d3b5030 Update readme.md ab94b04da Merge pull request #40 from JeffreySu/Developer fa78058fd WxOpen v3.5.4 修正 UniformSendData 参数 #1901 @Dysheng f79fb31db 更新版本号 e26032c2a 更新 .net 4.5 Sample 的 nuget 引用 80ee4bc8a Merge branch 'Developer' of https://github.com/JeffreySu/WeiXinMPSDK into Developer 4e143b788 更新 .net 4.5 项目版本号 948aa6130 WxOpen v3.5.3 引用最新版本 CO2NET 和 Senparc.Weixin c683cc428 Merge pull request #39 from JeffreySu/Developer 06e1e3b98 合并 WxOpen 代码 75fd43ff8 Update README.md bc78d5321 修正代码 532b57caa 添加注释 a8b835d26 全民升级版本,引用最新的 CO2NET 138e020f3 Sample v3.8.5 添加 EncryptHelper.DecodeUserInfoBySessionId() 异常调试日志记录 487947132 完善 AES_Decrypt,处理偶然出现的 adding is invalid and cannot be removed 问题(未发现规律);同时完善单元测试 99d32044b modify 1d3444a15 测试 EncryptHelper.DecodeEncryptedData() 方法 66fe7dfc1 创建单元测试 for #1869 ddd98b1b6 创建单元测试 for #1825 701a2cc02 更新版本号 git-subtree-dir: src/Senparc.Weixin.WxOpen git-subtree-split: d8c85736cafc993a4b5a97de99fb91652c2b6522
- Loading branch information
Showing
36 changed files
with
1,608 additions
and
274 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Senparc.Weixin.WxOpen.AppDemo/pages/websocket_signalr/websocket_signalr.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
...WxOpen.AppDemo/utils/senparc.websocket.js → ...en.AppDemo/utils/senparc.websocket.1.0.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
/* senparc.websocket.js - 20190716 - v1.0 */ | ||
/* 支持 .NET Core 2.2- SignalR。 */ | ||
|
||
var senparcWebSocketConnection; | ||
|
||
|
41 changes: 41 additions & 0 deletions
41
src/Senparc.Weixin.WxOpen.AppDemo/utils/senparc.websocket.2.0.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/* senparc.websocket.js - 20191001 - v2.0 */ | ||
/* 支持 .NET Core 3.0+ SignalR。 */ | ||
|
||
var senparcWebSocketConnection; | ||
|
||
function buildConnectionAndStart(hubUrl, signalR, onStart){ | ||
senparcWebSocketConnection = new signalR.HubConnectionBuilder() | ||
.withUrl(hubUrl) | ||
//.withAutomaticReconnect([0, 2000, 5000, 10000, 30000, 45000, 60000]) | ||
.build(); | ||
senparcWebSocketConnection.start(onStart()).then().catch(function (err) { | ||
return console.error(err.toString()); | ||
}); | ||
return senparcWebSocketConnection; | ||
} | ||
|
||
function sendMessage(text,sessionId,formId){ | ||
//如果使用 Senparc.WebSocket,必须严格按照以下 submitData 数据字段发送(参数只能多不能少) | ||
var submitData = JSON.stringify({ | ||
Message: text,//必填 | ||
SessionId: sessionId,//选填,不需要可输入'' | ||
FormId: formId//选填formId用于发送模板消息,不需要可输入'' | ||
}); | ||
|
||
//ReceiveMessage 为特殊约定的方法入口,请勿修改,如果使用其他名称,则会对应到 SenparcHub 下的其他自定义方法 | ||
senparcWebSocketConnection.invoke("ReceiveMessage", submitData).catch(function (err) { | ||
return console.error(err.toString()); | ||
}); | ||
} | ||
|
||
function onReceiveMessage(receive){ | ||
senparcWebSocketConnection.on("ReceiveMessage", function (res) { | ||
receive(res); | ||
}); | ||
} | ||
|
||
module.exports = { | ||
buildConnectionAndStart: buildConnectionAndStart, | ||
sendMessage: sendMessage, | ||
onReceiveMessage: onReceiveMessage | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
src/Senparc.Weixin.WxOpen.Tests/Senparc.Weixin.WxOpen.Tests.NetCore3.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
|
||
<PropertyGroup> | ||
<TargetFramework>netcoreapp3.0</TargetFramework> | ||
|
||
<IsPackable>false</IsPackable> | ||
|
||
<AssemblyName>Senparc.Weixin.WxOpen.Tests</AssemblyName> | ||
|
||
<RootNamespace>Senparc.Weixin.WxOpen.Tests</RootNamespace> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<Compile Remove="Properties\AssemblyInfo.cs" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" /> | ||
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" /> | ||
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<Folder Include="Properties\" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\..\..\Senparc.Weixin.Cache\Senparc.Weixin.Cache.Redis\Senparc.Weixin.Cache.Redis.netcore3.csproj" /> | ||
<ProjectReference Include="..\..\..\Senparc.Weixin.MP\Senparc.Weixin.MP.Test\Senparc.Weixin.MP.Test.NetCore3.csproj" /> | ||
<ProjectReference Include="..\..\..\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.netcore3.csproj" /> | ||
<ProjectReference Include="..\..\..\Senparc.Weixin.MP\Senparc.WeixinTests\Senparc.WeixinTests.NetCore3.csproj" /> | ||
<ProjectReference Include="..\..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.netcore3.csproj" /> | ||
<ProjectReference Include="..\Senparc.Weixin.WxOpen\Senparc.Weixin.WxOpen\Senparc.Weixin.WxOpen.netcore3.csproj" /> | ||
</ItemGroup> | ||
|
||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.