From fb245f04af0c848128da7d14c61694736b4afde7 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 20 十一月 2025 14:50:46 +0800
Subject: [PATCH] Merge branch 'dev-818-3.4.2.12' of http://120.26.58.240:8888/r/ApiTools into dev-818-3.4.2.12
---
ApiTools.Application/ApiTools.Application.csproj | 5 -
ApiTools.Application/ApiTools.Application.xml | 8 ++
ApiTools.Core/Models/WxmpUtils/Commands/SaveWxSendCommand.cs | 51 +++++++++++++++++
ApiTools.Core/ApiTools.Core.xml | 35 +++++++++++
ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs | 27 +++++---
5 files changed, 111 insertions(+), 15 deletions(-)
diff --git a/ApiTools.Application/ApiTools.Application.csproj b/ApiTools.Application/ApiTools.Application.csproj
index f08bd68..4c7484c 100644
--- a/ApiTools.Application/ApiTools.Application.csproj
+++ b/ApiTools.Application/ApiTools.Application.csproj
@@ -8,11 +8,6 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
-
- <ItemGroup>
- <Compile Remove="WxUtils\Commands\SaveWxCommandHandler.cs" />
- </ItemGroup>
-
<ItemGroup>
<None Remove="ApiTools.Application.xml" />
</ItemGroup>
diff --git a/ApiTools.Application/ApiTools.Application.xml b/ApiTools.Application/ApiTools.Application.xml
index 8a0e71c..a8261f0 100644
--- a/ApiTools.Application/ApiTools.Application.xml
+++ b/ApiTools.Application/ApiTools.Application.xml
@@ -287,6 +287,14 @@
<param name="cancellationToken"></param>
<returns></returns>
</member>
+ <member name="M:ApiTools.CommonServer.Application.SaveWxCommandHandler.Handle(ApiTools.Core.SaveWxSendCommand,System.Threading.CancellationToken)">
+ <summary>
+ 璇ユ帴鍙ｇ敤浜庡彂閫佽闃呮秷鎭�
+ </summary>
+ <param name="request"></param>
+ <param name="cancellationToken"></param>
+ <returns></returns>
+ </member>
<member name="M:ApiTools.CommonServer.Application.SaveWxSettingCommandHandler.Handle(ApiTools.Core.SaveWxSettingCommand,System.Threading.CancellationToken)">
<summary>
淇濆瓨寰俊閰嶇疆
diff --git a/ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs b/ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs
index f28e247..6aa1365 100644
--- a/ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs
+++ b/ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs
@@ -9,21 +9,28 @@
namespace ApiTools.CommonServer.Application
{
- public class SaveWxCommandHandler(WxmpUtils utils) : IRequestHandler<SaveWxSettingCommand, Guid>
+ public class SaveWxCommandHandler(WxmpUtils utils) : IRequestHandler<SaveWxSendCommand, string>
{
- public async Task<Guid> Handle(SaveWxSettingCommand request, CancellationToken cancellationToken)
+ private readonly WxmpUtils utils = utils;
+ /// <summary>
+ /// 璇ユ帴鍙ｇ敤浜庡彂閫佽闃呮秷鎭�
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<string> Handle(SaveWxSendCommand request, CancellationToken cancellationToken)
{
return await utils.WxSend(new SendRequest
{
- WxmpCode = request.Code,
+ WxmpCode = request.WxmpCode,
EnvVersion = request.EnvVersion,
- template_id = request.t,
- page = request.ChannelCreatedUserId,
- touser = request.ChannelCreatedUserId,
- data =
- miniprogram_state=
- lang=
- }, request.TemplateParam, cancellationToken);
+ template_id = request.template_id,
+ page = request.page,
+ touser = request.touser,
+ data = request.data,
+ miniprogram_state = request.miniprogram_state,
+ lang = request.lang
+ });
}
}
}
diff --git a/ApiTools.Core/ApiTools.Core.xml b/ApiTools.Core/ApiTools.Core.xml
index da4c73e..ab8921b 100644
--- a/ApiTools.Core/ApiTools.Core.xml
+++ b/ApiTools.Core/ApiTools.Core.xml
@@ -3268,6 +3268,41 @@
绛惧悕鍚嶇О
</summary>
</member>
+ <member name="T:ApiTools.Core.SaveWxSendCommand">
+ <summary>
+ 璇ユ帴鍙ｇ敤浜庡彂閫佽闃呮秷鎭�
+ </summary>
+ </member>
+ <member name="P:ApiTools.Core.SaveWxSendCommand.WxmpCode">
+ <summary>
+ 灏忕▼搴忕紪鍙�
+ </summary>
+ </member>
+ <member name="P:ApiTools.Core.SaveWxSendCommand.EnvVersion">
+ <summary>
+ 瑕佹墦寮�鐨勫皬绋嬪簭鐗堟湰銆傛寮忕増涓� "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
+ </summary>
+ </member>
+ <member name="P:ApiTools.Core.SaveWxSendCommand.template_id">
+ <summary>
+ 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d
+ </summary>
+ </member>
+ <member name="P:ApiTools.Core.SaveWxSendCommand.page">
+ <summary>
+ 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆
+ </summary>
+ </member>
+ <member name="P:ApiTools.Core.SaveWxSendCommand.touser">
+ <summary>
+ 鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid
+ </summary>
+ </member>
+ <member name="P:ApiTools.Core.SaveWxSendCommand.data">
+ <summary>
+ 妯℃澘鍐呭锛屾牸寮忓舰濡倇 "phrase3": { "value": "瀹℃牳閫氳繃" }, "name1": { "value": "璁㈤槄" }, "date2": { "value": "2019-12-25 09:42" } }
+ </summary>
+ </member>
<member name="T:ApiTools.Core.SaveWxSettingCommand">
<summary>
淇濆瓨寰俊閰嶇疆
diff --git a/ApiTools.Core/Models/WxmpUtils/Commands/SaveWxSendCommand.cs b/ApiTools.Core/Models/WxmpUtils/Commands/SaveWxSendCommand.cs
new file mode 100644
index 0000000..ac32a57
--- /dev/null
+++ b/ApiTools.Core/Models/WxmpUtils/Commands/SaveWxSendCommand.cs
@@ -0,0 +1,51 @@
+锘縰sing MediatR;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ApiTools.Core
+{
+ /// <summary>
+ /// 璇ユ帴鍙ｇ敤浜庡彂閫佽闃呮秷鎭�
+ /// </summary>
+ [Resource([EnumResourceController.CommonServerWxUtils], Method = EnumResourceMethod.Post)]
+ public class SaveWxSendCommand : IRequest<string>
+ {
+ /// <summary>
+ /// 灏忕▼搴忕紪鍙�
+ /// </summary>
+ public string WxmpCode { get; set; }
+
+ /// <summary>
+ /// 瑕佹墦寮�鐨勫皬绋嬪簭鐗堟湰銆傛寮忕増涓� "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
+ /// </summary>
+ public string EnvVersion { get; set; }
+
+ /// <summary>
+ /// 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d
+ /// </summary>
+ public string template_id { get; set; }
+
+ /// <summary>
+ /// 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆
+ /// </summary>
+ public string page { get; set; }
+
+ /// <summary>
+ /// 鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid
+ /// </summary>
+ public string touser { get; set; }
+
+ /// <summary>
+ /// 妯℃澘鍐呭锛屾牸寮忓舰濡倇 "phrase3": { "value": "瀹℃牳閫氳繃" }, "name1": { "value": "璁㈤槄" }, "date2": { "value": "2019-12-25 09:42" } }
+ /// </summary>
+ public object data { get; set; }
+ public string miniprogram_state { get; set; }
+
+ public string lang { get; set; }
+ }
+}
--
Gitblit v1.9.1