Merge branch 'master' of http://192.168.1.222:3000/yuqian/Service-Wechat

ServiceWechat/ServiceWechat/Controllers/WechatApis/HomeController.cs

@@ -1,23 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Senparc.Weixin.MP;
 using Microsoft.Extensions.Configuration;
 using Senparc.Weixin.MP.Entities.Request;
-using ServiceWechat.Api.Controllers.Base;
-using Microsoft.Extensions.Logging;
 using NLog;
 using System.Text;
 using System.IO;
-using ServiceWechat.Api.CryptCode;
-using ServiceWechat.Utility;
-using System.Xml;
-using System.Xml.Linq;
 using ServiceWechat.Api.MessageHandlers;
 using Senparc.Weixin.MP.MvcExtension;
 using Microsoft.AspNetCore.Hosting;
+using Senparc.Weixin.MP.Helpers;
 
 namespace ServiceWechat.Api.Controllers.WechatApis
 {
@@ -63,7 +55,7 @@ namespace ServiceWechat.Api.Controllers.WechatApis
         /// </summary>
         [HttpPost]
         [Produces("text/xml")]
-        public ActionResult Verify(PostModel postModel)
+        public IActionResult Verify(PostModel postModel)
         {
             if (!CheckSignature.Check(postModel.Signature, postModel.Timestamp, postModel.Nonce, Token))
             {
@@ -81,31 +73,145 @@ namespace ServiceWechat.Api.Controllers.WechatApis
             CustomMessageHandler messageHandler = new CustomMessageHandler(inputStream, postModel);//接收消息
             messageHandler.Execute();//执行微信处理过程
 
-            var responseDocumentFileName = Path.Combine(_host.ContentRootPath, string.Format("{0}_Response_{1}.txt", _getRandomFileName(), messageHandler.RequestMessage.FromUserName));
-            var ecryptResponseDocumentFileName = Path.Combine(_host.ContentRootPath, string.Format("{0}_Response_Final_{1}.txt", _getRandomFileName(), messageHandler.RequestMessage.FromUserName));
+            #region 在本地记录解密前后xml：仅调试有用
+            //var responseDocumentFileName = Path.Combine(_host.ContentRootPath, string.Format("{0}_Response_{1}.txt", _getRandomFileName(), messageHandler.RequestMessage.FromUserName));
+            //var ecryptResponseDocumentFileName = Path.Combine(_host.ContentRootPath, string.Format("{0}_Response_Final_{1}.txt", _getRandomFileName(), messageHandler.RequestMessage.FromUserName));
 
-            if (messageHandler.ResponseDocument != null)
-            {
-                using (FileStream fs = new FileStream(responseDocumentFileName, FileMode.CreateNew, FileAccess.ReadWrite))
-                {
-                    messageHandler.ResponseDocument.Save(fs);
-                }
-            }
+            //if (messageHandler.ResponseDocument != null)
+            //{
+            //    using (FileStream fs = new FileStream(responseDocumentFileName, FileMode.CreateNew, FileAccess.ReadWrite))
+            //    {
+            //        messageHandler.ResponseDocument.Save(fs);
+            //    }
+            //}
 
-            if (messageHandler.UsingEcryptMessage && messageHandler.FinalResponseDocument != null)
-            {
-                using (FileStream fs = new FileStream(ecryptResponseDocumentFileName, FileMode.CreateNew, FileAccess.ReadWrite))
-                {
-                    //记录加密后的响应信息
-                    messageHandler.FinalResponseDocument.Save(fs);
-                }
-            }
-            return new WeixinResult(messageHandler);//返回结果
+            //if (messageHandler.UsingEcryptMessage && messageHandler.FinalResponseDocument != null)
+            //{
+            //    using (FileStream fs = new FileStream(ecryptResponseDocumentFileName, FileMode.CreateNew, FileAccess.ReadWrite))
+            //    {
+            //        //记录加密后的响应信息
+            //        messageHandler.FinalResponseDocument.Save(fs);
+            //    }
+            //}
+            #endregion
+
+            //直接返回 xml 文件流，微信消息接口调试: 文本消息工具，返回success，有解析前后xml，但是公众号提示“该公众号提供的服务出现故障，请稍后再试”
+            //直接返回xml文档转为xml字符串，微信消息接口调试:解析错误
+
+            //最终返回结果是：【xml文档转为xml字符串并且去掉“换行”、“空格”后的字符串】
+            return new WeixinResult(messageHandler.FinalResponseDocument.ToString().Replace("\r\n", "").Replace(" ", ""));
         }
 
-        public string Test()
+        /// <summary>
+        /// 供前端调用JSSDK，获取基本验证信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult GetInfo()
         {
-            return "test";
+            var timestamp = JSSDKHelper.GetTimestamp(); //获取随机码
+            var nonce = JSSDKHelper.GetNoncestr();
+            var signature = CheckSignature.GetSignature(timestamp, nonce, Token);
+            return Ok(new
+            {
+                appid = AppId,
+                timestamp,
+                nonce,
+                signature
+            });
         }
+
+
+
+
+
+        #region 生成带参数的微信公众号二维码 ：暂无用
+        //public async Task<string> GetTicket()
+        //{
+
+        //    var accessToken = await AccessTokenContainer.GetAccessTokenAsync(AppId);
+
+        //    var str = CreateTicket(accessToken);
+        //    return str;
+        //}
+
+        //public string GetImage(string ticket)
+        //{
+        //    string content = string.Empty;
+        //    string strpath = string.Empty;
+        //    string savepath = string.Empty;
+
+        //    string stUrl = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=" + ticket;
+
+        //    HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(stUrl);
+
+        //    req.Method = "GET";
+
+        //    using (HttpWebResponse myResponse = (HttpWebResponse)req.GetResponse())
+        //    {
+
+        //        strpath = myResponse.ResponseUri.ToString();
+
+        //        WebClient mywebclient = new WebClient();
+        //        var path = _host.ContentRootPath + "\\iamges\\";
+        //        if (!Directory.Exists(path))
+        //        {
+        //            Directory.CreateDirectory(path);
+        //        }
+
+        //        savepath = Path.Combine(path, DateTime.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next().ToString().Substring(0, 4) + "." + myResponse.ContentType.Split('/')[1].ToString());
+
+        //        try
+        //        {
+        //            mywebclient.DownloadFile(strpath, savepath);
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            savepath = ex.ToString();
+        //        }
+
+
+        //    }
+        //    return savepath;
+        //}
+
+        ///// <summary>  
+        ///// 创建二维码ticket  
+        ///// </summary>  
+        ///// <returns></returns>  
+        //public static string CreateTicket(string TOKEN)
+        //{
+
+        //    string result = "";
+        //    //string strJson = @"{""expire_seconds"":1800, ""action_name"": ""QR_SCENE"", ""action_info"": {""scene"": {""scene_id"":100000023}}}";  
+        //    string strJson = @"{""action_name"": ""QR_LIMIT_STR_SCENE"", ""action_info"": {""scene"": {""scene_str"": ""http://www.baidu.com""}}}";
+        //    string wxurl = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + TOKEN;
+
+        //    WebClient myWebClient = new WebClient();
+        //    myWebClient.Credentials = CredentialCache.DefaultCredentials;
+        //    try
+        //    {
+
+
+        //        result = myWebClient.UploadString(wxurl, "POST", strJson);
+        //        //WriteLog("上传result:" + result);  
+        //        Ticket _mode = JsonConvert.DeserializeObject<Ticket>(result);
+        //        //UploadMM _mode = JsonHelper.ParseFromJson<UploadMM>(result);  
+        //        //result = _mode.ticket;  
+        //        result = _mode.ticket;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        result = "Error:" + ex.Message;
+        //    }
+        //    //WriteLog("上传MediaId:" + result);  
+
+        //    return result;
+        //}
+        #endregion
+
+
+
+
     }
 }

