1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminSystemLabelController.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using GxPress.Repository.Interface.SystemLabel;
+using GxPress.Request.SystemLabel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -26,7 +27,7 @@ namespace GxPress.Api.AdminControllers
             return await _repository.InsertAsync(note);
         }
         [HttpPut]
-        public async Task<bool> UpdateAsync(Entity.SystemLabel.SystemLabel note)
+        public async Task<bool> UpdateAsync(SystemLabelUpRequest request)
         {
             return await _repository.UpdateAsync(note);
         }

gx_api/GxPress/Api/GxPress.Api/WebControllers/WxpayController.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
-using Alipay.AopSdk.Core.Util;
-using GxPress.Common.AliPay;
+
+using System.Web;
+using System.Text;
 using GxPress.Common.WechatPay;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using System.IO;
+using System.Threading.Tasks;
 
 namespace GxPress.Api.WebControllers
 {
@@ -13,105 +17,87 @@ namespace GxPress.Api.WebControllers
     [Authorize]
     public class WxpayController : Controller
     {
+        private IHttpContextAccessor _contextAccessor;
+        private HttpContext _context { get { return _contextAccessor.HttpContext; } }
+        public WxpayController(IHttpContextAccessor contextAccessor)
+        {
+            _contextAccessor = contextAccessor;
+        }
         [HttpGet()]
         [AllowAnonymous]
         public string GetNativePayUrl()
         {
             var nativePay = new NativePay();
-            return nativePay.GetPayUrl("111");
+            return nativePay.GetPayUrl("637263608658642540","汪峰讲故事",7);
         }
         /// <summary>
         /// 回调地址
         /// </summary>
-        [HttpGet("notify")]
+        [HttpPost("notify")]
         [AllowAnonymous]
-        public string Callback()
+        public async Task<string> Callback()
         {
-            /* 实际验证过程建议商户添加以下校验。
-             1、商户需要验证该通知数据中的out_trade_no是否为商户系统中创建的订单号，
-             2、判断total_amount是否确实为该订单的实际金额（即商户订单创建时的金额），
-             3、校验通知中的seller_id（或者seller_email) 是否为out_trade_no这笔单据的对应的操作方（有的时候，一个商户可能有多个seller_id/seller_email）
-             4、验证app_id是否为该商户本身。
-             */
-
-            Dictionary<string, string> sArray = GetRequestGet();
-            //检查openid和product_id是否返回
-            if (!sArray.Keys.Equals("openid") || !sArray.Keys.Equals("product_id"))
+            var contentType = Request.ContentType;
+            var notifyData = await GetNotifyData();
+            //检查支付结果中transaction_id是否存在
+            if (!notifyData.IsSet("transaction_id"))
             {
+                //若transaction_id不存在，则立即返回结果给微信支付后台
                 WxPayData res = new WxPayData();
                 res.SetValue("return_code", "FAIL");
-                res.SetValue("return_msg", "回调数据异常");
+                res.SetValue("return_msg", "支付结果中微信订单号不存在");
                 return (res.ToXml());
             }
-
-            //调统一下单接口，获得下单结果
-            //string openid = notifyData.GetValue("openid").ToString();
-            sArray.TryGetValue("openid", out var openid);
-            //string product_id = notifyData.GetValue("product_id").ToString();
-            sArray.TryGetValue("product_id", out var product_id);
-            WxPayData unifiedOrderResult = new WxPayData();
-            try
-            {
-                unifiedOrderResult = GxPress.Common.WechatPay.WxPayApi.UnifiedOrder(openid, product_id);
-            }
-            catch (Exception ex)//若在调统一下单接口时抛异常，立即返回结果给微信支付后台
+            string transaction_id = notifyData.GetValue("transaction_id").ToString();
+            //查询订单，判断订单真实性
+            if (!Common.WechatPay.WxPayApi.QueryOrder(transaction_id))
             {
+                //若订单查询失败，则立即返回结果给微信支付后台
                 WxPayData res = new WxPayData();
                 res.SetValue("return_code", "FAIL");
-                res.SetValue("return_msg", "统一下单失败");
+                res.SetValue("return_msg", "订单查询失败");
                 return (res.ToXml());
             }
-
-            //若下单失败，则立即返回结果给微信支付后台
-            if (!unifiedOrderResult.IsSet("appid") || !unifiedOrderResult.IsSet("mch_id") || !unifiedOrderResult.IsSet("prepay_id"))
+            //查询订单成功
+            else
             {
                 WxPayData res = new WxPayData();
-                res.SetValue("return_code", "FAIL");
-                res.SetValue("return_msg", "统一下单失败");
-                //Log.Error(this.GetType().ToString(), "UnifiedOrder failure : " + res.ToXml());
+                res.SetValue("return_code", "SUCCESS");
+                res.SetValue("return_msg", "OK");
                 return (res.ToXml());
-                //page.Response.End();
             }
-          
-            //统一下单成功,则返回成功结果给微信支付后台
-            WxPayData data = new WxPayData();
-            data.SetValue("return_code", "SUCCESS");
-            data.SetValue("return_msg", "OK");
-            data.SetValue("appid", WxPayConfig.GetConfig().GetAppID());
-            data.SetValue("mch_id", WxPayConfig.GetConfig().GetMchID());
-            data.SetValue("nonce_str", WxPayApi.GenerateNonceStr());
-            data.SetValue("prepay_id", unifiedOrderResult.GetValue("prepay_id"));
-            data.SetValue("result_code", "SUCCESS");
-            data.SetValue("err_code_des", "OK");
-            data.SetValue("sign", data.MakeSign());
-
-            // Log.Info(this.GetType().ToString(), "UnifiedOrder success , send data to WeChat : " + data.ToXml());
-            return data.ToXml();
         }
-        private Dictionary<string, string> GetRequestPost()
+        public async Task<WxPayData> GetNotifyData()
         {
-            Dictionary<string, string> sArray = new Dictionary<string, string>();
-
-            ICollection<string> requestItem = Request.Form.Keys;
-            foreach (var item in requestItem)
+            var body = string.Empty;
+            //接收从微信后台POST过来的数据
+            using (var reader = new StreamReader(Request.Body))
             {
-                sArray.Add(item, Request.Form[item]);
-
+                body = await reader.ReadToEndAsync();
             }
-            return sArray;
-
-        }
-        private Dictionary<string, string> GetRequestGet()
-        {
-            Dictionary<string, string> sArray = new Dictionary<string, string>();
-
-            ICollection<string> requestItem = Request.Query.Keys;
-            foreach (var item in requestItem)
+            //转换数据格式并验证签名
+            WxPayData data = new WxPayData();
+            if (string.IsNullOrEmpty(body))
             {
-                sArray.Add(item, Request.Query[item]);
+                data.SetValue("return_code", "FAIL");
+                return data;
             }
-            return sArray;
-
+            try
+            {
+                data.FromXml(body);
+            }
+            catch (WxPayException ex)
+            {
+                //若签名错误，则立即返回结果给微信支付后台
+                WxPayData res = new WxPayData();
+                res.SetValue("return_code", "FAIL");
+                res.SetValue("return_msg", ex.Message);
+                // Log.Error(this.GetType().ToString(), "Sign check error : " + res.ToXml());
+                // page.Response.Write(res.ToXml());
+                // page.Response.End();
+            }
+            // Log.Info(this.GetType().ToString(), "Check sign success");
+            return data;
         }
     }
 }

