周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 c0cec62277977a462e69873edd2cb4b655e01db7 2 个父辈 8bb5df27 61aadc42

合并分支 'lyh-server' 到 'master' 

变更数据



查看合并请求 !2867
内嵌 并排对比
正在显示 9 个修改的文件 包含 17 行增加 和 23 行删除
... ... @@ -218,15 +218,8 @@ class BlogController extends BaseController
public function edit_seo(BlogLogic $blogLogic){
$this->request->validate([
'id'=>['required'],
'seo_title'=>['required','max:70'],
'seo_description'=>['required','max:200'],
'seo_keywords'=>['required','max:200'],
],[
'id.required' => 'ID不能为空',
'seo_title.required' => 'seo_title不能为空',
'seo_description.required' => 'seo_description不能为空',
'seo_keywords.required' => 'seo_description不能为空',
'seo_title.max' => 'seo_title不能超过70个字符',
]);
$blogLogic->edit_seo();
$this->response('success');
... ...
... ... @@ -201,14 +201,14 @@ class CustomModuleContentController extends BaseController
'name'=>['required'],
'route'=>['required'],
'module_id'=>['required'],
'seo_title'=>['max:70'],
// 'seo_title'=>['max:70'],
'seo_keywords'=>['max:200'],
'seo_description'=>['max:200'],
],[
'name.required' => '分类名称不能为空',
'route.required' => '分类路由不能为空',
'module_id.required' => '所选模块id不能为空',
'seo_title.max' => 'SEO标题不能超过70个字符',
// 'seo_title.max' => 'SEO标题不能超过70个字符',
'seo_keywords.max' => 'SEO关键词不能超过200个字符',
'seo_description.max' => 'SEO描述不能超过200个字符',
]);
... ...
... ... @@ -44,6 +44,9 @@ class ProductLogic extends BaseLogic
if(isset($this->param['id']) && !empty($this->param['id'])){
$data = $this->editProduct();
}else{
if(!isset($this->param['seo_title']) || empty($this->param['seo_title'])){
$this->param['seo_title'] = $this->param['title'];
}
$data = $this->addProduct();
}
CategoryRelated::saveRelated($data['id'], $this->param['category_id'] ?? []);//分类关联
... ...
... ... @@ -25,7 +25,7 @@ class AiBlogRequest extends FormRequest
{
return [
'new_title'=>'required',
'seo_title'=>'max:70',
// 'seo_title'=>'max:70',
'seo_keywords'=>'max:200',
'seo_description'=>'max:200',
];
... ... @@ -35,7 +35,7 @@ class AiBlogRequest extends FormRequest
{
return [
'new_title.required' => '新标题不能为空',
'seo_title.max' => 'SEO标题不能超过70个字符',
// 'seo_title.max' => 'SEO标题不能超过70个字符',
'seo_keywords.max' => 'SEO关键词不能超过200个字符',
'seo_description.max' => 'SEO描述不能超过200个字符',
];
... ...
... ... @@ -27,7 +27,7 @@ class BlogRequest extends FormRequest
'name'=>'required|max:200',
'remark'=>'max:1000',
'url'=>'required',
'seo_title'=>'max:70',
// 'seo_title'=>'max:70',
'seo_keywords'=>'max:200',
'seo_description'=>'max:200',
// 'text'=>'max:5000',
... ... @@ -40,7 +40,7 @@ class BlogRequest extends FormRequest
'name.required'=>'请填写名称',
'name.max'=>'名称超过最长长度200',
'url.required'=>'链接不能为空',
'seo_title.max' => 'SEO标题不能超过70个字符',
// 'seo_title.max' => 'SEO标题不能超过70个字符',
'seo_keywords.max' => 'SEO关键词不能超过200个字符',
'seo_description.max' => 'SEO描述不能超过200个字符',
'remark.max'=>'描述超过最长长度1000',
... ...
... ... @@ -25,7 +25,7 @@ class NewsCategoryRequest extends FormRequest
{
return [
'name'=>'required|max:200',
'seo_title'=>'max:70',
// 'seo_title'=>'max:70',
'seo_keywords'=>'max:200',
'seo_description'=>'max:200',
];
... ... @@ -36,7 +36,7 @@ class NewsCategoryRequest extends FormRequest
return [
'name.required'=>'请填写名称',
'name.max'=>'名称最大100字',
'seo_title.max' => 'SEO标题不能超过70个字符',
// 'seo_title.max' => 'SEO标题不能超过70个字符',
'seo_keywords.max' => 'SEO关键词不能超过200个字符',
'seo_description.max' => 'SEO描述不能超过200个字符',
];
... ...
... ... @@ -27,7 +27,7 @@ class NewsRequest extends FormRequest
'name'=>'required|max:200',
// 'remark'=>'max:2000',
'url'=>'required',
'seo_title' => 'max:70',
// 'seo_title' => 'max:70',
'seo_keywords' => 'max:200',
'seo_description' => 'max:200',
];
... ... @@ -40,7 +40,7 @@ class NewsRequest extends FormRequest
'name.max'=>'名称超过最长长度200',
'url.required'=>'链接不能为空',
// 'remark.max'=>'描述超过最长长度2000'
'seo_title.max' => 'SEO标题不能超过70个字符',
// 'seo_title.max' => 'SEO标题不能超过70个字符',
'seo_keywords.max' => 'SEO关键词不能超过300个字符',
'seo_description.max' => 'SEO描述不能超过200个字符',
];
... ...
... ... @@ -31,7 +31,7 @@ class KeywordRequest extends FormRequest
{
return [
'title'=>'required|max:200',
'seo_title'=>'max:70',
// 'seo_title'=>'max:70',
'seo_keywords'=>'max:200',
'seo_description'=>'max:200',
'related_news_ids'=>'array|max:2',
... ... @@ -44,7 +44,7 @@ class KeywordRequest extends FormRequest
return [
'title.required' => '请输入关键词',
'title.max' => '关键词不能超过200个字符',
'seo_title.max' => 'SEO标题不能超过70个字符',
// 'seo_title.max' => 'SEO标题不能超过70个字符',
'seo_keywords.max' => 'SEO关键词不能超过200个字符',
'seo_description.max' => 'SEO描述不能超过200个字符',
'related_news_ids.max' => '关联新闻不能超过两条',
... ...
... ... @@ -38,8 +38,7 @@ class ProductRequest extends FormRequest
return [
'title' => 'required|max:200',
'route' => 'required|max:200',
'seo_mate.title' => 'max:70',
'seo_mate.keyword' => 'max:200',
'seo_mate.keywords' => 'max:300',
'seo_mate.description' => 'max:200',
'status' => ['required', Rule::in(array_keys(Product::statusMap()))],
];
... ... @@ -55,8 +54,7 @@ class ProductRequest extends FormRequest
'status.required' => '请选择产品状态',
'status.in' => '产品状态值异常',
// 可选的 seo_mate 子字段的提示
'seo_mate.title.max' => 'SEO 标题不能超过70个字符',
'seo_mate.keyword.max' => 'SEO 关键字不能超过200个字符',
'seo_mate.keywords.max' => 'SEO 关键字不能超过200个字符',
'seo_mate.description.max' => 'SEO 描述不能超过200个字符',
];
}
... ...