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

@@ -61,14 +61,14 @@ class AyrReleaseController extends BaseController
         $share_info = $ayrShareLogic->ayr_share_info($this->param['share_id']);
         //验证发送平台
         $ayrShareLogic->verify_param($share_info);
-        $data['images'] = $this->param['images'];
         if(isset($this->param['video']) && !empty($this->param['video'])){
             $data['files'] = $this->param['video'];
         }
+        if(isset($this->param['images']) && !empty($this->param['images'])){
+            $data['images'] = $this->param['images'];
+        }
         //参数处理
         $this->param['mediaUrls'] = $ayrReleaseLogic->image_file_param($data);
-        var_dump($this->param);
-        die();
         //时间处理
         $datetime = new \DateTime($this->param['schedule_date']);
         $formattedTime = $datetime->format("Y-m-d\TH:i:s\Z");

@@ -5,24 +5,12 @@ namespace App\Http\Controllers\Bside\User;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\User\DeptUserLogic;
+use App\Http\Logic\Bside\User\UserLogic;
 use App\Models\User\DeptUser;
 use App\Models\User\ViewDeptUser;
 
 class DeptUserController extends BaseController
 {
-    /**
-     * @param ViewDeptUser $viewDeptUser
-     * @name   :（部门获取成员列表）lists
-     * @author :lyh
-     * @method :post
-     * @time   :2023/5/17 17:27
-     */
-    public function lists(ViewDeptUser $viewDeptUser){
-        $this->param['project_id'] = $this->user['project_id'];
-        $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,$this->order);
-        $this->response('success',Code::SUCCESS,$lists);
-    }
-
 
     /**
      * @param ViewDeptUser $viewDeptUser
@@ -42,12 +30,12 @@ class DeptUserController extends BaseController
     }
 
     /**
-     * @name   :(部门添加用户)add
+     * @name   :(部门添加与更新用户)add
      * @author :lyh
      * @method :post
      * @time   :2023/5/17 17:36
      */
