gx

@@ -112,12 +112,6 @@ zFePUMXy1bFghAfzNKlrc5XgH4ixeeMh3cDtU97K
      * "linkedin", "instagram","youtube", "reddit" ,"telegram""
      * "linkedin", "instagram","youtube", "reddit" ,"telegram""
      */
      */
     public function post_send_msg($param){
     public function post_send_msg($param){
-        $param = [
-            'post'=>$param['post'],//内容（帖子文本）
-            'platforms'=>$param['platforms'],//平台
-            'idempotencyKey'=>$param['idempotencyKey'],//帖子唯一id
-            'mediaUrls'=>$param['mediaUrls'],
-        ];
         //平台参数处理
         //平台参数处理
         $this->headers['Accept-Encoding'] = 'gzip';
         $this->headers['Accept-Encoding'] = 'gzip';
         $this->headers['Authorization'] = $this->headers['Authorization'].$param['profile_key'];
         $this->headers['Authorization'] = $this->headers['Authorization'].$param['profile_key'];

+<?php
+
+namespace App\Http\Controllers\Bside\AyrShare;
+
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\AyrShare\AyrReleaseLogic;
+
+/**
+ * @name:社交发布
+ */
+class AyrReleaseController extends BaseController
+{
+    /**
+     * @name   :(发布社交)send_post
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/9 9:36
+     */
+    public function send_post(AyrReleaseLogic $ayrReleaseLogic){
+        //保存数据库
+        $ayrReleaseLogic->release_add();
+
+    }
+
+}

@@ -101,54 +101,4 @@ class AyrShareController extends BaseController
         $this->response('success',Code::SUCCESS,$res);
         $this->response('success',Code::SUCCESS,$res);
     }
     }
 
 
-    /**
-     * @name   :(获取当前用户的配置文件)get_profiles
-     * @author :lyh
-     * @method :post
-     * @time   :2023/5/6 16:39
-     */
-    public function get_profiles(AyrShareLogic $ayrShareLogic){
-        $this->request->validate([
-            'id'=>['required']
-        ],[
-            'id.required' => 'ID不能为空'
-        ]);
-        $info = $ayrShareLogic->ayr_share_info();
-        //发送请求注册社交用户
-        $ayrShareHelper = new AyrShareHelper();
-        $data = [
-            'title'=>$info['title'],
-            'refId'=>$info['ref_id'],
-            'profileKeys'=>$info['profile_keys']
-        ];
-        $res = $ayrShareHelper->post_generate_jwt($data);
-        if($res['status'] == 'fail'){
-            $this->response($res['message'],Code::USER_ERROR);
-        }
-        $this->response('success',Code::SUCCESS,$res);
-    }
-
-    /**
-     * @name   :(上传图片到第三方)post_uploads
-     * @author :lyh
-     * @method :post
-     * @time   :2023/5/8 13:45
-     */
-    public function post_uploads(){
-
-    }
-    /**
-     * @name   :(发布推文到第三方平台)send_api_post
-     * @author :lyh
-     * @method :post
-     * @time   :2023/5/8 13:37
-     */
-    public function send_api_post(AyrShareLogic $ayrShareLogic){
-        $this->request->validate([
-            'id'=>['required']
-        ],[
-            'id.required' => 'ID不能为空'
-        ]);
-        $info = $ayrShareLogic->ayr_share_info();
-    }
 }
 }

@@ -160,6 +160,9 @@ class BaseController extends Controller
                     case 'image':
                     case 'image':
                         $data['image_link'] = url('/b/image/' . $v);
                         $data['image_link'] = url('/b/image/' . $v);
                         break;
                         break;
