Skip to content

Commit

Permalink
Merge pull request #3072 from JeffreySu/Developer
Browse files Browse the repository at this point in the history
Developer
  • Loading branch information
JeffreySu authored Sep 13, 2024
2 parents 6a935a2 + ee36a3f commit 6075396
Show file tree
Hide file tree
Showing 63 changed files with 45 additions and 101 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/
//DPBMARK_FILE MP

using System.Collections.Generic;
using Senparc.Weixin.MP.Entities;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20191003
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using System.Threading;
using System.Threading.Tasks;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using Senparc.CO2NET.Extensions;
using Senparc.NeuChar.Entities;
using Senparc.Weixin.Exceptions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using Senparc.CO2NET.Helpers;
using Senparc.CO2NET.Utilities;
using Senparc.NeuChar.Agents;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using Senparc.CO2NET;
using Senparc.CO2NET.Extensions;
using Senparc.CO2NET.Utilities;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE WebSocket
#if !NET462
#if !NET462
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE Work
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE Work
using System;
using System.Collections.Generic;
using System.IO;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE MiniProgram
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
----------------------------------------------------------------*/

//DPBMARK_FILE MiniProgram
using Senparc.CO2NET.Utilities;
using Senparc.NeuChar.Entities;
using Senparc.Weixin.WxOpen.Entities;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//DPBMARK_FILE MiniProgram

using Senparc.CO2NET.Cache;
using Senparc.Weixin.Sample.CommonService.TemplateMessage.WxOpen;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
//DPBMARK_FILE Redis
//DPBMARK_FILE Memcached
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using Senparc.CO2NET.Cache;
using Senparc.Weixin.Cache;
using Senparc.Weixin.Containers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
修改描述:优化消息模拟功能
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using System;
using System.Collections.Generic;
using System.IO;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE MP
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using Senparc.Weixin.MP.AdvancedAPIs;
using Senparc.Weixin.MP.AdvancedAPIs.Analysis;
using Senparc.Weixin.MP.Containers;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE MP
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using Senparc.CO2NET.Cache;
using Senparc.CO2NET.Extensions;
using Senparc.CO2NET.HttpUtility;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE MP
using Senparc.Weixin.MP.Helpers;
using Senparc.Weixin.MP.Helpers;
using System;
using System.Collections.Generic;
using System.Configuration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
修改标识:Senparc - 20150312
修改描述:TestUploadMediaFile() 方法专为Senparc.Weixin.MP.Test/HttpUtility/RequestUtilityTest.cs/HttpPostTest 提供上传测试目标
----------------------------------------------------------------*/
//DPBMARK_FILE MP

using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/
//DPBMARK_FILE MP
using System;
using System.Collections.Generic;
using System.Diagnostics;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using System;
using System.Collections.Generic;
using System.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE MP
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE MP
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
----------------------------------------------------------------*/


//DPBMARK_FILE MP

//using System;
//using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动,
*/

//DPBMARK_FILE MP
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using System;
using System.Collections.Generic;
using System.IO;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE MP
using Senparc.Weixin.MP.CommonAPIs;
using Senparc.Weixin.MP.CommonAPIs;
using Senparc.Weixin.MP.Helpers;
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE Open
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE Open
using System;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

/* 注意:TenPayApiV3Controller 为真正微信支付 API V3 的示例 */

//DPBMARK_FILE TenPay
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Senparc.CO2NET.Extensions;
Expand All @@ -37,14 +36,13 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;


using Senparc.Weixin.MP;
using Senparc.Weixin.Sample.Net8.Filters;
using Senparc.Weixin.MP.AdvancedAPIs;
using Senparc.Weixin.Sample.CommonService.TemplateMessage;
using Senparc.Weixin.Sample.CommonService.Utilities;
using Senparc.CO2NET.HttpUtility;
using Senparc.CO2NET.Trace;
//DPBMARK_END

namespace Senparc.Weixin.Sample.Net8.Controllers
Expand Down Expand Up @@ -219,7 +217,7 @@ public IActionResult ProductPayCode(int productId, int hc)

#endregion


