3 Commits 1489831572 ... 7fad2be0c3

Author SHA1 Message Date
  Lgx 7fad2be0c3 Merge branch 'master' of http://192.168.20.122:3000/root/MemberCenter.git 4 years ago
  Lgx 1b4c3ee357 更改redis端口 4 years ago
  Lgx 53d0ff8984 更改es/redis的ip端口 4 years ago

File diff suppressed because it is too large
+ 895 - 0
Member/MemberUI/src/pages/tag/addTag_setting copy.js


File diff suppressed because it is too large
+ 61 - 46
Member/MemberUI/src/pages/tag/addTag_setting.js


+ 1 - 1
Member/MemberWeb/Commonss/RedisUtil.cs

@@ -14,7 +14,7 @@ namespace MemberWeb.Commonss
 {
     public static class RedisUtil
     {
-        public static string connectionredis = "192.168.50.34:6379,poolsize=3,tryit=0,password=360lj.com!";
+        public static string connectionredis = "192.168.50.41:6379,poolsize=3,tryit=0,password=360lj.com!";
         //public static string connectionredis = "127.0.0.1:6379,poolsize=3,tryit=0";
         public static int timeCont = 86400;//数据过期时间
         public static DateTime dateTime = DateTime.Parse(DateTime.Now.ToString());

+ 1 - 1
Member/MemberWeb/Controllers/ES_DataStaisController.cs

@@ -45,7 +45,7 @@ namespace SupplierWeb.Controllers
             string redisKey = "1_redis_stais";//缓存Key
             Object query = null;
             DateTime dateTime = DateTime.Parse(DateTime.Now.ToString());
-            string orderStr = "{\"ym"+ dateTime.AddDays(-30).ToString("yyyyMM") + ".RM\":{\"order\":\"desc\"}}";
+            string orderStr = "{\"ym"+ dateTime.AddDays(-60).ToString("yyyyMM") + ".RM\":{\"order\":\"desc\"}}";
                 if (data != null)
                 {
                     filters = data.filters.ToObject<QueryFilter[]>();