Wesmiler

app/Http/Controllers/Api/v1/ArticleController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api\v1;
 
 use App\Http\Controllers\Api\webApp;
+use App\Http\Validator\ConsultValidator;
 use App\Services\Api\ArticleService;
 use App\Services\Api\SupervisorsService;
 use App\Services\Common\AdService;
@@ -99,9 +100,13 @@ class ArticleController extends webApp
     /**
      * 咨询提交
      */
-    public function consult()
+    public function consult(ConsultValidator $validator)
     {
         $params = request()->post();
+        $params = $validator->check($params, 'submit');
+        if (!is_array($params)) {
+            return showJson($params, false);
+        }
         try {
             if (ArticleService::make()->consultSubmit($this->userId, $params)) {
                 return showJson(ArticleService::make()->getError(), true);

app/Http/Controllers/Api/v1/LoginController.php

@@ -6,7 +6,6 @@ use App\Http\Controllers\Api\webApp;
 use App\Http\Validator\MemberValidator;
 use App\Services\Api\MemberService;
 use App\Services\RedisService;
-use App\Services\SmsService;
 
 /**
  * 授权登录控制器基类

app/Http/Controllers/Api/v1/SupervisorsController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api\v1;
 
 use App\Http\Controllers\Api\webApp;
+use App\Http\Validator\ConsultValidator;
 use App\Services\Api\SupervisorsService;
 
 /**
@@ -61,9 +62,14 @@ class SupervisorsController extends webApp
     /**
      * 咨询提交
      */
-    public function consult()
+    public function consult(ConsultValidator $validator)
     {
         $params = request()->post();
+        $params = $validator->check($params, 'submit');
+        if (!is_array($params)) {
+            return showJson($params, false);
+        }
+
         try {
             if (SupervisorsService::make()->consultSubmit($this->userId, $params)) {
                 return showJson(SupervisorsService::make()->getError(), true);

app/Http/Validator/AgentValidator.php

@@ -1,13 +1,12 @@
 <?php
 namespace App\Http\Validator;
-class AgentValidator extends BaseValidator
+class ConsultValidator extends BaseValidator
 {
     // 当前模型所有验证规则
     public static $rules = [
         'id' => 'required',
-        'real_name' => 'required|max:20',
-        'phone' => 'required|mobile|max:30',
-        'idcard' => 'required|max:20',
+        'realname' => 'required|max:20',
+        'mobile' => 'required|mobile|max:30',
     ];
     public static $msgs = [
         'required' => ':attribute不能为空',
@@ -22,15 +21,13 @@ class AgentValidator extends BaseValidator
     // 当前模型所有验证字段
     public static $fields = [
         'id' => 'ID',
-        'real_name' => '姓名',
-        'phone' => '手机号码',
-        'idcard' => '身份证号码',
+        'realname' => '姓名',
+        'mobile' => '联系方式',
     ];
 
     // 当前模型所有验证场景
     public static $scenes = [
-        'apply'=> ['real_name','phone','idcard'],
-        'save'=> ['id','real_name','phone','idcard'],
+        'submit'=> ['realname','mobile'],
         'del'=> ['id'],
     ];
 

app/Http/Validator/StoreValidator.php

@@ -1,55 +0,0 @@
-<?php
-namespace App\Http\Validator;
-class StoreValidator extends BaseValidator
-{
-    // 当前模型所有验证规则
-    public static $rules = [
-        'id' => 'required',
-        'name' => 'required|max:100',
-        'real_name' => 'required|max:20',
-        'phone' => 'required|mobile|max:30',
-        'address' => 'required|max:200',
-        'category_id' => 'required|max:10',
-        'logo' => 'required|max:250',
-        'business_license' => 'required|max:250',
-    ];
-    public static $msgs = [
-        'required' => ':attribute不能为空',
-        'string' => ':attribute必须是字符串',
-        'min' => ':attribute长度不能小于:min位',
-        'max' => ':attribute长度不能大于:max位',
-        'exists' => ':attribute不存在',
-        'rule' => ':attribute格式不正确',
-        'mobile' => ':attribute格式不正确',
-    ];
-
-    // 当前模型所有验证字段
-    public static $fields = [
-        'id' => 'ID',
-        'name' => '店铺名称',
-        'real_name' => '姓名',
-        'phone' => '电话',
-        'address' => '店铺地址',
-        'category_id' => '行业分类',
-        'logo' => '店铺门头',
-        'business_license' => '营业执照',
-    ];
-
-    // 当前模型所有验证场景
-    public static $scenes = [
-        'apply'=> ['name','real_name','phone','address','category_id','business_license','logo'],
-        'save'=> ['id','name','real_name','phone','address','category_id','business_license','logo'],
-        'del'=> ['id'],
-    ];
-
-    /**
-     * 验证
-     * @param $request
-     * @param string $scene
-     * @return int|mixed
-     */
-    public static function check($request, $scene=''){
-        $validator = new BaseValidator(self::$rules, self::$msgs, self::$fields, self::$scenes);
-        return $validator->checkParams($request, $scene);
-    }
-}