Prechádzať zdrojové kódy

调整Redis,异常处理日志暂时改为写文件
去掉所有bothdis写法,改用redis

lichunlei 3 rokov pred
rodič
commit
17c492e493
68 zmenil súbory, kde vykonal 458 pridanie a 304 odobranie
  1. 33 33
      AppStart/BothdisDbconn.cs
  2. 3 3
      AppStart/Helper/AlipayPayBack2Service.cs
  3. 6 6
      AppStart/Helper/AlipayPayBackService.cs
  4. 8 8
      AppStart/Helper/CheckAlipaySignService.cs
  5. 9 9
      AppStart/Helper/CheckWeChatSignService.cs
  6. 3 3
      AppStart/Helper/ConsumerOrdersReturnDoService.cs
  7. 2 2
      AppStart/Helper/ConsumerOrdersReturnStatService.cs
  8. 30 30
      AppStart/Helper/ConsumerOrdersStatService.cs
  9. 1 1
      AppStart/Helper/DelMySql/DeleteMySqlDataService.cs
  10. 3 3
      AppStart/Helper/MakeReferenceQrCodeService.cs
  11. 22 22
      AppStart/Helper/MerchantConfirmService.cs
  12. 52 0
      AppStart/Helper/MerchantTypeSetService.cs
  13. 5 5
      AppStart/Helper/Profit/ActiveService.cs
  14. 10 10
      AppStart/Helper/Profit/DiviService.cs
  15. 13 13
      AppStart/Helper/Profit/FluxService.cs
  16. 5 5
      AppStart/Helper/Profit/OpenService.cs
  17. 27 27
      AppStart/Helper/Profit/ProfitHelper.cs
  18. 13 13
      AppStart/Helper/Profit/ProfitService.cs
  19. 8 8
      AppStart/Helper/Profit/StandardService.cs
  20. 4 4
      AppStart/Helper/Profit/TeamTopService.cs
  21. 2 2
      AppStart/Helper/ReceiveProfitService.cs
  22. 2 2
      AppStart/Helper/ReceiveTaskService.cs
  23. 2 2
      AppStart/Helper/StatDataService.cs
  24. 3 3
      AppStart/Helper/SycnActiveRewardService.cs
  25. 3 3
      AppStart/Helper/SycnMerchantInfoService.cs
  26. 4 3
      AppStart/Helper/SycnMysql/ConsumerOpenIdsHelper.cs
  27. 6 5
      AppStart/Helper/SycnMysql/ConsumerOrdersHelper.cs
  28. 4 3
      AppStart/Helper/SycnMysql/ConsumersHelper.cs
  29. 4 3
      AppStart/Helper/SycnMysql/MachineApplyHelper.cs
  30. 4 3
      AppStart/Helper/SycnMysql/MerchantParamSetHelper.cs
  31. 4 3
      AppStart/Helper/SycnMysql/OrderProductHelper.cs
  32. 4 3
      AppStart/Helper/SycnMysql/OrdersHelper.cs
  33. 1 1
      AppStart/Helper/SycnMysql/PopService.cs
  34. 4 3
      AppStart/Helper/SycnMysql/PosMachinesHelper.cs
  35. 4 3
      AppStart/Helper/SycnMysql/ProductsHelper.cs
  36. 3 3
      AppStart/Helper/SycnMysql/PublicTableHelper.cs
  37. 4 3
      AppStart/Helper/SycnMysql/StoreChangeHistoryHelper.cs
  38. 4 3
      AppStart/Helper/SycnMysql/StoreStockChangeHelper.cs
  39. 4 3
      AppStart/Helper/SycnMysql/TeamApplyHelper.cs
  40. 4 3
      AppStart/Helper/SycnMysql/TeamOfferApplyHelper.cs
  41. 4 3
      AppStart/Helper/SycnMysql/UserAddressHelper.cs
  42. 4 3
      AppStart/Helper/SycnMysql/UserBackHelper.cs
  43. 4 3
      AppStart/Helper/SycnMysql/UserCashRecordHelper.cs
  44. 4 3
      AppStart/Helper/SycnMysql/UserLoginRecordHelper.cs
  45. 4 3
      AppStart/Helper/SycnMysql/UserMachineDataHelper.cs
  46. 4 3
      AppStart/Helper/SycnMysql/UserStoreChangeHelper.cs
  47. 4 3
      AppStart/Helper/SycnMysql/UsersHelper.cs
  48. 3 3
      AppStart/Helper/SycnTradeRecordService.cs
  49. 6 6
      AppStart/Helper/WeChatPayBackService.cs
  50. 63 0
      AppStart/RabbitMQClient.cs
  51. 18 0
      AppStart/RedisDbconn.cs
  52. 2 2
      AppStart/WeChatFunction.cs
  53. 6 6
      Controllers/HomeController.cs
  54. 1 1
      Program.cs
  55. 1 1
      Properties/launchSettings.json
  56. 1 0
      Startup.cs
  57. BIN
      bin/Debug/netcoreapp3.0/MySystem.dll
  58. BIN
      bin/Debug/netcoreapp3.0/MySystem.pdb
  59. 1 1
      bin/Debug/netcoreapp3.0/stat/StoreIdFlag.txt
  60. BIN
      bin/release/netcoreapp3.0/MySystem.dll
  61. BIN
      bin/release/netcoreapp3.0/MySystem.pdb
  62. 1 1
      bin/release/netcoreapp3.0/Properties/launchSettings.json
  63. BIN
      obj/Debug/netcoreapp3.0/MySystem.dll
  64. BIN
      obj/Debug/netcoreapp3.0/MySystem.pdb
  65. BIN
      obj/release/netcoreapp3.0/MySystem.dll
  66. BIN
      obj/release/netcoreapp3.0/MySystem.pdb
  67. BIN
      publish/MySystem.dll
  68. BIN
      publish/MySystem.pdb

+ 33 - 33
AppStart/BothdisDbconn.cs

@@ -24,7 +24,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.Set(key, value))
+                if (RedisDbconn.Instance.Set(key, value))
                 {
                     RedisDbconn.Instance.Clear(key);
                 }
@@ -37,7 +37,7 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:Set", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:Set");
             }
         }
         #endregion
@@ -47,7 +47,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.AddInt(key, value) > 0)
+                if (RedisDbconn.Instance.AddInt(key, value) > 0)
                 {
                     RedisDbconn.Instance.Clear(key);
                 }
@@ -60,7 +60,7 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:AddInt", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddInt");  // TODO:重新执行,最多重试3次
             }
         }
         #endregion
@@ -70,7 +70,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.AddNumber(key, value) > 0)
+                if (RedisDbconn.Instance.AddNumber(key, value) > 0)
                 {
                     RedisDbconn.Instance.Clear(key);
                 }
@@ -83,7 +83,7 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:AddNumber", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddNumber");  // TODO:重新执行,最多重试3次
             }
         }
         #endregion
@@ -96,7 +96,7 @@ namespace MySystem
             {
                 return obj;
             }
-            T newobj = TendisDbconn.Instance.Get<T>(key);
+            T newobj = RedisDbconn.Instance.Get<T>(key);
             if (newobj != null)
             {
                 RedisDbconn.Instance.Set(key, newobj);
@@ -110,7 +110,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.HSet(key, field, value))
+                if (RedisDbconn.Instance.HSet(key, field, value))
                 {
                     RedisDbconn.Instance.HSet(key, field, value);
                 }
@@ -123,7 +123,7 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:HSet", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:HSet");  // TODO:重新执行,最多重试3次
             }
         }
         #endregion
@@ -133,7 +133,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.HAddInt(key, field, value) > 0)
+                if (RedisDbconn.Instance.HAddInt(key, field, value) > 0)
                 {                     
                     RedisDbconn.Instance.HAddInt(key, field, value);
                 }
@@ -146,7 +146,7 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:HAddInt", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:HAddInt");  // TODO:重新执行,最多重试3次
             }
         }
         #endregion
@@ -156,7 +156,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.HAddNumber(key, field, value) > 0)
+                if (RedisDbconn.Instance.HAddNumber(key, field, value) > 0)
                 { 
                     RedisDbconn.Instance.HAddNumber(key, field, value);
                 }
@@ -169,7 +169,7 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:HAddNumber", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:HAddNumber");  // TODO:重新执行,最多重试3次
             }
         }
         #endregion
@@ -182,7 +182,7 @@ namespace MySystem
             {
                 return obj;
             }
-            T newobj = TendisDbconn.Instance.HGet<T>(key, field);
+            T newobj = RedisDbconn.Instance.HGet<T>(key, field);
             if (newobj != null)
             {
                 RedisDbconn.Instance.HSet(key, field, newobj);
@@ -199,7 +199,7 @@ namespace MySystem
             {
                 return obj;
             }
-            Dictionary<string, T> newobj = TendisDbconn.Instance.HGetAll<T>(key);
+            Dictionary<string, T> newobj = RedisDbconn.Instance.HGetAll<T>(key);
             if (newobj != null)
             {
                 foreach (string sub in newobj.Keys)
@@ -216,7 +216,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.SAdd(key, value) > 0)
+                if (RedisDbconn.Instance.SAdd(key, value) > 0)
                 { 
                     RedisDbconn.Instance.SAdd(key, value);
                 }
@@ -229,14 +229,14 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:SAdd", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:SAdd");  // TODO:重新执行,最多重试3次
             }
         }
         public void SAdd(string key, object[] value)
         {
             try
             {
-                if (TendisDbconn.Instance.SAdd(key, value) > 0)
+                if (RedisDbconn.Instance.SAdd(key, value) > 0)
                 { 
                     RedisDbconn.Instance.SAdd(key, value);
                 }
@@ -249,7 +249,7 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:SAdd", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:SAdd");  // TODO:重新执行,最多重试3次
             }
         }
         #endregion
@@ -265,7 +265,7 @@ namespace MySystem
                     return obj;
                 }
             }
-            T[] newobj = TendisDbconn.Instance.SGetList<T>(key);
+            T[] newobj = RedisDbconn.Instance.SGetList<T>(key);
             if (newobj != null)
             {
                 foreach (T sub in newobj)
@@ -282,7 +282,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.AddList(key, value) > 0)
+                if (RedisDbconn.Instance.AddList(key, value) > 0)
                 { 
                     RedisDbconn.Instance.Clear(key);
                 }
@@ -295,14 +295,14 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:AddList", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddList");  // TODO:重新执行,最多重试3次
             }
         }
         public void AddList(string key, object[] value)
         {
             try
             {
-                if (TendisDbconn.Instance.AddList(key, value) > 0)
+                if (RedisDbconn.Instance.AddList(key, value) > 0)
                 { 
                     RedisDbconn.Instance.Clear(key);
                 }
@@ -315,7 +315,7 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:AddList", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddList");  // TODO:重新执行,最多重试3次
             }
         }
         #endregion
@@ -328,7 +328,7 @@ namespace MySystem
             {
                 return list;
             }
-            return TendisDbconn.Instance.GetList<T>(key, pageNum, pageSize);
+            return RedisDbconn.Instance.GetList<T>(key, pageNum, pageSize);
         }
         #endregion
 
@@ -337,7 +337,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.AddSort(key, value, score) > 0)
+                if (RedisDbconn.Instance.AddSort(key, value, score) > 0)
                 { 
                     RedisDbconn.Instance.AddSort(key, value, score);
                     int Expired = 60 * 60 * 24 * 180;
@@ -352,7 +352,7 @@ namespace MySystem
                     value = value,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:AddSort", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:AddSort");  // TODO:重新执行,最多重试3次
             }
         }
         #endregion
@@ -365,7 +365,7 @@ namespace MySystem
             {
                 return list;
             }
