测试支付

AppStart/PublicFunction.cs

@@ -173,8 +173,12 @@ namespace MySystem
 
 
         #region 获取jwt的token
-
         public static string AppToken(int UserId, string JwtSecret, string JwtIss, string tag = "")
+        {
+            return AppToken(UserId.ToString(), JwtSecret, JwtIss, tag);
+        }
+
+        public static string AppToken(string UserId, string JwtSecret, string JwtIss, string tag = "")
         {
             string Token = RedisDbconn.Instance.Get<string>("apptoken:" + UserId + tag);
             if(!string.IsNullOrEmpty(Token))

Areas/Api/Controllers/SystemSetController.cs

@@ -30,12 +30,13 @@ namespace MySystem.Areas.Api.Controllers
         public JsonResult AppCheck(string value)
         { 
             value = DesDecrypt(value);
-            // string uuid = data["uuid"].ToString();
-            // string salt = data["salt"].ToString();
-            // string u = function.MD5_16(uuid + salt);
+            JsonData data = JsonMapper.ToObject(value);
+            string uuid = data["uuid"].ToString();
+            string salt = data["salt"].ToString();
+            string u = function.MD5_16(uuid + salt);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             //生成jwt令牌
-            Obj.Add("Token", PublicFunction.AppToken(1, JwtSecret, JwtIss, "consumer"));
+            Obj.Add("Token", PublicFunction.AppToken(u, JwtSecret, JwtIss, "consumer"));
             return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
         }
         #endregion

Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -754,9 +754,9 @@ namespace MySystem.Areas.Api.Controllers.v1
             JsonData data = JsonMapper.ToObject(value);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             string Sn = data["Sn"].ToString();
-            MerchantQrCode code = MerchantQrCodeDbconn.Instance.Get(Sn) ?? new MerchantQrCode();
-            MerchantInfo query = MerchantInfoDbconn.Instance.Get(code.MerchantId) ?? new MerchantInfo();
-            MerchantParamSet set = maindb.MerchantParamSet.FirstOrDefault(m => m.Id == code.MerchantId) ?? new MerchantParamSet();
+            MerchantQrCode code = new MerchantQrCodeService().Query(Sn);
+            MerchantInfo query = new MerchantInfoService().Query(code.MerchantId);
+            MerchantParamSet set = new MerchantParamSetService().Query(code.MerchantId);
             Obj.Add("Name", query.Name); //名称
             Obj.Add("Mobile", query.Mobile); //手机号
             Obj.Add("IsAuth", query.IsAuth); //是否认证

Services/MerchantParamSetService.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.MainModels;
+using Library;
+using LitJson;
+
+namespace MySystem
+{
+    public class MerchantParamSetService
+    {
+        string _conn = "";
+        public MerchantParamSetService()
+        {
+            _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        }
+
+        /// <summary>
+        /// 查询列表
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <param name="page">页码</param>
+        /// <param name="limit">每页条数</param>
+        /// <returns></returns>
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantParamSet", fields, orderby, "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            return diclist;
+        }
+
+        /// <summary>
+        /// 查询一条记录
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <returns></returns>
+        public MerchantParamSet Query(int Id)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MerchantParamSet editData = db.MerchantParamSet.FirstOrDefault(m => m.Id == Id) ?? new MerchantParamSet();
+            db.Dispose();
+            return editData;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <returns></returns>
+        public int Add(Dictionary<string, object> Fields)
+        {
+            return new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantParamSet", Fields, 0);
+        }
+
+        /// <summary>
+        /// 修改数据
+        /// </summary>
+        /// <param name="Fields">要设置的字段</param>
+        /// <param name="Id">主键Id</param>
+        public void Edit(Dictionary<string, object> Fields, int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantParamSet", Fields, Id);
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        public void Delete(int Id)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantParamSet", Id);
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id">主键Id</param>
+        /// <param name="Sort">排序序号</param>
+        public void Sort(int Id, int Sort)
+        {
+            new DbService(AppConfig.Base.mainTables, _conn).Sort("MerchantParamSet", Sort, Id);
+        }
+
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData">json数据</param>
+        public void Import(string ExcelData)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count;i++ )
+            {
+                JsonData dr = list[i];
+                
+                db.MerchantParamSet.Add(new MerchantParamSet()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+                    
+                });
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
+        /// <summary>
+        /// 导出excel表格
+        /// </summary>
+        /// <param name="fields">查询条件(单个字段)</param>
+        /// <param name="condition">查询条件(sql语句)</param>
+        /// <returns></returns>
+        public Dictionary<string, object> ExportExcel(List<FieldItem> fields, string condition, string orderby = "Id desc")
+        {
+            Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantParamSet", fields, orderby, "0", 1, 20000, condition, "Id", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("Status", "1");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+
+            result.Add("Fields", ReturnFields);
+            return result;
+        }
+    }
+}

Startup.cs

@@ -109,12 +109,13 @@ namespace MySystem
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
+                Library.ConfigurationManager.EnvironmentFlag = 1;
             }
             else
             {
                 app.UseHsts();
+                Library.ConfigurationManager.EnvironmentFlag = 2;
             }
-            Library.ConfigurationManager.EnvironmentFlag = 2;
             Library.function.WritePage("/", "WebRootPath.txt", env.WebRootPath);
             
             app.UseStaticFiles();