From 29045b28aed633b6fc3a5d8644a444c9726b4e17 Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期一, 04 三月 2024 09:12:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Services/Message/CoreCmsSmsServices.cs | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 12 deletions(-)
diff --git a/CoreCms.Net.Services/Message/CoreCmsSmsServices.cs b/CoreCms.Net.Services/Message/CoreCmsSmsServices.cs
index bd04690..8a84f9d 100644
--- a/CoreCms.Net.Services/Message/CoreCmsSmsServices.cs
+++ b/CoreCms.Net.Services/Message/CoreCmsSmsServices.cs
@@ -10,7 +10,12 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.IRepository;
@@ -24,10 +29,12 @@
using CoreCms.Net.Utility.Helper;
using Flurl.Http;
using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SqlSugar;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ComponentTCBBatchCreateContainerServiceVersionResponse.Types;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.WxaApiUserLogSearchResponse.Types.Data.Types.RealtimeLog.Types;
@@ -129,11 +136,11 @@
switch (type)
{
case "login":
- oldLog.contentBody = "鎮ㄦ湰娆＄櫥闄嗙殑楠岃瘉鐮佹槸锛�" + codeNumber + "锛岃涓嶈灏嗛獙璇佺爜娉勯湶缁欎粬浜猴紒";
+ oldLog.contentBody = "鎮ㄦ鍦ㄧ櫥闄嗚处鍙凤紝楠岃瘉鐮佹槸" + codeNumber + "锛岃鍕垮憡璇変粬浜恒��";//鎮ㄦ湰娆＄櫥闄嗙殑楠岃瘉鐮佹槸锛�" + codeNumber + "锛岃涓嶈灏嗛獙璇佺爜娉勯湶缁欎粬浜猴紒"
oldLog.parameters = JsonConvert.SerializeObject(obj);
break;
default:
- oldLog.contentBody = "鎮ㄩ獙璇佺爜鏄細" + codeNumber + "锛岃涓嶈灏嗛獙璇佺爜娉勯湶缁欎粬浜猴紒";
+ oldLog.contentBody = "鎮ㄧ殑楠岃瘉鐮佹槸" + codeNumber + "锛岃鍕垮憡璇変粬浜恒��"; //"鎮ㄩ獙璇佺爜鏄細" + codeNumber + "锛岃涓嶈灏嗛獙璇佺爜娉勯湶缁欎粬浜猴紒";
oldLog.parameters = JsonConvert.SerializeObject(obj);
break;
}
@@ -192,17 +199,44 @@
{
if (smsOptions.Enabled)
{
- var result = await smsOptions.ApiUrl.PostUrlEncodedAsync(new
+ var result = new SMSReturnData()
{
- action = "send",
- userid = smsOptions.UserId,
- account = smsOptions.Account,
- password = smsOptions.Password,
- mobile,
- content = "銆�" + smsOptions.Signature + "銆�" + contentBody,
- rt = "json"
- }).ReceiveJson<SMSReturnData>();
- result.IsSuccess = result.ReturnStatus.ToLowerInvariant() == "success";
+ ReturnStatus = "faild",
+ Message = "鐭俊鍙戦�佸け璐�",
+ RemainPoint = 0,
+ TaskID = 0,
+ SuccessCounts = 0
+ };
+
+ string url = smsOptions.ApiUrl;
+ string data = "CorpID="+ smsOptions.Account + "&Pwd="+ smsOptions.Password + "&Mobile=" + mobile + "&Content=" + contentBody + "銆愬窛鍗版枃鍖栭泦鍥㈣偂浠芥湁闄愬叕鍙搞��&SendTime="; //閫�璁㈠洖N
+ string ssss = await HttpClientPostGB2312Async(url, "POST", data);
+ int aaaa = 0;
+ if (int.TryParse(ssss, out aaaa) && aaaa > 0)
+ {
+ result = new SMSReturnData()
+ {
+ ReturnStatus = "success",
+ Message = "鐭俊鍙戦�佹垚鍔�",
+ RemainPoint = 0,
+ TaskID = 0,
+ SuccessCounts = 1,
+ IsSuccess = true,
+ };
+ }
+
+
+ //var result = await smsOptions.ApiUrl.PostUrlEncodedAsync(new
+ //{
+ // action = "send",
+ // userid = smsOptions.UserId,
+ // account = smsOptions.Account,
+ // password = smsOptions.Password,
+ // mobile,
+ // content = "銆�" + smsOptions.Signature + "銆�" + contentBody,
+ // rt = "json"
+ //}).ReceiveJson<SMSReturnData>();
+ //result.IsSuccess = result.ReturnStatus.ToLowerInvariant() == "success";
return result;
}
else
@@ -435,6 +469,27 @@
}
#endregion
+ public async Task<string> HttpClientPostGB2312Async(string url, string Method, string data = "")
+ {
+ string _url = url;// "http://localhost:65022/login/getaa";
+ string jsonParam = data;// "{\"a\":\"aa\",\"b\":\"bb\",\"c\":\"cc\"}";
+ var request = (HttpWebRequest)WebRequest.Create(_url);
+ request.Method = Method;//"POST";
+ request.ContentType = "application/x-www-form-urlencoded;charset=GB2312";
+ var byteData = Encoding.GetEncoding("GB2312").GetBytes(jsonParam);
+ var length = byteData.Length;
+ request.ContentLength = length;
+ request.ServicePoint.Expect100Continue = false;
+ //ServicePointManager.Expect100Continue = false;
+ request.Timeout = 5000; //鏄繘琛屽悗缁悓姝ヨ姹傛椂浣跨敤 GetResponse 鏂规硶绛夊緟鍝嶅簲浠ュ強 GetRequestStream 鏂规硶绛夊緟娴佹墍鍏佽鐨勬绉掓暟
+ var writer = request.GetRequestStream();
+ await writer.WriteAsync(byteData, 0, length);
+ writer.Close();
+ //鎺ユ敹鍝嶅簲鍐呭
+ var response = (HttpWebResponse)request.GetResponse();
+ var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
+ return responseString.ToString();
+ }
}
}
--
Gitblit v1.9.1