diff --git a/app/middleware/ntripCaster/ntripCaster.js b/app/middleware/ntripCaster/ntripCaster.js index 5aaee07..852118f 100644 --- a/app/middleware/ntripCaster/ntripCaster.js +++ b/app/middleware/ntripCaster/ntripCaster.js @@ -345,12 +345,8 @@ class SimpleNtripCaster { } } if (found == 'Client-Type: Virtual-NTRIP-Client/1.0') { - // 开发/测试环境 - const uid = lines[7].split(': ')[1]; - const token = lines[6].split(': ')[1]; - // 生产环境 - // const uid = lines[9].split(': ')[1]; - // const token = lines[5].split(': ')[1]; + const uid = lines.find(line => line.split(': ')[0] == 'uid').split(': ')[1]; + const token = lines.find(line => line.split(': ')[0] == 'Authorization').split(': ')[1]; let decryptUid = CryptoJS.AES.decrypt(uid, KEY, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 @@ -370,7 +366,7 @@ class SimpleNtripCaster { } } if (find == 'Request-Type: SIZE') { - const uid = lines[8].split(': ')[1]; + const uid = lines.find(line => line.split(': ')[0] == 'uid').split(': ')[1]; // 接受客户端连接 this.sizeSockets.set(uid + ':' + mountpoint, socket); const size = [...this.clientSockets.values()].filter(value => value == mountpoint);