Fix single instance mode variable

Author: lisgroup

laravel/app/Http/Controllers/Api/ApiExcelController.php

@@ -21,7 +21,7 @@ class ApiExcelController extends Controller
      */
     public $perPage = 10;
 
-    private $request = null;
+    // private $request = null;
 
     /**
      * Create a new AuthController instance.
@@ -42,15 +42,14 @@ public function __construct(Request $request)
         $perPage = intval($request->input('perPage'));
         $this->perPage = $perPage ?? 11;
 
-        $this->request || $this->request = $request;
     }
 
     /**
      * Display a listing of the resource.
      *
      * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(Request $request)
     {
         $user_id = auth('api')->user()['id'];
 
@@ -59,7 +58,9 @@ public function index()
         if ($user_id != 1) {
             $where = ['uid' => $user_id];
         }
-        $list = ApiExcel::with('apiParam')->where($where)->orderBy('id', 'desc')->paginate($this->perPage);
+        $perPage = intval($request->input('perPage'));
+        $perPage = $perPage ?? 11;
+        $list = ApiExcel::with('apiParam')->where($where)->orderBy('id', 'desc')->paginate($perPage);
         // 获取完成进度情况
         $list = ApiRepository::getInstent()->workProgress($list);
 
@@ -82,7 +83,7 @@ public function upload(Request $request)
         // 上传文件
         if ($request->isMethod('post')) {
 
-            $file = $this->request->file('file');
+            $file = $request->file('file');
             // 文件是否上传成功
             if ($file->isValid()) {
 
@@ -114,9 +115,9 @@ public function upload(Request $request)
      *
      * @return \Illuminate\Http\Response
      */
-    public function startTask()
+    public function startTask(Request $request)
     {
-        $data = $this->request->all();
+        $data = $request->all();
         // $data = ['id' => 2, 'api_excel_id' => 1, 'appkey' => '123','upload_url' => '/storage/20190130_114747_5c511e632efe8.xlsx', 'state' => 0];
         // 1. 检测参数是否正常
         if (empty($data['id']) || !isset($data['state']) || empty($data['upload_url'])) {
@@ -292,9 +293,9 @@ public function forceDelete($id)
      *
      * @return \Illuminate\Http\Response
      */
-    public function downloadLog()
+    public function downloadLog(Request $request)
     {
-        $api_excel_id = $this->request->input('id');
+        $api_excel_id = $request->input('id');
         // 判断用户有没有下载权限
         $user_id = auth('api')->user()['id'];
         // $user_id = 1;

laravel/app/Http/Controllers/Api/IndexController.php

@@ -8,7 +8,8 @@
 
 class IndexController extends Controller
 {
-    private $request = null;
+    // private $request = null;
+    private $mySqlVersion = null;
 
     /**
      * IndexController constructor.
@@ -25,7 +26,6 @@ public function __construct(Request $request)
         // 另外关于上面的中间件，官方文档写的是『auth:api』
         // 但是我推荐用 『jwt.auth』，效果是一样的，但是有更加丰富的报错信息返回
 
-        $this->request || $this->request = $request;
     }
 
     /**
@@ -35,11 +35,12 @@ public function __construct(Request $request)
      */
     public function index()
     {
+        $this->mySqlVersion || $this->mySqlVersion = DB::select('SHOW VARIABLES LIKE "version"')[0]->Value;
         $data['serve'] = [
             ['name' => '服务器操作系统', 'value' => PHP_OS],
             ['name' => '服务器解译引擎', 'value' => $_SERVER['SERVER_SOFTWARE'] ?? ''],
             ['name' => '服务器主机名', 'value' => $_SERVER['SERVER_NAME'] ?? ''],
-            ['name' => 'MySQL 版本', 'value' => DB::select('SHOW VARIABLES LIKE "version"')[0]->Value],
+            ['name' => 'MySQL 版本', 'value' => $this->mySqlVersion],
         ];
         // PHP相关参数
         $data['php'] = [
@@ -69,9 +70,9 @@ public function memory()
      *
      * @return \Illuminate\Http\Response
      */
-    public function report()
+    public function report(Request $request)
     {
-        $input = $this->request->all();
+        $input = $request->all();
         // start, end 传递参数时
         // if (empty($input['start']) || empty($input['end']) || $input['start'] > $input['end'] || $input['end'] > date('Y-m-d')) {
         //     return $this->out(1006);