diff --git a/app/common/controller/UserController.php b/app/common/controller/UserController.php index cf31b71..335f816 100644 --- a/app/common/controller/UserController.php +++ b/app/common/controller/UserController.php @@ -171,7 +171,7 @@ class UserController extends BaseController $result = $this->service->miniappLogin($request->all()); return $this->success($result); } catch (\Throwable $th) { - return $this->error($th->getMessage().$th->getLine().$th->getFile()); + return $this->error($th->getMessage()); } } diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index a3ef501..06f5708 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -296,7 +296,9 @@ class UserService $old = UserOld::where('mobile', $mobile)->first(); $uinfo = User::where('id', $request->user->uid)->first(); if ($old) { - $uinfo->name = $old->name; + if(!empty($old->name)){ + $uinfo->name = $old->name; + } $uinfo->is_release = 1; } $uinfo->mobile = $mobile;