-    public function add(DeptUserLogic $deptUserLogic){
+    public function save(DeptUserLogic $deptUserLogic){
         $this->request->validate([
             'dept_id'=>['required'],
             'user_id'=>['required']
@@ -55,43 +43,43 @@ class DeptUserController extends BaseController
             'dept_id.required' => '组织架构id不能为空',
             'user_id.required' => '用户id不能为空',
         ]);
-        $deptUserLogic->dept_user_add();
+        $deptUserLogic->dept_user_save();
         $this->response('success');
     }
 
     /**
-     * @name   :(编辑成员)edit
+     * @name   :(设置管理员)set_admin
      * @author :lyh
      * @method :post
-     * @time   :2023/5/18 9:19
+     * @time   :2023/5/18 10:32
      */
-    public function edit(DeptUserLogic $deptUserLogic){
+    public function set_admin(DeptUserLogic $deptUserLogic){
         $this->request->validate([
             'id'=>['required'],
-            'dept_id'=>['required'],
+            'is_admin'=>['required'],
         ],[
             'id.required' => 'id不能为空',
-            'dept_id.required' => '组织架构id不能为空',
+            'is_admin.required' => 'is_admin不能为空',
         ]);
         $deptUserLogic->dept_user_edit();
         $this->response('success');
     }
 
     /**
-     * @name   :(设置管理员)set_admin
+     * @name   :(设置用户角色)set_role
      * @author :lyh
      * @method :post
-     * @time   :2023/5/18 10:32
+     * @time   :2023/5/19 9:32
      */
-    public function set_admin(DeptUserLogic $deptUserLogic){
+    public function set_role(DeptUserLogic $deptUserLogic){
         $this->request->validate([
             'id'=>['required'],
-            'is_admin'=>['required'],
+            'role_id'=>['required'],
         ],[
-            'id.required' => 'id不能为空',
-            'is_admin.required' => 'is_admin不能为空',
+            'id.required' => '用户id不能为空',
+            'role_id.required' => 'role_id不能为空',
         ]);
-        $deptUserLogic->dept_user_edit();
+        $deptUserLogic->user_edit_role();
         $this->response('success');
     }
 }

@@ -7,7 +7,9 @@ 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\ProjectRole;
 use App\Models\User\User as UserModel;
+use App\Models\User\ViewDeptUser;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 
@@ -19,17 +21,24 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function lists(UserModel $userModel){
-        //TODO::搜索参数统一处理
+    public function lists(ViewDeptUser $viewDeptUser){
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at','wechat','status']);
-        if(empty($lists)){
-            $this->response('error',Code::USER_ERROR,[]);
-        }
+        $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,'user_id');
         $this->response('success',Code::SUCCESS,$lists);
     }
 
     /**
+     * @name   :(添加管理员获取角色菜单)role_list
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/18 17:04
+     */
+    public function role_list(ProjectRole $projectRole){
+        $list = $projectRole->list(['status'=>0,'project_id'=>$this->user['project_id']],'id');
+        $this->response('success',Code::SUCCESS,$list);
+    }
+
+    /**
      * @name :添加管理员
      * @return void
      * @author :liyuhang

@@ -70,7 +70,7 @@ class AyrReleaseLogic extends BaseLogic
                 $fileModel = new File();
                 $info = $fileModel->read(['hash'=>$v]);
                 $filename = basename($info['path']);
-                $arr[] = url('/upload/file/'.$filename);
+                $arr[] = url('/upload/files/'.$filename);
             }
         }
         return $this->success($arr);

@@ -209,6 +209,9 @@ class AyrShareLogic extends BaseLogic
             if(!in_array($v,json_decode($info['bind_platforms']))){
                 $this->fail('未绑定平台');
             }
+            if($v == 'reddit' && isset($this->param['video'])){
+                $this->fail('不支持视频');
+            }
             //验证图片数
             $img_num = count($this->param['images']);
             if($img_num > $this->send_num[$v]){

@@ -4,7 +4,7 @@ namespace App\Http\Logic\Bside\User;
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\User\DeptUser;
-use App\Models\User\User;
+use App\Models\User\User as UserModel;
 
 class DeptUserLogic extends BaseLogic
 {
@@ -15,6 +15,23 @@ class DeptUserLogic extends BaseLogic
         $this->model = new DeptUser();
         $this->param = $this->requestAll;
     }
+    /**
+     * @name   :(部门用户)dept_user_add
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/18 10:21
+     */
+    public function dept_user_save(){
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $rs = $this->dept_user_edit($this->param);
+        }else{
+            $rs = $this->dept_user_add();
+        }
+        if ($rs === false) {
+            $this->fail('部门添加成员失败');
+        }
+        return $this->success();
+    }
 
     /**
      * @name   :(部门添加用户)dept_user_add
@@ -43,8 +60,23 @@ class DeptUserLogic extends BaseLogic
      * @method :post
      * @time   :2023/5/17 17:54
      */
-    public function dept_user_edit(){
-        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+    public function dept_user_edit($param){
+        $rs = $this->model->edit($param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @name   :(用户设置角色)user_edit_role
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/19 9:35
+     */
+    public function user_edit_role(){
+        $userModel = new UserModel();
+        $rs = $userModel->edit(['role_id'=>$this->param['role_id']],['id'=>$this->param['id']]);
         if($rs === false){
             $this->fail('error');
         }

@@ -24,7 +24,7 @@ class AyrReleaseRequest extends FormRequest
     {
         return [
             'title'=>'required',
-            'images'=>'required|array',
+//            'images'=>'required|array',
 //            'video'=>'required',
             'content'=>'required',
             'share_id'=>'required',

@@ -21,6 +21,7 @@ Route::middleware(['bloginauth'])->group(function () {
         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('/role_list', [\App\Http\Controllers\Bside\User\UserController::class, 'role_list'])->name('user_role_list');
         Route::any('/del', [\App\Http\Controllers\Bside\User\UserController::class, 'del'])->name('user_del');
     });
 
@@ -96,7 +97,7 @@ Route::middleware(['bloginauth'])->group(function () {
         //公用ai自动生成
         Route::any('/ai_http_post', [\App\Http\Controllers\Bside\Ai\AiCommandController::class, 'ai_http_post'])->name('ai_http_post');
     });
-    //ai指令
+    //网站设置
     Route::prefix('setting')->group(function () {
         //首页设置
         Route::any('/', [\App\Http\Controllers\Bside\Setting\WebSettingController::class, 'lists'])->name('web_setting_lists');
@@ -175,12 +176,10 @@ Route::middleware(['bloginauth'])->group(function () {
         //成员管理
         //组织架构
         Route::prefix('user')->group(function () {
-            Route::any('/', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'lists'])->name('dept_user');
-            Route::any('/add', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'add'])->name('dept_user_add');
+            Route::any('/save', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'save'])->name('dept_user_add');
             Route::any('/info', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'info'])->name('dept_user_info');
-            Route::post('/edit', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'edit'])->name('dept_user_edit');
             Route::any('/set_admin', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'set_admin'])->name('dept_user_set_admin');
-
+            Route::any('/set_role', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'set_role'])->name('dept_user_set_role');
         });
     });
 
@@ -270,5 +269,5 @@ Route::group([], function () {
 //    Route::any('/', [\App\Http\Controllers\Bside\ComController::class, 'get_country'])->name('get_country');
     Route::get('/file/download', [\App\Http\Controllers\Bside\FileController::class, 'download'])->name('file_download');
     Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class,'index'])->name('image_show');
-    Route::any('/file_hash/{hash}/{w?}', [\App\Http\Controllers\File\FileController::class,'index'])->name('file_show');
+    Route::any('/file_hash/{hash}', [\App\Http\Controllers\File\FileController::class,'index'])->name('file_show');
 });