From a774eafddbb4b0e0e3306ce7a5da5eb7ac3a4a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= Date: Mon, 12 Oct 2020 05:20:25 +0800 Subject: [PATCH] =?UTF-8?q?Fixes=20#37,=20#40,=20#42,=20webApi=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Admin/ArticleController.php | 8 +++---- .../Controllers/Api/WebApi/BaseController.php | 24 ++++++++----------- app/Http/Controllers/AuthController.php | 4 ++-- app/Http/Requests/Admin/UserUpdateRequest.php | 2 +- resources/views/admin/user/info.blade.php | 2 +- resources/views/auth/login.blade.php | 4 ++-- 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/Admin/ArticleController.php b/app/Http/Controllers/Admin/ArticleController.php index 01fd9aa0..2da70095 100644 --- a/app/Http/Controllers/Admin/ArticleController.php +++ b/app/Http/Controllers/Admin/ArticleController.php @@ -36,7 +36,7 @@ class ArticleController extends Controller { $data = $request->except('_method', '_token'); // LOGO - if ($request->input('type') != 4 && $request->hasFile('logo')) { + if ($request->input('type') !== "4" && $request->hasFile('logo')) { $data['logo'] = 'upload/'.$request->file('logo')->store('images'); if (!$data['logo']) { Session::flash('errorMsg', 'LOGO不合法'); @@ -45,14 +45,14 @@ class ArticleController extends Controller } } - $id = Article::insertGetId($data); - if ($id) { + $article = Article::create($data); + if ($article->id) { Session::flash('successMsg', '添加成功'); } else { Session::flash('errorMsg', '添加失败'); } - return Redirect::to(route('admin.article.edit', $id)); + return Redirect::to(route('admin.article.edit', $article->id)); } // 文章页面 diff --git a/app/Http/Controllers/Api/WebApi/BaseController.php b/app/Http/Controllers/Api/WebApi/BaseController.php index 55a950f2..af3b3146 100644 --- a/app/Http/Controllers/Api/WebApi/BaseController.php +++ b/app/Http/Controllers/Api/WebApi/BaseController.php @@ -40,11 +40,11 @@ class BaseController $obj->log_time = time(); $obj->save(); - if ($obj->id) { - return $this->returnData('上报节点心跳信息成功', 'success', 200); + if (!$obj->id) { + return $this->returnData('生成节点心跳信息失败'); } - return $this->returnData('上报节点心跳信息失败，请检查字段'); + return $this->returnData('上报节点心跳信息成功', 'success', 200); } // 返回数据 @@ -72,11 +72,7 @@ class BaseController $onlineCount = 0; foreach ($inputArray as $input) { if (!Arr::has($input, ['ip', 'uid'])) { - return $this->returnData('上报节点在线情况失败，请检查字段'); - } - - if (!isset($input['ip'], $input['uid'])) { - return $this->returnData('上报节点在线情况失败，请检查字段'); + return $this->returnData('上报节点在线用户IP信息失败，请检查字段'); } $obj = new NodeOnlineUserIp(); @@ -88,7 +84,7 @@ class BaseController $obj->save(); if (!$obj->id) { - return $this->returnData('上报节点在线情况失败，请检查字段'); + return $this->returnData('生成节点在线用户IP信息失败'); } $onlineCount++; } @@ -103,14 +99,14 @@ class BaseController return $this->returnData('上报节点在线情况成功', 'success', 200); } - return $this->returnData('上报节点在线情况失败，请检查字段'); + return $this->returnData('生成节点在线情况失败'); } // 上报用户流量日志 public function setUserTraffic(Request $request, $id): JsonResponse { foreach ($request->all() as $input) { - if (Arr::exists($input, 'uid')) { + if (!Arr::exists($input, 'uid')) { return $this->returnData('上报用户流量日志失败，请检查字段'); } @@ -127,7 +123,7 @@ class BaseController $log->save(); if (!$log->id) { - return $this->returnData('上报用户流量日志失败，请检查字段'); + return $this->returnData('生成用户流量日志失败'); } $user = User::find($log->user_id); if ($user) { @@ -181,10 +177,10 @@ class BaseController $obj->save(); if ($obj->id) { - return $this->returnData('上报用户触发审计规则记录成功', 'success', 200); + return $this->returnData('上报用户触发审计规则日志成功', 'success', 200); } } - return $this->returnData('上报用户触发审计规则记录失败'); + return $this->returnData('上报用户触发审计规则日志失败'); } } diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index ac81039e..214a4352 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -337,7 +337,7 @@ class AuthController extends Controller $logId = Helpers::addNotificationLog('注册激活', '请求地址：'.$activeUserUrl, 1, $email); Mail::to($email)->send(new activeUser($logId, $activeUserUrl)); - Session::flash('regSuccessMsg', trans('auth.register_active_tip')); + Session::flash('successMsg', trans('auth.register_active_tip')); } else { // 则直接给推荐人加流量 if ($inviter_id) { @@ -351,7 +351,7 @@ class AuthController extends Controller User::find($uid)->update(['status' => 1]); } - Session::flash('regSuccessMsg', trans('auth.register_success')); + Session::flash('successMsg', trans('auth.register_success')); } return Redirect::route('login')->withInput(); diff --git a/app/Http/Requests/Admin/UserUpdateRequest.php b/app/Http/Requests/Admin/UserUpdateRequest.php index 7be0f022..b1992d78 100644 --- a/app/Http/Requests/Admin/UserUpdateRequest.php +++ b/app/Http/Requests/Admin/UserUpdateRequest.php @@ -27,7 +27,7 @@ class UserUpdateRequest extends FormRequest 'is_admin' => 'boolean|exclude_unless:id,1|gte:1', 'reset_time' => 'nullable|date_format:Y-m-d', 'invite_num' => 'numeric', - 'status' => 'required|boolean', + 'status' => 'required|integer|between:-1,1', ]; } } diff --git a/resources/views/admin/user/info.blade.php b/resources/views/admin/user/info.blade.php index 3f591410..ed3c44ad 100644 --- a/resources/views/admin/user/info.blade.php +++ b/resources/views/admin/user/info.blade.php @@ -500,7 +500,7 @@ swal.fire({title: ret.message, timer: 1000, showConfirmButton: false}); } }, - error: function(ret) { + error: function(data) { let str = ''; const errors = data.responseJSON; if ($.isEmptyObject(errors) === false) { diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 3643f91f..759f0e1b 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -6,8 +6,8 @@ @if($errors->any()) @endif - @if (Session::get('regSuccessMsg')) - + @if (Session::get('successMsg')) + @endif