-            return TendisDbconn.Instance.GetSort<T>(key, pageNum, pageSize);
+            return RedisDbconn.Instance.GetSort<T>(key, pageNum, pageSize);
         }
         public List<T> GetSortDesc<T>(string key, int pageNum = 1, int pageSize = 10)
         {
@@ -374,7 +374,7 @@ namespace MySystem
             {
                 return list;
             }
-            return TendisDbconn.Instance.GetSortDesc<T>(key, pageNum, pageSize);
+            return RedisDbconn.Instance.GetSortDesc<T>(key, pageNum, pageSize);
         }
         #endregion
 
@@ -382,7 +382,7 @@ namespace MySystem
         {
             try
             {
-                if (TendisDbconn.Instance.Remove(key, start, end))
+                if (RedisDbconn.Instance.Remove(key, start, end))
                 {                     
                     RedisDbconn.Instance.Remove(key, start, end);
                 }
@@ -396,7 +396,7 @@ namespace MySystem
                     end = end,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:Remove", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:Remove");  // TODO:重新执行,最多重试3次
             }
         }
 
@@ -409,7 +409,7 @@ namespace MySystem
         {
             try
             {
-                TendisDbconn.Instance.Clear(pattern);
+                RedisDbconn.Instance.Clear(pattern);
                 RedisDbconn.Instance.Clear(pattern);
             }
             catch (Exception ex)
@@ -419,7 +419,7 @@ namespace MySystem
                     key = pattern,
                     errMsg = ex.ToString(),
                 };
-                RedisDbconn.Instance.AddList("Tendis:Clear", err);  // TODO:重新执行,最多重试3次
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(err), "Tendis:Clear");  // TODO:重新执行,最多重试3次
             }
         }
     }

+ 3 - 3
AppStart/Helper/AlipayPayBack2Service.cs

@@ -31,11 +31,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }
@@ -45,7 +45,7 @@ namespace MySystem
             bool op = true;
             while (op)
             {
-                string content = TendisDbconn.Instance.RPop<string>("PayCallBack2");
+                string content = RedisDbconn.Instance.RPop<string>("PayCallBack2");
                 if (!string.IsNullOrEmpty(content))
                 {
                     JsonData jsonObj = JsonMapper.ToObject(content);

+ 6 - 6
AppStart/Helper/AlipayPayBackService.cs

@@ -31,11 +31,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }
@@ -45,7 +45,7 @@ namespace MySystem
             bool op = true;
             while (op)
             {
-                string content = TendisDbconn.Instance.RPop<string>("PayCallBack");
+                string content = RedisDbconn.Instance.RPop<string>("PayCallBack");
                 if (!string.IsNullOrEmpty(content))
                 {
                     JsonData jsonObj = JsonMapper.ToObject(content);
@@ -65,9 +65,9 @@ namespace MySystem
                             order.MaxDivi = order.MaxDivi * 10000M;
                             db.SaveChanges();
                             BothdisDbconn.Instance.SendMq("Pop:ConsumerOrders", order);
-                            TendisDbconn.Instance.AddList("ConsumerOrdersStat", order.Id);
-                            TendisDbconn.Instance.AddList("ConsumerOrders:Divi:List", order.Id.ToString());
-                            TendisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.MerchantId, order);
+                            RedisDbconn.Instance.AddList("ConsumerOrdersStat", order.Id);
+                            RedisDbconn.Instance.AddList("ConsumerOrders:Divi:List", order.Id.ToString());
+                            RedisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.MerchantId, order);
                             // ConsumerOrdersStatService.Instance.Stat(order);
                         }
                     }

+ 8 - 8
AppStart/Helper/CheckAlipaySignService.cs

@@ -20,7 +20,7 @@ namespace MySystem
             {
                 PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
                 List<MerchantSign> deletes = new List<MerchantSign>();
-                List<MerchantSign> signs = TendisDbconn.Instance.GetList<MerchantSign>("AlipaySignList", 1, 10000000); // TODO: 换成mysql存储遍历
+                List<MerchantSign> signs = RedisDbconn.Instance.GetList<MerchantSign>("AlipaySignList", 1, 10000000); // TODO: 换成mysql存储遍历
                 foreach (MerchantSign sign in signs)
                 {
                     string content = new AlipayFunction().QuerySignStatus(sign.BusinessCode);
@@ -49,7 +49,7 @@ namespace MySystem
                                 merchantadd.SeoKeyword = SignUrlList;
                                 merchantadd.SeoTitle = dic["alipay_open_agent_order_query_response"]["merchant_pid"].ToString();
                                 db.SaveChanges();
-                                BothdisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
+                                RedisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
                             }
                         }
                         else if (dic["alipay_open_agent_order_query_response"]["order_status"].ToString() == "MERCHANT_CONFIRM_SUCCESS")
@@ -59,7 +59,7 @@ namespace MySystem
                             {
                                 merchantadd.QueryCount = 2;
                                 db.SaveChanges();
-                                BothdisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
+                                RedisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
                                 if (merchantadd.Status == 2 && merchantadd.QueryCount == 2)
                                 {
                                     PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
@@ -93,12 +93,12 @@ namespace MySystem
                                 merchantadd.SeoDescription = Season;
                                 merchantadd.QueryCount = -1;
                                 db.SaveChanges();
-                                BothdisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
+                                RedisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
                                 PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                                 if (merchant != null)
                                 {
                                     merchant.Status = -1;
-                                    BothdisDbconn.Instance.Set("MerchantInfo:" + sign.MerchantAddInfoId, merchant);
+                                    RedisDbconn.Instance.Set("MerchantInfo:" + sign.MerchantAddInfoId, merchant);
                                 }
                                 deletes.Add(sign);
                             }
@@ -111,8 +111,8 @@ namespace MySystem
                     {
                         signs.Remove(delete);
                     }
-                    TendisDbconn.Instance.Clear("AliaySignList");
-                    TendisDbconn.Instance.AddList("AliaySignList", signs.ToArray());
+                    RedisDbconn.Instance.Clear("AliaySignList");
+                    RedisDbconn.Instance.AddList("AliaySignList", signs.ToArray());
                 }
                 jobInfo.Status = 1;
                 jobInfo.Msg = "执行完成";
@@ -120,7 +120,7 @@ namespace MySystem
             }
             catch (Exception ex)
             {
-                TendisDbconn.Instance.AddList("public:merchant:signerr", DateTime.Now.ToString() + ":" + ex.ToString());
+                function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public:merchant:signerr");
             }
         }
     }

+ 9 - 9
AppStart/Helper/CheckWeChatSignService.cs

@@ -20,7 +20,7 @@ namespace MySystem
             {
                 PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
                 List<MerchantSign> deletes = new List<MerchantSign>();
-                List<MerchantSign> signs = TendisDbconn.Instance.GetList<MerchantSign>("WeChatSignList", 1, 10000000); // TODO: 换成mysql存储遍历
+                List<MerchantSign> signs = RedisDbconn.Instance.GetList<MerchantSign>("WeChatSignList", 1, 10000000); // TODO: 换成mysql存储遍历
                 foreach (MerchantSign sign in signs)
                 {
                     Dictionary<string, object> dic = new WeChatFunction().QueryMerchant(sign.BusinessCode);
@@ -47,7 +47,7 @@ namespace MySystem
                                 merchant.Status = 1;
                             }
                             db.SaveChanges();
-                            BothdisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
+                            RedisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
                         }
                     }
                     else if (dic["applyment_state"].ToString() == "APPLYMENT_STATE_FINISHED")
@@ -56,7 +56,7 @@ namespace MySystem
                         if (merchantadd != null)
                         {
                             merchantadd.Status = 2;
-                            BothdisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
+                            RedisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
                             PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                             if (merchantadd.Status == 2 && merchantadd.QueryCount == 2)
                             {
@@ -95,12 +95,12 @@ namespace MySystem
                             merchantadd.SeoDescription = Season;
                             merchantadd.Status = -1;
                             db.SaveChanges();
-                            BothdisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
+                            RedisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
                             PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
                             if (merchant != null)
                             {
                                 merchant.Status = -1;
-                                BothdisDbconn.Instance.Set("MerchantInfo:" + sign.MerchantAddInfoId, merchant);
+                                RedisDbconn.Instance.Set("MerchantInfo:" + sign.MerchantAddInfoId, merchant);
                             }
                             deletes.Add(sign);
                         }
@@ -116,7 +116,7 @@ namespace MySystem
                             {
                                 merchantadd.SubMchid = sub_mchid;
                                 db.SaveChanges();
-                                BothdisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
+                                RedisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
                             }
                         }
                     }
@@ -127,8 +127,8 @@ namespace MySystem
                     {
                         signs.Remove(delete);
                     }
-                    TendisDbconn.Instance.Clear("WeChatSignList");
-                    TendisDbconn.Instance.AddList("WeChatSignList", signs.ToArray());
+                    RedisDbconn.Instance.Clear("WeChatSignList");
+                    RedisDbconn.Instance.AddList("WeChatSignList", signs.ToArray());
                 }
                 jobInfo.Status = 1;
                 jobInfo.Msg = "执行完成";
@@ -136,7 +136,7 @@ namespace MySystem
             }
             catch (Exception ex)
             {
-                TendisDbconn.Instance.AddList("public:merchant:signerr", DateTime.Now.ToString() + ":" + ex.ToString());
+                function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public:merchant:signerr");
             }
         }
     }

+ 3 - 3
AppStart/Helper/ConsumerOrdersReturnDoService.cs

