Procházet zdrojové kódy

1.
reids server fix
2.add redquirements.txt content
3.fix config

chenjunkai před 5 roky
rodič
revize
71058d48c1

+ 0 - 1
AnsjerPush/config.py

@@ -62,7 +62,6 @@ NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
 SERVER_DOMAIN = 'http://www.dvema.com/'
 SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
 DOMAIN_HOST = 'www.dvema.com'
-SERVER_HOST = '192.168.136.45'
 # SERVER_HOST = 'localhost'
 PAYPAL_CRD = {
     "mode": "live",  # sandbox or live

+ 4 - 3
AnsjerPush/formal_config.py

@@ -62,8 +62,8 @@ NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
 SERVER_DOMAIN = 'http://www.dvema.com/'
 SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
 DOMAIN_HOST = 'www.dvema.com'
-SERVER_HOST = '192.168.136.45'
-# SERVER_HOST = 'localhost'
+SERVER_HOST = 'localhost'
+
 PAYPAL_CRD = {
     "mode": "live",  # sandbox or live
     "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
@@ -143,4 +143,5 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/accloud-dev.pem',
     }
 }
-APNS_MODE = 'prod'
+APNS_MODE = 'prod'
+REDIS_ADDRESS = 'localhost'

+ 2 - 1
AnsjerPush/local_config.py

@@ -143,4 +143,5 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/accloud-dev.pem',
     }
 }
-APNS_MODE = 'dev'
+APNS_MODE = 'dev'
+REDIS_ADDRESS = '192.168.136.45'

+ 3 - 3
AnsjerPush/test_config.py

@@ -61,8 +61,7 @@ NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
 SERVER_DOMAIN = 'http://www.dvema.com/'
 SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
 DOMAIN_HOST = 'www.dvema.com'
-SERVER_HOST = '192.168.136.45'
-# SERVER_HOST = 'localhost'
+SERVER_HOST = 'localhost'
 PAYPAL_CRD = {
     "mode": "live",  # sandbox or live
     "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
@@ -142,4 +141,5 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/accloud-dev.pem',
     }
 }
-APNS_MODE = 'dev'
+APNS_MODE = 'dev'
+REDIS_ADDRESS = 'localhost'

+ 2 - 2
Object/RedisObject.py

@@ -13,7 +13,7 @@
 """
 import redis
 
-from AnsjerPush.config import SERVER_HOST
+from AnsjerPush.config import REDIS_ADDRESS
 
 # SERVER_HOST = '192.168.136.45'
 
@@ -25,7 +25,7 @@ db=3  -> 统计在线人数用
 class RedisObject:
 
     def __init__(self, db=0):
-        self.POOL = redis.ConnectionPool(host=SERVER_HOST, port=6379, db=db)
+        self.POOL = redis.ConnectionPool(host=REDIS_ADDRESS, port=6379, db=db)
         self.CONN = redis.Redis(connection_pool=self.POOL)
 
     def set_data(self, key, val, expire=0):

+ 5 - 1
requirements.txt

@@ -24,4 +24,8 @@ boto
 django-ratelimit
 paypalrestsdk
 pymongo
-apns2-client
+apns2-client
+pillow
+redis
+pyfcm
+ipip-ipdb