From 0f9263238c5760267db714bb9fb6f4b86e202b22 Mon Sep 17 00:00:00 2001
From: lijin <17408817@qq.com>
Date: 星期五, 21 十一月 2025 09:05:37 +0800
Subject: [PATCH] 签入
---
ApiTools.Core/Enums/WxmpUtils/EnumTemplate.cs | 19 ++++++
ApiTools.Core/Models/WxmpUtils/Commands/SaveWxSendCommand.cs | 34 +++++++----
ApiTools.Core/Utils/WxmpUtils/WxmpGetQrCodeRequest.cs | 20 +++---
ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs | 12 +++-
ApiTools.Core/ApiTools.Core.xml | 30 +++++-----
ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs | 14 ++--
6 files changed, 81 insertions(+), 48 deletions(-)
diff --git a/ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs b/ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs
index 6aa1365..18489f4 100644
--- a/ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs
+++ b/ApiTools.Application/WxUtils/Commands/SaveWxCommandHandler.cs
@@ -23,13 +23,13 @@
return await utils.WxSend(new SendRequest
{
WxmpCode = request.WxmpCode,
- EnvVersion = request.EnvVersion,
- template_id = request.template_id,
- page = request.page,
- touser = request.touser,
- data = request.data,
- miniprogram_state = request.miniprogram_state,
- lang = request.lang
+ //EnvVersion = request.EnvVersion,
+ Template_id = request.Template_id.ToString(),
+ 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 ab8921b..75f2db9 100644
--- a/ApiTools.Core/ApiTools.Core.xml
+++ b/ApiTools.Core/ApiTools.Core.xml
@@ -3278,29 +3278,29 @@
灏忕▼搴忕紪鍙�
</summary>
</member>
- <member name="P:ApiTools.Core.SaveWxSendCommand.EnvVersion">
+ <member name="P:ApiTools.Core.SaveWxSendCommand.Template_id">
<summary>
- 瑕佹墦寮�鐨勫皬绋嬪簭鐗堟湰銆傛寮忕増涓� "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
+ 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d锛堝仛鎴愭灇涓撅級
</summary>
</member>
- <member name="P:ApiTools.Core.SaveWxSendCommand.template_id">
+ <member name="P:ApiTools.Core.SaveWxSendCommand.Page">
<summary>
- 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d
+ 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆锛堝仛鍒伴厤缃枃浠堕噷闈級
</summary>
</member>
- <member name="P:ApiTools.Core.SaveWxSendCommand.page">
- <summary>
- 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆
- </summary>
- </member>
- <member name="P:ApiTools.Core.SaveWxSendCommand.touser">
+ <member name="P:ApiTools.Core.SaveWxSendCommand.Touser">
<summary>
鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid
</summary>
</member>
- <member name="P:ApiTools.Core.SaveWxSendCommand.data">
+ <member name="P:ApiTools.Core.SaveWxSendCommand.Data">
<summary>
妯℃澘鍐呭锛屾牸寮忓舰濡倇 "phrase3": { "value": "瀹℃牳閫氳繃" }, "name1": { "value": "璁㈤槄" }, "date2": { "value": "2019-12-25 09:42" } }
+ </summary>
+ </member>
+ <member name="P:ApiTools.Core.SaveWxSendCommand.Lang">
+ <summary>
+ 璇█锛堥粯璁や腑鏂囷級
</summary>
</member>
<member name="T:ApiTools.Core.SaveWxSettingCommand">
@@ -7005,22 +7005,22 @@
瑕佹墦寮�鐨勫皬绋嬪簭鐗堟湰銆傛寮忕増涓� "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
</summary>
</member>
- <member name="P:ApiTools.Core.SendRequest.template_id">
+ <member name="P:ApiTools.Core.SendRequest.Template_id">
<summary>
鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d
</summary>
</member>
- <member name="P:ApiTools.Core.SendRequest.page">
+ <member name="P:ApiTools.Core.SendRequest.Page">
<summary>
鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆
</summary>
</member>
- <member name="P:ApiTools.Core.SendRequest.touser">
+ <member name="P:ApiTools.Core.SendRequest.Touser">
<summary>
鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid
</summary>
</member>
- <member name="P:ApiTools.Core.SendRequest.data">
+ <member name="P:ApiTools.Core.SendRequest.Data">
<summary>
妯℃澘鍐呭锛屾牸寮忓舰濡倇 "phrase3": { "value": "瀹℃牳閫氳繃" }, "name1": { "value": "璁㈤槄" }, "date2": { "value": "2019-12-25 09:42" } }
</summary>
diff --git a/ApiTools.Core/Enums/WxmpUtils/EnumTemplate.cs b/ApiTools.Core/Enums/WxmpUtils/EnumTemplate.cs
new file mode 100644
index 0000000..261773a
--- /dev/null
+++ b/ApiTools.Core/Enums/WxmpUtils/EnumTemplate.cs
@@ -0,0 +1,19 @@
+锘縰sing Furion.FriendlyException;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ApiTools.Core.Enums.WxmpUtils
+{
+ [ErrorCodeType]
+ public enum EnumTemplate
+ {
+ [ErrorCodeItemMetadata("妯℃澘1")]
+ Template01 = 01,
+
+ [ErrorCodeItemMetadata("妯℃澘2")]
+ Template02 = 02,
+ }
+}
diff --git a/ApiTools.Core/Models/WxmpUtils/Commands/SaveWxSendCommand.cs b/ApiTools.Core/Models/WxmpUtils/Commands/SaveWxSendCommand.cs
index ac32a57..0650b65 100644
--- a/ApiTools.Core/Models/WxmpUtils/Commands/SaveWxSendCommand.cs
+++ b/ApiTools.Core/Models/WxmpUtils/Commands/SaveWxSendCommand.cs
@@ -1,4 +1,5 @@
-锘縰sing MediatR;
+锘縰sing ApiTools.Core.Enums.WxmpUtils;
+using MediatR;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -20,32 +21,39 @@
/// </summary>
public string WxmpCode { get; set; }
- /// <summary>
- /// 瑕佹墦寮�鐨勫皬绋嬪簭鐗堟湰銆傛寮忕増涓� "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
- /// </summary>
- public string EnvVersion { get; set; }
+ ///// <summary>
+ ///// 瑕佹墦寮�鐨勫皬绋嬪簭鐗堟湰銆傛寮忕増涓� "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛�傦紙璇诲彇閰嶇疆锛�
+ ///// </summary>
+ //public string EnvVersion { get; set; }
/// <summary>
- /// 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d
+ /// 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d锛堝仛鎴愭灇涓撅級
/// </summary>
- public string template_id { get; set; }
+ public EnumTemplate Template_id { get; set; }
/// <summary>
- /// 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆
+ /// 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆锛堝仛鍒伴厤缃枃浠堕噷闈級
/// </summary>
- public string page { get; set; }
+ public string Page { get; set; }
/// <summary>
/// 鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid
/// </summary>
- public string touser { get; set; }
+ 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 object Data { get; set; }
- public string lang { get; set; }
+ ///// <summary>
+ ///// 璺宠浆灏忕▼搴忕被鍨嬶細developer涓哄紑鍙戠増锛泃rial涓轰綋楠岀増锛沠ormal涓烘寮忕増锛涢粯璁や负姝ｅ紡鐗�
+ ///// </summary>
+ //public string miniprogram_state { get; set; }
+
+ /// <summary>
+ /// 璇█锛堥粯璁や腑鏂囷級
+ /// </summary>
+ public string Lang { get; set; }
}
}
diff --git a/ApiTools.Core/Utils/WxmpUtils/WxmpGetQrCodeRequest.cs b/ApiTools.Core/Utils/WxmpUtils/WxmpGetQrCodeRequest.cs
index 86515bc..e60c155 100644
--- a/ApiTools.Core/Utils/WxmpUtils/WxmpGetQrCodeRequest.cs
+++ b/ApiTools.Core/Utils/WxmpUtils/WxmpGetQrCodeRequest.cs
@@ -129,38 +129,38 @@
/// <summary>
/// 鎵�闇�涓嬪彂鐨勮闃呮ā鏉縤d
/// </summary>
- [JsonProperty("template_id")]
+ [JsonProperty("Template_id")]
[Required]
- public string template_id { get; set; }
+ public string Template_id { get; set; }
/// <summary>
/// 鐐瑰嚮妯℃澘鍗＄墖鍚庣殑璺宠浆椤甸潰锛屼粎闄愭湰灏忕▼搴忓唴鐨勯〉闈€�傛敮鎸佸甫鍙傛暟,锛堢ず渚媔ndex?foo=bar锛夈�傝瀛楁涓嶅～鍒欐ā鏉挎棤璺宠浆
/// </summary>
- [JsonProperty("page")]
+ [JsonProperty("Page")]
[Required]
- public string page { get; set; }
+ public string Page { get; set; }
/// <summary>
/// 鎺ユ敹鑰咃紙鐢ㄦ埛锛夌殑 openid
/// </summary>
- [JsonProperty("touser")]
+ [JsonProperty("Touser")]
[Required]
- public string touser { get; set; }
+ public string Touser { get; set; }
/// <summary>
/// 妯℃澘鍐呭锛屾牸寮忓舰濡倇 "phrase3": { "value": "瀹℃牳閫氳繃" }, "name1": { "value": "璁㈤槄" }, "date2": { "value": "2019-12-25 09:42" } }
/// </summary>
- [JsonProperty("data")]
+ [JsonProperty("Data")]
[Required]
- public object data { get; set; }
+ public object Data { get; set; }
[JsonProperty("璺宠浆灏忕▼搴忕被鍨嬶細developer涓哄紑鍙戠増锛泃rial涓轰綋楠岀増锛沠ormal涓烘寮忕増锛涢粯璁や负姝ｅ紡鐗�")]
[Required]
- public string miniprogram_state { get; set; }
+ public string Miniprogram_state { get; set; }
[JsonProperty("杩涘叆灏忕▼搴忔煡鐪嬧�濈殑璇█绫诲瀷锛屾敮鎸亃h_CN(绠�浣撲腑鏂�)銆乪n_US(鑻辨枃)銆亃h_HK(绻佷綋涓枃)銆亃h_TW(绻佷綋涓枃)锛岄粯璁や负zh_CN")]
[Required]
- public string lang { get; set; }
+ public string Lang { get; set; }
}
diff --git a/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs b/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs
index 3806ced..cb686c5 100644
--- a/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs
+++ b/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs
@@ -4,6 +4,7 @@
using Azure.Core;
using Furion.FriendlyException;
using Furion.HttpRemote;
+using Furion.JsonSerialization;
using Mapster;
using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Options;
@@ -15,8 +16,10 @@
using System.Net.Http.Json;
using System.Text;
using System.Text.Json.Nodes;
+using System.Text.Unicode;
using System.Threading;
using System.Threading.Tasks;
+using static System.Net.Mime.MediaTypeNames;
namespace ApiTools.Core
{
@@ -148,11 +151,14 @@
.WithQueryParameter("access_token", accessToken)
.SetJsonContent(jsonContent));
response.EnsureSuccessStatusCode();
- if (response.Content.Headers.ContentType.ToString() == "application/json; charset=UTF-8")
+ //var a = response.Content.Headers.ContentType.ToString();
+ //application/json; encoding=utf-8
+ //if (response.Content.Headers.ContentType.ToString() == "application/json; charset=UTF-8")
+ if (response.Content.Headers.ContentType.ToString() == "application/json; encoding=utf-8")
{
var jsonResult = await response.Content.ReadAsStringAsync();
- var callback = jsonResult.JsonTo<SendResponse>();
- if (callback == null || callback.ErrorCode != 0)
+ //var callback = jsonResult.JsonTo<SendResponse>();
+ //if (callback == null || callback.ErrorCode != 0)
//throw Oops.Oh(EnumErrorCodeType.s510, $"鑾峰彇灏忕▼搴忕爜澶辫触锛歿callback.errmsg}锛岃鑱旂郴绠＄悊鍛�");
return jsonResult;
}
--
Gitblit v1.9.1