diff --git a/app/controller/UserController.php b/app/controller/UserController.php index e05b2fd..c2a9c7f 100644 --- a/app/controller/UserController.php +++ b/app/controller/UserController.php @@ -164,16 +164,16 @@ class UserController if (Util::isEmpty($id)) { $option = ['email' => $email]; - $userService = new UserService; - $res = $userService->createOrquery($option); +// $userService = new UserService; +// $res = $userService->createOrquery($option); Log::info('register_rpc',$res); // return Util::fail($res, trans('register_fail')); - if ($res['code'] != 200 && $res['data']['code'] != 0){ - return Util::fail($res, trans('register_fail')); - } - $data['sn'] = $res['data']['data']['sn']; - $data['id'] = $res['data']['data']['uid']; - $res = User::firstOrCreate(['sn' => $data['sn']],$data); +// if ($res['code'] != 200 && $res['data']['code'] != 0){ +// return Util::fail($res, trans('register_fail')); +// } +// $data['sn'] = $res['data']['data']['sn']; +// $data['id'] = $res['data']['data']['uid']; + $res = User::firstOrCreate(['email' => $email],$data); $res['id'] = $data['id']; } else { $res = User::where('id', $id) @@ -259,12 +259,12 @@ class UserController $mobile = $user->isDirty('mobile'); $name = $user->isDirty('name'); $sign = $user->isDirty('sign'); - if($mobile || $name || $sign){ - $userService = new UserService; - $option = ['uid' => $user->id, 'phone' => $user->mobile, 'name' => $user->name, 'sign' => $user->sign, ]; - $res = $userService->update($option); - Log::info('register_rpc',$res); - } +// if($mobile || $name || $sign){ +// $userService = new UserService; +// $option = ['uid' => $user->id, 'phone' => $user->mobile, 'name' => $user->name, 'sign' => $user->sign, ]; +// $res = $userService->update($option); +// Log::info('register_rpc',$res); +// } $res = $user->save();