结构调整

letpep · Aug 8, 2018 · a715c47 · a715c47
1 parent 8d04789
commit a715c47
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 301 deletions.
diff --git a/nginx.conf b/nginx.conf
@@ -67,32 +67,6 @@ http {
         server_name   127.0.0.1  localhost;
 
 
-
-        location /redis_zrangebyscore{
-            default_type 'text/html';
-            lua_need_request_body on;
-            content_by_lua_file fengtrust/ft_redis/rdszrangebyscore.lua;
-        }
-        location /redis_zremrangebyscore{
-            default_type 'text/html';
-            lua_need_request_body on;
-            content_by_lua_file fengtrust/ft_redis/rdszremrangebyscore.lua;
-        }
-        location /redis_zrevrange{
-            default_type 'text/html';
-            lua_need_request_body on;
-            content_by_lua_file fengtrust/ft_redis/rdszrevrange.lua;
-        }
-        location /redis_zadd{
-            default_type 'text/html';
-            lua_need_request_body on;
-            content_by_lua_file fengtrust/ft_redis/rdszadd.lua;
-        }
-        location /redis_zcount{
-            default_type 'text/html';
-            lua_need_request_body on;
-            content_by_lua_file fengtrust/ft_redis/rdszcount.lua;
-        }
         location /getlog {
             default_type 'text/html';
             lua_need_request_body on;

diff --git a/redis/rdsexists.lua b/redis/rdsexists.lua
diff --git a/redis/rdszadd.lua b/redis/rdszadd.lua
diff --git a/redis/rdszcount.lua b/redis/rdszcount.lua
diff --git a/redis/rdszrangebyscore.lua b/redis/rdszrangebyscore.lua
diff --git a/redis/rdszremrangebyscore.lua b/redis/rdszremrangebyscore.lua
diff --git a/redis/rdszrevrange.lua b/redis/rdszrevrange.lua
diff --git a/util/redisOP.lua b/util/redisOP.lua
@@ -12,7 +12,7 @@ local _M = {
 }
 
 
-function _M.addlog2redis(key,score,value)
+function _M.zadd(key,score,value)
     local red = redis.new()
     local res, err = red:exec(
         function(red)
@@ -50,5 +50,32 @@ function _M.rdsexpir(key,time)
     )
     return err
 end
+function _M.zcount(key,start,endt)
+    local red = redis.new()
+    local res, err = red:exec(
+        function(red)
+            return red:zcount(key,start,endt)
+        end
+    )
+    if(err)then
+        return err
+    else
+        --        ngx.log(ngx.ERR,json.encode(res))
+        return(cjson.encode(res))
+    end
+end
+function _M.zrevrange(key,start,endt)
+    local red = redis.new()
+    local res, err = red:exec(
+        function(red)
+            return red:zrevrange(key,start,endt)
+        end
+    )
+    if(err)then
+        return err
+    else
+        return(cjson.encode(res))
+    end
+end
 
 return _M