warr.qian 2 жил өмнө
parent
commit
aeba9c8c96

+ 1 - 1
Publish.ps1

@@ -65,7 +65,7 @@ BuildService "WingASRService" 1 0 "../WingASRService"
 
 BuildService "WingEducationService" 1 0 "../WingEducationService"
 
-BuildService "WingPaymentService" 1
+BuildService "WingPaymentService" 1 0 "../WingPaymentService"
 
 Write-Host 'Finished!' -NoNewline
 $null = [Console]::ReadKey('?')

+ 8 - 3
src/Plugin/PaymentPlugin.cs

@@ -59,10 +59,15 @@ namespace WingCloudServer.Plugin
             var dataLength = (int)context.GetRequestContentLength();
             var requests = JsonRpcCodec.DecodeRequestsAsync(requestData, new System.Threading.CancellationToken(), dataLength).Result;
             var apiName = $"{context.GetRequestPath().Trim('/')}/{requests[0].Method.Trim('/')}";
-            if(apiName == "IPaymentService/PayNotify")
+            if (apiName == "IPaymentService/AlipayNotify")
             {
                 var contentStr = GetInputStreamValue(requestData);
-                _paymentService.PayCallbackAsync(contentStr);
+                _paymentService.PayCallbackAsync("Alipay", contentStr);
+            }
+            if (apiName == "IPaymentService/WeChatPayNotify")
+            {
+                var contentStr = GetInputStreamValue(requestData);
+                _paymentService.PayCallbackAsync("WeChat", contentStr);
             }
             return new PluginProcessResult(requestData, false);
         }
@@ -84,7 +89,7 @@ namespace WingCloudServer.Plugin
         /// <returns></returns>
         private string GetInputStreamValue(byte[] data)
         {
-            using(StreamReader sr = new StreamReader(new MemoryStream(data)))
+            using (StreamReader sr = new StreamReader(new MemoryStream(data)))
             {
                 return sr.ReadToEnd();
             }

+ 2 - 1
src/Plugin/TokenVerifyPluginService.cs

@@ -80,7 +80,8 @@ namespace WingCloudServer.Plugin
             "IManagementService/ImitateLoginAsync",
             "IManagementService/FindCMSTemplateByUserAsync",
             "IManagementService/FindCMSStatisticRecordsAsync",
-            "IPaymentService/PayNotify",
+            "IPaymentService/AlipayNotify",
+            "IPaymentService/WeChatPayNotify",
         };
 
         public PluginProcessResult PreProcess(IJsonRpcHttpContext context, byte[] requestData)

+ 7 - 5
src/appsettings.json

@@ -126,7 +126,7 @@
     "CMSUrl": "http://127.0.0.1:9302/cmsTemplatePreview?token={0}&lang={1}"
   },
   "Alipay":{
-	  "Protocol":"https",
+	"Protocol":"https",
     "GatewayHost":"openapi.alipay.com",
     "SignType":"RSA2",
     "AppId":"2016093000634680",
@@ -138,13 +138,15 @@
     "NotifyUrl" : "http://127.0.0.1/IPaymentService/PayNotify"
   },
   "WeChat":{
-	"ServerIP":"https",
-    "ServerUrl":"openapi.alipay.com",
-    "AppId":"RSA2",
+	"Protocol":"https",
+    "GatewayHost":"api.mch.weixin.qq.com",
+    "AppId":"2016093000634680",
+	"ServerIP":"127.0.0.1",
     "MchId":"2016093000634680",
     "Key":"MIIEogIBAAKCAQEAhygM6jtljPLN7LNlyOJwJxgkj39PdW6RmEG7hiUb4DHUIQi5LRg/y0EPZ7jR7XDyvGwXJK9QaCe6EvDX/cAwAbgdtjTXyrOGqcSvI/4IxSb/Ah75UhrQg8C1zbeI9L47Gi2EHJ0dYacY7oLx4udTw9susJlBTdrfSuCp+VOCQzuM5KC9QQKvaH7dIrU6wdjTxZpuRU2zxyKo44fTpdQy8FGW8OoLdykw9T8fQHrwCfmrqLhxwREgXa6oLPinm4gMts4Wu7biJQT6+WSNa7HV4R5U2BgldAKIT97jqgEM4rYtMGFhGo67ufCZoMfdUkrYrE6ttztIkjHYCzQvC77rSQIDAQABAoIBAFhruD9JCn+ynUu8ddt9YHgDEHAcjuQ5qOCeKEtzXZBHqQrPhS3eTmXvs19dB2G6YeMpJ97lHsp1KwOXMwccQ4vsYuvAGGjRGElalmYKnLw2beB6WQwA5Oc9HPNvnhbXmRzgKCz8EKvBQMtROWQDiMZ6T0pTiOihRzHaVvj5TCAlErCAlT4VGW4ADbxWB3MrNgVkeq5GmFPOkCXT5D7fxdmhECZ4DCoKg7zWJc7jDjN2Kwy+hiMB+ZvebXunjA2jgf48Q3nvZu5WbtyyeIoKAeZI7b8mrd8T5NlUNJaClm6QHlFVofEpZiRfCZbbODJ/8c/9HjxOTBcikbT0W8sUs20CgYEAw4v6a0mDRRguVKWxz2jy8kNrilmFpXfcNldOAIrkGGU4hhY5HPRcYdffISQW9JNW4pQAehPOPrC5Kq9LNJ8cGkm0gVFmV6nY41RuhSPPHq0v4Ivrx+rCiQxnE8gr0HRDMVO+NMdqqK+ovfKLCvBooKIyKEHk+vhEmuGaHB5LqnMCgYEAsPCkU9NiTepxbyC5MOjPL0BVbPu1xQJY840v292otLnhSBNPvY4xv1yPI/pQ1VAGtFtNcsTBgGfPdC0I/WzInd/jTe5fXgqsYXkdevW0og1omYTykUTcf9go3zqbP1/Jle/T9xoU291tN8shs7AbW6fu5xjYdY/CqWkqxd18uFMCgYB8Hlc+zhRyQNz3gYyRN+4s87pIwHXiB2hRXaz3DzGkgmsUQPrTdA9HU3wfTwb7CqJ1greixPt+MzH08/rqVavCy9G023P4ZKhz8t2LyKTotcjT4DwyUsJTtvmeRsn4sDMOFjd+zKzYkVar6k1zDhF7FDh98QVkfz0cieIFwv0IHQKBgGXok5y8GNhreR3aKQ9kZz/9u7XjW5O2gGj2HmRxzCMbFAehJ8IzTa+7ra25FClnyBTEqVy6ugAsyi1NauobZ4iWVKKj8kWFvDb/vNz++ySCuIYDLnpAwQbZBuFbLeNYVhCHavvdB7qCU89YrXaCrZ8in9R2WOWNAT71lW8U3CqFAoGARYE89ADTQYooxZoA4ukX/LkVvnrG5Z1mYzyL8+VVZKGVnbNV0wqycgmjf0tBc23ecmRhvYgWJg+HmCigJXNSj/L10A43mnUvcwjfsD191VGznP27AQfABJ8072FjT1IIf03mYES/eDvUYTEJ1WtiZMNzqoxwNL5XOrFyUWpJeQg=",
     "AppSecret":"mpath",
     "SSLCertData":"certpath",
-    "SSLCertPassword":"rootpath"
+    "SSLCertPassword":"rootpath",
+	"NotifyUrl" : "http://127.0.0.1/IPaymentService/PayNotify"
   }
 }