Optimization code

Author: ankadada

rtc/example/example.php

@@ -4,7 +4,7 @@
 use \Qiniu\Auth;
 
 $ak = 'gwd_gV4gPKZZsmEOvAuNU1AcumicmuHooTfu64q5';
-$sk = 'xxxx';
+$sk = '9G4isTkVuj5ITPqH1ajhljJMTc2k4m-hZh5r5ZsK';
 
 $auth = new Auth($ak, $sk);
 $client = new Qiniu\Rtc\AppClient($auth);
@@ -15,15 +15,15 @@
     $resp = $client->createApp($hub, $title, $maxUsers);
     print_r($resp);exit;
     // 获取app状态
-    $resp = $client->getApp('dgbo3e8f6');
+    $resp = $client->getApp('dgbrj7ghp');
     print_r($resp);exit;
     //修改app状态
     $mergePublishRtmp = null;
     $mergePublishRtmp['enable'] = true;
-    $resp = $client->UpdateApp('dgbgljsxp', $hub, $title, $maxUsers, $mergePublishRtmp);
+    $resp = $client->UpdateApp('dgbrj7ghp', $hub, $title, $maxUsers, $mergePublishRtmp);
     print_r($resp);exit;
     //删除app
-    $resp = $client->deleteApp('dgbo8p9nm');
+    $resp = $client->deleteApp('dgbrj7ghp');
     print_r($resp);exit;
     //获取房间连麦的成员
     $resp=$client->getappUserNum("dgbfvvzid", 'lfxl');

src/Qiniu/Auth.php

@@ -185,31 +185,4 @@ public function authorizationV2($url, $method, $body = null, $contentType = null
         $auth = 'Qiniu ' . $sign;
         return array('Authorization' => $auth);
     }
-
-    public function RtcToken($method, $url, $contentType, $body)
-    {
-        $url = parse_url($url);
-        $data = '';
-        if (!empty($url['path'])) {
-            $data = $method . ' ' . $url['path'];
-        }
-        if (!empty($url['query'])) {
-            $data .= '?' . $url['query'];
-        }
-        if (!empty($url['host'])) {
-            $data .= "\nHost: " . $url['host'];
-            if (isset($url['port'])) {
-                $data .= ':' . $url['port'];
-            }
-        }
-        if (!empty($contentType)) {
-            $data .= "\nContent-Type: " . $contentType;
-        }
-        $data .= "\n\n";
-        if (!empty($body)) {
-            $data .= $body;
-        }
-        $sign = $this->sign($data);
-        return 'Qiniu ' . $sign;
-    }
 }

src/Qiniu/Rtc/AppClient.php

@@ -192,12 +192,9 @@ public function appToken($appId, $roomName, $userId, $expireAt, $permission)
     private function get($url)
     {
         $cType = null;
-        $rtcToken = $this->auth->RtcToken("GET", $url, $cType, $body);
-        $headers = array(
-            'Content-Type'  => $cType,
-            'Authorization' => $rtcToken,
-        );
-        $ret = Client::get($url, $headers);
+        $rtcToken = $this->auth->authorizationV2($url, "GET", $body, $cType);
+        $rtcToken['Content-Type'] = $cType;
+        $ret = Client::get($url, $rtcToken);
         if (!$ret->ok()) {
             return array(null, new Error($url, $ret));
         }
@@ -207,12 +204,9 @@ private function get($url)
     private function delete($url)
     {
         $cType = 'application/json';
-        $rtcToken = $this->auth->RtcToken("DELETE", $url, $cType, $body);
-        $headers = array(
-            'Content-Type'  => $cType,
-            'Authorization' => $rtcToken,
-        );
-        $ret = Client::delete($url, $headers);
+        $rtcToken = $this->auth->authorizationV2($url, "DELETE", $body, $cType);
+        $rtcToken['Content-Type'] = $cType;
+        $ret = Client::delete($url, $rtcToken);
         if (!$ret->ok()) {
             return array(null, new Error($url, $ret));
         }
@@ -222,12 +216,9 @@ private function delete($url)
     private function post($url, $body)
     {
         $cType = 'application/json';
-        $rtcToken = $this->auth->RtcToken("POST", $url, $cType, $body);
-        $headers = array(
-            'Content-Type'  => $cType,
-            'Authorization' => $rtcToken,
-        );
-        $ret = Client::post($url, $body, $headers);
+        $rtcToken = $this->auth->authorizationV2($url, "POST", $body, $cType);
+        $rtcToken['Content-Type'] = $cType;
+        $ret = Client::post($url, $body, $rtcToken);
         if (!$ret->ok()) {
             return array(null, new Error($url, $ret));
         }