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

@@ -2,6 +2,10 @@
 
 namespace App\Http\Controllers\Bside;
 
+use App\Enums\Common\Code;
+use App\Http\Logic\Bside\ProjectGroupLogic;
+use App\Http\Requests\Bside\ProjectGroupRequest;
+
 /**
  * @name:用户组相关
  */
@@ -17,4 +21,39 @@ class ProjectGroupController extends BaseController
     {
 
     }
+
+    /**
+     * @param ProjectGroupRequest $request
+     * @param ProjectGroupLogic $logic
+     * @name : 添加用户组
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function add(ProjectGroupRequest $request){
+        $this->response('success');
+    }
+
+    /**
+     * @param ProjectGroupRequest $request
+     * @param ProjectGroupLogic $logic
+     * @name :编辑用户组
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function edit(ProjectGroupRequest $request){
+        $request->validated();
+        $this->response('success');
+    }
+
+    /**
+     * @name :删除用户组
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function del(){
+
+    }
 }

@@ -3,12 +3,8 @@
 namespace App\Http\Controllers\Bside;
 
 use App\Enums\Common\Code;
-use App\Http\Logic\Bside\UserLogic;
 use App\Models\User as UserModel;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Validator;
-use Symfony\Component\HttpFoundation;
 
 class UserController extends BaseController
 {
@@ -56,7 +52,7 @@ class UserController extends BaseController
         ];
         $validate = Validator::make($this->param, $rules, $message);
         if($validate->fails()){
-                return $this->response($validate->errors()->first(),Code::USER_LOGIN_ERROE,$this->param);
+                return $this->response($validate->errors()->first(),Code::USER_LOGIN_ERROE);
         }
         $userModel = new UserModel();
         $this->param['project_id'] = $this->user['project_id'];

+<?php
+
+namespace App\Http\Logic\Bside;
+
+class ProjectGroupLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->model = new Attr();
+    }
+}

+<?php
+
+namespace App\Http\Requests\Bside;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ProjectGroupRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name'=>['required'],
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required' => '请输入描述名称',
+        ];
+    }
+}

 <?php
 
-namespace App\Http\Requests\Bside\product;
+namespace App\Http\Requests\Bside;
 
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -24,25 +24,7 @@ class UserRequest extends FormRequest
     public function rules()
     {
         return [
-            'mobile'=>'required|string|max:11',
-            'password'=>'required|string|min:5',
-            'name'=>'required|max:20',
-            'role_id'=>'required'
-        ];
-    }
-
-    public function messages()
-    {
-        return [
-            'mobile.required'=>'号码必须填写',
-            'mobile.string'=>'号码中含有非法文字',
-            'mobile.max'   =>  '号码不大于11字符.',
-            'password.required'=>'密码必须填写',
-            'password.string'=>'密码中含有非法文字',
-            'password.min'   =>  '密码不小于5字符.',
-            'name.required'=>'名称必须填写',
-            'name.min'   =>  '名称不小于5字符.',
-            'role_id.required'=>'角色必须填写',
+            'mobile'=>['required'],
         ];
     }
 }

@@ -27,6 +27,13 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::any('/project_role/status', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'status'])->name('project_role_status');
     Route::any('/project_role/del', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'del'])->name('project_role_del');
 
+    //group相关路由
+    Route::any('/project_group/add', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'add'])->name('project_group_add');
+    Route::any('/project_group/edit', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'edit'])->name('project_group_edit');
+    Route::any('/project_group/status', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'status'])->name('project_group_status');
+    Route::any('/project_group/lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'lists'])->name('project_group_lists');
+    Route::any('/project_group/del', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'del'])->name('project_group_del');
+
 });
 
 //无需登录验证的路由组