ok

src/Middleware/CompanyAuth.php

@@ -8,18 +8,19 @@ use General\Helpers\CommonHelper;
 use General\Requests\CompanyAuthRequest;
 use General\Services\BaseAuthConfig;
 use General\Services\Config\ConfigService;
+use Illuminate\Http\Request;
 
 class CompanyAuth
 {
     use BaseAuthConfig;
-    /**
-     * Handle an incoming request.
-     *
-     */
-    public function handle(CompanyAuthRequest $request, Closure $next)
+
+
+    public function handle(Request $request, Closure $next)
     {
         $app_id = $request->get('app_id', '');
         $service = new ConfigService;
+        $validate = new CompanyAuthRequest($request);
+        $validate->validate();
         $client_ip = CommonHelper::GetClientIp();
         if (in_array($client_ip, $service->CompanyAuthIps($app_id))) {
             $params = $request->except('_url');

src/Requests/CompanyAuth/BookQueryRequest.php

@@ -3,7 +3,7 @@
 namespace General\Requests\CompanyAuth;
 
 use General\Requests\Request;
-use General\Requests\Rules\BidRule;
+use General\Rules\BidRule;
 
 class BookQueryRequest extends Request
 {

src/Requests/CompanyAuth/CompanyAuthRequest.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace General\Requests;
+
+use Illuminate\Http\Request as BaseRequest;
+
+class CompanyAuthRequest extends Request
+{
+    public function __construct(BaseRequest $request)
+    {
+        $this->query = $request->query;
+        $this->request = $request->request;
+        $this->attributes = $request->attributes;
+        $this->cookies = $request->cookies;
+        $this->files = $request->files;
+        $this->server = $request->server;
+        $this->content = $request->content;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'app_id' => 'required|string|exists:company_auth_configs',
+            'nonce_str' => 'required|string',
+            'timestamp' => 'required|string',
+            'sign' => 'required|string',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'app_id.exists' => '未授权!',
+        ];
+    }
+}

src/Requests/CompanyAuthRequest.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace General\Requests;
-
-
-class CompanyAuthRequest extends Request
-{
-    use BaseAuthConfig;
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'app_id' => 'required|string|exists:company_auth_configs',
-            'nonce_str' => 'required|string',
-            'timestamp' => 'required|string',
-            'sign' => 'required|string',
-        ];
-    }
-
-    public function messages()
-    {
-        return [
-            'app_id.exists' => '未授权!',
-        ];
-    }
-}

src/Requests/Rules/BidRule.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace General\Requests\Rules;
+namespace General\Rules;
 
 use General\Helpers\CommonHelper;
 use Illuminate\Contracts\Validation\Rule;