@@ -31,11 +31,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }
@@ -45,7 +45,7 @@ namespace MySystem
             bool op = true;
             while (op)
             {
-                RefundItem item = TendisDbconn.Instance.RPop<RefundItem>("ConsumerOrdersStat");
+                RefundItem item = RedisDbconn.Instance.RPop<RefundItem>("ConsumerOrdersStat");
                 if (item != null)
                 {
                     bool success = false;

+ 2 - 2
AppStart/Helper/ConsumerOrdersReturnStatService.cs

@@ -31,11 +31,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }

+ 30 - 30
AppStart/Helper/ConsumerOrdersStatService.cs

@@ -31,11 +31,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }
@@ -45,7 +45,7 @@ namespace MySystem
             bool op = true;
             while (op)
             {
-                int OrderId = TendisDbconn.Instance.RPop<int>("ConsumerOrdersStat");
+                int OrderId = RedisDbconn.Instance.RPop<int>("ConsumerOrdersStat");
                 if (OrderId > 0)
                 {
                     WebCMSEntities db = new WebCMSEntities();
@@ -70,26 +70,26 @@ namespace MySystem
                                     db.SaveChanges();
                                     BothdisDbconn.Instance.SendMq("Pop:MerchantInfo:" + order.MerchantId, merchant);
 
-                                    BothdisDbconn.Instance.AddNumber("TotalAmount:" + merchant.UserId, PayMoney);
-                                    decimal TotalAmount = BothdisDbconn.Instance.Get<decimal>("TotalAmount:" + merchant.UserId);
-                                    BothdisDbconn.Instance.AddNumber("TotalAmount:" + merchant.UserId + ":" + TradeMonth, PayMoney);
+                                    RedisDbconn.Instance.AddNumber("TotalAmount:" + merchant.UserId, PayMoney);
+                                    decimal TotalAmount = RedisDbconn.Instance.Get<decimal>("TotalAmount:" + merchant.UserId);
+                                    RedisDbconn.Instance.AddNumber("TotalAmount:" + merchant.UserId + ":" + TradeMonth, PayMoney);
                                     // 微信/支付宝
                                     if (order.PayMode == 1)
                                     {
-                                        BothdisDbconn.Instance.AddInt("TotalOrder:Alipay:" + merchant.UserId + ":" + TradeMonth);
+                                        RedisDbconn.Instance.AddInt("TotalOrder:Alipay:" + merchant.UserId + ":" + TradeMonth);
                                     }
                                     else if (order.PayMode == 2)
                                     {
-                                        BothdisDbconn.Instance.AddInt("TotalOrder:WeChat:" + merchant.UserId + ":" + TradeMonth);
+                                        RedisDbconn.Instance.AddInt("TotalOrder:WeChat:" + merchant.UserId + ":" + TradeMonth);
                                     }
                                     // 活动、非活动
                                     if (order.IsAct == 1)
                                     {
-                                        BothdisDbconn.Instance.AddNumber("TotalAmount:Active:" + merchant.UserId + ":" + TradeMonth, PayMoney);
+                                        RedisDbconn.Instance.AddNumber("TotalAmount:Active:" + merchant.UserId + ":" + TradeMonth, PayMoney);
                                     }
                                     else
                                     {
-                                        BothdisDbconn.Instance.AddNumber("TotalAmount:UnActive:" + merchant.UserId + ":" + TradeMonth, PayMoney);
+                                        RedisDbconn.Instance.AddNumber("TotalAmount:UnActive:" + merchant.UserId + ":" + TradeMonth, PayMoney);
                                     }
                                     // 判断激活商户,从绑定音箱码开始,30天内,活动交易额满1000为激活
                                     int ActivationStatus = 0;
@@ -99,10 +99,10 @@ namespace MySystem
                                         merchant.ActivationDate = DateTime.Now;
                                         db.SaveChanges();
                                         ActivationStatus = 1;
-                                        BothdisDbconn.Instance.AddInt("ActMerchantCount:" + merchant.UserId + ":" + TradeMonth);
-                                        BothdisDbconn.Instance.AddInt("ActMerchantCount:" + merchant.UserId + ":" + TradeDate);
-                                        BothdisDbconn.Instance.AddInt("ActMerchantCount:" + merchant.UserId + ":" + PayMode + ":" + TradeMonth);
-                                        BothdisDbconn.Instance.AddInt("ActMerchantCount:" + merchant.UserId + ":" + PayMode + ":" + TradeDate);
+                                        RedisDbconn.Instance.AddInt("ActMerchantCount:" + merchant.UserId + ":" + TradeMonth);
+                                        RedisDbconn.Instance.AddInt("ActMerchantCount:" + merchant.UserId + ":" + TradeDate);
+                                        RedisDbconn.Instance.AddInt("ActMerchantCount:" + merchant.UserId + ":" + PayMode + ":" + TradeMonth);
+                                        RedisDbconn.Instance.AddInt("ActMerchantCount:" + merchant.UserId + ":" + PayMode + ":" + TradeDate);
                                     }
 
                                     // 遍历上级,累加团队数据
@@ -116,33 +116,33 @@ namespace MySystem
                                         {
                                             if (Level >= 1)
                                             {
-                                                BothdisDbconn.Instance.AddNumber("TeamTotalAmount:" + UserId + ":" + TradeMonth, PayMoney);
+                                                RedisDbconn.Instance.AddNumber("TeamTotalAmount:" + UserId + ":" + TradeMonth, PayMoney);
                                                 // 微信/支付宝
                                                 if (order.PayMode == 1)
                                                 {
-                                                    BothdisDbconn.Instance.AddInt("TeamTotalOrder:Alipay:" + UserId + ":" + TradeMonth);
+                                                    RedisDbconn.Instance.AddInt("TeamTotalOrder:Alipay:" + UserId + ":" + TradeMonth);
                                                 }
                                                 else if (order.PayMode == 2)
                                                 {
-                                                    BothdisDbconn.Instance.AddInt("TeamTotalOrder:WeChat:" + UserId + ":" + TradeMonth);
+                                                    RedisDbconn.Instance.AddInt("TeamTotalOrder:WeChat:" + UserId + ":" + TradeMonth);
                                                 }
                                                 // 活动、非活动
                                                 if (order.IsAct == 1)
                                                 {
-                                                    BothdisDbconn.Instance.AddNumber("TeamTotalAmount:Active:" + UserId + ":" + TradeMonth, PayMoney);
+                                                    RedisDbconn.Instance.AddNumber("TeamTotalAmount:Active:" + UserId + ":" + TradeMonth, PayMoney);
                                                 }
                                                 else
                                                 {
-                                                    BothdisDbconn.Instance.AddNumber("TeamTotalAmount:UnActive:" + UserId + ":" + TradeMonth, PayMoney);
+                                                    RedisDbconn.Instance.AddNumber("TeamTotalAmount:UnActive:" + UserId + ":" + TradeMonth, PayMoney);
                                                 }
 
                                                 // 创客的激活商户累计
                                                 if (ActivationStatus == 1)
                                                 { 
-                                                    BothdisDbconn.Instance.AddInt("ActMerchantCount:" + UserId + ":" + TradeMonth);
-                                                    BothdisDbconn.Instance.AddInt("ActMerchantCount:" + UserId + ":" + TradeDate);
-                                                    BothdisDbconn.Instance.AddInt("ActMerchantCount:" + UserId + ":" + PayMode + ":" + TradeMonth);
-                                                    BothdisDbconn.Instance.AddInt("ActMerchantCount:" + UserId + ":" + PayMode + ":" + TradeDate);
+                                                    RedisDbconn.Instance.AddInt("ActMerchantCount:" + UserId + ":" + TradeMonth);
+                                                    RedisDbconn.Instance.AddInt("ActMerchantCount:" + UserId + ":" + TradeDate);
+                                                    RedisDbconn.Instance.AddInt("ActMerchantCount:" + UserId + ":" + PayMode + ":" + TradeMonth);
+                                                    RedisDbconn.Instance.AddInt("ActMerchantCount:" + UserId + ":" + PayMode + ":" + TradeDate);
                                                 }
                                             }
                                             UserId = user.ParentUserId;
@@ -154,12 +154,12 @@ namespace MySystem
                                     }
                                     
                                     //创客所属商户交易额数据
-                                    BothdisDbconn.Instance.AddNumber("MerchantTradeAmount:" + order.MerchantId + ":" + TradeMonth, order.PayMoney);
-                                    BothdisDbconn.Instance.AddNumber("MerchantTradeAmount:" + order.MerchantId + ":" + TradeDate, order.PayMoney);
-                                    List<string> TradeMonths = BothdisDbconn.Instance.GetList<string>("MerchantTradeList:" + order.MerchantId + ":" + TradeMonth, 1, 1000);
+                                    RedisDbconn.Instance.AddNumber("MerchantTradeAmount:" + order.MerchantId + ":" + TradeMonth, order.PayMoney);
+                                    RedisDbconn.Instance.AddNumber("MerchantTradeAmount:" + order.MerchantId + ":" + TradeDate, order.PayMoney);
+                                    List<string> TradeMonths = RedisDbconn.Instance.GetList<string>("MerchantTradeList:" + order.MerchantId + ":" + TradeMonth, 1, 1000);
                                     if (!TradeMonths.Contains(TradeDate))
                                     {
-                                        BothdisDbconn.Instance.AddList("MerchantTradeList:" + order.MerchantId + ":" + TradeMonth, TradeDate);
+                                        RedisDbconn.Instance.AddList("MerchantTradeList:" + order.MerchantId + ":" + TradeMonth, TradeDate);
                                     }
                                 }
                                 tran.Commit();
@@ -168,7 +168,7 @@ namespace MySystem
                         catch (Exception ex)
                         {
                             tran.Rollback();
-                            TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                            function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                         }
                     }
                     db.Dispose();
@@ -184,8 +184,8 @@ namespace MySystem
         {
             string DateString = order.UpdateDate.Value.ToString("yyyyMMdd");
             string MonthString = order.UpdateDate.Value.ToString("yyyyMM");
-            BothdisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + DateString, order.PayMoney);
-            BothdisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + MonthString, order.PayMoney);
+            RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + DateString, order.PayMoney);
+            RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + MonthString, order.PayMoney);
         }
     }
 }

+ 1 - 1
AppStart/Helper/DelMySql/DeleteMySqlDataService.cs

@@ -29,7 +29,7 @@ namespace MySystem
                 ErrorMsg msg = new ErrorMsg();
                 msg.Time = DateTime.Now;
                 msg.ErrorContent = ex.ToString();
-                TendisDbconn.Instance.AddList("Pop:MerchantInfo:Error", msg);
+                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:MerchantInfo:Error");
             }
             db.Dispose();
         }

+ 3 - 3
AppStart/Helper/MakeReferenceQrCodeService.cs

@@ -41,11 +41,11 @@ namespace MySystem
                             pxcdb.SaveChanges();
                         }
                         pxcdb.Dispose();
-                        PxcModels.Users editUser = BothdisDbconn.Instance.Get<PxcModels.Users>("Users:" + UserId);
+                        PxcModels.Users editUser = RedisDbconn.Instance.Get<PxcModels.Users>("Users:" + UserId);
                         if (editUser != null)
                         {
                             editUser.ReferenceQrCode = user.ReferenceQrCode;
-                            BothdisDbconn.Instance.Set("Users:" + UserId, editUser);
+                            RedisDbconn.Instance.Set("Users:" + UserId, editUser);
                         }
                     }
                     db.Dispose();
@@ -53,7 +53,7 @@ namespace MySystem
             }
             catch (Exception ex)
             {
-                TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
             }
         }
 

+ 22 - 22
AppStart/Helper/MerchantConfirmService.cs

@@ -42,7 +42,7 @@ namespace MySystem
                     }
                     merchantForMobile.MerchantId = MerchantId;
                     db.SaveChanges();
-                    List<MerchantInfo> merchants = TendisDbconn.Instance.GetList<MerchantInfo>("MerchantList:" + merchant.UserId, 1, 10000000);
+                    List<MerchantInfo> merchants = RedisDbconn.Instance.GetList<MerchantInfo>("MerchantList:" + merchant.UserId, 1, 10000000);
 
                     //微信
                     if (Kind == 0 || Kind == 2)
@@ -54,11 +54,11 @@ namespace MySystem
                             AddInfo.ApplymentId = jsonObj["applyment_id"].ToString();
                             AddInfo.Status = 0;
                             db.SaveChanges();