+                    case 'file':
+                        $data['file_link'] = url('/b/file_hash/' . $v);
+                        break;
                     case 'operator_id':
                     case 'operator_id':
                         if(!empty($v)){
                         if(!empty($v)){
                             $name = (new UserModel())->read(['operator_id'=>$v],['id','name']);
                             $name = (new UserModel())->read(['operator_id'=>$v],['id','name']);

@@ -9,9 +9,7 @@ use App\Http\Controllers\Bside\json;
 use App\Http\Logic\Bside\ProjectGroupLogic;
 use App\Http\Logic\Bside\ProjectGroupLogic;
 use App\Http\Logic\Bside\User\GroupLogic;
 use App\Http\Logic\Bside\User\GroupLogic;
 use App\Http\Requests\Bside\User\ProjectGroupRequest;
 use App\Http\Requests\Bside\User\ProjectGroupRequest;
-use App\Models\ProjectGroup as ProjectGroupModel;
-use App\Models\User\User as UserModel;
-use Illuminate\Http\Request;
+use App\Models\User\ProjectGroup;
 
 
 
 
 /**
 /**
@@ -25,9 +23,9 @@ class ProjectGroupController extends BaseController
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function lists(ProjectGroupModel $projectGroupModel)
+    public function lists(ProjectGroup $projectGroup)
     {
     {
-        $lists = $projectGroupModel->lists($this->map,$this->page,$this->row);
+        $lists = $projectGroup->lists($this->map,$this->page,$this->row);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -4,6 +4,9 @@ namespace App\Http\Controllers\file;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Models\File\File;
 use App\Models\File\File;
+use App\Models\File\Image as ImageModel;
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Http\JsonResponse;
 
 
 class FileController
 class FileController
 {
 {
@@ -30,10 +33,17 @@ class FileController
     {
     {
         $this->request = request();
         $this->request = request();
         $this->config = config('filesystems.disks.upload');
         $this->config = config('filesystems.disks.upload');
-        $this->path = $this->config['root'];
+        $this->path = $this->config['root'].'/file/';
     }
     }
 
 
-    public function index($hash = '', $w = 0 ,$h = 0){
+    /**
+     * @param  :(获取文件)$hash
+     * @name   :index
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/9 9:15
+     */
+    public function index($hash = ''){
         if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
         if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
             header("HTTP/1.1 304 Not Modified");
             header("HTTP/1.1 304 Not Modified");
             exit;
             exit;
@@ -51,4 +61,110 @@ class FileController
         $header['Content-Length'] = $info['size'];
         $header['Content-Length'] = $info['size'];
         return response($content, 200, $header);
         return response($content, 200, $header);
     }
     }
+    /**
+     * 图片上传
+     */
+    public function upload() {
+        $this->request->validate([
+            'image'=>['required'],
+        ],[
+            'image.required'=>'图片必须填写',
+        ]);
+        $files = $this->request->file('file');
+        if (empty($files)) {
+            $this->response('没有上传的文件!', 400);
+        }
+        $type = $this->request->post('type', 'single');
+        if ($type == 'multi') {
+            return $this->multi($files);
+        } else {
+            return $this->single($files);
+        }
+    }
+    /**
+     * @name :上传图片
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function single($files){
+        $hash = hash_file('md5', $files->getPathname());
+        //查看文件是否存在
+        $fileModel = new File();
+        $file_hash = $fileModel->read(['hash'=>$hash]);
+        if($file_hash !== false){
+            return $hash;
+        }
+        $url = $this->path;
+        $res =  $this->request->file('image')->move($url);
+        if ($res === false) {
+            return $this->response($files->getError(), Code::USER_ERROR);
+        }
+        $data = [
+            'path' => $url.'/'.$res->getClientOriginalName(),
+            'created_at' => date('Y-m-d H:i:s',time()),
+            'size' => $res->getSize(),
+            'hash' => $hash,
+            'type'=>$files->getClientOriginalExtension(),
+        ];
+        $rs = $fileModel->add($data);
+        if ($rs === false) {
+            return $this->response('添加失败', Code::USER_ERROR);
+        }
+        return $hash;
+    }
+    /**
+     * 多文件上传
+     * @param type $files file对象集合
+     * @return type
+     */
+    private function multi($files) {
+        if (!is_array($files)) {
+            $files = [$files];
+        }
+        $save_data = [];
+        $data = [];
+        foreach ($files as $file) {
+            $fileModel = new File();
+            $hash = hash_file('md5', $file->getPathname());
+            $file_hash = $fileModel->read(['hash'=>$hash]);
+            if($file_hash !== false){
+                $data[] = $hash;
+                continue;
+            }
+            $url = $this->path;
+            $res = $file->move($url);
+            if ($res === false) {
+                return $this->response($file->getError(), Code::USER_ERROR);
+            }
+            $save_data[] = [
+                'path' => $url.'/'.$res->getClientOriginalName(),
+                'created_at' => date('Y-m-d H:i:s',time()),
+                'size' => $res->getSize(),
+                'hash' => $hash,
+                'type'=>$files->getClientOriginalExtension(),
+            ];
+            $data[] = $hash;
+        }
+        $fileModel->insert($save_data);
+        return $data;
+    }
+    /**
+     * @name 统一返回参数
+     * @return JsonResponse
+     * @author :liyuhang
+     * @method
+     */
+    public function response($msg = null,string $code = Code::SUCCESS,$data = [],$result_code = 200,$type = 'application/json'): JsonResponse
+    {
+        $code = Code::fromValue($code);
+        $result = [
+            'msg' => $msg == ' ' ? $code->description : $msg,
+            'code' => $code->value,
+            'data' => $data,
+        ];
+        $this->header['Content-Type'] = $type;
+        $response =  response($result,$result_code,$this->header);
+        throw new HttpResponseException($response);
+    }
 }
 }

