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

+<?php
+
+namespace App\Helper;
+
+use GuzzleHttp\Client;
+
+/**
+ * @name: ayr_share社交绑定
+ */
+class AyrShare
+{
+    public $path = 'https://app.ayrshare.com/api';
+    //api_key
+    public $api_key = 'G8GQW3X-XBTMGXW-QPDDZ9A-WE1Z5SB';
+    //系统设置
+    public $config = [
+
+    ];
+    //profile_key
+    public $profile_key = "-----BEGIN RSA PRIVATE KEY-----
+            MIICWgIBAAKBgGFatMeBeaw7QJrqmylMLZlwuuO0FA/EZg5/g7Rrqu+FgpwvFkJq
+            9twEZJY+aIdDH8/RVrCZQGR/xUxKw9v4ows+sLwi4g41m8KRKDXUcJwQvSlwsHAi
+            h9hPGZxDsRK0Nv4pZ7XqGgh0Wb0VypX/+Q1dhX9BnXQmvEKayk8GQWQxAgMBAAEC
+            gYAFqOJNnudV7fPpja4LjpQwEW+sATIRYJeWTC9587ByUE6xicM/hTxouhCm82Xc
+            Rzi4OjFR/vbRYOQ1dTtBtIi18fdRrseQNyR/N2NZjw1X8n5aZcw5NVaa3d3YTQNa
+            uzjnYF5eYSOD4pNKKIDc35VHdmvGCV/JXwQKMTgu1+4AAQJBAL5jjN3kvMKFF8vG
+            DyYR8k+wPG9iXAdR0HjVNB3OzxKVW0MTwM32pJBXCmF1MOziL8WC48VHQL48hVRa
+            52xRqAECQQCC53rrrOPhPCLIb6kBfgqnxCojqlUK9paFL7NYTPtLYcOajY6+NiKT
+            CG1gaOwZh4r34HF7I59l/Ds98Z4nQDwxAkAC4/oIiGeBQIoK8vfZ6R3XreJNAp5J
+            EinrG7mN1kz4iEH5c7xSpDL9agTjU+cpQYneIs2Yeit2d+7CSBsJXvgBAkBDFsfU
+            yYLxCJT7DN8dOK/VU6AVL1Luj3qNP+k2tB2GgNBzAWHK8ou9t2/3HU8DtofuikUe
+            yx8Cccca9B4OF8nBAkAgIUZKGmVNFcGnFFo55vSJInNXFo4HCJ2o4DunBORVtQ/j
+            zFePUMXy1bFghAfzNKlrc5XgH4ixeeMh3cDtU97K
+            -----END RSA PRIVATE KEY-----";
+    //设置请求头
+    public $headers = [
+        'Authorization' => 'Bearer ',
+        'Content-Type' => 'application/json',
+//        'Accept-Encoding' => 'deflate, gzip',
+    ];
+
+    /**
+     * @name :参数构建
+     */
+    public function __construct()
+    {
+        $this->headers['Authorization'] = $this->headers['Authorization'].$this->api_key;
+    }
+
+    /**
+     * @name   :获取过去30天发布的历史记录（1-30）
+     * @author :lyh
+     * @method :get
+     * @time   :2023/5/5 10:00
+     */
+    public function get_analytics_links($to_day){
+        $last_days = (string)$to_day;
+        $url = $this->path.'/analytics/links?lastDays='.$last_days;
+        return $this->http_click('get',$url);
+    }
+
+    /**
+     * @name   :(通过 Ayrshare 获取给定帖子的实时分析，例如点赞、印象、转推等)post_analytics
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/5 11:56
+     */
+    public function post_analytics($id){
+        $param = [
+            'id'=>$id,
+            'platforms' => ['facebook', 'instagram', 'twitter', 'linkedin', 'pinterest', 'youtube', 'tiktok'],
+        ];
+        $url = $this->path.'/api/analytics/post';
+        return $this->http_click('post', $url, $param);
+    }
+    /**
+     * @name   :(获取特定用户个人资料)analytics_post
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/5 10:43
+     */
+    public function post_analytics_social(){
+        $post_data = [
+            'platforms' => ['facebook', 'instagram', 'twitter', 'linkedin', 'pinterest', 'youtube', 'tiktok'],
+        ];
+        $url = $this->path.'/api/analytics/social';
+        return $this->http_click('post',$url,$post_data);
+    }
+
+    /**
+     * @name   :(设置自动计划)post_schedule_set
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/5 13:58
+     */
+    public function post_schedule_set($data){
+        $param = [
+            'schedule'=>["13:05Z", "20:14Z"],
+            'title'=>$data['title'],
+        ];
+        $url = $this->path.'/api/auto-schedule/set';
+        return $this->http_click('post',$url,$param);
+    }
+
+    /**
+     * @name   :(删除自动计划)delete_schedule
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/5 14:04
+     */
+    public function delete_schedule($data){
+        $param = [
+            'title'=>$data['title'],
+        ];
+        $url = $this->path.'/api/auto-schedule/delete';
+        return $this->http_click('delete',$url,$param);
+    }
+
+    /**
+     * @name   :(列出自动计划)get_schedule_list
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/5 14:08
+     */
+    public function get_schedule_list(){
+        $url = $this->path.'/api/auto-schedule/list';
+        return $this->http_click('get',$url);
+    }
+
+    /**
+     * @name   :(发布到用户个人资料)post_user
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/5 15:00
+     */
+    public function post_user($data){
+        $param = [
+            'post'=>$data['post'],
+            'platforms'=>$data['platforms'],
+            'profileKey'=>$this->profile_key,
+            'mediaUrls'=>$data['mediaUrls']
+        ];
+        $url = $this->path.'/api/post';
+        return $this->http_click('post',$url,$param);
+    }
+
+    /**
+     * @name   :(创建子账户相关操作)post_create_profiles
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/5 15:16
+     */
+    public function post_create_profiles($data){
+        $param = [
+            'title'=>$data['title'],
+        ];
+        $url = $this->path.'/profiles/profile';
+        return $this->http_click('post',$url,$param);
+    }
+    /**
+     * @name   :(删除子账户相关操作)post_create_profiles
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/5 15:16
+     */
+    public function deleted_create_profiles($data){
+        $param = [
+            'title'=>$data['title'],
+            'profileKey'=>$this->profile_key,
+        ];
+        $url = $this->path.'/profiles/profile';
+        return $this->http_click('delete',$url,$param);
+    }
+
+    public function put_update_profiles($data){
+        $param = [
+            'title'=>$data['title'],
+            'profileKey'=>$this->profile_key,
+        ];
+        $url = $this->path.'/profiles/profile';
+        return $this->http_click('put',$url,$param);
+    }
+    /**
+     * @name   :(获取有关用户社交资料的分析和人口统计，例如印象，视图和关注着)post_social
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/5 10:37
+     */
+    public function api_user(){
+        $post_data = [
+            'platforms' => ['facebook', 'instagram', 'twitter', 'linkedin', 'pinterest', 'youtube', 'tiktok'],
+        ];
+        $url = $this->path.'/api/user';
+        return $this->http_click('post',$url,$post_data);
+    }
+
+
+    /**
+     * 发送http post,get,put,delete请求
+     * @param type $url
+     * @param type $post_data
+     */
+    function http_click($method = 'post',$url, $param = [],$header = [])
+    {
+        if(!empty($param)){
+            $post_data['json'] = $param;
+        }
+        $post_data['headers'] = !empty($header) ? $header : $this->headers;
+        $client = new Client();
+        try {
+            $res = $client->request(strtoupper($method), $url, $post_data)->getBody()->getContents();
+            return $res;
+        } catch (\Exception $e) {
+            return json_encode(["status"=>"fail","message"=>$e->getMessage()]);
+        }
+    }
+}