-                            List<MerchantSign> signs = TendisDbconn.Instance.GetList<MerchantSign>("MerchantSignList", 1, 10000000);
+                            List<MerchantSign> signs = RedisDbconn.Instance.GetList<MerchantSign>("MerchantSignList", 1, 10000000);
                             bool op = signs.Any(m => m.BusinessCode == BusinessCode);
                             if (!op)
                             {
-                                TendisDbconn.Instance.AddList("WeChatSignList", new MerchantSign()
+                                RedisDbconn.Instance.AddList("WeChatSignList", new MerchantSign()
                                 {
                                     BusinessCode = BusinessCode,
                                     MerchantAddInfoId = MerchantId,
@@ -68,16 +68,16 @@ namespace MySystem
                             signs.Clear();
                             if (merchants.Any(m => m.Id == merchant.Id) == false)
                             {
-                                BothdisDbconn.Instance.AddList("MerchantList:" + merchant.UserId, merchant);
+                                RedisDbconn.Instance.AddList("MerchantList:" + merchant.UserId, merchant);
                             }
                             else
                             {
-                                PxcModels.MerchantAddInfo merchantAddInfo = BothdisDbconn.Instance.Get<PxcModels.MerchantAddInfo>("MerchantAddInfo:" + MerchantId);
+                                PxcModels.MerchantAddInfo merchantAddInfo = RedisDbconn.Instance.Get<PxcModels.MerchantAddInfo>("MerchantAddInfo:" + MerchantId);
                                 if (merchantAddInfo != null)
                                 {
                                     merchantAddInfo.ApplymentId = AddInfo.ApplymentId;
                                     merchantAddInfo.Status = AddInfo.Status;
-                                    BothdisDbconn.Instance.Set("MerchantAddInfo:" + MerchantId, merchantAddInfo);
+                                    RedisDbconn.Instance.Set("MerchantAddInfo:" + MerchantId, merchantAddInfo);
                                 }
                             }
                         }
@@ -100,25 +100,25 @@ namespace MySystem
                             db.SaveChanges();
                             if (merchants.Any(m => m.Id == merchant.Id) == false)
                             {
-                                BothdisDbconn.Instance.AddList("MerchantList:" + merchant.UserId, merchant);
+                                RedisDbconn.Instance.AddList("MerchantList:" + merchant.UserId, merchant);
                             }
                             else
                             {
-                                PxcModels.MerchantAddInfo merchantAddInfo = BothdisDbconn.Instance.Get<PxcModels.MerchantAddInfo>("MerchantAddInfo:" + MerchantId);
+                                PxcModels.MerchantAddInfo merchantAddInfo = RedisDbconn.Instance.Get<PxcModels.MerchantAddInfo>("MerchantAddInfo:" + MerchantId);
                                 if (merchantAddInfo != null)
                                 {
                                     merchantAddInfo.SeoDescription = AddInfo.SeoDescription;
                                     merchantAddInfo.Status = AddInfo.Status;
-                                    BothdisDbconn.Instance.Set("MerchantAddInfo:" + MerchantId, merchantAddInfo);
+                                    RedisDbconn.Instance.Set("MerchantAddInfo:" + MerchantId, merchantAddInfo);
                                 }
                             }
-                            List<MerchantSign> signs = TendisDbconn.Instance.GetList<MerchantSign>("WeChatSignList", 1, 10000000);
+                            List<MerchantSign> signs = RedisDbconn.Instance.GetList<MerchantSign>("WeChatSignList", 1, 10000000);
                             MerchantSign sign = signs.FirstOrDefault(m => m.BusinessCode == BusinessCode);
                             if (sign != null)
                             {
                                 signs.Remove(sign);
-                                TendisDbconn.Instance.Clear("WeChatSignList");
-                                TendisDbconn.Instance.AddList("WeChatSignList", signs.ToArray());
+                                RedisDbconn.Instance.Clear("WeChatSignList");
+                                RedisDbconn.Instance.AddList("WeChatSignList", signs.ToArray());
                             }
                         }
                     }
@@ -148,11 +148,11 @@ namespace MySystem
                                     AddInfo.QueryCount = 0;
                                     AddInfo.SeoTitle = batch_no;
                                     db.SaveChanges();
-                                    List<MerchantSign> signs = TendisDbconn.Instance.GetList<MerchantSign>("MerchantSignList", 1, 10000000);
+                                    List<MerchantSign> signs = RedisDbconn.Instance.GetList<MerchantSign>("MerchantSignList", 1, 10000000);
                                     bool op = signs.Any(m => m.BusinessCode == batch_no);
                                     if (!op)
                                     {
-                                        TendisDbconn.Instance.AddList("AlipaySignList", new MerchantSign()
+                                        RedisDbconn.Instance.AddList("AlipaySignList", new MerchantSign()
                                         {
                                             BusinessCode = batch_no,
                                             MerchantAddInfoId = MerchantId,
@@ -162,7 +162,7 @@ namespace MySystem
                                     signs.Clear();
                                     if (merchants.Any(m => m.Id == merchant.Id) == false)
                                     {
-                                        BothdisDbconn.Instance.AddList("MerchantList:" + merchant.UserId, merchant);
+                                        RedisDbconn.Instance.AddList("MerchantList:" + merchant.UserId, merchant);
                                     }
                                 }
                                 else
@@ -198,25 +198,25 @@ namespace MySystem
                             db.SaveChanges();
                             if (merchants.Any(m => m.Id == merchant.Id) == false)
                             {
-                                BothdisDbconn.Instance.AddList("MerchantList:" + merchant.UserId, merchant);
+                                RedisDbconn.Instance.AddList("MerchantList:" + merchant.UserId, merchant);
                             }
                             else
                             {
-                                PxcModels.MerchantAddInfo merchantAddInfo = BothdisDbconn.Instance.Get<PxcModels.MerchantAddInfo>("MerchantAddInfo:" + MerchantId);
+                                PxcModels.MerchantAddInfo merchantAddInfo = RedisDbconn.Instance.Get<PxcModels.MerchantAddInfo>("MerchantAddInfo:" + MerchantId);
                                 if (merchantAddInfo != null)
                                 {
                                     merchantAddInfo.SeoDescription = AddInfo.SeoDescription;
                                     merchantAddInfo.QueryCount = AddInfo.QueryCount;
-                                    BothdisDbconn.Instance.Set("MerchantAddInfo:" + MerchantId, merchantAddInfo);
+                                    RedisDbconn.Instance.Set("MerchantAddInfo:" + MerchantId, merchantAddInfo);
                                 }
                             }
-                            List<MerchantSign> signs = TendisDbconn.Instance.GetList<MerchantSign>("AlipaySignList", 1, 10000000);
+                            List<MerchantSign> signs = RedisDbconn.Instance.GetList<MerchantSign>("AlipaySignList", 1, 10000000);
                             MerchantSign sign = signs.FirstOrDefault(m => m.BusinessCode == BusinessCode);
                             if (sign != null)
                             {
                                 signs.Remove(sign);
-                                TendisDbconn.Instance.Clear("AlipaySignList");
-                                TendisDbconn.Instance.AddList("AlipaySignList", signs.ToArray());
+                                RedisDbconn.Instance.Clear("AlipaySignList");
+                                RedisDbconn.Instance.AddList("AlipaySignList", signs.ToArray());
                             }
                         }
                     }
@@ -227,7 +227,7 @@ namespace MySystem
             }
             catch (Exception ex)
             {
-                TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
             }
         }
     }

+ 52 - 0
AppStart/Helper/MerchantTypeSetService.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using Library;
+using LitJson;
+using System.Linq;
+using MySystem.PxcModels;
+using Org.BouncyCastle.Crypto.Modes;
+using Org.BouncyCastle.Crypto.Engines;
+using Org.BouncyCastle.Crypto.Parameters;
+using System.Text;
+
+namespace MySystem
+{
+    public class MerchantTypeSetService
+    {
+        public readonly static MerchantTypeSetService Instance = new MerchantTypeSetService();
+        private MerchantTypeSetService()
+        { }
+
+        public void Start(JobMqMsg jobInfo)
+        {
+            string content = "";
+            try
+            {
+                dosomething();
+                string Msg = "success";
+                jobInfo.Status = Msg == "success" ? 1 : 0;
+                jobInfo.Msg = Msg == "success" ? "执行完成" : Msg;
+                RabbitMQClient.Instance.SendMsg(Newtonsoft.Json.JsonConvert.SerializeObject(jobInfo), "PublicBack");
+            }
+            catch (Exception ex)
+            {
+                if (!string.IsNullOrEmpty(content))
+                {
+                    Dictionary<string, string> data = new Dictionary<string, string>();
+                    data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                    data.Add("ErrMsg", ex.ToString());
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
+                }
+                else
+                {
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
+                }
+            }
+        }
+
+        public void dosomething()
+        {
+            // TODO: 每天扫描非商户型创客的持有机具数量,如果
+        }
+    }
+}

+ 5 - 5
AppStart/Helper/Profit/ActiveService.cs

@@ -30,11 +30,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("activeback_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "activeback_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("activeback_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "activeback_service");
                 }
             }
         }
@@ -98,10 +98,10 @@ namespace MySystem
                         }).Entity;
                         db.SaveChanges();
 
-                        BothdisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
+                        RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
 
                         //我的-常用工具-收支明细
-                        BothdisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, accountRecord);
+                        RedisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, accountRecord);
                     }
                     
                     tran.Commit();
@@ -114,7 +114,7 @@ namespace MySystem
                         Time = DateTime.Now,
                         ErrorContent = ex.ToString(),
                     };
-                    TendisDbconn.Instance.AddList("ActiveServiceError", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "ActiveServiceError");
                 }
             }
             db.Dispose();

+ 10 - 10
AppStart/Helper/Profit/DiviService.cs

@@ -30,11 +30,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("diviback_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "diviback_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("diviback_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "diviback_service");
                 }
             }
         }
@@ -87,15 +87,15 @@ namespace MySystem
                         }
                         db.SaveChanges();
 
-                        BothdisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
+                        RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
 
                         //首页-快联盟产品-主界面产品数据
-                        UserMachineData MachineData = BothdisDbconn.Instance.Get<UserMachineData>("UserMachineData:" + sub.UserId + ":" + sub.ProductType) ?? new UserMachineData();
+                        UserMachineData MachineData = RedisDbconn.Instance.Get<UserMachineData>("UserMachineData:" + sub.UserId + ":" + sub.ProductType) ?? new UserMachineData();
                         MachineData.DividendsProfit += sub.ChangeAmount;
-                        BothdisDbconn.Instance.Set("UserMachineData:" + sub.UserId + ":" + sub.ProductType, MachineData);
+                        RedisDbconn.Instance.Set("UserMachineData:" + sub.UserId + ":" + sub.ProductType, MachineData);
 
                         //首页-快联盟产品-收益查看-分红奖励
-                        List<TradeProfitItem> DiviList = BothdisDbconn.Instance.GetList<TradeProfitItem>("TradeProfit:Divi:" + sub.UserId + ":" + sub.ProductType, 1, 1000000);
+                        List<TradeProfitItem> DiviList = RedisDbconn.Instance.GetList<TradeProfitItem>("TradeProfit:Divi:" + sub.UserId + ":" + sub.ProductType, 1, 1000000);
                         TradeProfitItem Check = DiviList.FirstOrDefault(m => m.TradeMonthValue == TradeMonth);
                         if (Check == null)
                         {
@@ -111,11 +111,11 @@ namespace MySystem
                         {
                             Check.TradeProfit += sub.ChangeAmount;
                         }
-                        BothdisDbconn.Instance.Clear("TradeProfit:Divi:" + sub.UserId + ":" + sub.ProductType);
-                        BothdisDbconn.Instance.AddList("TradeProfit:Divi:" + sub.UserId + ":" + sub.ProductType, DiviList.ToArray());
+                        RedisDbconn.Instance.Clear("TradeProfit:Divi:" + sub.UserId + ":" + sub.ProductType);
+                        RedisDbconn.Instance.AddList("TradeProfit:Divi:" + sub.UserId + ":" + sub.ProductType, DiviList.ToArray());
 
                         //我的-常用工具-收支明细
-                        BothdisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, edit);
+                        RedisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, edit);
                     }
                     
                     tran.Commit();
@@ -128,7 +128,7 @@ namespace MySystem
                         Time = DateTime.Now,
                         ErrorContent = ex.ToString(),
                     };
-                    TendisDbconn.Instance.AddList("DiviServiceError", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "DiviServiceError");
                 }
             }
             db.Dispose();

+ 13 - 13
AppStart/Helper/Profit/FluxService.cs

@@ -30,11 +30,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("fluxback_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "fluxback_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("fluxback_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "fluxback_service");
                 }
             }
         }
@@ -110,21 +110,21 @@ namespace MySystem
                             }).Entity;
                             db.SaveChanges();
 
-                            BothdisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
+                            RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
 
                             //首页-快联盟产品-主界面产品数据
-                            UserMachineData MachineData = BothdisDbconn.Instance.Get<UserMachineData>("UserMachineData:" + sub.UserId + ":" + sub.BrandId);
+                            UserMachineData MachineData = RedisDbconn.Instance.Get<UserMachineData>("UserMachineData:" + sub.UserId + ":" + sub.BrandId);
                             if (MachineData != null)
                             {
                                 MachineData.FluxProfit = FluxProfitAmt;
-                                BothdisDbconn.Instance.Set("UserMachineData:" + sub.UserId + ":" + sub.BrandId, MachineData);
-                                TendisDbconn.Instance.AddList("Pop:UserMachineData", MachineData); // TODO:同步mysql
+                                RedisDbconn.Instance.Set("UserMachineData:" + sub.UserId + ":" + sub.BrandId, MachineData);
+                                RedisDbconn.Instance.AddList("Pop:UserMachineData", MachineData); // TODO:同步mysql
                             }
 
                             //我的-常用工具-收支明细
