fix(IM): 修复未使用环信情况下后台更新用户资料永远都会失败问题

slimkit · Mar 1, 2019 · 155005a · 155005a
1 parent ff784d6
commit 155005a
Showing 1 changed file with 10 additions and 18 deletions.
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
@@ -20,6 +20,7 @@
 
 namespace Zhiyi\Plus\Http\Controllers\Admin;
 
+use DB;
 use Carbon\Carbon;
 use Zhiyi\Plus\Models\Role;
 use Zhiyi\Plus\Models\User;
@@ -329,30 +330,21 @@ public function update(Request $request, User $user)
             $user->createPassword($password);
         }
 
-        $easeMob = new EaseMobController();
-
-        $response = app('db.connection')->transaction(function () use ($user, $request, $easeMob, $oldPwdHash) {
+        DB::transaction(function () use ($user, $request) {
             $user->save();
-            $user->roles()->sync(
-                $request->input('roles')
-            );
+            $user->roles()->sync($request->input('roles'));
+        });
 
-            // 环信重置密码
+        // 更新环信密码
+        if ($password && setting('user', 'vendor:easemob', ['open' => false])['open'] ?? false) {
             $request->user_id = $user->id;
             $request->old_pwd_hash = $oldPwdHash;
-            $im = $easeMob->resetPassword($request);
-            if ($im->getStatusCode() != 201) {
-                return false;
-            }
-
-            return true;
-        });
+            (new EaseMobController)->resetPassword($request);
+        }
 
         return response()->json([
-            'messages' => [
-                $response === true ? '更新成功' : '更新失败',
-            ],
-        ])->setStatusCode($response === true ? 201 : 422);
+            'message' => ['更新成功'],
+        ])->setStatusCode(201);
     }
 
     /**