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

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Aside;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Enums\Common\Common;
 use App\Enums\Common\Common;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Controller;
+use App\Models\User\User as UserModel;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\Exceptions\HttpResponseException;
@@ -160,6 +161,12 @@ class BaseController extends Controller
                     case 'image':
                     case 'image':
                         $v['image_link'] = url('/a/image/' . $v);
                         $v['image_link'] = url('/a/image/' . $v);
                         break;
                         break;
+                    case 'operator_id':
+                        if(!empty($v)){
+                            $name = (new UserModel())->read(['id'=>$v],['id','name']);
+                            $data['operator_name'] = (isset($name['name']) && !empty($name['name'])) ? $name['name'] : '无名称';
+                        }
+                        break;
                 }
                 }
             }
             }
         }
         }

@@ -17,11 +17,13 @@ use Illuminate\Http\Request;
  */
  */
 class ProjectUserController extends BaseController
 class ProjectUserController extends BaseController
 {
 {
+
     /**
     /**
-     * @name :用户列表
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @remark :用户列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:27
      */
      */
     public function lists(){
     public function lists(){
         $userModel = new UserModel();
         $userModel = new UserModel();
@@ -31,10 +33,12 @@ class ProjectUserController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @name :详情
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param UserLogic $userLogic
+     * @remark :用户详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:27
      */
      */
     public function info(UserLogic $userLogic){
     public function info(UserLogic $userLogic){
         $this->request->validate([
         $this->request->validate([
@@ -42,14 +46,18 @@ class ProjectUserController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
-        $userLogic->user_info();
-        $this->response('success');
+        $info = $userLogic->user_info();
+        $this->response('success',Code::SUCCESS,$info);
     }
     }
+
     /**
     /**
-     * @name :添加用户
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param UserRequest $request
+     * @param UserLogic $userLogic
+     * @remark :添加用户
+     * @name   :add
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:27
      */
      */
     public function add(UserRequest $request,UserLogic $userLogic){
     public function add(UserRequest $request,UserLogic $userLogic){
         $request->validated();
         $request->validated();
@@ -58,10 +66,13 @@ class ProjectUserController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @name : 编辑
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param UserRequest $request
+     * @param UserLogic $userLogic
+     * @remark :编辑用户
+     * @name   :edit
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:28
      */
      */
     public function edit(UserRequest $request,UserLogic $userLogic){
     public function edit(UserRequest $request,UserLogic $userLogic){
         $request->validate([
         $request->validate([
@@ -74,10 +85,12 @@ class ProjectUserController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @name :批量删除
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param UserLogic $userLogic
+     * @remark :编辑用户
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/25 9:28
      */
      */
     public function del(UserLogic $userLogic){
     public function del(UserLogic $userLogic){
         $this->request->validate([
         $this->request->validate([

@@ -92,7 +92,15 @@ class ProjectMenuLogic extends BaseLogic
      * @time   :2023/6/21 17:26
      * @time   :2023/6/21 17:26
      */
      */
     public function MenuList(){
     public function MenuList(){
-        $list = $this->model->list(['status'=>$this->model::ZERO,'is_role'=>$this->model::ZERO]);
-        return $this->success($list);
+        $lists = $this->model->list(['status'=>$this->model::ZERO,'is_role'=>$this->model::ZERO]);
+        $menu = array();
+        foreach ($lists as $v){
+            $v = (array)$v;
+            if ($v['pid'] == 0) {
+                $v['sub'] = _get_child($v['id'], $lists);
+                $menu[]   = $v;
+            }
+        }
+        return $this->success($menu);
     }
     }
 }
 }

@@ -22,7 +22,7 @@ class UserLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function user_info(){
     public function user_info(){
-        $info = $this->model->read($this->param);
+        $info = $this->model->read($this->param,['id','project_id','name','status','mobile','operator_id']);
         if($info === false){
         if($info === false){
             $this->fail('当前数据不存在');
             $this->fail('当前数据不存在');
         }
         }

@@ -32,6 +32,7 @@ Route::middleware(['aloginauth'])->group(function () {
         //栏目管理
         //栏目管理
         Route::prefix('menu')->group(function () {
         Route::prefix('menu')->group(function () {
             Route::any('/', [Aside\User\ProjectMenuController::class, 'lists'])->name('admin.menu_lists');
             Route::any('/', [Aside\User\ProjectMenuController::class, 'lists'])->name('admin.menu_lists');
+            Route::any('/list', [Aside\User\ProjectMenuController::class, 'list'])->name('admin.menu_list');
             Route::any('/info', [Aside\User\ProjectMenuController::class, 'info'])->name('admin.menu_info');
             Route::any('/info', [Aside\User\ProjectMenuController::class, 'info'])->name('admin.menu_info');
             Route::any('/add', [Aside\User\ProjectMenuController::class, 'add'])->name('admin.menu_add');
             Route::any('/add', [Aside\User\ProjectMenuController::class, 'add'])->name('admin.menu_add');
             Route::any('/edit', [Aside\User\ProjectMenuController::class, 'edit'])->name('admin.menu_edit');
             Route::any('/edit', [Aside\User\ProjectMenuController::class, 'edit'])->name('admin.menu_edit');
@@ -106,7 +107,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/del', [Aside\Project\ProjectGscController::class, 'del'])->name('admin.del');
         Route::any('/del', [Aside\Project\ProjectGscController::class, 'del'])->name('admin.del');
     });
     });
 
 
-    //优化gsc账号记录表
+    //gsc账号审核
     Route::prefix('optimize')->group(function () {
     Route::prefix('optimize')->group(function () {
         Route::any('/empowerDomain', [Aside\Project\OptimizeController::class, 'empowerDomain'])->name('admin.empowerDomain');
         Route::any('/empowerDomain', [Aside\Project\OptimizeController::class, 'empowerDomain'])->name('admin.empowerDomain');
     });
     });
@@ -192,8 +193,8 @@ Route::middleware(['aloginauth'])->group(function () {
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {
     Route::any('/login', [Aside\LoginController::class, 'login'])->name('admin.login.white');
     Route::any('/login', [Aside\LoginController::class, 'login'])->name('admin.login.white');
-    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('image_show');
-    Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('file_show');
+    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('admin.image_show');
+    Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('admin.file_show');
 });
 });