-                            BothdisDbconn.Instance.AddList("UserAccountRecord:" + UserId + ":1:" + TradeMonth, accountRecord);
+                            RedisDbconn.Instance.AddList("UserAccountRecord:" + UserId + ":1:" + TradeMonth, accountRecord);
 
-                            TendisDbconn.Instance.HAddNumber("TmpFluxProfit", sub.UserId + "_" + sub.BrandId + "_" + StatDate.ToString("yyyy年MM月") + "_" + StatDate.ToString("yyyyMM"), FluxProfitAmt);
+                            RedisDbconn.Instance.HAddNumber("TmpFluxProfit", sub.UserId + "_" + sub.BrandId + "_" + StatDate.ToString("yyyy年MM月") + "_" + StatDate.ToString("yyyyMM"), FluxProfitAmt);
                         }
                         else
                         {
@@ -134,12 +134,12 @@ namespace MySystem
                                 ErrorContent = "同步流量卡分佣失败,数据不一致",
                                 Obj = Newtonsoft.Json.JsonConvert.SerializeObject(sub),
                             };
-                            TendisDbconn.Instance.AddList("FluxServiceWarning", msg);
+                            RedisDbconn.Instance.AddList("FluxServiceWarning", msg);
                         }
                     }
 
                     //首页-快联盟产品-收益查看-流量卡分佣
-                    Dictionary<string, decimal> datalist = TendisDbconn.Instance.HGetAll<decimal>("TmpFluxProfit");
+                    Dictionary<string, decimal> datalist = RedisDbconn.Instance.HGetAll<decimal>("TmpFluxProfit");
                     foreach (string key in datalist.Keys)
                     {
                         string[] fields = key.Split('_');
@@ -147,7 +147,7 @@ namespace MySystem
                         string BrandId = fields[1];
                         string TradeM = fields[2];
                         string TradeMValue = fields[3];
-                        BothdisDbconn.Instance.AddList("FluxProfitSummary:" + UserId + ":" + BrandId, new TradeProfitItem()
+                        RedisDbconn.Instance.AddList("FluxProfitSummary:" + UserId + ":" + BrandId, new TradeProfitItem()
                         {
                             TradeProfit = datalist[key],
                             TradeMonth = TradeM,
@@ -155,7 +155,7 @@ namespace MySystem
                             CreateDate = DateTime.Now,
                         });
                     }
-                    TendisDbconn.Instance.Clear("TmpFluxProfit");
+                    RedisDbconn.Instance.Clear("TmpFluxProfit");
                     
                     tran.Commit();
                 }
@@ -167,7 +167,7 @@ namespace MySystem
                         Time = DateTime.Now,
                         ErrorContent = ex.ToString(),
                     };
-                    TendisDbconn.Instance.AddList("ProfitServiceError", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "ProfitServiceError");
                 }
             }
             db.Dispose();

+ 5 - 5
AppStart/Helper/Profit/OpenService.cs

@@ -30,11 +30,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("openback_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "openback_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("openback_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "openback_service");
                 }
             }
         }
@@ -98,10 +98,10 @@ namespace MySystem
                         }).Entity;
                         db.SaveChanges();
 
-                        BothdisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
+                        RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
 
                         //我的-常用工具-收支明细
-                        BothdisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, accountRecord);
+                        RedisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, accountRecord);
                     }
                     
                     tran.Commit();
@@ -114,7 +114,7 @@ namespace MySystem
                         Time = DateTime.Now,
                         ErrorContent = ex.ToString(),
                     };
-                    TendisDbconn.Instance.AddList("StandardServiceError", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "StandardServiceError");
                 }
             }
             db.Dispose();

+ 27 - 27
AppStart/Helper/Profit/ProfitHelper.cs

@@ -37,7 +37,7 @@ namespace MySystem
             bool op = true;
             while (op)
             {
-                string orderidstring = TendisDbconn.Instance.RPop<string>("ConsumerOrders:Divi:List");
+                string orderidstring = RedisDbconn.Instance.RPop<string>("ConsumerOrders:Divi:List");
                 if (!string.IsNullOrEmpty(orderidstring))
                 {
                     ReturnStat(orderidstring);
@@ -67,7 +67,7 @@ namespace MySystem
                         if (merchant != null)
                         {
                             int UserId = merchant.UserId;
-                            List<CustomTagSet> customTagSets = TendisDbconn.Instance.GetList<CustomTagSet>("CustomTagSet", 1, 1000); //获取公用配置参数集和
+                            List<CustomTagSet> customTagSets = RedisDbconn.Instance.GetList<CustomTagSet>("CustomTagSet", 1, 1000); //获取公用配置参数集和
                             //获取参数
                             CustomTagSet profitPercentSet = customTagSets.FirstOrDefault(m => m.Tags == "CusumerProfitPercent") ?? new CustomTagSet();
                             decimal profitPercent = decimal.Parse(function.CheckNum(profitPercentSet.Contents)); //基于收款金额的总分润比例;
@@ -108,7 +108,7 @@ namespace MySystem
                                     //         GetMoney = GetMoney,
                                     //     }).Entity;
                                     //     db.SaveChanges();
-                                    //     TendisDbconn.Instance.AddList("ConsumerOrdersStat", new RefundItem()
+                                    //     RedisDbconn.Instance.AddList("ConsumerOrdersStat", new RefundItem()
                                     //     {
                                     //         ProfitId = cprofit.Id,
                                     //         TradeNo = order.OrderNo,
@@ -120,7 +120,7 @@ namespace MySystem
                                     // }
                                     List<int> deletes = new List<int>();
                                     long CurDiviPersons = DiviPersons;
-                                    long QueueCount = TendisDbconn.Instance.Count("ConsumerOrders:Divi:" + MerchantId);
+                                    long QueueCount = RedisDbconn.Instance.Count("ConsumerOrders:Divi:" + MerchantId);
                                     long CurQueueCount = QueueCount;
                                     // int CheckNum = 0; //判断活动人数是否大于当前队列订单数来确认while循环的数量,如果是就少循环一次,判处自己的订单名额
                                     if (CurDiviPersons >= CurQueueCount)
@@ -137,7 +137,7 @@ namespace MySystem
                                     int OutCount = 0; // 出局人数
                                     while (CurDiviPersons > 0)
                                     {
-                                        ConsumerOrders suborder = TendisDbconn.Instance.RPop<ConsumerOrders>("ConsumerOrders:Divi:" + MerchantId);
+                                        ConsumerOrders suborder = RedisDbconn.Instance.RPop<ConsumerOrders>("ConsumerOrders:Divi:" + MerchantId);
                                         if (suborder != null)
                                         {
                                             MerchantParamSet subset = Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantParamSet>(order.SeoDescription);
@@ -172,7 +172,7 @@ namespace MySystem
                                                         GetMoney = GetMoney,
                                                     }).Entity;
                                                     db.SaveChanges();
-                                                    TendisDbconn.Instance.AddList("ConsumerOrdersStat", new RefundItem()
+                                                    RedisDbconn.Instance.AddList("ConsumerOrdersStat", new RefundItem()
                                                     {
                                                         ProfitId = cprofit.Id,
                                                         TradeNo = order.OrderNo,
@@ -183,7 +183,7 @@ namespace MySystem
                                                     });
                                                     if (suborder.CurDivi < suborder.MaxDivi)
                                                     {
-                                                        TendisDbconn.Instance.AddList("ConsumerOrders:Divi:" + MerchantId, suborder);
+                                                        RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + MerchantId, suborder);
                                                     }
                                                     else
                                                     {
@@ -198,7 +198,7 @@ namespace MySystem
                                             }
                                         }
                                         CurDiviPersons -= 1;
-                                        QueueCount = TendisDbconn.Instance.Count("ConsumerOrders:Divi:" + MerchantId);
+                                        QueueCount = RedisDbconn.Instance.Count("ConsumerOrders:Divi:" + MerchantId);
                                         if (QueueCount == 0)
                                         {
                                             CurDiviPersons = 0;
@@ -231,12 +231,12 @@ namespace MySystem
                             db.SaveChanges();
                             BothdisDbconn.Instance.SendMq("Pop:MerchantInfo:" + order.MerchantId, merchant);
 
-                            List<string> Dates = BothdisDbconn.Instance.GetList<string>("ConsumerStat:" + MerchantId + ":" + MonthString, 1, 1000);
+                            List<string> Dates = RedisDbconn.Instance.GetList<string>("ConsumerStat:" + MerchantId + ":" + MonthString, 1, 1000);
                             if (!Dates.Contains(DateString))
                             {
-                                BothdisDbconn.Instance.AddList("ConsumerStat:" + MerchantId + ":" + MonthString, DateString);
+                                RedisDbconn.Instance.AddList("ConsumerStat:" + MerchantId + ":" + MonthString, DateString);
                             }
-                            MerchantIndexStat DateIndexStat = BothdisDbconn.Instance.Get<MerchantIndexStat>("MerchantIndexStat:" + MerchantId + ":" + DateString) ?? new MerchantIndexStat();
+                            MerchantIndexStat DateIndexStat = RedisDbconn.Instance.Get<MerchantIndexStat>("MerchantIndexStat:" + MerchantId + ":" + DateString) ?? new MerchantIndexStat();
                             DateIndexStat.TotalOrder += 1;
                             DateIndexStat.TotalAmount += PayMoney;
                             DateIndexStat.TotalActual += TotalActual;
@@ -250,14 +250,14 @@ namespace MySystem
                                 DateIndexStat.WeChatTotalAmount += PayMoney;
                                 DateIndexStat.WeChatTotalActual += TotalActual;
                             }
-                            BothdisDbconn.Instance.Set("MerchantIndexStat:" + MerchantId + ":" + DateString, DateIndexStat);
+                            RedisDbconn.Instance.Set("MerchantIndexStat:" + MerchantId + ":" + DateString, DateIndexStat);
 
-                            List<string> Months = BothdisDbconn.Instance.GetList<string>("ConsumerStat:" + MerchantId, 1, 1000);
+                            List<string> Months = RedisDbconn.Instance.GetList<string>("ConsumerStat:" + MerchantId, 1, 1000);
                             if (!Months.Contains(MonthString))
                             {
-                                BothdisDbconn.Instance.AddList("ConsumerStat:" + MerchantId, MonthString);
+                                RedisDbconn.Instance.AddList("ConsumerStat:" + MerchantId, MonthString);
                             }
-                            MerchantIndexStat MonthIndexStat = BothdisDbconn.Instance.Get<MerchantIndexStat>("MerchantIndexStat:" + MerchantId + ":" + MonthString) ?? new MerchantIndexStat();
+                            MerchantIndexStat MonthIndexStat = RedisDbconn.Instance.Get<MerchantIndexStat>("MerchantIndexStat:" + MerchantId + ":" + MonthString) ?? new MerchantIndexStat();
                             MonthIndexStat.TotalOrder += 1;
                             MonthIndexStat.TotalAmount += PayMoney;
                             MonthIndexStat.TotalActual += TotalActual;
@@ -271,13 +271,13 @@ namespace MySystem
                                 MonthIndexStat.WeChatTotalAmount += PayMoney;
                                 MonthIndexStat.WeChatTotalActual += TotalActual;
                             }
-                            BothdisDbconn.Instance.Set("MerchantIndexStat:" + MerchantId + ":" + MonthString, MonthIndexStat);
+                            RedisDbconn.Instance.Set("MerchantIndexStat:" + MerchantId + ":" + MonthString, MonthIndexStat);
 
                             //统计创客数据
-                            BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + MonthString, PayMoney);
-                            BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + DateString, PayMoney);
-                            BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + PayMode + ":" + DateString, PayMoney);
-                            BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + PayMode + ":" + DateString, PayMoney);
+                            RedisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + MonthString, PayMoney);
+                            RedisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + DateString, PayMoney);
+                            RedisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + PayMode + ":" + DateString, PayMoney);
+                            RedisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + PayMode + ":" + DateString, PayMoney);
 
                         }
                     }
