gx路由设置

@@ -38,27 +38,6 @@ class ProductRequest extends FormRequest
         return [
         return [
             'title' => 'required|max:200',
             'title' => 'required|max:200',
             'route' => 'required|max:200',
             'route' => 'required|max:200',
-//            'gallery' => ['required', 'array'],
-//            'icon' => 'required|array',
-//            'attrs' => ['array', function ($attribute, $value, $fail) {
-//                foreach ($value as $v) {
-//                    if (empty($v['key'])) {
-//                        $fail('产品属性名不能为空');
-//                    }
-//                    if (empty($v['value'])) {
-//                        $fail('产品属性值不能为空');
-//                    }
-//                }
-//            }],
-//            'category_id' => 'required',
-//            'intro' => 'required|max:500',
-//            'content' => 'required',
-//            'related_product_id' => [function ($attribute, $value, $fail) {
-//                $value = array_filter(Arr::splitFilterToArray($value), 'intval');
-//                if(count($value) > 16){
-//                    $fail('关联产品不能超过16个');
-//                }
-//            }],
             'status' => ['required', Rule::in(array_keys(Product::statusMap()))],
             'status' => ['required', Rule::in(array_keys(Product::statusMap()))],
         ];
         ];
     }
     }
@@ -70,16 +49,6 @@ class ProductRequest extends FormRequest
             'title.max' => '产品标题不能超过200个字符',
             'title.max' => '产品标题不能超过200个字符',
             'route.required' => '请输入产品链接',
             'route.required' => '请输入产品链接',
             'route.max' => '产品链接不能超过200个字符',
             'route.max' => '产品链接不能超过200个字符',
-//            'gallery.required' => '请上传产品图片',
-//            'gallery.array' => '产品图片格式异常',
-//            'attrs.required' => '请添加产品参数',
-//            'attrs.array' => '产品参数格式异常',
-//            'icon.required' => '图标不能为空',
-//            'category_id.required' => '请选择分类',
-//            'intro.required' => '请输入短描述',
-//            'intro.max' => '短描述不能超过500个字符',
-//            'content.required' => '请输入产品描述',
-//            'related_product_id.required' => '请选择相关产品',
             'status.required' => '请选择产品状态',
             'status.required' => '请选择产品状态',
             'status.in' => '产品状态值异常',
             'status.in' => '产品状态值异常',
         ];
         ];

@@ -68,12 +68,11 @@ class RouteMap extends Base
         }
         }
         //过滤特殊字符
         //过滤特殊字符
         $sign = generateRoute($title);
         $sign = generateRoute($title);
-        //查看当前路由是否存在
-        $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
+        //查看当前数据路由是否存在
+        $routeInfo = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
         $suffix = '';//设置路由后缀
         $suffix = '';//设置路由后缀
         $route_len = 180;//默认设置字符为180
         $route_len = 180;//默认设置字符为180
-        //产品路由新增时，拼接-product
-        if(empty($info)){
+        if(empty($routeInfo)){
             if($source == self::SOURCE_PRODUCT){
             if($source == self::SOURCE_PRODUCT){
                 $suffix = '-product';
                 $suffix = '-product';
             }
             }