Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

@@ -161,7 +161,7 @@ class BaseController extends Controller
                         break;
                         break;
                     case 'operator_id':
                     case 'operator_id':
                         if(!empty($v)){
                         if(!empty($v)){
-                            $data['operator_name'] = (new User())->get_name();
+                            $data['operator_name'] = (new User())->get_name($v);
                         }
                         }
 
 
                 }
                 }

@@ -7,13 +7,8 @@ use App\Helper\Common;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
 use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
 use App\Http\Logic\Bside\Blog\BlogLogic;
 use App\Http\Logic\Bside\Blog\BlogLogic;
-use App\Http\Logic\Bside\User\UserLogic;
 use App\Http\Requests\Bside\Blog\BlogRequest;
 use App\Http\Requests\Bside\Blog\BlogRequest;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\Blog as BlogModel;
-use App\Models\Blog\BlogCategory as BlogCategoryModel;
-use App\Models\User\User;
-use App\Models\User\UserLog;
-use App\Models\User\UserLogin;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 class BlogController extends BaseController
 class BlogController extends BaseController
 {
 {

@@ -9,7 +9,6 @@ use App\Http\Logic\Bside\News\NewsCategoryLogic;
 use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Requests\Bside\News\NewsRequest;
 use App\Http\Requests\Bside\News\NewsRequest;
 use App\Models\News\News as NewsModel;
 use App\Models\News\News as NewsModel;
-use App\Models\News\NewsCategory as NewsCategoryModel;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 /**
 /**

@@ -25,8 +25,11 @@ class BlogRequest extends FormRequest
     {
     {
         return [
         return [
             'name'=>'required|max:100',
             'name'=>'required|max:100',
+            'url'=>'required',
+            'label_id'=>'required',
             'remark'=>'required|max:100',
             'remark'=>'required|max:100',
             'text'=>'required|min:10',
             'text'=>'required|min:10',
+            'url'=>'required',
         ];
         ];
     }
     }
 
 
@@ -39,6 +42,8 @@ class BlogRequest extends FormRequest
             'name.max'=>'名称最大100字',
             'name.max'=>'名称最大100字',
             'remark.max'=>'简介最大100字',
             'remark.max'=>'简介最大100字',
             'text.max'=>'内容最小100字',
             'text.max'=>'内容最小100字',
+            'label_id.required'=>'标签不能为空',
+            'url.required'=>'请填写链接',
         ];
         ];
     }
     }
 }
 }