@@ -410,14 +410,14 @@ namespace MySystem
                         ErrorContent = ex.ToString(),
                         Obj = Newtonsoft.Json.JsonConvert.SerializeObject(trade_record),
                     };
-                    TendisDbconn.Instance.AddList("MainServerProfitError", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "MainServerProfitError");
                 }
             // }
         }
 
         public void DoActives(WebCMSEntities dbnew, TradeRecord trade_record)
         {
-            if (TendisDbconn.Instance.CheckKey("pobjact" + trade_record.Sort))
+            if (RedisDbconn.Instance.CheckKey("pobjact" + trade_record.Sort))
             {
                 List<ProfitObjectsActives> objactives = RedisDbconn.Instance.GetList<ProfitObjectsActives>("pobjact" + trade_record.Sort);
                 if (objactives.Count > 0)
@@ -685,7 +685,7 @@ namespace MySystem
             {
                 try
                 {
-                    string orderidstring = TendisDbconn.Instance.Get<string>("ConsumerOrders:Divi:List");
+                    string orderidstring = RedisDbconn.Instance.Get<string>("ConsumerOrders:Divi:List");
                     if (!string.IsNullOrEmpty(orderidstring))
                     {
                         int OrderId = int.Parse(function.CheckInt(orderidstring));
@@ -741,7 +741,7 @@ namespace MySystem
                         user = users[curFloor - 1];
                     }
                     int UserLevel = 1; //user.UserLevel; //当前会员等级
-                    decimal utrade = BothdisDbconn.Instance.Get<decimal>("TeamTradeStat:" + user.UserId + ":" + BrandId + ":" + DateTime.Now.ToString("yyMM"));
+                    decimal utrade = RedisDbconn.Instance.Get<decimal>("TeamTradeStat:" + user.UserId + ":" + BrandId + ":" + DateTime.Now.ToString("yyMM"));
                     UserLevelSet checklevel = levels.Where(m => m.UpLevelIntegral < utrade).OrderBy(m => m.Id).FirstOrDefault();
                     if (checklevel != null)
                     {
@@ -774,9 +774,9 @@ namespace MySystem
                                 bool bigMarket = false;
                                 decimal smallMarket = 0;
                                 List<Users> directs = dbnew.Users.Where(m => m.ParentUserId == user.UserId).ToList();
-                                decimal BigMarketTradeAmt = int.Parse(BothdisDbconn.Instance.Get<string>("pobjrule:" + BrandId + ":Dividends:BigMarketTradeAmt")); //大市场交易额
-                                decimal PassTradeAmt = int.Parse(BothdisDbconn.Instance.Get<string>("pobjrule:" + BrandId + ":Dividends:PassTradeAmt")); //小市场交易超越额
-                                decimal UnitPrize = int.Parse(BothdisDbconn.Instance.Get<string>("pobjrule:" + BrandId + ":Dividends:UnitPrize")); //单位奖励基数
+                                decimal BigMarketTradeAmt = int.Parse(RedisDbconn.Instance.Get<string>("pobjrule:" + BrandId + ":Dividends:BigMarketTradeAmt")); //大市场交易额
+                                decimal PassTradeAmt = int.Parse(RedisDbconn.Instance.Get<string>("pobjrule:" + BrandId + ":Dividends:PassTradeAmt")); //小市场交易超越额
+                                decimal UnitPrize = int.Parse(RedisDbconn.Instance.Get<string>("pobjrule:" + BrandId + ":Dividends:UnitPrize")); //单位奖励基数
                                 foreach (Users direct in directs)
                                 {
                                     UserData userData = dbnew.UserData.FirstOrDefault(m => m.UserId == direct.Id) ?? new UserData();

+ 13 - 13
AppStart/Helper/Profit/ProfitService.cs

@@ -30,11 +30,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("profitback_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "profitback_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("profitback_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "profitback_service");
                 }
             }
         }
@@ -125,21 +125,21 @@ namespace MySystem
                             }).Entity;
                             db.SaveChanges();
 
-                            BothdisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
+                            RedisDbconn.Instance.Set("UserAccount:" + account, sub.UserId);
 
                             //首页-快联盟产品-主界面产品数据
-                            UserMachineData MachineData = BothdisDbconn.Instance.Get<UserMachineData>("UserMachineData:" + sub.UserId + ":" + BrandId);
+                            UserMachineData MachineData = RedisDbconn.Instance.Get<UserMachineData>("UserMachineData:" + sub.UserId + ":" + BrandId);
                             if (MachineData != null)
                             {
                                 MachineData.TradeProfit = ProfitMoney;
-                                BothdisDbconn.Instance.Set("UserMachineData:" + sub.UserId + ":" + BrandId, MachineData);
-                                TendisDbconn.Instance.AddList("Pop:UserMachineData", MachineData); // TODO:同步mysql
+                                RedisDbconn.Instance.Set("UserMachineData:" + sub.UserId + ":" + BrandId, MachineData);
+                                RedisDbconn.Instance.AddList("Pop:UserMachineData", MachineData); // TODO:同步mysql
                             }
 
                             //我的-常用工具-收支明细
-                            BothdisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, accountRecord);
+                            RedisDbconn.Instance.AddList("UserAccountRecord:" + sub.UserId + ":1:" + TradeMonth, accountRecord);
 
-                            TendisDbconn.Instance.HAddNumber("TmpTradeProfit", sub.UserId + "_" + BrandId + "_" + StatDate.ToString("yyyy年MM月") + "分润_" + StatDate.ToString("yyyyMM"), ProfitMoney);
+                            RedisDbconn.Instance.HAddNumber("TmpTradeProfit", sub.UserId + "_" + BrandId + "_" + StatDate.ToString("yyyy年MM月") + "分润_" + StatDate.ToString("yyyyMM"), ProfitMoney);
                         }
                         else
                         {
@@ -149,12 +149,12 @@ namespace MySystem
                                 ErrorContent = "同步交易分润失败,数据不一致",
                                 Obj = Newtonsoft.Json.JsonConvert.SerializeObject(sub),
                             };
-                            TendisDbconn.Instance.AddList("ProfitServiceWarning", msg);
+                            RedisDbconn.Instance.AddList("ProfitServiceWarning", msg);
                         }
                     }
 
                     //首页-快联盟产品-收益查看-交易分润
-                    Dictionary<string, decimal> datalist = TendisDbconn.Instance.HGetAll<decimal>("TmpTradeProfit");
+                    Dictionary<string, decimal> datalist = RedisDbconn.Instance.HGetAll<decimal>("TmpTradeProfit");
                     foreach (string key in datalist.Keys)
                     {
                         string[] fields = key.Split('_');
@@ -162,7 +162,7 @@ namespace MySystem
                         string BrandId = fields[1];
                         string TradeM = fields[2];
                         string TradeMValue = fields[3];
-                        BothdisDbconn.Instance.AddList("TradeProfit:" + UserId + ":" + BrandId, new TradeProfitItem()
+                        RedisDbconn.Instance.AddList("TradeProfit:" + UserId + ":" + BrandId, new TradeProfitItem()
                         {
                             TradeProfit = datalist[key],
                             TradeMonth = TradeM,
@@ -170,7 +170,7 @@ namespace MySystem
                             CreateDate = DateTime.Now,
                         });
                     }
-                    TendisDbconn.Instance.Clear("TmpTradeProfit");
+                    RedisDbconn.Instance.Clear("TmpTradeProfit");
                     tran.Commit();
                 }
                 catch (Exception ex)
@@ -181,7 +181,7 @@ namespace MySystem
                         Time = DateTime.Now,
                         ErrorContent = ex.ToString(),
                     };
-                    TendisDbconn.Instance.AddList("ProfitServiceError", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "ProfitServiceError");
                 }
             }
             db.Dispose();

+ 8 - 8
AppStart/Helper/Profit/StandardService.cs

@@ -30,11 +30,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("standardback_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "standardback_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("standardback_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "standardback_service");
                 }
             }
         }
@@ -54,9 +54,9 @@ namespace MySystem
                     List<MerchantRebateDetail> list = db.MerchantRebateDetail.Where(m => m.TradeMonth == TradeMonth && m.SyncStatus == 0).ToList();
                     foreach (MerchantRebateDetail sub in list)
                     {
-                        MachineForSnNo machinefor = BothdisDbconn.Instance.Get<MachineForSnNo>("MachineForSnNo:" + sub.SnNo) ?? new MachineForSnNo();
-                        PosMachines machine = BothdisDbconn.Instance.Get<PosMachines>("PosMachines:" + machinefor.SnId) ?? new PosMachines();
-                        Users user = BothdisDbconn.Instance.Get<Users>("Users:" + machine.UserId) ?? new Users();
+                        MachineForSnNo machinefor = RedisDbconn.Instance.Get<MachineForSnNo>("MachineForSnNo:" + sub.SnNo) ?? new MachineForSnNo();
+                        PosMachines machine = RedisDbconn.Instance.Get<PosMachines>("PosMachines:" + machinefor.SnId) ?? new PosMachines();
+                        Users user = RedisDbconn.Instance.Get<Users>("Users:" + machine.UserId) ?? new Users();
                         int TopUserId = 0;
                         if (!string.IsNullOrEmpty(user.ParentNav))
                         {
@@ -106,10 +106,10 @@ namespace MySystem
                         }).Entity;
                         db.SaveChanges();
 
-                        BothdisDbconn.Instance.Set("UserAccount:" + account, user.Id);
+                        RedisDbconn.Instance.Set("UserAccount:" + account, user.Id);
 
                         //我的-常用工具-收支明细
-                        BothdisDbconn.Instance.AddList("UserAccountRecord:" + user.Id + ":1:" + TradeMonth, accountRecord);
+                        RedisDbconn.Instance.AddList("UserAccountRecord:" + user.Id + ":1:" + TradeMonth, accountRecord);
                     }
                     
                     tran.Commit();
@@ -122,7 +122,7 @@ namespace MySystem
                         Time = DateTime.Now,
                         ErrorContent = ex.ToString(),
                     };
-                    TendisDbconn.Instance.AddList("StandardServiceError", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "StandardServiceError");
                 }
             }
             db.Dispose();

+ 4 - 4
AppStart/Helper/Profit/TeamTopService.cs

@@ -18,18 +18,18 @@ public class TeamTopService : BackgroundService
 
                 //首页-特训营-排行榜-个人
                 var personTops = db.TeamPersonDayTop.Select(m => new { m.Id, m.ActMerNum }).OrderByDescending(m => m.ActMerNum).ToList();
-                BothdisDbconn.Instance.Clear("TeamPersonDayTop");
+                RedisDbconn.Instance.Clear("TeamPersonDayTop");
                 foreach (var sub in personTops)
                 {
-                    BothdisDbconn.Instance.AddList("TeamPersonDayTop", sub.Id);
+                    RedisDbconn.Instance.AddList("TeamPersonDayTop", sub.Id);
                 }
 
                 //首页-特训营-排行榜-团队
                 var teamTops = db.TeamDayTop.Select(m => new { m.Id, m.ActMerNum }).OrderByDescending(m => m.ActMerNum).ToList();
-                BothdisDbconn.Instance.Clear("TeamDayTop");
+                RedisDbconn.Instance.Clear("TeamDayTop");
                 foreach (var sub in teamTops)
                 {
-                    BothdisDbconn.Instance.AddList("TeamDayTop", sub.Id);
+                    RedisDbconn.Instance.AddList("TeamDayTop", sub.Id);
                 }
 
                 db.Dispose();

+ 2 - 2
AppStart/Helper/ReceiveProfitService.cs

@@ -35,11 +35,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }

+ 2 - 2
AppStart/Helper/ReceiveTaskService.cs

@@ -35,11 +35,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }

+ 2 - 2
AppStart/Helper/StatDataService.cs