@@ -80,6 +80,7 @@ class ImageController
         $img_base64 = 'data:image/' . $img_type . ';base64,' . $content;
         $img_base64 = 'data:image/' . $img_type . ';base64,' . $content;
         return response($img_base64, 200, $header);
         return response($img_base64, 200, $header);
     }
     }
+
     /**
     /**
      * 图片上传
      * 图片上传
      */
      */
@@ -100,6 +101,7 @@ class ImageController
             return $this->single($files);
             return $this->single($files);
         }
         }
     }
     }
+
     /**
     /**
      * @name :上传图片
      * @name :上传图片
      * @return void
      * @return void
@@ -115,7 +117,6 @@ class ImageController
             return $hash;
             return $hash;
         }
         }
         $url = $this->path;
         $url = $this->path;
-        $filename = date('ymdHis').rand(10000,99999);
         $res =  $this->request->file('image')->move($url);
         $res =  $this->request->file('image')->move($url);
         if ($res === false) {
         if ($res === false) {
             return $this->response($files->getError(), Code::USER_ERROR);
             return $this->response($files->getError(), Code::USER_ERROR);
@@ -167,13 +168,12 @@ class ImageController
                 continue;
                 continue;
             }
             }
             $url = $this->path;
             $url = $this->path;
-            $filename = date('ymdHis').rand(10000,99999);
-            $res = $file->move($url,$filename);
+            $res = $file->move($url);
             if ($res === false) {
             if ($res === false) {
                 return $this->response($file->getError(), Code::USER_ERROR);
                 return $this->response($file->getError(), Code::USER_ERROR);
             }
             }
             $save_data[] = [
             $save_data[] = [
-                'path' => $url.'/'.$filename,
+                'path' => $url.'/'.$res->getClientOriginalName(),
                 'created_at' => date('Y-m-d H:i:s',time()),
                 'created_at' => date('Y-m-d H:i:s',time()),
                 'size' => $res->getSize(),
                 'size' => $res->getSize(),
                 'hash' => $hash,
                 'hash' => $hash,

+<?php
+
+namespace App\Http\Logic\Bside\AyrShare;
+
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\AyrShare\AyrRelease;
+
+class AyrReleaseLogic extends BaseLogic
+{
+
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new AyrRelease();
+        $this->param = $this->requestAll;
+    }
+
+    /**
+     * @name   :(发布社交写入数据库)release_add
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/9 9:38
+     */
+    public function release_add(){
+        $rs = $this->model->add($this->param);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
+}

@@ -9,10 +9,11 @@ use App\Models\AyrShare\AyrShare;
 
 
 class AyrShareLogic extends BaseLogic
 class AyrShareLogic extends BaseLogic
 {
 {
+
+
     public function __construct()
     public function __construct()
     {
     {
         parent::__construct();
         parent::__construct();
-
         $this->model = new AyrShare();
         $this->model = new AyrShare();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
     }
     }

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

@@ -192,7 +192,10 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::prefix('images')->group(function () {
     Route::prefix('images')->group(function () {
         Route::post('/upload', [\App\Http\Controllers\file\ImageController::class, 'upload'])->name('image_upload');
         Route::post('/upload', [\App\Http\Controllers\file\ImageController::class, 'upload'])->name('image_upload');
     });
     });
-
+    //文件上传第三方操作
+    Route::prefix('files')->group(function () {
+        Route::post('/upload', [\App\Http\Controllers\file\FileController::class, 'upload'])->name('files_upload');
+    });
     //精准询盘
     //精准询盘
     Route::prefix('inquiry')->group(function () {
     Route::prefix('inquiry')->group(function () {
         Route::get('/', [\App\Http\Controllers\Bside\InquiryController::class, 'index'])->name('inquiry');
         Route::get('/', [\App\Http\Controllers\Bside\InquiryController::class, 'index'])->name('inquiry');
@@ -218,7 +221,8 @@ Route::middleware(['bloginauth'])->group(function () {
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {
     Route::any('/login', [\App\Http\Controllers\Bside\ComController::class, 'login'])->name('login');
     Route::any('/login', [\App\Http\Controllers\Bside\ComController::class, 'login'])->name('login');
-    Route::any('/', [\App\Http\Controllers\Bside\ComController::class, 'get_country'])->name('get_country');
+//    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::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('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\file\ImageController::class,'index'])->name('image_show');
+    Route::any('/file_hash/{hash}', [\App\Http\Controllers\file\FileController::class,'index'])->name('file_show');
 });
 });