修复操作日志username读取不到问题

Author: linyiyuan

app/Controller/IndexController.php

@@ -6,6 +6,7 @@
 
 use App\Foundation\Facades\Log;
 use App\Foundation\Utils\Mail;
+use App\Job\EmailNotificationJob;
 use App\Model\Laboratory\Bilibili\UpUser;
 use App\Model\Laboratory\Bilibili\UpUserReport;
 use App\Service\Laboratory\Bilibili\VideoService;
@@ -31,8 +32,11 @@ public function __construct()
      */
     public function index()
    {
-       $bvid = $this->request->input('bvid');
-       return curl_get('https://api.bilibili.com/x/web-interface/view?bvid=' . $bvid);
+       //分发队列
+       $this->queue->push(new EmailNotificationJob([
+           'title' => $params['title'],
+           'content' => $params['content'],
+       ]));
 
 //        $url = 'https://m.bilibili.com/video/BV1Q624y1q7sj';
 

app/Controller/Laboratory/UploadController.php

@@ -44,6 +44,7 @@ public function uploadPicByBase64()
         ];
         $this->verifyParams($params, $rules, $message);
 
+        base64DecImg($params['file']);
         $uploadResult = UploadService::getInstance()->uploadSinglePicByBase64($params['file'], $params['savePath']);
         return $this->success($uploadResult);
     }

app/Exception/Handler/AppExceptionHandler.php

@@ -56,13 +56,13 @@ public function handle(Throwable $throwable, ResponseInterface $response)
         if ($throwable instanceof TokenValidException) {
             // 阻止异常冒泡
             $this->stopPropagation();
-            return $this->error($throwable->getCode(), $throwable->getMessage());
+            return $this->error($throwable->getCode(), $throwable->getMessage(), false);
         }
 
         if ($throwable instanceof JWTException) {
             // 阻止异常冒泡
             $this->stopPropagation();
-            return $this->error($throwable->getCode(), $throwable->getMessage());
+            return $this->error($throwable->getCode(), $throwable->getMessage(), false);
         }
 
         // 判断是否由业务异常类抛出的异常

app/Foundation/Facades/MessageParser.php

@@ -6,7 +6,7 @@
 use Hyperf\Utils\Codec\Json;
 
 /**
- * json格式化
+ * 消息格式化
  * Class MessageParser
  * @Author YiYuan-Lin
  * @Date: 2021/3/12
@@ -15,7 +15,6 @@ class MessageParser
 {
     /**
      * @param string $data
-     *
      * @return array
      */
     public static function decode(string $data) : array
@@ -25,11 +24,20 @@ public static function decode(string $data) : array
 
     /**
      * @param array $data
-     *
      * @return string
      */
     public static function encode(array $data) : string
     {
         return Json::encode($data);
     }
+
+    /**
+     * 异常消息格式化
+     * @param \Exception $e
+     * @return string
+     */
+    public static function expMessageParser(\Exception $e) : string
+    {
+        return '错误码为：' . $e->getCode() . '错误信息： ' . $e->getMessage() . ':: 错误信息文件位置:' . $e->getFile() . ':: 错误信息行数: ' . $e->getLine();
+    }
 }

app/Foundation/Traits/ApiTrait.php

@@ -59,9 +59,10 @@ protected function successByMessage(string $message = '')
      * 错误响应
      * @param int $statusCode
      * @param string|null $message
+     * @param bool $isRecordLog
      * @return \Psr\Http\Message\ResponseInterface
      */
-    protected function error(int $statusCode = StatusCode::ERR_EXCEPTION, string $message = null)
+    protected function error(int $statusCode = StatusCode::ERR_EXCEPTION, string $message = null, bool $isRecordLog = true)
     {
         $message = $message ?? StatusCode::ERR_EXCEPTION;
 
@@ -73,17 +74,16 @@ protected function error(int $statusCode = StatusCode::ERR_EXCEPTION, string $me
             $loginLogData['response_code'] = $statusCode;
             $loginLogData['response_result'] = $message;
             LoginLog::add($loginLogData);
-            return $this->response->json($this->formatResponse([], $message, $statusCode));
-        }else {
+        }else if ($isRecordLog) {
             //记录操作异常日志
             $logData = OperateLogService::getInstance()->collectLogInfo();
             if(!empty($logData)) {
                 $logData['response_result'] = $message;
                 $logData['response_code'] = $statusCode;
                 if (!empty($logData['action'])) OperateLog::add($logData);
             }
-            return $this->response->json($this->formatResponse([], $message, $statusCode));
         }
+        return $this->response->json($this->formatResponse([], $message, $statusCode));
     }
 
     /**

app/Job/EmailNotificationJob.php

@@ -5,6 +5,7 @@
 namespace App\Job;
 
 use App\Foundation\Facades\Log;
+use App\Foundation\Facades\MessageParser;
 use App\Foundation\Utils\Mail;
 use App\Model\Auth\User;
 use Hyperf\AsyncQueue\Job;
@@ -48,7 +49,7 @@ public function handle()
                     ->send();
             }
         } catch (\Exception $e) {
-            Log::jobLog()->error($e->getMessage());
+            Log::jobLog()->error(MessageParser::expMessageParser($e));
         }
     }
 

app/Service/System/LoginLogService.php

@@ -36,7 +36,7 @@ public function collectLoginLogInfo() : array
         $loginTime = date('Y-m-d H:i:s');
 
         return [
-           'username' => $requireParams['username'],
+           'username' => $requireParams['username'] ?? '',
            'login_ip' => $loginIp,
            'login_address' => $loginAddress,
            'login_browser' => $browser,

bin/hyperf.php

@@ -1,6 +1,5 @@
 #!/usr/bin/env php
 <?php
-
 ini_set('display_errors', 'on');
 ini_set('display_startup_errors', 'on');