@@ -169,8 +169,8 @@ namespace MySystem
         {
             string DateString = order.UpdateDate.Value.ToString("yyyyMMdd");
             string MonthString = order.UpdateDate.Value.ToString("yyyyMM");
-            BothdisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + DateString, order.PayMoney);
-            BothdisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + MonthString, order.PayMoney);
+            RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + DateString, order.PayMoney);
+            RedisDbconn.Instance.AddNumber("TradeStat:" + UserId + ":" + MonthString, order.PayMoney);
         }
     }
 }

+ 3 - 3
AppStart/Helper/SycnActiveRewardService.cs

@@ -26,7 +26,7 @@ namespace MySystem
                     bool op = true;
                     while (op)
                     {
-                        string data = TendisDbconn.Instance.RPop<string>(TableName);
+                        string data = RedisDbconn.Instance.RPop<string>(TableName);
                         if(!string.IsNullOrEmpty(data))
                         {
                             Dictionary<string, string> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
@@ -49,11 +49,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }

+ 3 - 3
AppStart/Helper/SycnMerchantInfoService.cs

@@ -26,7 +26,7 @@ namespace MySystem
                     bool op = true;
                     while (op)
                     {
-                        string data = TendisDbconn.Instance.RPop<string>(TableName);
+                        string data = RedisDbconn.Instance.RPop<string>(TableName);
                         if(!string.IsNullOrEmpty(data))
                         {
                             Dictionary<string, string> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
@@ -56,11 +56,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }

+ 4 - 3
AppStart/Helper/SycnMysql/ConsumerOpenIdsHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<ConsumerOpenIds>("Pop:ConsumerOpenIds");
+                    PopData = RedisDbconn.Instance.RPop<ConsumerOpenIds>("Pop:ConsumerOpenIds");
                     if (PopData != null)
                     {
                         ConsumerOpenIds checkExist = db.ConsumerOpenIds.FirstOrDefault(m => m.OpenId == PopData.OpenId);
@@ -57,7 +58,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:ConsumerOpenIds:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:ConsumerOpenIds:Error");
                     result = "有异常,请查看Pop:ConsumerOpenIds:Error队列";
                 }
             }

+ 6 - 5
AppStart/Helper/SycnMysql/ConsumerOrdersHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<ConsumerOrders>("Pop:ConsumerOrders");
+                    PopData = RedisDbconn.Instance.RPop<ConsumerOrders>("Pop:ConsumerOrders");
                     if (PopData != null)
                     {
                         ConsumerOrders checkExist = db.ConsumerOrders.FirstOrDefault(m => m.Id == PopData.Id);
@@ -35,8 +36,8 @@ namespace MySystem
                         {
                             ConsumerOrders item = db.ConsumerOrders.Add(PopData).Entity;
                             db.SaveChanges();
-                            TendisDbconn.Instance.AddList("ConsumerOrders:Divi:" + PopData.MerchantId, item);
-                            TendisDbconn.Instance.AddList("ConsumerOrders:Divi:List", item.Id.ToString());
+                            RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + PopData.MerchantId, item);
+                            RedisDbconn.Instance.AddList("ConsumerOrders:Divi:List", item.Id.ToString());
                         }
                         // if (total >= 20)
                         // {
@@ -55,7 +56,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:ConsumerOrders:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:ConsumerOrders:Error");
                     result = "有异常,请查看Pop:ConsumerOrders:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/ConsumersHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<Consumers>("Pop:Consumers");
+                    PopData = RedisDbconn.Instance.RPop<Consumers>("Pop:Consumers");
                     if (PopData != null)
                     {
                         Consumers checkExist = db.Consumers.FirstOrDefault(m => m.Id == PopData.Id);
@@ -57,7 +58,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:Consumers:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:Consumers:Error");
                     result = "有异常,请查看Pop:Consumers:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/MachineApplyHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<MachineApply>("Pop:MachineApply");
+                    PopData = RedisDbconn.Instance.RPop<MachineApply>("Pop:MachineApply");
                     if (PopData != null)
                     {
                         MachineApply checkExist = db.MachineApply.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:MachineApply:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:MachineApply:Error");
                     result = "有异常,请查看Pop:MachineApply:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/MerchantParamSetHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<MerchantParamSet>("Pop:MerchantParamSet");
+                    PopData = RedisDbconn.Instance.RPop<MerchantParamSet>("Pop:MerchantParamSet");
                     if (PopData != null)
                     {
                         MerchantParamSet checkExist = db.MerchantParamSet.FirstOrDefault(m => m.Id == PopData.Id);
@@ -57,7 +58,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:MerchantParamSet:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:MerchantParamSet:Error");
                     result = "有异常,请查看Pop:MerchantParamSet:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/OrderProductHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<OrderProduct>("Pop:OrderProduct");
+                    PopData = RedisDbconn.Instance.RPop<OrderProduct>("Pop:OrderProduct");
                     if (PopData != null)
                     {
                         OrderProduct checkExist = db.OrderProduct.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:OrderProduct:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:OrderProduct:Error");
                     result = "有异常,请查看Pop:OrderProduct:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/OrdersHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<Orders>("Pop:Orders");
+                    PopData = RedisDbconn.Instance.RPop<Orders>("Pop:Orders");
                     if (PopData != null)
                     {
                         Orders checkExist = db.Orders.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:Orders:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:Orders:Error");
                     result = "有异常,请查看Pop:Orders:Error队列";
                 }
             }

+ 1 - 1
AppStart/Helper/SycnMysql/PopService.cs

@@ -19,7 +19,7 @@ public class PopService : BackgroundService
 
     private void Start()
     {
-        string data = TendisDbconn.Instance.RPop<string>("MainPopWaitList");
+        string data = RedisDbconn.Instance.RPop<string>("MainPopWaitList");
         if (!string.IsNullOrEmpty(data))
         {
             JobMqMsg job = Newtonsoft.Json.JsonConvert.DeserializeObject<JobMqMsg>(data);

+ 4 - 3
AppStart/Helper/SycnMysql/PosMachinesHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<PosMachines>("Pop:PosMachines");
+                    PopData = RedisDbconn.Instance.RPop<PosMachines>("Pop:PosMachines");
                     if (PopData != null)
                     {
                         PosMachines checkExist = db.PosMachines.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:PosMachines:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:PosMachines:Error");
                     result = "有异常,请查看Pop:PosMachines:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/ProductsHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<Products>("Pop:Products");
+                    PopData = RedisDbconn.Instance.RPop<Products>("Pop:Products");
                     if (PopData != null)
                     {
                         Products checkExist = db.Products.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:Products:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:Products:Error");
                     result = "有异常,请查看Pop:Products:Error队列";
                 }
             }

+ 3 - 3
AppStart/Helper/SycnMysql/PublicTableHelper.cs

@@ -16,7 +16,7 @@ namespace MySystem
             bool op = true;
             OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
             string result = "success";
-            int startId = 0; //TendisDbconn.Instance.Get<int>("Start" + table + "Id");
+            int startId = 0; //RedisDbconn.Instance.Get<int>("Start" + table + "Id");
             // int total = 0;
             while (op)
             {
@@ -97,7 +97,7 @@ namespace MySystem
                     else
                     {
                         op = false;
-                        TendisDbconn.Instance.Set("Start" + table + "Id", startId);
+                        RedisDbconn.Instance.Set("Start" + table + "Id", startId);
                     }
                 }
                 catch (Exception ex)
@@ -105,7 +105,7 @@ namespace MySystem
                     ErrorMsg msg = new ErrorMsg();
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList(table + ":Error", msg);
+                    RedisDbconn.Instance.AddList(table + ":Error", msg);
                 }
             }
             OtherMySqlConn.connstr = "";

+ 4 - 3
AppStart/Helper/SycnMysql/StoreChangeHistoryHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<StoreChangeHistory>("Pop:StoreChangeHistory");
+                    PopData = RedisDbconn.Instance.RPop<StoreChangeHistory>("Pop:StoreChangeHistory");
                     if (PopData != null)
                     {
                         // StoreChangeHistory checkExist = db.StoreChangeHistory.FirstOrDefault(m => m.Id == PopData.Id);
@@ -52,7 +53,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:StoreChangeHistory:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:StoreChangeHistory:Error");
                     result = "有异常,请查看Pop:StoreChangeHistory:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/StoreStockChangeHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<StoreStockChange>("Pop:StoreStockChange");
+                    PopData = RedisDbconn.Instance.RPop<StoreStockChange>("Pop:StoreStockChange");
                     if (PopData != null)
                     {
                         // StoreStockChange checkExist = db.StoreStockChange.FirstOrDefault(m => m.Id == PopData.Id);
@@ -56,7 +57,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:StoreStockChange:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:StoreStockChange:Error");
                     result = "有异常,请查看Pop:StoreStockChange:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/TeamApplyHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<TeamApply>("Pop:TeamApply");
+                    PopData = RedisDbconn.Instance.RPop<TeamApply>("Pop:TeamApply");
                     if (PopData != null)
                     {
                         TeamApply checkExist = db.TeamApply.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:TeamApply:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:TeamApply:Error");
                     result = "有异常,请查看Pop:TeamApply:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/TeamOfferApplyHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<TeamOfferApply>("Pop:TeamOfferApply");
+                    PopData = RedisDbconn.Instance.RPop<TeamOfferApply>("Pop:TeamOfferApply");
                     if (PopData != null)
                     {
                         TeamOfferApply checkExist = db.TeamOfferApply.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:TeamOfferApply:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:TeamOfferApply:Error");
                     result = "有异常,请查看Pop:TeamOfferApply:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/UserAddressHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<UserAddress>("Pop:UserAddress");
+                    PopData = RedisDbconn.Instance.RPop<UserAddress>("Pop:UserAddress");
                     if (PopData != null)
                     {
                         UserAddress checkExist = db.UserAddress.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:UserAddress:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:UserAddress:Error");
                     result = "有异常,请查看Pop:UserAddress:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/UserBackHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<UserBack>("Pop:UserBack");
+                    PopData = RedisDbconn.Instance.RPop<UserBack>("Pop:UserBack");
                     if (PopData != null)
                     {
                         // UserBack checkExist = db.UserBack.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:UserBack:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:UserBack:Error");
                     result = "有异常,请查看Pop:UserBack:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/UserCashRecordHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<UserCashRecord>("Pop:UserCashRecord");
+                    PopData = RedisDbconn.Instance.RPop<UserCashRecord>("Pop:UserCashRecord");
                     if (PopData != null)
                     {
                         // UserCashRecord checkExist = db.UserCashRecord.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:UserCashRecord:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:UserCashRecord:Error");
                     result = "有异常,请查看Pop:UserCashRecord:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/UserLoginRecordHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<UserLoginRecord>("Pop:UserLoginRecord");
+                    PopData = RedisDbconn.Instance.RPop<UserLoginRecord>("Pop:UserLoginRecord");
                     if (PopData != null)
                     {
                         // UserLoginRecord checkExist = db.UserLoginRecord.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:UserLoginRecord:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:UserLoginRecord:Error");
                     result = "有异常,请查看Pop:UserLoginRecord:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/UserMachineDataHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<UserMachineData>("Pop:UserMachineData");
+                    PopData = RedisDbconn.Instance.RPop<UserMachineData>("Pop:UserMachineData");
                     if (PopData != null)
                     {
                         UserMachineData checkExist = db.UserMachineData.FirstOrDefault(m => m.IdBrand == PopData.IdBrand);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:UserMachineData:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:UserMachineData:Error");
                     result = "有异常,请查看Pop:UserMachineData:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/UserStoreChangeHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<UserStoreChange>("Pop:UserStoreChange");
+                    PopData = RedisDbconn.Instance.RPop<UserStoreChange>("Pop:UserStoreChange");
                     if (PopData != null)
                     {
                         // UserStoreChange checkExist = db.UserStoreChange.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:UserStoreChange:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:UserStoreChange:Error");
                     result = "有异常,请查看Pop:UserStoreChange:Error队列";
                 }
             }

+ 4 - 3
AppStart/Helper/SycnMysql/UsersHelper.cs

@@ -1,4 +1,5 @@
-using MySystem.Models;
+using Library;
+using MySystem.Models;
 using System;
 using System.Linq;
 
@@ -22,7 +23,7 @@ namespace MySystem
                 try
                 {
                     //获取apserver待同步的数据,执行入库
-                    PopData = TendisDbconn.Instance.RPop<Users>("Pop:Users");
+                    PopData = RedisDbconn.Instance.RPop<Users>("Pop:Users");
                     if (PopData != null)
                     {
                         Users checkExist = db.Users.FirstOrDefault(m => m.Id == PopData.Id);
@@ -53,7 +54,7 @@ namespace MySystem
                     msg.Obj = PopData;
                     msg.Time = DateTime.Now;
                     msg.ErrorContent = ex.ToString();
-                    TendisDbconn.Instance.AddList("Pop:Users:Error", msg);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(msg), "Pop:Users:Error");
                     result = "有异常,请查看Pop:Users:Error队列";
                 }
             }

+ 3 - 3
AppStart/Helper/SycnTradeRecordService.cs

@@ -26,7 +26,7 @@ namespace MySystem
                     bool op = true;
                     while (op)
                     {
-                        string data = TendisDbconn.Instance.RPop<string>(TableName);
+                        string data = RedisDbconn.Instance.RPop<string>(TableName);
                         if(!string.IsNullOrEmpty(data))
                         {
                             Dictionary<string, string> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(data);
@@ -49,11 +49,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }

+ 6 - 6
AppStart/Helper/WeChatPayBackService.cs

@@ -35,11 +35,11 @@ namespace MySystem
                     Dictionary<string, string> data = new Dictionary<string, string>();
                     data.Add("ErrTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     data.Add("ErrMsg", ex.ToString());
-                    TendisDbconn.Instance.AddList("public_err", data);
+                    function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(data), "public_err");
                 }
                 else
                 {
-                    TendisDbconn.Instance.AddList("public_service", DateTime.Now.ToString() + ":" + ex.ToString());
+                    function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "public_service");
                 }
             }
         }
@@ -49,7 +49,7 @@ namespace MySystem
             bool op = true;
             while (op)
             {
-                string content = TendisDbconn.Instance.RPop<string>("WeChatPayBack");
+                string content = RedisDbconn.Instance.RPop<string>("WeChatPayBack");
                 if (!string.IsNullOrEmpty(content))
                 {
                     JsonData jsonObj = JsonMapper.ToObject(content);
@@ -76,9 +76,9 @@ namespace MySystem
                                     order.MaxDivi = order.MaxDivi * 10000M;
                                     db.SaveChanges();
                                     BothdisDbconn.Instance.SendMq("Pop:ConsumerOrders", order);
-                                    TendisDbconn.Instance.AddList("ConsumerOrdersStat", order.Id);
-                                    TendisDbconn.Instance.AddList("ConsumerOrders:Divi:List", order.Id.ToString());
-                                    TendisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.MerchantId, order);
+                                    RedisDbconn.Instance.AddList("ConsumerOrdersStat", order.Id);
+                                    RedisDbconn.Instance.AddList("ConsumerOrders:Divi:List", order.Id.ToString());
+                                    RedisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.MerchantId, order);
                                     // ConsumerOrdersStatService.Instance.Stat(order);
                                 }
                             }

+ 63 - 0
AppStart/RabbitMQClient.cs

@@ -4,6 +4,7 @@ using System.Text;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using Library;
+using System.Threading;
 
 namespace MySystem
 {
@@ -21,6 +22,7 @@ namespace MySystem
         #region 单对单发送
         public void SendMsg(string content, string QueueName = "")
         {
+            // RedisDbconn.Instance.AddList("MainServerMq", QueueName + "#cut#" + content);
             //创建连接对象工厂
             var factory = new ConnectionFactory()
             {
@@ -45,6 +47,67 @@ namespace MySystem
         }
         #endregion
 
+        #region 单对单发送
+        public void ListenSendMsg()
+        {
+            Thread th = new Thread(ListenSendMsgDo);
+            th.IsBackground = true;
+            th.Start();
+        }
+        Dictionary<string, IModel> channels = new Dictionary<string, IModel>();
+        public void ListenSendMsgDo()
+        {
+            while (true)
+            {
+                //创建连接对象工厂
+                var factory = new ConnectionFactory()
+                {
+                    UserName = UserName,
+                    Password = Password,
+                    AutomaticRecoveryEnabled = true,  //如果connection挂掉是否重新连接
+                    TopologyRecoveryEnabled = true  //连接恢复后,连接的交换机,队列等是否一同恢复
+                };
+                List<AmqpTcpEndpoint> p = new List<AmqpTcpEndpoint>();
+                string[] HostNames = HostName.Split(',');
+                foreach (string subHostName in HostNames)
+                {
+                    string[] subHostNameData = subHostName.Split(':');
+                    p.Add(new AmqpTcpEndpoint(subHostNameData[0], int.Parse(subHostNameData[1])));
+                }
+                var conn = factory.CreateConnection(p);
+                bool op = true;
+                while (op)
+                {
+                    string data = RedisDbconn.Instance.RPop<string>("MainServerMq");
+                    if (!string.IsNullOrEmpty(data))
+                    {
+                        try
+                        {
+                            string[] dataList = data.Split("#cut#");
+                            string QueueName = dataList[0];
+                            if (!channels.ContainsKey(QueueName))
+                            { 
+                                var channelCreate = conn.CreateModel();
+                                channels.Add(QueueName, channelCreate);
+                            }
+                            var channel = channels[QueueName];
+                            channel.QueueDeclare(QueueName, true, false, false);
+                            channel.BasicPublish("", QueueName, null, Encoding.Default.GetBytes(dataList[1]));
+                        }
+                        catch (Exception ex)
+                        {
+                            op = false;
+                            function.WriteLog(DateTime.Now.ToString() + "\r\n" + ex.ToString(), "MQ消息队列单对单发送监听异常");
+                        }
+                    }
+                }
+                // channel.Dispose();
+                conn.Dispose();
+                function.WriteLog(DateTime.Now.ToString(), "MQ测试");
+            }
+        }
+        #endregion
+
         #region 单对单接收
         public void StartReceive(string QueueName)
         {

+ 18 - 0
AppStart/RedisDbconn.cs

@@ -87,6 +87,11 @@ namespace MySystem
             return csredis.LPush(key, value);
             // return 0;
         }
+        public long AddRightList(string key, object value)
+        {
+            return csredis.RPush(key, value);
+            // return 0;
+        }
         public long AddList(string key, object[] value)
         {
             return csredis.LPush(key, value);
@@ -213,5 +218,18 @@ namespace MySystem
         { 
             csredis.Expire(key, expire); //秒为单位
         }
+
+        #region 判断Key是否存在
+
+        public bool CheckKey(string key)
+        {
+            if (csredis.Exists(key))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        #endregion
     }
 }

+ 2 - 2
AppStart/WeChatFunction.cs

@@ -377,7 +377,7 @@ namespace MySystem
                 return "";
             }
             string key = "wechatpic:" + function.MD5_16(imgPath);
-            string media_id = BothdisDbconn.Instance.Get<string>(key);
+            string media_id = RedisDbconn.Instance.Get<string>(key);
             if (!string.IsNullOrEmpty(media_id))
             {
                 return media_id;
@@ -399,7 +399,7 @@ namespace MySystem
             var sha256 = builder.ToString();
             string metaStr = "{\"filename\":\""+ filename + "\",\"sha256\":\"" + sha256 + "\"}";
             media_id = UploadImgApi(metaStr, imgBytesIn, filename);
-            BothdisDbconn.Instance.Set(key, media_id);
+            RedisDbconn.Instance.Set(key, media_id);
             return media_id;
         }
 

+ 6 - 6
Controllers/HomeController.cs

@@ -64,8 +64,8 @@ namespace MySystem.Controllers
                 PxcModels.ConsumerOrders order = db.ConsumerOrders.FirstOrDefault(m => m.Id == i);
                 if (order != null)
                 {
-                    TendisDbconn.Instance.AddList("ConsumerOrders:Divi:List", order.Id.ToString());
-                    TendisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.MerchantId, order);
+                    RedisDbconn.Instance.AddList("ConsumerOrders:Divi:List", order.Id.ToString());
+                    RedisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.MerchantId, order);
                     ProfitHelper.Instance.StartListenTradeDo();
                 }
             }
@@ -78,17 +78,17 @@ namespace MySystem.Controllers
             // PxcModels.ConsumerOrders order = db.ConsumerOrders.FirstOrDefault(m => m.Id == 613);
             // if (order != null)
             // {
-            //     TendisDbconn.Instance.AddList("ConsumerOrders:Divi:" + order.MerchantId, order);
+            //     RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + order.MerchantId, order);
             // }
             // ProfitHelper.Instance.ReturnStat("613");
             db.Dispose();
             return "ok";
         }
 
-        public string setqrcode()
+        public string setqrcode(int uid)
         {
             WebCMSEntities db = new WebCMSEntities();
-            List<Users> users = db.Users.ToList();
+            List<Users> users = db.Users.Where(m => m.Id == uid).ToList();
             foreach (Users user in users)
             {
                 string path = function.CreateQRCode2(ConfigurationManager.AppSettings["SourceHost"].ToString() + "p/user-inviteregist-1?Id=" + user.Id, function.MD5_16(user.Id.ToString() + "8745"), "/bsserver_com/static/ReferenceQrCode/");
@@ -98,7 +98,7 @@ namespace MySystem.Controllers
                 resultpath = resultpath.Replace("bsserver_com/", "");
                 user.ReferenceQrCode = resultpath;
                 db.SaveChanges();
-                BothdisDbconn.Instance.Set("Users:" + user.Id, user);
+                RedisDbconn.Instance.Set("Users:" + user.Id, user);
             }
             return "ok";
         }

+ 1 - 1
Program.cs

@@ -22,7 +22,7 @@ namespace MySystem
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder
-                    .UseUrls("http://*:5047")
+                    .UseUrls("http://*:5046")
                     .UseKestrel()
                     .UseContentRoot(Directory.GetCurrentDirectory())
                     .UseIISIntegration()

+ 1 - 1
Properties/launchSettings.json

@@ -21,7 +21,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://127.0.0.1:5047"
+      "applicationUrl": "http://127.0.0.1:5046"
     }
   }
 }

