From 4928047d3d61fbf6e066e11c9de5a4294bff114c Mon Sep 17 00:00:00 2001 From: denggang Date: Tue, 4 Sep 2018 12:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8OpenId=5Fdg=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SmallReport/SmallReport.Assist/JSONHelper.cs | 3 ++- SmallReport/SmallReport.Assist/LogHelper.cs | 4 ++-- .../SmallReport.Assist/WeChat/MessageHelper.cs | 5 ++++- .../WeChat/Model/AccessTokenModel.cs | 4 ++-- .../SmallReport.Assist/WeChat/WeChatHelper.cs | 15 ++++++++------- .../SmallReport.Web/Config/AuthToken.config | 4 ++-- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/SmallReport/SmallReport.Assist/JSONHelper.cs b/SmallReport/SmallReport.Assist/JSONHelper.cs index 5267751..f446848 100644 --- a/SmallReport/SmallReport.Assist/JSONHelper.cs +++ b/SmallReport/SmallReport.Assist/JSONHelper.cs @@ -32,7 +32,8 @@ private static string Encode(T t, Formatting format) public static T Decode(string json) { - return (T)JsonConvert.DeserializeObject(json, typeof(T)); + var output = (T)JsonConvert.DeserializeObject(json, typeof(T)); + return output; } #endregion } diff --git a/SmallReport/SmallReport.Assist/LogHelper.cs b/SmallReport/SmallReport.Assist/LogHelper.cs index 3004eb1..287ab7d 100644 --- a/SmallReport/SmallReport.Assist/LogHelper.cs +++ b/SmallReport/SmallReport.Assist/LogHelper.cs @@ -1,6 +1,6 @@ -using log4net; -using System; +using System; using System.Text; +using Common.Logging; namespace SmallReport.Assist { diff --git a/SmallReport/SmallReport.Assist/WeChat/MessageHelper.cs b/SmallReport/SmallReport.Assist/WeChat/MessageHelper.cs index e1e0928..11f83cc 100644 --- a/SmallReport/SmallReport.Assist/WeChat/MessageHelper.cs +++ b/SmallReport/SmallReport.Assist/WeChat/MessageHelper.cs @@ -105,9 +105,12 @@ public static string AccessService(string toUser, string fromUser) #region Template Msg public static void SendExpMsg() { + var openId_leh = "oc0Qp0m9wYecC0cBihpsDdsS-4FU"; + var openId_dg = "oc0Qp0pm6a4o9fuFsMZ6ApeEWloU"; + var text = $@" {{ - ""touser"": ""{"oc0Qp0m9wYecC0cBihpsDdsS-4FU"}"", + ""touser"": ""{openId_dg}"", ""template_id"": ""{"u6slk3ft-7x4jRR8lgy-ZlvNtGbMzpP3zeOyX4dGN_0"}"", ""topcolor"":""#FF0000"", ""url"":"""", diff --git a/SmallReport/SmallReport.Assist/WeChat/Model/AccessTokenModel.cs b/SmallReport/SmallReport.Assist/WeChat/Model/AccessTokenModel.cs index 1053a3d..52fdd17 100644 --- a/SmallReport/SmallReport.Assist/WeChat/Model/AccessTokenModel.cs +++ b/SmallReport/SmallReport.Assist/WeChat/Model/AccessTokenModel.cs @@ -3,9 +3,9 @@ public class AccessTokenModel { - public string AccessToken { get; set; } + public string access_token { get; set; } - public int ExpiresIn { get; set; } + public int expires_in { get; set; } public string RefreshToken { get; set; } diff --git a/SmallReport/SmallReport.Assist/WeChat/WeChatHelper.cs b/SmallReport/SmallReport.Assist/WeChat/WeChatHelper.cs index 835295d..dd602f5 100644 --- a/SmallReport/SmallReport.Assist/WeChat/WeChatHelper.cs +++ b/SmallReport/SmallReport.Assist/WeChat/WeChatHelper.cs @@ -119,14 +119,14 @@ private static string GetExistAccessToken() var selectSingleNode = xml.SelectSingleNode("xml"); var singleNode = selectSingleNode?.SelectSingleNode("AccessToken"); if (singleNode != null) - singleNode.InnerText = model.AccessToken; - var accessToken = DateTime.Now.AddSeconds(model.ExpiresIn); + singleNode.InnerText = model.access_token; + var accessToken = DateTime.Now.AddSeconds(model.expires_in); var xmlNode = xml.SelectSingleNode("xml"); var node = xmlNode?.SelectSingleNode("AccessExpires"); if (node != null) node.InnerText = accessToken.ToString(CultureInfo.InvariantCulture); xml.Save(filePath); - token = model.AccessToken; + token = model.access_token; return token; } @@ -136,8 +136,8 @@ private static AccessTokenModel GetAccessToken() var atoken = new AccessTokenModel(); var content = HttpGet(asseccUrl); var token = ParseFromJson(content); - atoken.AccessToken = token.AccessToken; - atoken.ExpiresIn = token.ExpiresIn; + atoken.access_token = token.access_token; + atoken.expires_in = token.expires_in; return atoken; } #endregion @@ -219,7 +219,8 @@ private static string HttpGet(string url) private static T ParseFromJson(string szJson) { - return JsonHelper.Decode(szJson); + var output = JsonHelper.Decode(szJson); + return output; } public static void SendTemplateMsg(string postContent) @@ -254,7 +255,7 @@ private static void Post(string url, string param) var response = request.GetResponse(); { var reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8); - reader.ReadToEnd(); + var responseStr = reader.ReadToEnd(); reader.Close(); } } diff --git a/SmallReport/SmallReport.Web/Config/AuthToken.config b/SmallReport/SmallReport.Web/Config/AuthToken.config index d609562..9c1c6d6 100644 --- a/SmallReport/SmallReport.Web/Config/AuthToken.config +++ b/SmallReport/SmallReport.Web/Config/AuthToken.config @@ -1,5 +1,5 @@  - 13_HL2ZP3QrKeD625IBz8IurvvTJFHBkG1LcQVhSIYtJn5tUTDjx3-oomZ6B58B-MK_VMK1Fte0wjHVYPoN5UmUfZdRljJzeHK-mQ5NLVDSaTA7uVfMiGHr4HG5hNPkc_r_L5uGc1NyFnWazYf2ERZeADAVIQ - 2018/9/2 17:30:04 + 13_hcdCJxVL3bk_wmD6r4m_R8VaSCTkt-6umvxkYYpsh508BRgdx-L1FZGswze_S3ZCMvI57SnKVnJDUa4P6npo8t_l777xhWk6-UyM2PCLMG1DO0S_Pn1Y1D-2-Ok7tIcyZFefUc_6fuibuFzCEPUbAIAQBG + 09/04/2018 13:37:30 \ No newline at end of file