瀏覽代碼

增加欧洲rtsp服务器推流地址

peng 2 年之前
父節點
當前提交
0a12f02854
共有 2 個文件被更改,包括 3 次插入6 次删除
  1. 1 4
      azoauth/config.py
  2. 2 2
      controller/index.py

+ 1 - 4
azoauth/config.py

@@ -14,11 +14,8 @@
 
 RESP_SERVER_DOMAIN_DATA = {
     'CN': 'rtsp.zositech.xyz',
-    # 'en': 'www.zositech.org'
-    # 'EN': 'rtsp.zositech.org', 已弃用
     'EN': 'rtsp.zositech.com',
-    #'HK': '119.8.33.56'
-    'EN1':'3.142.65.168'
+    'EU': 'rtspeu.zositech.com'
 }
 SERVER_PREFIX = 'http://www.dvema.com'
 SERVER_PREFIX_TEST = 'http://test.zositechc.cn'

+ 2 - 2
controller/index.py

@@ -269,7 +269,7 @@ class oa2RtspStartView(TemplateView):
             channel = UID[-1:]
             UID = UID[:-2]
 
-        RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN']
+        RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA[region]
         MSG = '{}://{}:8554/{}'.format(RTSP_PREFIX, RESP_SERVER_DOMAIN, stream_name)
 
         logger = logging.getLogger('django')
@@ -467,7 +467,7 @@ class oa2DiscoveryDevice(TemplateView):
             nick = uid_a['nick']
 
             rtsp_url = rtko.encrypt(data=uid)
-            region = 'CN' if uid_a['region'] == 'CN' else 'EN'
+            region = 'EU' if uid_a['region'] == 'EU' else 'EN'
 
             if test_flag:
                 multi_channel = uid_a['multi_channel']