+ 1 - 0
Startup.cs

@@ -212,6 +212,7 @@ namespace MySystem
             // app.UseMiddleware<GraphQLMiddleware>();
 
             //当前必须打开的
+            // RabbitMQClient.Instance.ListenSendMsg();
             RabbitMQClient.Instance.StartReceive("MerchantConfirmList");
             RabbitMQClient.Instance.StartReceive("MakeReferenceQrCode");
             RabbitMQClient.Instance.StartReceive("CheckWeChatSign");

BIN
bin/Debug/netcoreapp3.0/MySystem.dll


BIN
bin/Debug/netcoreapp3.0/MySystem.pdb


+ 1 - 1
bin/Debug/netcoreapp3.0/stat/StoreIdFlag.txt

@@ -1 +1 @@
-1153
+1529

BIN
bin/release/netcoreapp3.0/MySystem.dll


BIN
bin/release/netcoreapp3.0/MySystem.pdb


+ 1 - 1
bin/release/netcoreapp3.0/Properties/launchSettings.json

@@ -21,7 +21,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://127.0.0.1:5047"
+      "applicationUrl": "http://127.0.0.1:5046"
     }
   }
 }

BIN
obj/Debug/netcoreapp3.0/MySystem.dll


BIN
obj/Debug/netcoreapp3.0/MySystem.pdb


BIN
obj/release/netcoreapp3.0/MySystem.dll


BIN
obj/release/netcoreapp3.0/MySystem.pdb


BIN
publish/MySystem.dll


BIN
publish/MySystem.pdb