退回clientid 设置

vendor/workerman/GatewayWorker/vendor/workerman/gateway-worker/src/Lib/Context.php

@@ -115,8 +115,8 @@ class Context
      */
     public static function addressToClientId($local_ip, $local_port, $connection_id)
     {
-        //return bin2hex(pack('NnN', $local_ip, $local_port, $connection_id));
-        return bin2hex(pack('NNnN', time(), $local_ip, $local_port, $connection_id));
+        return bin2hex(pack('NnN', $local_ip, $local_port, $connection_id));
+        //return bin2hex(pack('NNnN', time(), $local_ip, $local_port, $connection_id));
     }
 
     /**
@@ -128,15 +128,15 @@ class Context
      */
     public static function clientIdToAddress($client_id)
     {
-//        if (strlen($client_id) !== 20) {
-//            echo new Exception("client_id $client_id is invalid");
-//            return false;
-//        }
-//        return unpack('Nlocal_ip/nlocal_port/Nconnection_id', pack('H*', $client_id));
-        if (strlen($client_id) !== 28) {
+        if (strlen($client_id) !== 20) {
             echo new Exception("client_id $client_id is invalid");
             return false;
         }
-        return unpack('Ntime/Nlocal_ip/nlocal_port/Nconnection_id', pack('H*', $client_id));
+        return unpack('Nlocal_ip/nlocal_port/Nconnection_id', pack('H*', $client_id));
+//        if (strlen($client_id) !== 28) {
+//            echo new Exception("client_id $client_id is invalid");
+//            return false;
+//        }
+//        return unpack('Ntime/Nlocal_ip/nlocal_port/Nconnection_id', pack('H*', $client_id));
     }
 }

vendor/workerman/gatewayclient/Gateway.php

@@ -1417,8 +1417,8 @@ class Context
      */
     public static function addressToClientId($local_ip, $local_port, $connection_id)
     {
-        //return bin2hex(pack('NnN', $local_ip, $local_port, $connection_id));
-        return bin2hex(pack('NNnN', time(), $local_ip, $local_port, $connection_id));
+        return bin2hex(pack('NnN', $local_ip, $local_port, $connection_id));
+        //return bin2hex(pack('NNnN', time(), $local_ip, $local_port, $connection_id));
     }
 
     /**
@@ -1427,16 +1427,16 @@ class Context
      */
     public static function clientIdToAddress($client_id)
     {
-        if (strlen($client_id) !== 28) {
-            echo new Exception("client_id $client_id is invalid");
-            return false;
-        }
-        return unpack('Ntime/Nlocal_ip/nlocal_port/Nconnection_id', pack('H*', $client_id));
-//        if(strlen($client_id) !== 20)
-//        {
-//            throw new \Exception("client_id $client_id is invalid");
+//        if (strlen($client_id) !== 28) {
+//            echo new Exception("client_id $client_id is invalid");
+//            return false;
 //        }
-//        return unpack('Nlocal_ip/nlocal_port/Nconnection_id' ,pack('H*', $client_id));
+//        return unpack('Ntime/Nlocal_ip/nlocal_port/Nconnection_id', pack('H*', $client_id));
+        if(strlen($client_id) !== 20)
+        {
+            throw new \Exception("client_id $client_id is invalid");
+        }
+        return unpack('Nlocal_ip/nlocal_port/Nconnection_id' ,pack('H*', $client_id));
     }
 
 }