@@ -7,6 +7,9 @@ use App\Models\User\UserLog as UserLogModel;
 use App\Models\User\UserLogin as UserLoginModel;
 use Illuminate\Support\Facades\Cache;
 
+/**
+ * @name:
+ */
 class Common
 {
     /**

@@ -4,6 +4,9 @@ namespace App\Helper;
 
 use App\Models\WebSetting\WebSettingCountry;
 
+/**
+ * @name:多语言国家设置
+ */
 class Country
 {
     public $tls_list = [
@@ -681,6 +684,6 @@ class Country
         }
         $webCountry = new WebSettingCountry();
         $webCountry->insert($data);
-        return;
+        return true;
     }
 }

@@ -42,12 +42,14 @@ if(!function_exists('http_post')){
      * @param type $url
      * @param type $post_data
      */
-    function http_post($url, $post_data)
+    function http_post($url, $post_data,$header = [])
     {
-        $header = array(
-            "Accept: application/json",
-            "Content-Type:application/json;charset=utf-8",
-        );
+        if(empty($header)){
+            $header = array(
+                "Accept: application/json",
+                "Content-Type:application/json;charset=utf-8",
+            );
+        }
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
@@ -74,10 +76,12 @@ if(!function_exists('http_get')){
      * @param type $url
      * @return type
      */
-    function http_get($url)
+    function http_get($url,$header = [])
     {
-        $header[] = "content-type: application/x-www-form-urlencoded;
+        if(empty($header)){
+            $header[] = "content-type: application/json;
             charset = UTF-8";
+        }
         $ch1     = curl_init();
         $timeout = 5;
         curl_setopt($ch1, CURLOPT_URL, $url);

@@ -22,7 +22,7 @@ class BlogController extends BaseController
         //搜索条件
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $blogModel->lists($this->map,$this->page,$this->row,$this->order,
-            ['id','category_id','operator_id','status','created_at','label_id','updated_at','name','sort','url']);
+            ['id','category_id','operator_id','status','created_at','label_id','image','updated_at','name','sort','url']);
         if(!empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
                 //获取分类名称

@@ -25,7 +25,7 @@ class NewsController extends BaseController
     public function lists(NewsModel $news,NewsCategoryLogic $newsCategoryLogic){
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $news->lists($this->map,$this->page,$this->row,$this->order,
-            ['id','category_id','operator_id','status','created_at','updated_at','name','sort','url']);
+            ['id','category_id','operator_id','status','created_at','updated_at','image','name','sort','url']);
         if(!empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
                 $v = $newsCategoryLogic->get_category_name($v);

@@ -6,8 +6,6 @@ use App\Enums\Common\Code;
 use App\Models\Image as ImageModel;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Facades\Image;
 
@@ -32,9 +30,9 @@ class ImageController
 
     public $request = '';
 
-    public function __construct(Request $request)
+    public function __construct()
     {
-        $this->request = $request;
+        $this->request = request();
         $this->config = config('filesystems.disks.upload');
         $this->path = $this->config['root'];
     }

@@ -60,19 +60,19 @@ class NewsLogic extends BaseLogic
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['created_at'] = date('Y-m-d H:i:s',time());
         $this->param['updated_at'] = date('Y-m-d H:i:s',time());
-        DB::beginTransaction();
-        try {
+//        DB::beginTransaction();
+//        try {
             if(isset($this->param['image'])){
                 $data = $this->upload();
                 $this->param['image'] = $data;
             }
             $rs = $this->model->insertGetId($this->param);
             RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $rs, $this->user['project_id']);
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('添加失败');
-        }
+//            DB::commit();
+//        }catch (\Exception $e){
+//            DB::rollBack();
+//            $this->fail('添加失败');
+//        }
         return $this->success();
     }
 

@@ -25,7 +25,7 @@ class NewsRequest extends FormRequest
     {
         return [
             'name'=>'required|max:100',
-            'remark'=>'required|max:100',
+            'remark'=>'required|max:255',
             'text'=>'required|min:10',
             'category_id'=>'required',
         ];