ServiceWechat/ServiceWechat/MessageHandlers/CustomMessageHandler.cs

@@ -138,7 +138,11 @@ namespace ServiceWechat.Api.MessageHandlers
             return responseMessage;
         }
 
+        public override IResponseMessageBase OnEvent_ScanRequest(RequestMessageEvent_Scan requestMessage)
+        {
 
+            return base.OnEvent_ScanRequest(requestMessage);
+        }
 
         public override void OnExecuting()
         {

ServiceWechat/ServiceWechat/Models/Ticket.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ServiceWechat.Api.Models
+{
+    public class Ticket
+    {
+        public Ticket()
+        {
+            //  
+            //TODO: 在此处添加构造函数逻辑  
+            //  
+        }
+
+        string _ticket;
+        string _expire_seconds;
+
+        /// <summary>  
+        /// 获取的二维码ticket，凭借此ticket可以在有效时间内换取二维码。  
+        /// </summary>  
+        public string ticket
+        {
+            get { return _ticket; }
+            set { _ticket = value; }
+        }
+
+        /// <summary>  
+        /// 凭证有效时间，单位：秒  
+        /// </summary>  
+        public string expire_seconds
+        {
+            get { return _expire_seconds; }
+            set { _expire_seconds = value; }
+        }
+    }
+}

ServiceWechat/ServiceWechat/ServiceWechat.Api.csproj

@@ -18,10 +18,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.4.1" />
     <PackageReference Include="Senparc.Weixin" Version="4.20.2" />
     <PackageReference Include="Senparc.Weixin.MP" Version="14.10.3" />
     <PackageReference Include="Senparc.Weixin.MP.MVC" Version="5.2.0" />
+    <PackageReference Include="Senparc.Weixin.Open" Version="2.9.1" />
   </ItemGroup>
 
   <ItemGroup>

ServiceWechat/ServiceWechat/appsettings.json

@@ -20,6 +20,7 @@
     "MchId": "1493808312", //商户号
     "TenPayV3Notify": "http://meiwang.800100.net/wechatapi/payment/callback/", //回调地址
     "Key": "u92kcvielwoc045kigdslwod937ckw9c" //api秘钥
+
   }