gx_api/GxPress/Infrastructure/GxPress.Common/WechatPay/DemoConfig.cs

@@ -21,11 +21,11 @@ namespace GxPress.Common.WechatPay
         }
         public string GetMchID()
         {
-            return "100015452468";
+            return "1484922142";
         }
         public string GetKey()
         {
-            return "";
+            return "BMUrBXkbXybw2ha36HgXBB028nMysNbL";
         }
         public string GetAppSecret()
         {
@@ -56,7 +56,7 @@ namespace GxPress.Common.WechatPay
         */
         public string GetNotifyUrl()
         {
-            return "";
+            return "http://payzzz.top/api/web/wxpay/notify";
         }
 
         //=======【商户系统后台机器IP】===================================== 

gx_api/GxPress/Infrastructure/GxPress.Common/WechatPay/NativePay.cs

@@ -9,14 +9,14 @@ namespace GxPress.Common.WechatPay
       * @param productId 商品ID
       * @return 模式二URL
       */
-        public string GetPayUrl(string productId)
+        public string GetPayUrl(string productId,string productInfo,int userId)
         {
             //Log.Info(this.GetType().ToString(), "Native pay mode 2 url is producing...");
             try
             {
                 WxPayData data = new WxPayData();
-                data.SetValue("body", "test");//商品描述
-                data.SetValue("attach", "test");//附加数据
+                data.SetValue("body", productInfo);//商品描述
+                data.SetValue("attach", $"{productId}_{userId}");//附加数据
                 data.SetValue("out_trade_no", WxPayApi.GenerateOutTradeNo());//随机字符串
                 data.SetValue("total_fee", 1);//总金额
                 data.SetValue("time_start", DateTime.Now.ToString("yyyyMMddHHmmss"));//交易起始时间

gx_api/GxPress/Infrastructure/GxPress.Common/WechatPay/WxPayApi.cs

@@ -5,7 +5,7 @@ namespace GxPress.Common.WechatPay
     public class WxPayApi
     {
 
-        public static WxPayData UnifiedOrder(string openId,string productId)
+        public static WxPayData UnifiedOrder(string openId, string productId)
         {
             //统一下单
             WxPayData req = new WxPayData();
@@ -51,7 +51,7 @@ namespace GxPress.Common.WechatPay
             {
                 throw new WxPayException("提交被扫支付API接口中，缺少必填参数auth_code！");
             }
-       
+
             inputObj.SetValue("spbill_create_ip", WxPayConfig.GetConfig().GetIp());//终端ip
             inputObj.SetValue("appid", WxPayConfig.GetConfig().GetAppID());//公众账号ID
             inputObj.SetValue("mch_id", WxPayConfig.GetConfig().GetMchID());//商户号
@@ -78,7 +78,7 @@ namespace GxPress.Common.WechatPay
             return result;
         }
 
-        
+
         /**
         *    
         * 查询订单
@@ -109,7 +109,7 @@ namespace GxPress.Common.WechatPay
 
             ////Log.Debug("WxPayApi", "OrderQuery request : " + xml);
             string response = HttpService.Post(xml, url, false, timeOut);//调用HTTP通信接口提交数据
-           // //Log.Debug("WxPayApi", "OrderQuery response : " + response);
+                                                                         // //Log.Debug("WxPayApi", "OrderQuery response : " + response);
 
             var end = DateTime.Now;
             int timeCost = (int)((end - start).TotalMilliseconds);//获得接口耗时
@@ -122,6 +122,22 @@ namespace GxPress.Common.WechatPay
 
             return result;
         }
+        //查询订单
+        public static bool QueryOrder(string transaction_id)
+        {
+            WxPayData req = new WxPayData();
+            req.SetValue("transaction_id", transaction_id);
+            WxPayData res = WxPayApi.OrderQuery(req);
+            if (res.GetValue("return_code").ToString() == "SUCCESS" &&
+                res.GetValue("result_code").ToString() == "SUCCESS")
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
 
 
         /**
@@ -206,7 +222,7 @@ namespace GxPress.Common.WechatPay
             inputObj.SetValue("nonce_str", Guid.NewGuid().ToString().Replace("-", ""));//随机字符串
             inputObj.SetValue("sign_type", WxPayData.SIGN_TYPE_HMAC_SHA256);//签名类型
             inputObj.SetValue("sign", inputObj.MakeSign());//签名
-            
+
             string xml = inputObj.ToXml();
             var start = DateTime.Now;
 
@@ -238,41 +254,41 @@ namespace GxPress.Common.WechatPay
 	    * @throws WxPayException
 	    * @return 成功时返回，其他抛异常
 	    */
-	    public static WxPayData RefundQuery(WxPayData inputObj, int timeOut = 6)
-	    {
-		    string url = "https://api.mch.weixin.qq.com/pay/refundquery";
-		    //检测必填参数
-		    if(!inputObj.IsSet("out_refund_no") && !inputObj.IsSet("out_trade_no") &&
-			    !inputObj.IsSet("transaction_id") && !inputObj.IsSet("refund_id"))
-            {
-			    throw new WxPayException("退款查询接口中，out_refund_no、out_trade_no、transaction_id、refund_id四个参数必填一个！");
-		    }
-
-		    inputObj.SetValue("appid",WxPayConfig.GetConfig().GetAppID());//公众账号ID
-		    inputObj.SetValue("mch_id",WxPayConfig.GetConfig().GetMchID());//商户号
-		    inputObj.SetValue("nonce_str",GenerateNonceStr());//随机字符串
+        public static WxPayData RefundQuery(WxPayData inputObj, int timeOut = 6)
+        {
+            string url = "https://api.mch.weixin.qq.com/pay/refundquery";
+            //检测必填参数
+            if (!inputObj.IsSet("out_refund_no") && !inputObj.IsSet("out_trade_no") &&
+                !inputObj.IsSet("transaction_id") && !inputObj.IsSet("refund_id"))
+            {
+                throw new WxPayException("退款查询接口中，out_refund_no、out_trade_no、transaction_id、refund_id四个参数必填一个！");
+            }
+
+            inputObj.SetValue("appid", WxPayConfig.GetConfig().GetAppID());//公众账号ID
+            inputObj.SetValue("mch_id", WxPayConfig.GetConfig().GetMchID());//商户号
+            inputObj.SetValue("nonce_str", GenerateNonceStr());//随机字符串
             inputObj.SetValue("sign_type", WxPayData.SIGN_TYPE_HMAC_SHA256);//签名类型
             inputObj.SetValue("sign", inputObj.MakeSign());//签名
 
-		    string xml = inputObj.ToXml();
-		
-		    var start = DateTime.Now;//请求开始时间
+            string xml = inputObj.ToXml();
+
+            var start = DateTime.Now;//请求开始时间
 
             //Log.Debug("WxPayApi", "RefundQuery request : " + xml);
             string response = HttpService.Post(xml, url, false, timeOut);//调用HTTP通信接口以提交数据到API
             //Log.Debug("WxPayApi", "RefundQuery response : " + response);
 
             var end = DateTime.Now;
-            int timeCost = (int)((end-start).TotalMilliseconds);//获得接口耗时
+            int timeCost = (int)((end - start).TotalMilliseconds);//获得接口耗时
 
             //将xml格式的结果转换为对象以返回
-		    WxPayData result = new WxPayData();
+            WxPayData result = new WxPayData();
             result.FromXml(response);
 
-		    ReportCostTime(url, timeCost, result);//测速上报
-		
-		    return result;
-	    }
+            ReportCostTime(url, timeCost, result);//测速上报
+
+            return result;
+        }
 
 
         /**
@@ -327,23 +343,23 @@ namespace GxPress.Common.WechatPay
 	    * @throws WxPayException
 	    * @return 成功时返回，其他抛异常
 	    */
-	    public static WxPayData ShortUrl(WxPayData inputObj, int timeOut = 6)
-	    {
-		    string url = "https://api.mch.weixin.qq.com/tools/shorturl";
-		    //检测必填参数
-		    if(!inputObj.IsSet("long_url"))
-            {
-			    throw new WxPayException("需要转换的URL，签名用原串，传输需URL encode！");
-		    }
-
-		    inputObj.SetValue("appid",WxPayConfig.GetConfig().GetAppID());//公众账号ID
-		    inputObj.SetValue("mch_id",WxPayConfig.GetConfig().GetMchID());//商户号
-		    inputObj.SetValue("nonce_str",GenerateNonceStr());//随机字符串	
+        public static WxPayData ShortUrl(WxPayData inputObj, int timeOut = 6)
+        {
+            string url = "https://api.mch.weixin.qq.com/tools/shorturl";
+            //检测必填参数
+            if (!inputObj.IsSet("long_url"))
+            {
+                throw new WxPayException("需要转换的URL，签名用原串，传输需URL encode！");
+            }
+
+            inputObj.SetValue("appid", WxPayConfig.GetConfig().GetAppID());//公众账号ID
+            inputObj.SetValue("mch_id", WxPayConfig.GetConfig().GetMchID());//商户号
+            inputObj.SetValue("nonce_str", GenerateNonceStr());//随机字符串	
             inputObj.SetValue("sign_type", WxPayData.SIGN_TYPE_HMAC_SHA256);//签名类型
             inputObj.SetValue("sign", inputObj.MakeSign());//签名
-		    string xml = inputObj.ToXml();
-		
-		    var start = DateTime.Now;//请求开始时间
+            string xml = inputObj.ToXml();
+
+            var start = DateTime.Now;//请求开始时间
 
             //Log.Debug("WxPayApi", "ShortUrl request : " + xml);
             string response = HttpService.Post(xml, url, false, timeOut);
@@ -354,10 +370,10 @@ namespace GxPress.Common.WechatPay
 
             WxPayData result = new WxPayData();
             result.FromXml(response);
-			ReportCostTime(url, timeCost, result);//测速上报
-		
-		    return result;
-	    }
+            ReportCostTime(url, timeCost, result);//测速上报
+
+            return result;
+        }
 
 
         /**
@@ -432,7 +448,7 @@ namespace GxPress.Common.WechatPay
             return result;
         }
 
- 
+
         /**
 	    * 
 	    * 关闭订单
@@ -441,23 +457,23 @@ namespace GxPress.Common.WechatPay
 	    * @throws WxPayException
 	    * @return 成功时返回，其他抛异常
 	    */
-	    public static WxPayData CloseOrder(WxPayData inputObj, int timeOut = 6)
-	    {
-		    string url = "https://api.mch.weixin.qq.com/pay/closeorder";
-		    //检测必填参数
-		    if(!inputObj.IsSet("out_trade_no"))
-            {
-			    throw new WxPayException("关闭订单接口中，out_trade_no必填！");
-		    }
-
-		    inputObj.SetValue("appid",WxPayConfig.GetConfig().GetAppID());//公众账号ID
-		    inputObj.SetValue("mch_id",WxPayConfig.GetConfig().GetMchID());//商户号
-		    inputObj.SetValue("nonce_str",GenerateNonceStr());//随机字符串		
+        public static WxPayData CloseOrder(WxPayData inputObj, int timeOut = 6)
+        {
+            string url = "https://api.mch.weixin.qq.com/pay/closeorder";
+            //检测必填参数
+            if (!inputObj.IsSet("out_trade_no"))
+            {
+                throw new WxPayException("关闭订单接口中，out_trade_no必填！");
+            }
+
+            inputObj.SetValue("appid", WxPayConfig.GetConfig().GetAppID());//公众账号ID
+            inputObj.SetValue("mch_id", WxPayConfig.GetConfig().GetMchID());//商户号
+            inputObj.SetValue("nonce_str", GenerateNonceStr());//随机字符串		
             inputObj.SetValue("sign_type", WxPayData.SIGN_TYPE_HMAC_SHA256);//签名类型
             inputObj.SetValue("sign", inputObj.MakeSign());//签名
-		    string xml = inputObj.ToXml();
-		
-		    var start = DateTime.Now;//请求开始时间
+            string xml = inputObj.ToXml();
+
+            var start = DateTime.Now;//请求开始时间
 
             string response = HttpService.Post(xml, url, false, timeOut);
 
@@ -467,10 +483,10 @@ namespace GxPress.Common.WechatPay
             WxPayData result = new WxPayData();
             result.FromXml(response);
 
-		    ReportCostTime(url, timeCost, result);//测速上报
-		
-		    return result;
-	    }
+            ReportCostTime(url, timeCost, result);//测速上报
+
+            return result;
+        }
 
 
         /**
@@ -481,69 +497,69 @@ namespace GxPress.Common.WechatPay
 	    * @param WxPayData inputObj参数数组
 	    */
         private static void ReportCostTime(string interface_url, int timeCost, WxPayData inputObj)
-	    {
-		    //如果不需要进行上报
-		    if(WxPayConfig.GetConfig().GetReportLevel() == 0)
-            {
-			    return;
-		    } 
-
-		    //如果仅失败上报
-		    if(WxPayConfig.GetConfig().GetReportLevel() == 1 && inputObj.IsSet("return_code") && inputObj.GetValue("return_code").ToString() == "SUCCESS" &&
-			 inputObj.IsSet("result_code") && inputObj.GetValue("result_code").ToString() == "SUCCESS")
-            {
-		 	    return;
-		    }
-		 
-		    //上报逻辑
-		    WxPayData data = new WxPayData();
-            data.SetValue("interface_url",interface_url);
-		    data.SetValue("execute_time_",timeCost);
-		    //返回状态码
-		    if(inputObj.IsSet("return_code"))
-            {
-			    data.SetValue("return_code",inputObj.GetValue("return_code"));
-		    }
-		    //返回信息
-            if(inputObj.IsSet("return_msg"))
-            {
-			    data.SetValue("return_msg",inputObj.GetValue("return_msg"));
-		    }
-		    //业务结果
-            if(inputObj.IsSet("result_code"))
-            {
-			    data.SetValue("result_code",inputObj.GetValue("result_code"));
-		    }
-		    //错误代码
-            if(inputObj.IsSet("err_code"))
-            {
-			    data.SetValue("err_code",inputObj.GetValue("err_code"));
-		    }
-		    //错误代码描述
-            if(inputObj.IsSet("err_code_des"))
-            {
-			    data.SetValue("err_code_des",inputObj.GetValue("err_code_des"));
-		    }
-		    //商户订单号
-            if(inputObj.IsSet("out_trade_no"))
-            {
-			    data.SetValue("out_trade_no",inputObj.GetValue("out_trade_no"));
-		    }
-		    //设备号
-            if(inputObj.IsSet("device_info"))
-            {
-			    data.SetValue("device_info",inputObj.GetValue("device_info"));
-		    }
-		
-		    try
-            {
-			    Report(data);
-		    }
+        {
+            //如果不需要进行上报
+            if (WxPayConfig.GetConfig().GetReportLevel() == 0)
+            {
+                return;
+            }
+
+            //如果仅失败上报
+            if (WxPayConfig.GetConfig().GetReportLevel() == 1 && inputObj.IsSet("return_code") && inputObj.GetValue("return_code").ToString() == "SUCCESS" &&
+             inputObj.IsSet("result_code") && inputObj.GetValue("result_code").ToString() == "SUCCESS")
+            {
+                return;
+            }
+
+            //上报逻辑
+            WxPayData data = new WxPayData();
+            data.SetValue("interface_url", interface_url);
+            data.SetValue("execute_time_", timeCost);
+            //返回状态码
+            if (inputObj.IsSet("return_code"))
+            {
+                data.SetValue("return_code", inputObj.GetValue("return_code"));
+            }
+            //返回信息
+            if (inputObj.IsSet("return_msg"))
+            {
+                data.SetValue("return_msg", inputObj.GetValue("return_msg"));
+            }
+            //业务结果
+            if (inputObj.IsSet("result_code"))
+            {
+                data.SetValue("result_code", inputObj.GetValue("result_code"));
+            }
+            //错误代码
+            if (inputObj.IsSet("err_code"))
+            {
+                data.SetValue("err_code", inputObj.GetValue("err_code"));
+            }
+            //错误代码描述
+            if (inputObj.IsSet("err_code_des"))
+            {
+                data.SetValue("err_code_des", inputObj.GetValue("err_code_des"));
+            }
+            //商户订单号
+            if (inputObj.IsSet("out_trade_no"))
+            {
+                data.SetValue("out_trade_no", inputObj.GetValue("out_trade_no"));
+            }
+            //设备号
+            if (inputObj.IsSet("device_info"))
+            {
+                data.SetValue("device_info", inputObj.GetValue("device_info"));
+            }
+
+            try
+            {
+                Report(data);
+            }
             catch (WxPayException ex)
             {
-			    //不做任何处理
-		    }
-	    }
+                //不做任何处理
+            }
+        }
 
 
         /**
@@ -554,39 +570,39 @@ namespace GxPress.Common.WechatPay
 	    * @throws WxPayException
 	    * @return 成功时返回测速上报接口返回的结果，其他抛异常
 	    */
-	    public static WxPayData Report(WxPayData inputObj, int timeOut = 1)
-	    {
-		    string url = "https://api.mch.weixin.qq.com/payitil/report";
-		    //检测必填参数
-		    if(!inputObj.IsSet("interface_url"))
-            {
-			    throw new WxPayException("接口URL，缺少必填参数interface_url！");
-		    } 
-            if(!inputObj.IsSet("return_code"))
-            {
-			    throw new WxPayException("返回状态码，缺少必填参数return_code！");
-		    } 
-            if(!inputObj.IsSet("result_code"))
-            {
-			    throw new WxPayException("业务结果，缺少必填参数result_code！");
-		    } 
-            if(!inputObj.IsSet("user_ip"))
-            {
-			    throw new WxPayException("访问接口IP，缺少必填参数user_ip！");
-		    } 
-            if(!inputObj.IsSet("execute_time_"))
-            {
-			    throw new WxPayException("接口耗时，缺少必填参数execute_time_！");
-		    }
-
-		    inputObj.SetValue("appid",WxPayConfig.GetConfig().GetAppID());//公众账号ID
-		    inputObj.SetValue("mch_id",WxPayConfig.GetConfig().GetMchID());//商户号
-            inputObj.SetValue("user_ip",WxPayConfig.GetConfig().GetIp());//终端ip
-		    inputObj.SetValue("time",DateTime.Now.ToString("yyyyMMddHHmmss"));//商户上报时间	 
-		    inputObj.SetValue("nonce_str",GenerateNonceStr());//随机字符串
+        public static WxPayData Report(WxPayData inputObj, int timeOut = 1)
+        {
+            string url = "https://api.mch.weixin.qq.com/payitil/report";
+            //检测必填参数
+            if (!inputObj.IsSet("interface_url"))
+            {
+                throw new WxPayException("接口URL，缺少必填参数interface_url！");
+            }
+            if (!inputObj.IsSet("return_code"))
+            {
+                throw new WxPayException("返回状态码，缺少必填参数return_code！");
+            }
+            if (!inputObj.IsSet("result_code"))
+            {
+                throw new WxPayException("业务结果，缺少必填参数result_code！");
+            }
+            if (!inputObj.IsSet("user_ip"))
+            {
+                throw new WxPayException("访问接口IP，缺少必填参数user_ip！");
+            }
+            if (!inputObj.IsSet("execute_time_"))
+            {
+                throw new WxPayException("接口耗时，缺少必填参数execute_time_！");
+            }
+
+            inputObj.SetValue("appid", WxPayConfig.GetConfig().GetAppID());//公众账号ID
+            inputObj.SetValue("mch_id", WxPayConfig.GetConfig().GetMchID());//商户号
+            inputObj.SetValue("user_ip", WxPayConfig.GetConfig().GetIp());//终端ip
+            inputObj.SetValue("time", DateTime.Now.ToString("yyyyMMddHHmmss"));//商户上报时间	 
+            inputObj.SetValue("nonce_str", GenerateNonceStr());//随机字符串
             inputObj.SetValue("sign_type", WxPayData.SIGN_TYPE_HMAC_SHA256);//签名类型
             inputObj.SetValue("sign", inputObj.MakeSign());//签名
-		    string xml = inputObj.ToXml();
+            string xml = inputObj.ToXml();
 
             //Log.Info("WxPayApi", "Report request : " + xml);
 
@@ -596,8 +612,8 @@ namespace GxPress.Common.WechatPay
 
             WxPayData result = new WxPayData();
             result.FromXml(response);
-		    return result;
-	    }
+            return result;
+        }
 
         /**
         * 根据当前系统时间加随机序列来生成订单号

gx_api/GxPress/Model/GxPress.Entity/SystemLabel/SystemLabel.cs

@@ -15,6 +15,19 @@ namespace GxPress.Entity.SystemLabel
         [DataColumn]
         public string LabelName { get; set; }
 
+         /// <summary>
+        /// 标签名称描述
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string LabelNameDescribe { get; set; }
+         /// <summary>
+        /// 备注
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string Remark { get; set; }
+
         /// <summary>
         /// 是否禁用
         /// </summary>

gx_api/GxPress/Model/GxPress.Request/SystemLabel/SystemLabelRequest.cs

@@ -0,0 +1,90 @@
+namespace GxPress.Request.SystemLabel
+{
+    public class SystemLabelRequest
+    {
+
+    }
+    /// <summary>
+    /// 修改系统标签
+    /// </summary>
+    public class SystemLabelUpRequest
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 标签名称
+        /// </summary>
+        /// <value></value>
+
+        public string LabelName { get; set; }
+
+        /// <summary>
+        /// 标签名称描述
+        /// </summary>
+        /// <value></value>
+
+        public string LabelNameDescribe { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        /// <value></value>
+
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 是否禁用1 设置 2取消
+        /// </summary>
+        /// <value></value>
+
+        public int IsDisable { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <value></value>
+
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 是否跳转 1 设置 2取消
+        /// </summary>
+        /// <value></value>
+
+        public int IsSkip { get; set; }
+
+        /// <summary>
+        /// 是否分页 1 设置 2取消
+        /// </summary>
+        /// <value></value>
+
+        public int IsPage { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        /// <value></value>
+
+        public string ControllerUrl { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        /// <value></value>
+
+        public string ActionUrl { get; set; }
+        /// <summary>
+        /// 资源类型
+        /// </summary>
+        /// <value></value>
+
+        public int ResourceType { get; set; }
+
+        /// <summary>
+        /// 样式类型
+        /// </summary>
+        /// <value></value>
+
+        public string StyleType { get; set; }
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Implement/SystemLabel/SystemLabelRepository.cs

@@ -5,6 +5,7 @@ using Datory;
 using GxPress.Common.AppOptions;
 using GxPress.Common.Tools;
 using GxPress.Repository.Interface.SystemLabel;
+using GxPress.Request.SystemLabel;
 using Microsoft.Extensions.Options;
 
 namespace GxPress.Repository.Implement.SystemLabel
@@ -45,9 +46,32 @@ namespace GxPress.Repository.Implement.SystemLabel
             return await _repository.InsertAsync(note);
         }
 
-        public async Task<bool> UpdateAsync(Entity.SystemLabel.SystemLabel note)
+        public async Task<bool> UpdateAsync(SystemLabelUpRequest request)
         {
-            return await _repository.UpdateAsync(note);
+            if (request.Id > 0)
+            {
+                var model = await GetAsync(request.Id);
+                if (request.IsDisable > 0)
+                    model.IsDisable = request.IsDisable == 1;
+                if (request.IsPage > 0)
+                    model.IsPage = request.IsPage == 1;
+                if (request.IsSkip > 0)
+                    model.IsSkip = request.IsSkip == 1;
+                if (!string.IsNullOrEmpty(request.LabelName))
+                    model.LabelName = request.LabelName;
+                if (!string.IsNullOrEmpty(request.LabelNameDescribe))
+                    model.LabelNameDescribe = request.LabelNameDescribe;
+                if (!string.IsNullOrEmpty(request.Remark))
+                    model.Remark = request.Remark;
+                if (request.ResourceType > 0)
+                    model.ResourceType = request.ResourceType;
+                if (request.Sort > 0)
+                    model.Sort = request.Sort;
+                if (!string.IsNullOrEmpty(request.StyleType))
+                    model.StyleType = request.StyleType;
+                return await _repository.UpdateAsync(model);
+            }
+            return false;
         }
         public async Task<bool> UpdateAsync(SqlKata.Query query)
         {

gx_api/GxPress/Repository/GxPress.Repository.Interface/SystemLabel/ISystemLabelRepository.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Datory;
+using GxPress.Request.SystemLabel;
 
 namespace GxPress.Repository.Interface.SystemLabel
 {
@@ -12,7 +13,7 @@ namespace GxPress.Repository.Interface.SystemLabel
 
         Task<int> InsertAsync(Entity.SystemLabel.SystemLabel note);
 
-        Task<bool> UpdateAsync(Entity.SystemLabel.SystemLabel note);
+        Task<bool> UpdateAsync(SystemLabelUpRequest note);
         Task<IEnumerable<Entity.SystemLabel.SystemLabel>> GetAllAsync();
     }
 }