ok

src/Middleware/CompanyAuth.php

@@ -14,7 +14,6 @@ class CompanyAuth
 {
     use BaseAuthConfig;
 
-
     public function handle(Request $request, Closure $next)
     {
         $app_id = $request->get('app_id', '');

src/Requests/CompanyAuth/ChannelQueryRequest.php

@@ -27,8 +27,8 @@ class ChannelQueryRequest extends Request
 
     public function messages()
     {
-        return [
+        return array_merge(parent::messages(),  [
             'channel_id.in' => '站点未授权！'
-        ];
+        ]);
     }
 }

src/Requests/CompanyAuth/CompanyAuthRequest.php

@@ -2,19 +2,16 @@
 
 namespace General\Requests\CompanyAuth;
 
-use Illuminate\Http\Request as BaseRequest;
+use General\Requests\Request as RequestsRequest;
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 
-class CompanyAuthRequest extends Request
+class CompanyAuthRequest extends RequestsRequest
 {
-    public function __construct(BaseRequest $request)
+    public function __construct(Request $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;
+        $this->input = $request->all();
     }
 
     /**
@@ -27,15 +24,30 @@ class CompanyAuthRequest extends Request
         return [
             'app_id' => 'required|string|exists:company_auth_configs',
             'nonce_str' => 'required|string',
-            'timestamp' => 'required|string',
+            'timestamp' => 'required|integer',
             'sign' => 'required|string',
         ];
     }
 
     public function messages()
     {
-        return [
+        return array_merge(parent::messages(),  [
             'app_id.exists' => '未授权!',
-        ];
+        ]);
+    }
+
+    public function validate()
+    {
+        $validator = Validator::make($this->input, $this->rules(), $this->messages());
+        if ($validator->fails()) {
+            $err = $validator->errors()->all();
+            throw (new HttpResponseException(response()->json([
+                'code' => -1,
+                'msg' => $validator->errors()->first(),
+                'data' => $validator->errors()->first(),
+            ], 200)));;
+        }
+
+        return true;
     }
 }

src/Requests/CompanyAuth/CustomSendMsgRequest.php

@@ -29,8 +29,8 @@ class CustomSendMsgRequest extends Request
 
     public function messages()
     {
-        return [
+        return array_merge(parent::messages(),  [
             'channel_id.in' => '站点未授权！'
-        ];
+        ]);
     }
 }