Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit c17d7ee
Merge: 7540ace e1fa44a
Author: Jeffrey Su <zsu@senparc.com>
Date:   Mon Oct 22 23:31:16 2018 +0800

    Merge pull request JeffreySu#1453 from JeffreySu/Developer

    Developer

commit e1fa44a
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Mon Oct 22 23:08:16 2018 +0800

    modify

commit 3293366
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Mon Oct 22 20:20:44 2018 +0800

    整理代码

commit e4372d2
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Mon Oct 22 16:37:27 2018 +0800

    修改WxOpen项目文件引用（for .net 4.5）

commit 8400bf7
Merge: 2a33c93 549becc
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Mon Oct 22 16:27:45 2018 +0800

    拉取WxOpen代码，解决冲突

commit 549becc
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Mon Oct 22 16:25:27 2018 +0800

    Squashed 'src/Senparc.Weixin.WxOpen/' changes from 64ca79a4d..f80adde4a

    f80adde4a Merge pull request JeffreySu#29 from JeffreySu/Developer
    2e62a1ddb WxOpen完善解密过程，解决第二次获取小程序Session解密出错的不确定情况
    8f5542626 更新Demo，避免在某些特殊情况下MessageHandler日志记录过程异常
    69b7a4b4f WxOpen 3.1.13.2 小程序优化打通NeuChar流程
    5f028df3d 同步版本号
    8c9331c73 升级NeuChar
    9b94f73e4 升级NeuChar
    1f9377013 升级NeuChar，调试小程序消息处理能力
    449f0fc91 .net 4.5 demo 升级 NeuChar
    bcb642c5b v16.4.5 支持 Senparc.NeuChar v0.2.10，支持 NeuChar 连接检测
    d631fda87 提供 MessageHandler 的 NeuChar 对接能力
    1056db3b2 同步版本号
    0ef200b15 .net 4.5 demo 升级 neuchar 和 WxOpen 的 MP 最新版本引用
    578ee3c0b 支持 Senparc.NeuChar v0.2.9.1
    f23f9dc20 update  SDK
    141a2e59f 更新CO2NET
    e1472e495 Merge pull request JeffreySu#1433 from niktac/master
    171aca9ef 分配最新版本号
    fc20720f3 .net 4.5 Sample 引用最新SDK
    817e71ab8 更新依赖最新版本的NeuChar和CO2NET
    5f98e1a55 红包预支付接口,小程序插件相关接口
    8d632b651 分配新版本号，发布Neuget包
    2f34d49b8 支持NeuChar v0.2.7稳定版
    38767aab1 更新到NeuChar稳定版v0.2.7
    4954c7e7a 更新NeuChar v0.2.6.7，菜单点击测试通过
    b6e7ae598 升级NeuChar，支持菜单点击事件使用NeuChar定义
    55612fd86 更新NeuChar
    907428b9f 升级NeuChar及CO2NET
    15b72f807 升级NeuChar，菜单按钮类型（ButtonType）改为使用 Senparc.NeuChar.MenuButtonType
    c1d098687 升级NeuChar
    6f29e9631 安装CO2NET新版本 V0.2.14
    12ed0b64b 分配新版本号
    22ad83c9e 升级CO2NET v0.2.11
    b68e961ca 更新SDK引用
    a679b6529 Merge pull request JeffreySu#1419 from niktac/master
    a42fe37f5 WxOpenApi
    9065c325a Nuget 前面支持 Senparc.NeuChar v0.2.1
    850bc3f34 .net core 代码及Demo升级到NeuChar v0.2.1.1
    d5b0ae539 .net 4.5 Demo 及源代码项目升级到NeuChar  v0.2.1.1
    d68b2122f 更新NeuChar
    439f3eef8 更新AssemblyInfo.cs版权信息
    70bce92b8 WxOpen 的 .net 4.5 项目引用最新的 MP
    57299752d .net core项目升级NeuChar
    39ef8402b WxOpen完成最新的NeuChar升级
    65f8c93f0 RequestMessageEventBase 继承 NeuChar 的 RequestMessageEventBase 接口
    b727eb75d WxOpen 从 MP 移植并修改 ResponseMessageTransfer_Customer_Service
    62cf65537 修改NeuChar相关引用
    be7f67708 升级NeuChar最新引用
    f6c193669 更新SDK引用
    c0683544f 升级SDK引用
    e185ab023 使用最新版本的NeuChar提升接口处理能力
    119055c59 升级NeuChar到v0.1.2
    550677969 更新小程序Demo
    493590ce4 小程序添加专属的WxOpenApiHandlerWapper
    5531896b2 升级NeuChar到v0.1.1
    a10ddd1dc 升级NeuChar到v0.1.0
    5d4597f6c 更新NeuChar（v0.0.9.10）
    f4f1f75b1 更新NeuChar（测试v0.0.9.9）
    b86d2ff6e 升级NeuChar（测试）
    677b0df7c 更新到NeuChar 0.0.9.6（测试）
    08625383a 升级NeuChar（测试）
    8a4d6c383 升级NeuChar（测试）
    f6d08ae42 升级NeuChar（测试）
    db4070459 升级NeuChar（测试）
    96022d450 更新版本号
    71307211a 使用NeuChar v0.0.8 正式版，支持News消息类型设置
    601c177b2 NeuChar v0.0.8
    34f94e778 NeuChar v0.0.7.6，优化MessageHandler，支持小程序、公众号等不同账号自动识别
    c0fae220b 升级NeuChar
    709a1948c 更新版本号
    2f893d461 更新NeuChar到v0.0.7.4，Enlighten名称更改为Enlightener，优化Enlightener
    c63932df7 升级NeuChar到v0.0.7
    43b21c432 升级到NeuChar v0.0.6.24
    24975da40 优化NeuChar
    2088683a3 优化小程序兼容性
    ec00acb11 升级NeuChar
    c1c4e5fc4 升级 NeuChar 到 v0.0.6.10
    64caee0e3 更新小程序Demo
    ed5a3a3d5 修改小程序Demo
    796f97a6a 优化NeuChar，分配新版本号
    a51e1091a 完善NeuChar自定义API消息能力，Demo可运行
    13c23a718 升级NeuChar到v0.0.6.7支持多消息任务（使用套机接口发送客服消息）
    21753f955 更新NeuChar，调试MessageHandler
    4c2086c1c 升级NeuChar
    74c1b29f0 升级NeuChar
    4af5bd8ca 完善API自动处理能力
    8c14c1578 完善API自动处理能力
    fdbf9e879 支持 NeuChar v0.0.6.1，提供API自动处理能力
    0455cd1b9 更新到 NeuChar v0.0.6.1 支持 API 自动处理能力
    d69797177 分配新版本号
    e913962ee 升级NeuChar
    64cd19a30 .net core 编译成功
    adc8f4689 Work 通过编译
    60813e9e2 Work编译成功
    e3ff62509 WxOpen改造
    3677577eb MP完成MessageHandler重构（基础）
    3c815372d Request-Response重构
    2c5e3a07c 升级NeuChar
    d9dede098 升级NeuChar
    1b9233361 重构Request-Response
    fea641dca 重构MessageHandler相关
    e7e780db6 升级NeuChar
    c53b3309f 同步版本号
    1ad1ecb45 升级 CO2NET 最新版本
    45ea08eee 升级NeuChar
    ce0c7022f 升级WxOpen的微信SDK nuget包引用
    fb4259f0c 版本号升级，全面支持 NeuChar 标准
    ad57a3b78 WeixinContext. 替换为 GlobalMessageContext.
    56a9c1146 .net core 升级CO2NET和NeuChar最新版本
    563999583 替换NeuChar命名空间和引用，dll通过编译
    d010e5375 替换NeuChar命名空间
    31164066b 替换NeuChar命名空间
    3c123bd07 批量替换 using Senparc.Weixin.MessageHandlers; 为 using Senparc.NeuChar.MessageHandlers;
    79adddbbe 批量替换 Senparc.Weixin.Entities 为 Senparc.NeuChar.Entities
    4f71e5780 更新 CO2NET 到 v0.2.10
    6bc85a40b 升级CO2NET
    505d125f6 升级CO2NET
    a2ce789d6 完成NeuChar.config的保；升级CO2NET
    66ddf83a6 合并Develoer，解决冲突
    343dfb246 从Developer最新版本合并
    ab4288637 升级 CO2NET 引用，优化TenPay和WxOpen
    d546e2ee4 Merge pull request JeffreySu#28 from JeffreySu/Developer
    a65ecfbce 升级引用库
    fe4e7eba0 合并Developer最新代码
    59db53852 Merge pull request JeffreySu#27 from JeffreySu/Developer
    8b477eaba WxOpen  v2.4.1 fixbug：TemplateApi.LibraryGet() 方法修正 API 地址
    23d6fecab WxOpen v2.4.1 TemplateApi.LibraryGet() 方法修正 API 地址
    36e615c91 安装最新的 CO2NET v0.2.7
    7acab1628 单元测试通过：WxOpen v2.4.0 添加校验文字是否含有违法内容的接口
    e40317fe6 WxOpen 小程序  v2.4.0 添加校验文字及图片是否含有违法内容的接口 JeffreySu#1283 感谢 @lb0726
    41c8b0aa0 修改小程序Demo
    826a5e1e4 .net 4.5 WxOpen 项目引用最新的 MP
    13214778d 同步版本号
    9f10d05d9 WxOpen v2.3.0 单独设立小程序客服接口（AdvancedAPIs.CustomApi），支持所有小程序客服消息类型
    b378bf091 更新Demo和版本号
    400e8481c .net 4.5项目升级到最新的CO2NET和Senparc.Weixin调用
    ae98dfd85 升级到最新的 SenparcWeixinSetting 自动注册方法
    d6691dbb1 完善微信支付Demo，完成小程序支付后发送模板消息
    5d2e187b9 Work修改单元测试代码和代码引用
    a48b1195f Merge pull request JeffreySu#26 from JeffreySu/Developer
    4888e6b95 Senparc.Weixin  v3.4.1 支持 CO2NET v0.2.4
    904bf0db0 WxOpen v2.1.2 优化接口，支持 CO2NET v0.2.4
    8dc0299be 完成单元测试 JeffreySu#1320
    97c3297c8 优化小程序单元测试
    f57407a87 优化单元测试，创建WxOpenBaseTest基类
    15acf682e 完善WxOpen单元测试的wxOpenAppId引用
    03fa9b467 添加单元测试对 WxOpenAppId 和 Secret 的识别
    ee8c47594 创建 WxOpen 的 WxAppApi.GetWxaCodeUnlimit 方法单元测试
    78e985f6d 修改 .net core 项目文件设置（统一大小写） #
    e65f53859 Merge pull request JeffreySu#25 from JeffreySu/Developer
    f27e241ae WxOpen v2.1.1 fix bug 小程序“数据分析”接口 日趋势 字段类型 @FrancisFYK JeffreySu@b3835c5
    b5dc27cd6 优化WxOpen的.net 4.5独立编译项目设置
    7b859b484 Merge branch 'Developer' of https://github.com/JeffreySu/WeiXinMPSDK into Developer
    bb10c8bf2 更新nuget引用
    c204cdb2a Fix Bug  小程序“数据分析”接口 日趋势 字段类型
    e2c68b175 更新引用
    66580ead4 升级CO2NET到v0.2.0
    875342cda 升级MP nuget引用
    de2b4bf55 更新版本号
    a895b909f WxOpen v2.1.0 支持 Senparc.Weixin v5.1.0，重构 Container，提供新的缓存过期策略
    611c1e33e WxOpen v2.0.11.2 修正 TemplateApi.Add() 方法返回类型。感谢 @davidMaster  JeffreySu#1288
    44e3f30a1 WxOpen，v2.0.11.2 修正 TemplateApi.Add() 方法返回类型，感谢 @davidMaster  JeffreySu#1288
    a38075c59 Merge pull request JeffreySu#24 from JeffreySu/Developer
    9b8193a6b 添加 小程序码的接口缺少 is_hyaline 参数。感谢 @zxz19 JeffreySu#1286
    e01e39717 更新版本号
    a2dee5d11 更新CO2NET引用；同步版本号
    fed14ed8d .net framework 依赖 CO2NET v0.1.11
    b6d4f7aca .net framework 升级 CO2NET 引用
    974cd8b27 升级 .net framework 中的 Senparc.Weixin 引用
    f8eb1c715 支持 Senparc.Weixin v15.0.10
    4b7d2d7cf Senparc.Weixin v5.0.10 支持 CO2NET v0.1.10，将 SenparcWeixinSetting 中的 Redis 和 Memcached 配置参数调整到 CO2NET 的 SenparcSetting 中
    8673d8b81 升级到最新的 CO2NET，更新Demo
    91668500d 安装 CO2NET v0.1.9.1
    19b80ae9f 优化Demo写法
    2345b0e90 升级 CO2NET 版本
    91839a1cf v5.0.7 支持 CO2NET v0.1.7，为 WeixinRegister.UseSenparcWeixin() 方法提供自动注册扩展缓存的能力，配套更新Demo
    bea5d1d6a 修复单元测试升级CO2NET之后的代码
    74018e17f 更新版本号，更新Demo
    600fdaddb .net framework 4.5 项目升级到支持 CO2NET v0.1.6.1，解决XXE安全漏洞问题
    7dac02c20 更新CO2NETv0.1.6.1 ，解决 XXE 漏洞
    5e6a772b8 更新CO2NETv0.1.5 ，解决 XXE 漏洞
    f75aa27bc 修改版本号，支持CO2NET v0.1.5
    73e040a68 国外爆出的XXE安全漏洞，以及 微信支付团队的说明如下： https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=23_5 根据说明,将所有XmlDocument的地方 var xmlDoc = new XmlDocument(); xmlDoc.XmlResolver = null; // 添加这一行代码
    959409b64 V2.0.3 SessionBag 添加 UnionId 属性 感谢 @e4ky JeffreySu#1252
    7f7bb67c0 更新支持最新版本的 CO2NET
    18ff95663 modify demo
    081119142 完成小程序微信支付Demo，测试成功
    ddafb43be 同步版本号
    39feb2eed WxOpen升级到最新的Senprc.Weixin引用
    a139a1b8f 升级到CO2NET v0.1.2,；优化领域缓存策略的注册过程
    9d0547e62 升级到CO2NET v0.1.2
    bde33e057 添加小程序微信支付Demo
    6a338da18 .net framework Demo 改造为支持 CO2NET，编译通过
    997f70aed Senparc.Weixin v5.0-preview1 发布
    e50c4f1f1 项目引用CO2NET，编译通过
    7b902e4e4 CO2NET v0.1.0 ContainerBag 取消属性变动通知机制，使用手动更新缓存
    7f188564f modify WxOpen.EncryptHelper.cs
    9911dcb6e 统一改用
    f67f72e55 using Senparc.CO2NET.RegisterServices
    1a31f37b2 CO2NET融入单元测试编译通过
    abeea21ed WxOpen v2.0.0 引入 Senparc.CO2NET，支持 Senparc.Weixin v5.0
    f4fda49d6 using Senparc.Weixin.CacheUtility; 全局替换为 using Senparc.CO2NET.CacheUtility;
    547689462 using Senparc.Weixin.Helpers.Extensions 全局替换为 using Senparc.CO2NET.Extensions
    1aed098f2 WxOpen v1.10.5 发布支持 .net core 2.1 的正式版
    9795ef4e5 netcore 2.1正式版已上架nuget，故把原2.1 rc1改为正式版
    7e1ffa109 添加 .net core samole中的小程序 WxOpen 单元测试项目
    462d1f4c4 .net core sample 添加 Open.Test 单元测试

    git-subtree-dir: src/Senparc.Weixin.WxOpen
    git-subtree-split: f80adde4a924228ea5d423ac466fe26ad45ee43a

