merge develop

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - /root/aibot/dm/voice:/root/aibot/dm/voice
       - /home/hongshan/freeswitch:/freeswitch
     environment:
-      - SERVE_HOST=192.168.100.159
+      - SERVE_HOST=192.168.120.161
       - TZ=Asia/Shanghai
     ports:
       - 8084:8084/udp

src/core/callcenter/cache.py

@@ -142,8 +142,8 @@ class Cache:
     def get_route_gateway(self, saas_id):
         return RouteGateway(id=1,
                             saas_id=saas_id,
-                            name='63366692',
-                            media_host='192.168.100.159',
+                            name='8247190',
+                            media_host='192.168.120.162',
                             media_port=5060,
                             caller_prefix='',
                             called_prefix='',

src/core/datasource.py

@@ -16,15 +16,15 @@ from redis import StrictRedis, ConnectionPool
 from time import sleep
 
 SERVE_HOST = os.environ.get("SERVE_HOST")
-# SERVE_HOST = "192.168.100.159"
+# SERVE_HOST = "192.168.120.161"
 MYSQL_PASSWORD = 'EKoAe3H8xybQKrFPApXM'
 
-if SERVE_HOST != "192.168.100.159":
+if SERVE_HOST != "192.168.120.161":
     SIP_SERVER = SERVE_HOST
     MYSQL_PASSWORD = "12345678"
-    # SIP_SERVER = "pbx.fuxicarbon.com"
+    # SIP_SERVER = "jms.sqlibra.com"
 else:
-    SIP_SERVER = "pbx.fuxicarbon.com"
+    SIP_SERVER = "jms.sqlibra.com"
 
 # RADIS_HOST = os.environ.get("REDIS_HOST", "10.0.0.24")
 #