wupengfei 2 years ago
parent
commit
e8a594d54f
2 changed files with 3 additions and 3 deletions
  1. 2 2
      .idea/workspace.xml
  2. 1 1
      application/api/controller/Easemob.php

+ 2 - 2
.idea/workspace.xml

@@ -3,7 +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/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Login.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Easemob.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Easemob.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -176,7 +176,7 @@
       <workItem from="1666313182769" duration="19043000" />
       <workItem from="1668041658444" duration="593000" />
       <workItem from="1668042326649" duration="24523000" />
-      <workItem from="1668212914124" duration="15487000" />
+      <workItem from="1668212914124" duration="16212000" />
     </task>
     <servers />
   </component>

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

@@ -41,7 +41,7 @@ class Easemob{
 	function getToken()
 	{
 		$options=array(
-		"grant_type"=>"client_credentials",
+		"grant_type"=>"password",
 		"client_id"=>$this->client_id,
 		"client_secret"=>$this->client_secret
 		);