修改测试接口

AnsjerPush/us_config/formal_config.py

@@ -21,6 +21,10 @@ PUSH_BUCKET = 'foreignpush'                                # 推送存储桶
 
 # redis节点
 REDIS_ADDRESS = '10.60.1.113'
+REDIS_PASSWORD = '012bzaKUhleHc2645465'
+STARTUP_NODES = [
+    {'host': '10.60.1.113', 'port': 6379},
+]
 
 APNS_MODE = 'prod'
 

Controller/InitController.py

@@ -54,20 +54,21 @@ class InitView(View):
             key = request_dict.get('key', None)
             value = request_dict.get('value', None)
 
-            import rediscluster
-            from rediscluster import ClusterConnectionPool
-            password = '012bzaKUhleHc2645465'
-            startup_nodes = [
-                {"host": "10.60.1.113", "port": 6379},
-            ]
-            pool = ClusterConnectionPool(startup_nodes=startup_nodes, password=password)
-            r = rediscluster.RedisCluster(connection_pool=pool)
-            r.ping()
-            r.set(name=key, value=value, ex=60)
-            redis_value = r.get(name=key)
-            # redis_obj = RedisObject()
-            # redis_obj.set_data(key, value, 60)
-            # redis_value = redis_obj.get_data(key)
+            # import rediscluster
+            # from rediscluster import ClusterConnectionPool
+            # password = '012bzaKUhleHc2645465'
+            # startup_nodes = [
+            #     {"host": "10.60.1.113", "port": 6379},
+            # ]
+            # pool = ClusterConnectionPool(startup_nodes=startup_nodes, password=password)
+            # r = rediscluster.RedisCluster(connection_pool=pool)
+            # r.ping()
+            # r.set(name=key, value=value, ex=60)
+            # redis_value = r.get(name=key)
+
+            redis_obj = RedisObject()
+            redis_obj.set_data(key, value, 60)
+            redis_value = redis_obj.get_data(key)
             res = {
                 'redis_value': redis_value
             }

Object/RedisObject.py

@@ -1,4 +1,6 @@
 import redis
+import rediscluster
+from rediscluster import ClusterConnectionPool
 from AnsjerPush.config import REDIS_ADDRESS, CONFIG_INFO, CONFIG_US
 
 # 本地调试把注释打开
@@ -9,9 +11,9 @@ class RedisObject:
 
     def __init__(self, db=0):
         if CONFIG_INFO == CONFIG_US:
-            password = '012bzaKUhleHc2645465'
-            pool = redis.ConnectionPool()
-            self.CONN = redis.Redis(host=REDIS_ADDRESS, password=password, port=6379, db=db, connection_pool=pool)
+            from AnsjerPush.config import STARTUP_NODES, REDIS_PASSWORD
+            pool = ClusterConnectionPool(startup_nodes=STARTUP_NODES, password=REDIS_PASSWORD)
+            self.CONN = rediscluster.RedisCluster(connection_pool=pool)
         else:
             pool = redis.ConnectionPool(host=REDIS_ADDRESS, port=6379, db=db)
             self.CONN = redis.Redis(connection_pool=pool)