gx

@@ -4,7 +4,8 @@ namespace App\Http\Controllers\Aside\User;
 
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
-use App\Models\ProjectMenu as ProjectMenuModel;
+use App\Http\Requests\Aside\User\ProjectRoleRequest;
+use App\Models\User\ProjectMenu as ProjectMenuModel;
 
 class ProjectMenuController extends BaseController
 {
@@ -26,8 +27,12 @@ class ProjectMenuController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function info(){
-
+    public function info(ProjectRoleRequest $request){
+        $request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
     }
 
     /**

@@ -6,7 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\User\ProjectRoleLogic;
 use App\Http\Requests\Aside\User\ProjectRoleRequest;
-use App\Models\ProjectRole as ProjectRoleModel;
+use App\Models\User\ProjectRole as ProjectRoleModel;
 
 class ProjectRoleController extends BaseController
 {

@@ -6,7 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\User\UserLogic;
 use App\Http\Requests\Aside\User\UserRequest;
-use App\Models\User as UserModel;
+use App\Models\User\User as UserModel;
 
 class ProjectUserController extends BaseController
 {

@@ -5,11 +5,12 @@ namespace App\Http\Controllers\Bside;
 use App\Enums\Common\Code;
 use App\Models\Project;
 use App\Models\Project as ProjectModel;
-use App\Models\ProjectMenu as ProjectMenuModel;
-use App\Models\ProjectRole as ProjectRoleModel;
-use App\Models\User as UserModel;
+use App\Models\User\ProjectMenu as ProjectMenuModel;
+use App\Models\User\ProjectRole as ProjectRoleModel;
+use App\Models\User\User as UserModel;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
+
 /***
  * 当前为公共类  所有方法均不需要验证登录token
  */

 <?php
 
-namespace App\Http\Controllers\Bside;
+namespace App\Http\Controllers\Bside\User;
 
 use App\Enums\Common\Code;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Controllers\Bside\Ids;
+use App\Http\Controllers\Bside\json;
 use App\Http\Logic\Bside\ProjectGroupLogic;
-use App\Http\Requests\Bside\ProjectGroupRequest;
+use App\Http\Requests\Bside\User\ProjectGroupRequest;
 use App\Models\ProjectGroup as ProjectGroupModel;
-use App\Models\User as UserModel;
+use App\Models\User\User as UserModel;
 use Illuminate\Http\Request;
 
 

 <?php
 
-namespace App\Http\Controllers\Bside;
+namespace App\Http\Controllers\Bside\User;
 
 use App\Enums\Common\Code;
-use App\Http\Logic\Bside\RoleLogic;
-use App\Http\Requests\Bside\ProjectRoleRequest;
-use App\Models\ProjectRole as ProjectRoleModel;
-use App\Models\User as UserModel;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\User\RoleLogic;
+use App\Http\Requests\Bside\User\ProjectRoleRequest;
+use App\Models\User\ProjectRole as ProjectRoleModel;
+use App\Models\User\User as UserModel;
 use Illuminate\Http\Request;
 
 class ProjectRoleController extends BaseController

 <?php
 
-namespace App\Http\Controllers\Bside;
+namespace App\Http\Controllers\Bside\User;
 
 use App\Enums\Common\Code;
-use App\Http\Logic\Bside\UserLogic;
-use App\Http\Requests\Bside\UserRequest;
-use App\Models\User as UserModel;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Controllers\Bside\json;
+use App\Http\Logic\Bside\User\UserLogic;
+use App\Http\Requests\Bside\User\UserRequest;
+use App\Models\User\User as UserModel;
 use Illuminate\Http\Request;
 
 class UserController extends BaseController

@@ -3,7 +3,7 @@
 namespace App\Http\Logic\Aside\User;
 
 use App\Http\Logic\Aside\BaseLogic;
-use App\Models\ProjectMenu;
+use App\Models\User\ProjectMenu;
 
 class ProjectMenuLogic extends BaseLogic
 {

@@ -3,8 +3,8 @@
 namespace App\Http\Logic\Aside\User;
 
 use App\Http\Logic\Aside\BaseLogic;
-use App\Models\ProjectMenu as ProjectMenuModel;
-use App\Models\ProjectRole;
+use App\Models\User\ProjectMenu as ProjectMenuModel;
+use App\Models\User\ProjectRole;
 
 class ProjectRoleLogic extends BaseLogic
 {

@@ -2,9 +2,8 @@
 
 namespace App\Http\Logic\Aside\User;
 
-use App\Enums\Common\Code;
 use App\Http\Logic\Aside\BaseLogic;
-use App\Models\User;
+use App\Models\User\User;
 
 class UserLogic extends BaseLogic
 {

 <?php
 
-namespace App\Http\Logic\Bside;
+namespace App\Http\Logic\Bside\User;
 
 use App\Enums\Common\Code;
-use App\Models\ProjectMenu as ProjectMenuModel;
-use App\Models\ProjectRole as ProjectRoleModel;
-use App\Models\User;
-use App\Models\User as UserModel;
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\User\ProjectMenu as ProjectMenuModel;
+use App\Models\User\ProjectRole as ProjectRoleModel;
+use App\Models\User\User;
 
 class RoleLogic extends BaseLogic
 {
@@ -84,7 +84,7 @@ class RoleLogic extends BaseLogic
      */
     public function role_del(){
         //查询当前角色下是否有用户
-        $userModel = new UserModel();
+        $userModel = new User();
         //批量删除
         foreach ($this->param['id'] as $v){
             $user_info = $userModel->read(['role_id'=>$v]);

 <?php
 
-namespace App\Http\Logic\Bside;
+namespace App\Http\Logic\Bside\User;
 
 use App\Enums\Common\Code;
+use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Image;
-use App\Models\User;
-use Illuminate\Support\Facades\DB;
+use App\Models\User\User;
 
 class UserLogic extends BaseLogic
 {

@@ -2,10 +2,6 @@
 
 namespace App\Http\Middleware;
 
-use App\Enums\Common\Code;
-use App\Models\ProjectMenu;
-use App\Models\ProjectRole as ProjectRoleModel;
-
 class AccessToken
 {
     /**

@@ -3,14 +3,12 @@
 namespace App\Http\Middleware\Bside;
 
 use App\Enums\Common\Code;
-use App\Models\ProjectMenu;
-use App\Models\ProjectRole as ProjectRoleModel;
-use App\Services\ProjectServer;
+use App\Models\User\ProjectMenu;
+use App\Models\User\ProjectRole as ProjectRoleModel;
 use Closure;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Http\Exceptions\HttpResponseException;
+
 class LoginAuthMiddleware
 {
     /**

 <?php
 
-namespace App\Http\Requests\Bside;
+namespace App\Http\Requests\Bside\User;
 
 use Illuminate\Foundation\Http\FormRequest;
 

 <?php
 
-namespace App\Http\Requests\Bside;
+namespace App\Http\Requests\Bside\User;
 
 use Illuminate\Foundation\Http\FormRequest;
 

 <?php
 
-namespace App\Http\Requests\Bside;
+namespace App\Http\Requests\Bside\User;
 
 use Illuminate\Foundation\Http\FormRequest;
 

 <?php
 
-namespace App\Models;
+namespace App\Models\User;
+
+use App\Models\Base;
 
 class ProjectMenu extends Base
 {

 <?php
 
-namespace App\Models;
+namespace App\Models\User;
+
+use App\Models\Base;
 
 class ProjectRole extends Base
 {

 <?php
 
-namespace App\Models;
+namespace App\Models\User;
 
 //use Illuminate\Contracts\Auth\MustVerifyEmail;
-use App\Models\ProjectRole as ProjectRoleModel;
-use App\Models\User as UserModel;
+use App\Models\Base;
+use App\Models\User\ProjectRole as ProjectRoleModel;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-//use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Cache;
 use Laravel\Sanctum\HasApiTokens;
 
+//use Illuminate\Foundation\Auth\User as Authenticatable;
+
 class User extends Base
 {
     use HasApiTokens, HasFactory, Notifiable;

@@ -62,7 +62,7 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\Models\User::class,
+            'model' => \App\Models\User\User::class,
         ],
 
         // 'users' => [

@@ -18,12 +18,12 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::any('/notice/', [\App\Http\Controllers\Bside\NoticeController::class, 'lists'])->name('notice_lists');
     //用户相关路由
     Route::prefix('user')->group(function () {
-        Route::any('/', [\App\Http\Controllers\Bside\UserController::class, 'lists'])->name('user_lists');
-        Route::any('/add', [\App\Http\Controllers\Bside\UserController::class, 'add'])->name('user_add');
-        Route::any('/edit', [\App\Http\Controllers\Bside\UserController::class, 'edit'])->name('user_edit');
-        Route::any('/status', [\App\Http\Controllers\Bside\UserController::class, 'status'])->name('user_status');
-        Route::any('/info', [\App\Http\Controllers\Bside\UserController::class, 'info'])->name('user_info');
-        Route::any('/del', [\App\Http\Controllers\Bside\UserController::class, 'del'])->name('user_del');
+        Route::any('/', [\App\Http\Controllers\Bside\User\UserController::class, 'lists'])->name('user_lists');
+        Route::any('/add', [\App\Http\Controllers\Bside\User\UserController::class, 'add'])->name('user_add');
+        Route::any('/edit', [\App\Http\Controllers\Bside\User\UserController::class, 'edit'])->name('user_edit');
+        Route::any('/status', [\App\Http\Controllers\Bside\User\UserController::class, 'status'])->name('user_status');
+        Route::any('/info', [\App\Http\Controllers\Bside\User\UserController::class, 'info'])->name('user_info');
+        Route::any('/del', [\App\Http\Controllers\Bside\User\UserController::class, 'del'])->name('user_del');
     });
 
     //站内信
@@ -34,24 +34,24 @@ Route::middleware(['bloginauth'])->group(function () {
 
     //用户角色相关路由
     Route::prefix('role')->group(function () {
-        Route::any('/', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'lists'])->name('project_role_lists');
-        Route::any('/get_role_menu', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'get_role_menu'])->name('project_get_role_add');
-        Route::any('/add', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'add'])->name('project_role_add');
-        Route::any('/edit', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'edit'])->name('project_role_edit');
-        Route::any('/info', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'status'])->name('project_role_info');
-        Route::any('/status', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'status'])->name('project_role_status');
-        Route::any('/del', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'del'])->name('project_role_del');
-        Route::any('/get_user_list', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'get_user_list'])->name('project_role_get_user_list');
+        Route::any('/', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'lists'])->name('project_role_lists');
+        Route::any('/get_role_menu', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'get_role_menu'])->name('project_get_role_add');
+        Route::any('/add', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'add'])->name('project_role_add');
+        Route::any('/edit', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'edit'])->name('project_role_edit');
+        Route::any('/info', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'status'])->name('project_role_info');
+        Route::any('/status', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'status'])->name('project_role_status');
+        Route::any('/del', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'del'])->name('project_role_del');
+        Route::any('/get_user_list', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'get_user_list'])->name('project_role_get_user_list');
     });
 
     //group相关路
     Route::prefix('group')->group(function () {
-        Route::any('/', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'lists'])->name('project_group_lists');
-        Route::any('/add', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'add'])->name('project_group_add');
-        Route::any('/edit', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'edit'])->name('project_group_edit');
-        Route::any('/info', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'info'])->name('project_group_info');
-        Route::any('/del', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'del'])->name('project_group_del');
-        Route::any('/get_user_lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'get_user_lists'])->name('project_group_get_user_lists');
+        Route::any('/', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'lists'])->name('project_group_lists');
+        Route::any('/add', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'add'])->name('project_group_add');
+        Route::any('/edit', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'edit'])->name('project_group_edit');
+        Route::any('/info', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'info'])->name('project_group_info');
+        Route::any('/del', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'del'])->name('project_group_del');
+        Route::any('/get_user_lists', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'get_user_lists'])->name('project_group_get_user_lists');
     });
 
     //新闻相关路由