commit 7540ace
Merge: 355b926 2a33c93
Author: Jeffrey Su <zsu@senparc.com>
Date:   Mon Oct 22 16:20:38 2018 +0800

    Merge pull request JeffreySu#1452 from JeffreySu/Developer

    Developer

commit 2a33c93
Merge: 8dda396 7ce3d74
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Sun Oct 21 17:51:16 2018 +0800

    Merge branch 'Developer' of https://github.com/JeffreySu/WeiXinMPSDK into Developer

commit 8dda396
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Sun Oct 21 17:37:33 2018 +0800

    .net 3.5 DEMO 更新  SDK 引用

commit 2a62266
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Sun Oct 21 17:28:27 2018 +0800

    同步版本号

commit 28dd9fc
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Sun Oct 21 17:26:33 2018 +0800

    调整单元测试代码，使用新的MessaageHandler构造函数

commit bebe6c7
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Sun Oct 21 17:21:12 2018 +0800

    修改CO2NET命名空间，更新过期方法

commit 81ea0a6
Author: JeffreySu <www.jeffrey.su@gmail.com>
Date:   Sun Oct 21 16:54:13 2018 +0800

    支持 Senparc.NeuChar v0.2.11，升级 MessageHandler

commit 7ce3d74
Merge: 2191a7c 54bc286
Author: Jeffrey Su <zsu@senparc.com>
Date:   Sun Oct 21 14:11:30 2018 +0800

    Merge pull request JeffreySu#1451 from MartyZaneOS/Developer

    根据官方文档完善创建带参数的二维码方法的注释