#region OAuth授权
public ActionResult OAuthCallback(string code, string state, string returnUrl)
{
Expand Down Expand Up @@ -296,7 +294,6 @@ public async Task<IActionResult> JsApi(int productId, int hc)
var price = product == null ? 100 : (int)(product.Price * 100);//单位:分
var notifyUrl = TenPayV3Info.TenPayV3Notify.Replace("/TenpayV3/", "/TenPayApiV3/").Replace("http://", "https://");



//请求信息
TransactionsRequestData jsApiRequestData = new(TenPayV3Info.AppId, TenPayV3Info.MchId, name + " - 微信支付 V3", sp_billno, new TenpayDateTime(DateTime.Now.AddHours(1), false), null, notifyUrl, null, new() { currency = "CNY", total = price }, new(openId), null, null, null);
Expand All @@ -307,6 +304,7 @@ public async Task<IActionResult> JsApi(int productId, int hc)

if (result.VerifySignSuccess != true)
{
SenparcTrace.SendCustomLog("basePayApis2.JsApiAsync 接口出错", $" JsApiReturnJson 返回结果:{result.ToJson(true)}");
throw new WeixinException("获取 prepay_id 结果校验出错!");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE TenPay
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* 微信真正微信支付 API V3 的示例请见 TenPayApiV3Controller
*/

//DPBMARK_FILE TenPay
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Senparc.CO2NET.Extensions;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE Open
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动,
*/


//DPBMARK_FILE Work
using Microsoft.AspNetCore.Mvc;
using Senparc.CO2NET.AspNet.HttpUtility;
using Senparc.CO2NET.Utilities;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动,
*/

//DPBMARK_FILE MiniProgram
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Senparc.CO2NET.Cache;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE MP


using Microsoft.AspNetCore.Http;
using Senparc.Weixin.MP.MvcExtension;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE TenPay
using System;
using System;
using System.Collections.Generic;
using System.Linq;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE MP
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Senparc.Weixin.MP.Entities;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@model Senparc.Weixin.Sample.Net8.Models.VD.Analysis_IndexVD
@*//DPBMARK_FILE MP*@

@*
@{
ViewBag.Title = "微信分析数据接口测试工具";
Layout = "~/Views/Shared/_Layout.cshtml";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
ViewBag.Title = "微信分布式缓存策略测试";
Layout = "~/Views/Shared/_Layout.cshtml";

//DPBMARK_FILE Redis
//DPBMARK_FILE Memcached
}
@section HeaderContent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//DPBMARK_FILE WebSocket


using Microsoft.AspNetCore.SignalR;
using Senparc.WebSocket.SignalR;
using System.Threading.Tasks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using Senparc.NeuChar.Entities;
using Senparc.Weixin.MP.Entities;
using Senparc.Weixin.MP.Entities.Request;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@
<p>您可以在当前解决方案中,<strong>Libraries</strong> 目录下,将所需要引用的程序集引用(复制)到您开发环境的解决方案中,请注意需要同时引用被依赖的项目,如 <code>Senparc.Weixin</code> 项目是所有项目都需要依赖的。</p>
<p>当前示例项目默认就使用了直接引用源码的方式,可从 .csproj 文件中看到引用方式:</p>
<pre><code>&lt;ItemGroup&gt;
&lt;ProjectReference Include="..\..\..\src\Senparc.Weixin.MP.Middleware\Senparc.Weixin.MP.Middleware.net6.csproj" /&gt;
&lt;ProjectReference Include="..\..\..\src\Senparc.Weixin.MP.MvcExtension\Senparc.Weixin.MP.MvcExtension\Senparc.Weixin.MP.MvcExtension.net6.csproj" /&gt;
&lt;ProjectReference Include="..\..\..\src\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.net6.csproj" /&gt;
&lt;ProjectReference Include="..\..\..\src\Senparc.Weixin.MP.Middleware\Senparc.Weixin.MP.Middleware.net8.csproj" /&gt;
&lt;ProjectReference Include="..\..\..\src\Senparc.Weixin.MP.MvcExtension\Senparc.Weixin.MP.MvcExtension\Senparc.Weixin.MP.MvcExtension.net8.csproj" /&gt;
&lt;ProjectReference Include="..\..\..\src\Senparc.Weixin.MP\Senparc.Weixin.MP\Senparc.Weixin.MP.net8.csproj" /&gt;
&lt;/ItemGroup&gt;</code></pre>

<h5>引用程序集(推荐)</h5>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using Microsoft.AspNetCore.Mvc;
using Senparc.CO2NET.Extensions;
using Senparc.Weixin.Exceptions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ 2. 目前 Senparc.Weixin SDK 已经全面转向异步方法驱动,
3. 更多使用演示请参考 Senparc.Weixin.Sample.All 同名文件。
*/

//DPBMARK_FILE MP
using Microsoft.AspNetCore.Mvc;

namespace Senparc.Weixin.Sample.MP.Controllers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
创建标识:Senparc - 20150312
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
----------------------------------------------------------------*/

//DPBMARK_FILE MP
using Senparc.CO2NET.Helpers;
using Senparc.CO2NET.Utilities;
using Senparc.NeuChar.Entities;
Expand Down
Loading

0 comments on commit 6075396

Please sign in to comment.