From 312ebed2d86858e4fb57ec09679244e9b806b57f Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 28 十一月 2025 17:56:10 +0800
Subject: [PATCH] feat:开发
---
ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs | 16 ++------
ApiTools.Core/Utils/WxmpUtils/WxmpOptions.cs | 18 ---------
ApiTools.Web.Entry/appsettings.json | 38 +-----------------
ApiTools.Core/ApiTools.Core.xml | 15 -------
4 files changed, 7 insertions(+), 80 deletions(-)
diff --git a/ApiTools.Core/ApiTools.Core.xml b/ApiTools.Core/ApiTools.Core.xml
index 04bee02..683f524 100644
--- a/ApiTools.Core/ApiTools.Core.xml
+++ b/ApiTools.Core/ApiTools.Core.xml
@@ -7140,21 +7140,6 @@
寰俊灏忕▼搴忛厤缃�
</summary>
</member>
- <member name="P:ApiTools.Core.WxmpOptions.SubscribMessageTemplates">
- <summary>
- 璁㈤槄娑堟伅妯℃澘
- </summary>
- </member>
- <member name="P:ApiTools.Core.WxmpOptionsSubscribMessageTemplate.TemplateId">
- <summary>
- 妯℃澘Id
- </summary>
- </member>
- <member name="P:ApiTools.Core.WxmpOptionsSubscribMessageTemplate.Page">
- <summary>
- 椤甸潰
- </summary>
- </member>
<member name="P:ApiTools.Core.WxmpOptionsItem.Code">
<summary>
缂栧彿
diff --git a/ApiTools.Core/Utils/WxmpUtils/WxmpOptions.cs b/ApiTools.Core/Utils/WxmpUtils/WxmpOptions.cs
index 56bb3b0..ec1a277 100644
--- a/ApiTools.Core/Utils/WxmpUtils/WxmpOptions.cs
+++ b/ApiTools.Core/Utils/WxmpUtils/WxmpOptions.cs
@@ -18,24 +18,6 @@
}
public List<WxmpOptionsItem> Items { get; set; }
-
- /// <summary>
- /// 璁㈤槄娑堟伅妯℃澘
- /// </summary>
- public Dictionary<string, WxmpOptionsSubscribMessageTemplate> SubscribMessageTemplates { get; set; } = [];
- }
-
- public class WxmpOptionsSubscribMessageTemplate
- {
- /// <summary>
- /// 妯℃澘Id
- /// </summary>
- public string TemplateId { get; set; }
-
- /// <summary>
- /// 椤甸潰
- /// </summary>
- public string Page { get; set; }
}
public class WxmpOptionsItem
diff --git a/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs b/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs
index 864a1d8..39321b6 100644
--- a/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs
+++ b/ApiTools.Core/Utils/WxmpUtils/WxmpUtils.cs
@@ -161,11 +161,6 @@
if (option == null || option.AppId.IsNull() || option.AppSecret.IsNull())
throw Oops.Oh(EnumErrorCodeType.s400, "鍙戦�佽闃呮秷鎭け璐ワ紝缂哄け閰嶇疆锛歐xmpOptions");
command.EnvVersion = option.EnvVersion;
- //if (!options.Value.SubscribMessageTemplates.ContainsKey(command.TemplateId))
- // throw Oops.Oh(EnumErrorCodeType.s400, "鍙戦�佽闃呮秷鎭け璐ワ紝妯℃澘涓嶅瓨鍦�");
- //var template = options.Value.SubscribMessageTemplates[command.TemplateId];
- //command.TemplateId = template.TemplateId;
- //if (command.Page.IsNull()) command.Page = template.Page;
var accessToken = await GetAccessToken(command.WxmpCode);
var jsonContent = JsonConvert.SerializeObject(command, new JsonSerializerSettings
{
@@ -176,13 +171,10 @@
.WithQueryParameter("access_token", accessToken)
.SetJsonContent(jsonContent));
response.EnsureSuccessStatusCode();
- if (response.Content.Headers.ContentType.ToString() == "application/json; charset=UTF-8")
- {
- var jsonResult = await response.Content.ReadAsStringAsync();
- var callback = jsonResult.JsonTo<WxmpSendSubscribMessageResponse>();
- if (callback == null || callback.ErrorCode != 0)
- throw Oops.Oh(EnumErrorCodeType.s510, $"鍙戦�佽闃呮秷鎭け璐ワ細{callback.ErrorMessage}锛岃鑱旂郴绠＄悊鍛�");
- }
+ var jsonResult = await response.Content.ReadAsStringAsync();
+ var callback = jsonResult.JsonTo<WxmpSendSubscribMessageResponse>();
+ if (callback == null || callback.ErrorCode != 0)
+ throw Oops.Oh(EnumErrorCodeType.s510, $"鍙戦�佽闃呮秷鎭け璐ワ細{callback.ErrorMessage}锛岃鑱旂郴绠＄悊鍛�");
}
}
}
diff --git a/ApiTools.Web.Entry/appsettings.json b/ApiTools.Web.Entry/appsettings.json
index 54bb8df..bdb049d 100644
--- a/ApiTools.Web.Entry/appsettings.json
+++ b/ApiTools.Web.Entry/appsettings.json
@@ -58,39 +58,7 @@
"AppSecret": "9a132eda735bc925200b0e215cffe20a",
"EnvVersion": "trial"
}
- ],
- "SubscribMessageTemplates": {
- // 鏀粯鎴愬姛鎻愰啋 缁撶畻瀹屾垚鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ��
- "SettlementCompletedToSupplier": {
- "TemplateId": "dz2HCc-EnR4WEfsuj2GuduF8SLu40J83xez1bLLbaC0",
- "Page": "pages/workbenches/workbenches"
- },
- // 鎶ラ叕缁撶畻瀹℃牳缁撴灉閫氱煡 鐢叉柟缁撶畻纭鍚庡悜鎵挎徑绔鐞嗗憳鎺ㄩ��
- "SettlementAuditCompletedToSupplier": {
- "TemplateId": "Qp6cetvhwONMS1y9LOBt4dZgq49Hc14lIsm-LVE0Hfo",
- "Page": "pages/workbenches/workbenches"
- },
- // 宸ヨ祫鍙戞斁閫氱煡 缁撶畻瀹屾垚鍚庡悜C绔汉鍛橀�氱煡
- "SettlementReceiveCompletedToUser": {
- "TemplateId": "pw-WntZZJjADXfLsxcs5S8pKlpTrSc-HtJs0ZZvqliE",
- "Page": "pages/home/index"
- },
- // 鎶ュ悕褰曠敤缁撴灉閫氱煡 琚綍鐢ㄥ悗鍚慍绔汉鍛橀�氱煡
- "HireCompletedToUser": {
- "TemplateId": "dz2HCc-EnR4WEfsuj2GuduF8SLu40J83xez1bLLbaC0",
- "Page": "pages/home/index"
- },
- // 鎺掔彮鎴愬姛閫氱煡 鎺掔彮鍚庡悜C绔汉鍛橀�氱煡
- "ArrangeCompletedToUser": {
- "TemplateId": "dz2HCc-EnR4WEfsuj2GuduF8SLu40J83xez1bLLbaC0",
- "Page": "pages/home/index"
- },
- // 娴嬭瘯
- "Test": {
- "TemplateId": "T7Gta6H6TROZjcqeSWVTG2wWGGInWh0fGTOgCCgVBuk",
- "Page": "pages/home/index"
- }
- }
+ ]
},
"Task": {
"SettlementTime": "T0"
@@ -123,7 +91,7 @@
"Password": "8af9s7",
"TemplateCodes": {
//818骞冲彴鐧诲綍/娉ㄥ唽
- "LoginOrRegister": "楠岃瘉鐮�${code}锛岀敤鎴锋偍濂斤紝鎮ㄦ鍦ㄨ繘琛屽钩鍙扮櫥褰�/娉ㄥ唽锛岄獙璇佺爜10鍒嗛挓鍐呮湁鏁堛��",
+ "LoginOrRegister": "楠岃瘉鐮�${code}锛岀敤鎴锋偍濂斤紝鎮ㄦ鍦ㄨ繘琛屽钩鍙扮櫥褰�/娉ㄥ唽锛岄獙璇佺爜3鍒嗛挓鍐呮湁鏁堛��",
//818鎵嬫満鍙风爜淇敼
"UpdateUserPhoneNumber": "楠岃瘉鐮�${code}锛屾偍姝ｅ湪杩涜淇敼鎵嬫満鍙风爜鎿嶄綔锛岃鍕挎硠闇诧紝鑻ラ潪鏈汉鎿嶄綔璇峰拷鐣ャ��",
//818閽卞寘寮�閫�
@@ -200,7 +168,7 @@
"VerifyCode": "SMS_471100021",
//818骞冲彴鐧诲綍/娉ㄥ唽 楠岃瘉鐮�${code}锛岀敤鎴锋偍濂斤紝鎮ㄦ鍦ㄨ繘琛屽钩鍙扮櫥褰�/娉ㄥ唽锛岄獙璇佺爜10鍒嗛挓鍐呮湁鏁堛��
- "LoginOrRegister": "SMS_472170005",
+ "LoginOrRegister": "SMS_498465483",
//818璐﹀彿寮�閫氾紙绠＄悊绔級灏婃暚鐨勭敤鎴锋偍濂斤紝浜哄姏鏃犲咖璐﹀彿宸插紑閫氾紝璐﹀彿锛�${account}锛屽瘑鐮侊細${pwd}锛岃鐧诲綍缃戝潃 https://admin.81812333.com
"CreateOperationAccount": "SMS_471970028",
//818鎵嬫満鍙风爜淇敼 楠岃瘉鐮�${code}锛屾偍姝ｅ湪杩涜淇敼鎵嬫満鍙风爜鎿嶄綔锛岃鍕挎硠闇诧紝鑻ラ潪鏈汉鎿嶄綔璇峰拷鐣ャ��
--
Gitblit v1.9.1