Browse Source

修改bug

huangxiaojing 3 years ago
parent
commit
56dd2e6068
4 changed files with 4 additions and 4 deletions
  1. 1 1
      screenAndroid/WXdraw.js
  2. 1 1
      screenAndroid/WXtrialInterface.html
  3. 1 1
      screenIos/WXdraw.js
  4. 1 1
      screenIos/websocket.js

+ 1 - 1
screenAndroid/WXdraw.js

@@ -23,7 +23,7 @@ var parameters = GetRequest();
 var form = {};
 var form = {};
 
 
 var cardToken = parameters["cardToken"];
 var cardToken = parameters["cardToken"];
-cardToken = cardToken && cardToken.replace(/@/g, "=");
+cardToken = cardToken && encodeURI(cardToken);
 form.cardIp = parameters["cardIp"];
 form.cardIp = parameters["cardIp"];
 form.port = parameters["port"];
 form.port = parameters["port"];
 form.username = parameters["username"];
 form.username = parameters["username"];

+ 1 - 1
screenAndroid/WXtrialInterface.html

@@ -308,7 +308,7 @@
     var isWSS = true;
     var isWSS = true;
     var ip = parameters["ip"];
     var ip = parameters["ip"];
     var cardToken = parameters["cardToken"];
     var cardToken = parameters["cardToken"];
-    cardToken = cardToken && cardToken.replace(/@/g, "=");
+    cardToken = cardToken && encodeURI(cardToken);
     var appletPushAddress = parameters["appletPushAddress"];
     var appletPushAddress = parameters["appletPushAddress"];
     // "&type=business"
     // "&type=business"
     var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;
     var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;

+ 1 - 1
screenIos/WXdraw.js

@@ -21,7 +21,7 @@ var parameters = GetRequest();
 
 
 var form = {};
 var form = {};
 var cardToken = parameters["cardToken"];
 var cardToken = parameters["cardToken"];
-cardToken = cardToken && cardToken.replace(/@/g, "=");
+cardToken = cardToken && encodeURI(cardToken);
 form.cardIp = parameters['cardIp'];
 form.cardIp = parameters['cardIp'];
 form.port = parameters['port'];
 form.port = parameters['port'];
 form.sn = parameters['sn'];
 form.sn = parameters['sn'];

+ 1 - 1
screenIos/websocket.js

@@ -3,7 +3,7 @@ var parameters = GetRequest();
 var ip = parameters["ip"];
 var ip = parameters["ip"];
 var appletPushAddress = parameters["appletPushAddress"];
 var appletPushAddress = parameters["appletPushAddress"];
 var cardToken = parameters["token"];
 var cardToken = parameters["token"];
-cardToken = cardToken && cardToken.replace(/@/g, "=");
+cardToken = cardToken && encodeURI(cardToken);
 var isWSS = true;
 var isWSS = true;
 var errorTime = 0;
 var errorTime = 0;
 var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business" : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business";
 var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business" : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business";