gx

@@ -53,33 +53,26 @@ class AyrReleaseController extends BaseController
      * @time   :2023/5/9 9:36
      * @time   :2023/5/9 9:36
      */
      */
     public function send_post(AyrReleaseLogic $ayrReleaseLogic,AyrShareLogic $ayrShareLogic,AyrShareHelper $ayrShare){
     public function send_post(AyrReleaseLogic $ayrReleaseLogic,AyrShareLogic $ayrShareLogic,AyrShareHelper $ayrShare){
-//        DB::beginTransaction();
-//        try {
-            //获取发送账号详情
-            $share_info = $ayrShareLogic->ayr_share_info();
-            $data = [
-                'images'=>$this->param['image'],
-                'files'=>$this->param['file'],
-            ];
-            //参数处理
-            $this->param['mediaUrls'] = $ayrReleaseLogic->image_file_param($data);;
-            //统一生成链接
-            $param = [
-                'post'=>$this->param['content'],
-                'platforms'=>$this->param['platforms'],
-                'mediaUrls'=>$this->param['mediaUrls'],//参数处理
-                'idempotencyKey'=>$this->param['idempotencyKey'],//时间（如是过去时间，立即发布）
-            ];
-            //发送请求注册社交用户
-            $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
-            $this->response('success',Code::SUCCESS,$res);
-            //保存数据库
-            $ayrReleaseLogic->release_add();
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->response('error',Code::USER_ERROR);
-//        }
+        //获取发送账号详情
+        $share_info = $ayrShareLogic->ayr_share_info();
+        $data = [
+            'images'=>$this->param['images'],
+            'files'=>$this->param['video'],
+        ];
+        //参数处理
+        $this->param['mediaUrls'] = $ayrReleaseLogic->image_file_param($data);;
+        //统一生成发布
+        $param = [
+            'post'=>$this->param['content'],
+            'platforms'=>$this->param['platforms'],
+            'mediaUrls'=>$this->param['mediaUrls'],//参数处理
+            'idempotencyKey'=>$this->param['idempotency_key'],//时间（如是过去时间，立即发布）
+        ];
+        //发送请求发布社交文章
+        $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
+        //保存数据库
+        $ayrReleaseLogic->release_add();
+        $this->response('success',Code::SUCCESS,$res);
     }
     }
 
 
     /**
     /**

@@ -22,7 +22,10 @@ class AyrShareController extends BaseController
      * @time   :2023/5/5 16:06
      * @time   :2023/5/5 16:06
      */
      */
     public function lists(AyrShareModel $ayrShareModel){
     public function lists(AyrShareModel $ayrShareModel){
-        $lists = $ayrShareModel->lists($this->map,$this->page,$this->row,'id',['*']);
+        //授权配置列表
+        $share_list = $ayrShareModel->platforms;
+        $lists = $ayrShareModel->lists($this->map,$this->page,$this->row,'id',['id','name','bind_plat_from','operator_id','created_at','updated_at']);
+        $lists['share_list'] = $share_list;
         $this->response('列表',Code::SUCCESS,$lists);
         $this->response('列表',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -38,6 +38,8 @@ class AyrReleaseLogic extends BaseLogic
      * @time   :2023/5/9 9:38
      * @time   :2023/5/9 9:38
      */
      */
     public function release_add(){
     public function release_add(){
+        $this->param['project_id'] = $this->user['project_id'];
+        $this->param['operator_id'] = $this->user['id'];
         $rs = $this->model->add($this->param);
         $rs = $this->model->add($this->param);
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');

@@ -48,7 +48,7 @@ class AyrShareLogic extends BaseLogic
      * @time   :2023/5/6 10:16
      * @time   :2023/5/6 10:16
      */
      */
     public function ayr_share_info(){
     public function ayr_share_info(){
-        $info = $this->model->read(['id'=>$this->param['id']]);
+        $info = $this->model->read(['id'=>$this->param['share_id']]);
         if($info === false){
         if($info === false){
             $this->fail('当前数据不存在或已被删除');
             $this->fail('当前数据不存在或已被删除');
         }
         }

+<?php
+
+namespace App\Http\Requests\Bside\AyrRelease;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class AyrReleaseRequest 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 [
+            'title'=>'required',
+            'images'=>'required',
+            'video'=>'required',
+            'content'=>'required',
+            'share_id'=>'required',
+            'platforms'=>'required',
+            'idempotency_key'=>'required',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required'=>'参数错误',
+        ];
+    }
+}

@@ -7,4 +7,30 @@ use App\Models\Base;
 class AyrShare extends Base
 class AyrShare extends Base
 {
 {
     protected $table = 'gl_ayr_share';
     protected $table = 'gl_ayr_share';
+
+    const TYPE_FACEBOOK = 1;
+    const TYPE_TWITTER = 2;
+    const TYPE_LINKEDIN = 3;
+    const TYPE_INSTAGRAM = 4;
+    const TYPE_YOUTUBE = 5;
+    const TYPE_REDDIT = 6;
+    const TYPE_TELEGRAM = 7;
+    const TYPE_GMB = 8;
+    const TYPE_PINTEREST = 9;
+    const TYPE_TIKTOK = 10;
+    /**
+     * @var :授权列表
+     */
+    public $platforms = [
+        self::TYPE_FACEBOOK => 'Facebook',
+        self::TYPE_TWITTER => 'Twitter',
+        self::TYPE_LINKEDIN => 'LinkedIn',
+        self::TYPE_INSTAGRAM => 'Instagram',
+        self::TYPE_YOUTUBE => 'YouTube',
+        self::TYPE_REDDIT => 'Reddit',
+        self::TYPE_TELEGRAM => 'Telegram',
+        self::TYPE_GMB => 'Google',
+        self::TYPE_PINTEREST => 'Pinterest',
+        self::TYPE_TIKTOK => 'TikTok',
+    ];
 }
 }