commit 54bc286
Author: MartyZane <zhao36845726@163.com>
Date:   Sun Oct 21 08:31:03 2018 +0800

    根据官方文档完善创建带参数的二维码方法的注释
  • Loading branch information
@lovepoco
lovepoco committed Oct 23, 2018
1 parent 355b926 commit 421329a
Show file tree
Hide file tree
Showing 71 changed files with 218 additions and 201 deletions.
2 changes: 1 addition & 1 deletion ...parc.Weixin.MP.Sample.vs2017/Senparc.Weixin.MP.CoreSample/wwwroot/Scripts/senparc.menu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ senparc.menu = {
$('#menuTable tbody tr').eq(row).find('td').eq(0).addClass('currentMenuItem');

//一级菜单提示
if (row == 5) {
if (row === 5) {
$('#rootButtonNotice').show();
} else {
$('#rootButtonNotice').hide();
Expand Down
8 changes: 4 additions & 4 deletions ...ixin.MP.Sample.CommonService/MessageHandlers/CustomMessageHandler/CustomMessageHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ public CustomMessageHandler(Stream inputStream, PostModel postModel, int maxReco
};
}

public CustomMessageHandler(RequestMessageBase requestMessage)
: base(requestMessage)
{
}
//public CustomMessageHandler(RequestMessageBase requestMessage, PostModel postModel)
// : base(requestMessage, postModel)
//{
//}

public override void OnExecuting()
{
Expand Down
2 changes: 1 addition & 1 deletion .../Senparc.Weixin.MP.Sample.CommonService/Senparc.Weixin.MP.CoreSample.CommonService.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="0.2.10.3" />
<PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...mple/Senparc.Weixin.MP.Sample.CommonService/Senparc.Weixin.MP.Sample.CommonService.csproj
View file
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.2.10.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.2.10.3\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.2.11\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
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.16" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="1.0.0" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.2.10.3" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.2.11" 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
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.2.10.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.2.10.3\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.2.11\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
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.16" targetFramework="net45" />
<package id="Senparc.CO2NET.Cache.Redis.RedLock" version="1.0.0" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.2.10.3" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.2.11" 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
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.2.10.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.2.10.3\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Senparc.NeuChar.0.2.11\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
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.2.10.3" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.2.11" 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.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.1.9.*")]
[assembly: AssemblyVersion("7.1.10.*")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
4 changes: 2 additions & 2 deletions ...ixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
<Reference Include="Senparc.CO2NET, Version=0.2.16.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.CO2NET.0.2.16\lib\net45\Senparc.CO2NET.dll</HintPath>
</Reference>
<Reference Include="Senparc.NeuChar, Version=0.2.10.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.2.10.3\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.2.11\lib\net45\Senparc.NeuChar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand Down
6 changes: 3 additions & 3 deletions ....MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.vs2017.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFrameworks>net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
<Version>7.1.9</Version>
<Version>7.1.10</Version>
<AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
<RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -83,7 +83,7 @@
v7.1.6 支持 Senparc.NeuChar v0.2.1
v7.1.7 支持 Senparc.Weixin 6.1.4
v7.1.8 Senparc.NeuChar v0.2.7

v7.1.10 Senparc.NeuChar v0.2.11，升级 MessageHandler
</PackageReleaseNotes>
<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
<PackageId>Senparc.Weixin.MP.MVC</PackageId>
Expand Down Expand Up @@ -226,7 +226,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Senparc.NeuChar" Version="0.2.10.3" />
<PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/packages.config
View file
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.16" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.2.10.3" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.2.11" targetFramework="net45" />
</packages>
12 changes: 7 additions & 5 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/MessageHandlers/MessageHandlers_CancelTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ and limitations under the License.
using Senparc.NeuChar.Context;
using Senparc.NeuChar.Entities;
using Senparc.Weixin.MP.Entities;
using Senparc.Weixin.MP.Entities.Request;
using Senparc.Weixin.MP.MessageHandlers;

namespace Senparc.Weixin.MP.Test.MessageHandlers
{
public class CancelMessageHandlers : MessageHandler<MessageContext<IRequestMessageBase,IResponseMessageBase>>
public class CancelMessageHandlers : MessageHandler<MessageContext<IRequestMessageBase, IResponseMessageBase>>
{
public string RunStep { get; set; }

public CancelMessageHandlers(XDocument requestDoc)
: base(requestDoc)
public CancelMessageHandlers(XDocument requestDoc, PostModel postModel)
: base(requestDoc, postModel)
{
}

Expand Down Expand Up @@ -88,9 +89,10 @@ public class MessageHandlers_CancelTest
[TestMethod]
public void CancelTest()
{
var postModel = new PostModel() { AppId = "appId" };
{
//一开始就取消
var messageHandler = new CancelMessageHandlers(XDocument.Parse(xmlText));
var messageHandler = new CancelMessageHandlers(XDocument.Parse(xmlText), postModel);
messageHandler.CancelExcute = true;
messageHandler.Execute();

Expand All @@ -99,7 +101,7 @@ public void CancelTest()

{
//OnExecuting中途取消
var messageHandler = new CancelMessageHandlers(XDocument.Parse(xmlText));
var messageHandler = new CancelMessageHandlers(XDocument.Parse(xmlText), postModel);
messageHandler.Execute();

Assert.AreEqual("OnExecuting", messageHandler.RunStep);
Expand Down
21 changes: 13 additions & 8 deletions ...Weixin.MP/Senparc.Weixin.MP.Test/MessageHandlers/MessageHandlers_OmitRepeatMessageTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ and limitations under the License.
using Senparc.NeuChar.Context;
using Senparc.NeuChar.Entities;
using Senparc.Weixin.MP.Entities;
using Senparc.Weixin.MP.Entities.Request;
using Senparc.Weixin.MP.MessageHandlers;

namespace Senparc.Weixin.MP.Test.MessageHandlers
Expand All @@ -32,8 +33,9 @@ public class OmitRepeatMessageMessageHandlers : MessageHandler<MessageContext<IR
{
public string RunStep { get; set; }

public OmitRepeatMessageMessageHandlers(XDocument requestDoc)
: base(requestDoc)

public OmitRepeatMessageMessageHandlers(XDocument requestDoc,PostModel postModel)
: base(requestDoc, postModel)
{
}

Expand Down Expand Up @@ -76,17 +78,20 @@ public class MessageHandlers_OmitRepeatMessage
</xml>
";

private PostModel _postModel = new PostModel() { AppId = "appId" };


[TestMethod]
public void OmitMessageTest_DifferentMsgId()
{
//发送两条不同MsgId的消息
var messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "11", "Jeffrey")));
var messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "11", "Jeffrey")), _postModel);
messageHandler.OmitRepeatedMessage = true;
messageHandler.Execute();
Assert.IsNotNull(messageHandler.ResponseMessage);
Assert.AreEqual("Jeffrey", (messageHandler.ResponseMessage as ResponseMessageText).Content);

messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "12", "Su")));
messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "12", "Su")), _postModel);
messageHandler.OmitRepeatedMessage = true;
messageHandler.Execute();
Assert.IsNotNull(messageHandler.ResponseMessage);
Expand All @@ -97,13 +102,13 @@ public void OmitMessageTest_DifferentMsgId()
public void OmitMessageTest_SameMsgId()
{
//发送两条相同MsgId的消息
var messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "21", "Jeffrey")));
var messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "21", "Jeffrey")), _postModel);
messageHandler.OmitRepeatedMessage = true;
messageHandler.Execute();
Assert.IsNotNull(messageHandler.ResponseMessage);
Assert.AreEqual("Jeffrey", (messageHandler.ResponseMessage as ResponseMessageText).Content);

messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "21", "Su")));
messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "21", "Su")), _postModel);
messageHandler.OmitRepeatedMessage = true;
messageHandler.Execute();
Assert.IsNull(messageHandler.ResponseMessage);
Expand All @@ -115,13 +120,13 @@ public void OmitMessageTest_SameMsgId()
public void OmitMessageTest_NotOmit()
{
//发送两条相同MsgId的消息，但是不启用忽略
var messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "31", "Jeffrey")));
var messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "31", "Jeffrey")), _postModel);
messageHandler.OmitRepeatedMessage = false;
messageHandler.Execute();
Assert.IsNotNull(messageHandler.ResponseMessage);
Assert.AreEqual("Jeffrey", (messageHandler.ResponseMessage as ResponseMessageText).Content);

messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "31", "Su")));
messageHandler = new OmitRepeatMessageMessageHandlers(XDocument.Parse(string.Format(xmlText, "31", "Su")), _postModel);
messageHandler.OmitRepeatedMessage = false;
messageHandler.Execute();
Assert.IsNotNull(messageHandler.ResponseMessage);
Expand Down
4 changes: 2 additions & 2 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP.Test/Senparc.Weixin.MP.Test.csproj
View file
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.2.10.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.2.10.3\lib\net45\Senparc.NeuChar.dll</HintPath>
<Reference Include="Senparc.NeuChar, Version=0.2.11.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\Samples\Senparc.Weixin.MP.Sample\packages\Senparc.NeuChar.0.2.11\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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<package id="Senparc.CO2NET" version="0.2.16" 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.2.10.3" targetFramework="net45" />
<package id="Senparc.NeuChar" version="0.2.11" 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
12 changes: 6 additions & 6 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/QrCode/QrCodeApi.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ public static class QrCodeApi
/// 创建二维码
/// </summary>
/// <param name="accessTokenOrAppId">AccessToken或AppId（推荐使用AppId，需要先注册）</param>
/// <param name="expireSeconds">临时二维码有效时间，以秒为单位。永久二维码将忽略此参数</param>
/// <param name="sceneId">场景值ID，临时二维码时为32位整型，永久二维码时最大值为1000</param>
/// <param name="sceneStr">场景字符串，仅actionName为QR_LIMIT_STR_SCENE时有效</param>
/// <param name="expireSeconds">临时二维码有效时间，以秒为单位。最大不超过2592000（即30天），此字段如果不填，则默认有效期为30秒,永久二维码将忽略此参数</param>
/// <param name="sceneId">场景值ID，临时二维码时为32位非0整型，永久二维码时最大值为100000（目前参数只支持1--100000）</param>
/// <param name="sceneStr">场景字符串，字符串类型，长度限制为1到64，仅actionName为QR_LIMIT_STR_SCENE时有效</param>
/// <param name="timeOut">代理请求超时时间（毫秒）</param>
/// <param name="actionName">二维码类型，当actionName为QR_LIMIT_STR_SCENE时，sceneId会被忽略</param>
/// <returns></returns>
Expand Down Expand Up @@ -217,9 +217,9 @@ public static void ShowQrCode(string ticket, Stream stream)
/// 创建二维码
/// </summary>
/// <param name="accessTokenOrAppId">AccessToken或AppId（推荐使用AppId，需要先注册）</param>
/// <param name="expireSeconds">临时二维码有效时间，以秒为单位。永久二维码将忽略此参数</param>
/// <param name="sceneId">场景值ID，临时二维码时为32位整型，永久二维码时最大值为1000</param>
/// <param name="sceneStr">场景字符串，仅actionName为QR_LIMIT_STR_SCENE时有效</param>
/// <param name="expireSeconds">临时二维码有效时间，以秒为单位。最大不超过2592000（即30天），此字段如果不填，则默认有效期为30秒,永久二维码将忽略此参数</param>
/// <param name="sceneId">场景值ID，临时二维码时为32位非0整型，永久二维码时最大值为100000（目前参数只支持1--100000）</param>
/// <param name="sceneStr">场景字符串，字符串类型，长度限制为1到64，仅actionName为QR_LIMIT_STR_SCENE时有效</param>
/// <param name="timeOut">代理请求超时时间（毫秒）</param>
/// <param name="actionName">二维码类型，当actionName为QR_LIMIT_STR_SCENE时，sceneId会被忽略</param>
/// <returns></returns>
Expand Down
8 changes: 4 additions & 4 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/Containers/AccessTokenContainer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ public class AccessTokenBag : BaseContainerBag, IBaseContainerBag_AppId
//#endif
// }

private AccessTokenResult _accessTokenResult;
private DateTime _accessTokenExpireTime;
private string _appSecret;
private string _appId;
//private AccessTokenResult _accessTokenResult;
//private DateTime _accessTokenExpireTime;
//private string _appSecret;
//private string _appId;
}

/// <summary>
Expand Down
8 changes: 4 additions & 4 deletions src/Senparc.Weixin.MP/Senparc.Weixin.MP/Containers/JsApiTicketContainer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ public class JsApiTicketBag : BaseContainerBag, IBaseContainerBag_AppId
/// </summary>
internal object Lock = new object();

private DateTime _jsApiTicketExpireTime;
private JsApiTicketResult _jsApiTicketResult;
private string _appSecret;
private string _appId;
//private DateTime _jsApiTicketExpireTime;
//private JsApiTicketResult _jsApiTicketResult;
//private string _appSecret;
//private string _appId;
}

/// <summary>
Expand Down

0 comments on commit 421329a

Please sign in to comment.