wupengfei 2 年之前
父節點
當前提交
38b6e3595e
共有 3 個文件被更改,包括 6 次插入6 次删除
  1. 2 1
      .idea/workspace.xml
  2. 2 2
      application/api/controller/Easemob.php
  3. 2 3
      application/api/controller/Login.php

+ 2 - 1
.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Easemob.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Easemob.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Login.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -176,7 +177,7 @@
       <workItem from="1666313182769" duration="19043000" />
       <workItem from="1668041658444" duration="593000" />
       <workItem from="1668042326649" duration="24523000" />
-      <workItem from="1668212914124" duration="16777000" />
+      <workItem from="1668212914124" duration="17072000" />
     </task>
     <servers />
   </component>

+ 2 - 2
application/api/controller/Easemob.php

@@ -43,8 +43,8 @@ class Easemob{
 	{
 		$options=array(
 		"grant_type"=>"client_credentials",
-		"client_id"=>$this->client_id,
-		"client_secret"=>$this->client_secret
+		"clientId"=>$this->client_id,
+		"secretId"=>$this->client_secret
 		);
 
 		//json_encode()函数,可将PHP数组或对象转成json字符串,使用json_decode()函数,可以将json字符串转换为PHP数组或对象

+ 2 - 3
application/api/controller/Login.php

@@ -126,11 +126,10 @@ class Login extends Base
         $user_emchat_name = 'Act_'.$user_id;
         $user_emchat_password = 'abc123456';
         $base_set = [
-            'clientId' => 'YXA6NS5H0GDGEe20Q9VWb7Fpew',
-            'secretId' => 'YXA6zkYKRQMJbxi_6cN1ERHuFn9QUpI',
+            'client_id' => 'YXA6NS5H0GDGEe20Q9VWb7Fpew',
+            'client_secret' => 'YXA6zkYKRQMJbxi_6cN1ERHuFn9QUpI',
             'org_name' => '1414221110068467',
             'app_name' => 'kefuchannelapp104968',
-            'tenantId' => '104968',
         ];
         $emchat = new Easemob($base_set);
         $result = $emchat->createUser($user_emchat_name, $user_emchat_password,$nick_name); //创建emchat用户