feat: redis和mysql地址都统一到compose配置文件

docker-compose.yml

@@ -1,10 +1,12 @@
 version: '3'
 services:
   pjsua:
-    image: pjsua2:v2.14.1002
+    image: pjsua2:v2.14.1009
     container_name: pjsua
     ports:
       - 8000:8000/tcp
     restart: always
     volumes:
-      - /Users/davidliu/sip/voice-gateway-docker:/code
+      - /Users/yushanghui/hongshantianping/git/voice-gateway-service:/code
+    environment:
+      - SERVE_HOST=192.168.100.159

src/core/callcenter/esl/client.py

@@ -19,7 +19,7 @@ from src.core.callcenter.esl.constant.sip_header_constant import sipHeaderHoldMu
 from src.core.callcenter.enumeration import CallCause
 from src.core.callcenter.esl.handler.default_esl_event_handler import DefaultEslEventHandler
 from src.core.voip.bot import BotAgent
-
+from src.core.voip.constant import *
 
 class InboundClient:
 
@@ -31,7 +31,8 @@ class InboundClient:
         self.bot_agent = BotAgent(logger)
         self.handler_table = self.scan_esl_event_handlers()
         self.default_event_handler = DefaultEslEventHandler(self, self.bot_agent, self.logger)
-        self.host, self.port, self.password = '172.16.12.16', '8021', '4918257983818884358'
+        self.host, self.port, self.password = SERVE_HOST, '8021', '4918257983818884358'
+        print(f"mysql_hostESL:{SERVE_HOST}")
         self.executors = {x: concurrent.futures.ThreadPoolExecutor(max_workers=1) for x in range(self.thread_num)}
 
         threading.Thread(target=self.start, args=()).start()

src/core/datasource.py

@@ -13,6 +13,7 @@ import os
 from typing import List, Tuple
 from src.core import singleton
 from redis import StrictRedis, ConnectionPool
+from src.core.voip.constant import *
 
 
 RADIS_HOST = os.environ.get("REDIS_HOST", "10.0.0.24")
@@ -37,17 +38,18 @@ class MysqlHandler:
     """
 
     def __init__(self,
-                 host='172.16.12.16',
-                 user='root',
-                 passwd='12345678',
+                #  host='192.168.100.159',
+                #  user='root',
+                #  passwd='12345678',
 
-                 # host=MYSQL_HOST,
-                 # user='root',
-                 # passwd=MYSQL_PASSWORD,
+                 host=SERVE_HOST,
+                 user='root',
+                 passwd=MYSQL_PASSWORD,
                  db='libra_bot',
                  port=3306,
                  charset='utf8'
                  ):
+        print(f"mysql_host:{host}", f"mysql_passwd:{MYSQL_PASSWORD}" )
         self.host = host
         self.user = user
         self.passwd = passwd
@@ -111,7 +113,7 @@ class MysqlHandler:
         except:
             print(sql, values)
             traceback.print_exc()
-            raise e
+            raise 
         finally:
             cursor.close()
 
@@ -181,10 +183,10 @@ class MysqlHandler:
 @singleton
 class RedisHandler:
 
-    def __init__(self, host='172.16.12.16', port=6379, db=0, password='^YHN&UJM'):
+    def __init__(self, host='192.168.100.159', port=6379, db=0, password='^YHN&UJM'):
         try:
-            # host = '10.0.0.24'
-            # host = RADIS_HOST
+            host = SERVE_HOST
+            print(f"redis_host:{host}")
             self.redis = StrictRedis(
                 connection_pool=ConnectionPool(host=host, port=port, db=db, password=password))
         except Exception as e:

src/core/voip/bot.py

@@ -242,7 +242,7 @@ class MyCall(pj.Call):
 
 class BotAgent:
 
-    def __init__(self, logger, user_part_range=range(1001, 1011), host="172.16.12.16", port="5060", password="slibra@#123456"):
+    def __init__(self, logger, user_part_range=range(1001, 1011), host="pbx.fuxicarbon.com", port="5060", password="slibra@#123456"):
         self.logger = logger
         self.user_part_range, self.host, self.port, self.password = user_part_range, host, port, password
         self.user_part_pool = queue.Queue(maxsize=len(user_part_range))

src/core/voip/constant.py

@@ -30,4 +30,11 @@ def build_demo_script():
         file = os.path.join(player_script_dir, file)
         print('build_demo_script::', file)
         res.put(file)
-    return res
+    return res
+
+
+SERVE_HOST = os.environ.get("SERVE_HOST")
+MYSQL_PASSWORD = 'EKoAe3H8xybQKrFPApXM'
+
+if SERVE_HOST != "192.168.100.159":
+    MYSQL_PASSWORD = "12345678"