gx

@@ -127,15 +127,10 @@ class Common
      * @method :post
      * @method :post
      * @time   :2023/5/9 10:47
      * @time   :2023/5/9 10:47
      */
      */
-    public static function uniqueMultiArray($multiArray) {
-        $flatArray = array();
-        foreach ($multiArray as $item) {
-            if (is_array($item)) {
-                $flatArray = array_merge($flatArray, uniqueMultiArray($item));
-            } else {
-                $flatArray[] = $item;
-            }
-        }
-        return array_map("unserialize", array_unique(array_map("serialize", $flatArray)));
+    public static function uniqueMultiArray($arr) {
+        $arr = array_map('serialize', $arr);
+        $arr = array_unique($arr);
+        $arr = array_map('unserialize', $arr);
+        return $arr;
     }
     }
 }
 }

@@ -7,7 +7,6 @@ use App\Helper\AyrShare as AyrShareHelper;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\AyrShare\AyrReleaseLogic;
 use App\Http\Logic\Bside\AyrShare\AyrReleaseLogic;
 use App\Http\Logic\Bside\AyrShare\AyrShareLogic;
 use App\Http\Logic\Bside\AyrShare\AyrShareLogic;
-use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
  * @name:社交发布
  * @name:社交发布
@@ -15,16 +14,36 @@ use Illuminate\Support\Facades\DB;
 class AyrReleaseController extends BaseController
 class AyrReleaseController extends BaseController
 {
 {
     /**
     /**
+     * @name   :(获取当前用户已绑定的社交链接)info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/9 16:00
+     */
+    public function info(AyrShareLogic $ayrShareLogic){
+        $info = $ayrShareLogic->ayr_share_info();
+        $this->response('success',Code::SUCCESS,$info);
+    }
+    /**
      * @name   :(发布社交)send_post
      * @name   :(发布社交)send_post
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/5/9 9:36
      * @time   :2023/5/9 9:36
      */
      */
     public function send_post(AyrReleaseLogic $ayrReleaseLogic,AyrShareLogic $ayrShareLogic){
     public function send_post(AyrReleaseLogic $ayrReleaseLogic,AyrShareLogic $ayrShareLogic){
-        DB::beginTransaction();
-        try {
+//        DB::beginTransaction();
+//        try {
             //获取发送账号详情
             //获取发送账号详情
             $share_info = $ayrShareLogic->ayr_share_info();
             $share_info = $ayrShareLogic->ayr_share_info();
+            $data = [
+                'images'=>$this->param['image'],
+                'files'=>$this->param['file'],
+            ];
+            //参数处理
+            $image_data = $this->image_file_param($data);
+            $this->param['mediaUrls'] = array_merge($image_data['images_link'],$image_data['files_link']);
+            var_dump($this->param);
+            die();
+            //统一生成链接
             $param = [
             $param = [
                 'post'=>$this->param['content'],
                 'post'=>$this->param['content'],
                 'platforms'=>$this->param['platforms'],
                 'platforms'=>$this->param['platforms'],
@@ -36,9 +55,54 @@ class AyrReleaseController extends BaseController
             $this->response('success',Code::SUCCESS,$res);
             $this->response('success',Code::SUCCESS,$res);
             //保存数据库
             //保存数据库
             $ayrReleaseLogic->release_add();
             $ayrReleaseLogic->release_add();
-        }catch (\Exception $e){
+//            DB::commit();
+//        }catch (\Exception $e){
+//            DB::rollBack();
+//            $this->response('error',Code::USER_ERROR);
+//        }
+    }
 
 
+    /**
+     * @name   :（上传第三方参数参数）get_param
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/10 10:27
+     */
+    public function image_file_param($data) {
+        if (empty($data) || !is_array($data)) {
+            return empty($data) ? is_array($data) ? [] : '' : $data;
+        }
+        foreach ($data as $k => $v) {
+            if (is_array($v)) {
+                $data[$k] = $this->_extents($v);
+            } else {
+                if (is_null($v)) {
+                    $data[$k] = '';
+                    continue;
+                }
+                //获取操作人
+                switch ((string) $k) {
+                    case 'image':
+                        $data['image_link'] = url('/b/image/' . $v . '/2');
+                        break;
+                    case 'images':
+                        $v = explode(',',$v);
+                        foreach ($v as $k1=>$v1){
+                            $data['images_link'][$k1] = url('/b/image/' . $v1 . '/2');
+                        }
+                        break;
+                    case 'file':
+                        $data['file_link'] = url('/b/file_hash/' . $v .'/mp4');
+                        break;
+                    case 'files':
+                        $v = explode(',',$v);
+                        foreach ($v as $k1=>$v1){
+                            $data['files_link'][$k1] = url('/b/file_hash/' . $v1 . '/mp4');
+                        }
+                        break;
+                }
+            }
         }
         }
+        return $data;
     }
     }
-
 }
 }

@@ -78,7 +78,7 @@ class AyrShareController extends BaseController
             'title'=>$info['title'],
             'title'=>$info['title'],
             'profileKey'=>$info['profile_key']
             'profileKey'=>$info['profile_key']
         ];
         ];
-        //发送请求注册社交用户
+        //发送请求删除社交用户
         $ayrShareHelper = new AyrShareHelper();
         $ayrShareHelper = new AyrShareHelper();
         $res = $ayrShareHelper->deleted_profiles($data);
         $res = $ayrShareHelper->deleted_profiles($data);
         if($res['status'] == 'fail'){
         if($res['status'] == 'fail'){

@@ -141,8 +141,7 @@ class BaseController extends Controller
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function _extents($data) {
-
+    protected function _extents($data) {
         if (empty($data) || !is_array($data)) {
         if (empty($data) || !is_array($data)) {
             return empty($data) ? is_array($data) ? [] : '' : $data;
             return empty($data) ? is_array($data) ? [] : '' : $data;
         }
         }
@@ -159,6 +158,12 @@ 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 'images':
+                        $v = explode(',',$v);
+                        foreach ($v as $k1=>$v1){
+                            $data['images_link'][$k1] = url('/b/image/' . $v1);
+                        }
+                        break;
                     case 'file':
                     case 'file':
                         $data['file_link'] = url('/b/file_hash/' . $v);
                         $data['file_link'] = url('/b/file_hash/' . $v);
                         break;
                         break;

@@ -11,6 +11,7 @@ use App\Http\Logic\Bside\Setting\WebSettingServiceLogic;
  */
  */
 class WebSettingServiceController extends BaseController
 class WebSettingServiceController extends BaseController
 {
 {
+    const TYPE_CODE = 6;
     /**
     /**
      * @name   :lists
      * @name   :lists
      * @author :lyh
      * @author :lyh
@@ -19,6 +20,12 @@ class WebSettingServiceController extends BaseController
      */
      */
     public function lists(WebSettingServiceLogic $webSettingServiceLogic){
     public function lists(WebSettingServiceLogic $webSettingServiceLogic){
         $lists = $webSettingServiceLogic->setting_service_list();
         $lists = $webSettingServiceLogic->setting_service_list();
+        foreach ($lists as $k => $v){
+            if($v['type'] == self::TYPE_CODE){
+                $v['values_link'] = url('/b/image/' . $v['values']);
+                $lists[$k] = $v;
+            }
+        }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
     /**
     /**

@@ -25,7 +25,7 @@ class FileController
 
 
     public $config = '';
     public $config = '';
 
 
-    public $thr_path = '';
+    public $uploads = '';
 
 
     public $request = '';
     public $request = '';
 
 
@@ -33,7 +33,8 @@ 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'].'/file/';
+        $this->uploads = config('uploads.default_file');
+        $this->path = $this->config['root'].$this->uploads['path'].'/';
     }
     }
 
 
     /**
     /**
@@ -43,7 +44,7 @@ class FileController
      * @method :post
      * @method :post
      * @time   :2023/5/9 9:15
      * @time   :2023/5/9 9:15
      */
      */
-    public function index($hash = ''){
+    public function index($hash = '',$type = 1){
         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;
@@ -59,6 +60,7 @@ class FileController
         }
         }
         $content = file_get_contents($path);
         $content = file_get_contents($path);
         $header['Content-Length'] = $info['size'];
         $header['Content-Length'] = $info['size'];
+        $header['Content-Type'] = 'video/'.$info['type'];
         return response($content, 200, $header);
         return response($content, 200, $header);
     }
     }
     /**
     /**
@@ -66,9 +68,9 @@ class FileController
      */
      */
     public function upload() {
     public function upload() {
         $this->request->validate([
         $this->request->validate([
-            'image'=>['required'],
+            'file'=>['required'],
         ],[
         ],[
-            'image.required'=>'图片必须填写',
+            'file.required'=>'必须填写',
         ]);
         ]);
         $files = $this->request->file('file');
         $files = $this->request->file('file');
         if (empty($files)) {
         if (empty($files)) {
@@ -82,7 +84,7 @@ class FileController
         }
         }
     }
     }
     /**
     /**
-     * @name :上传图片
+     * @name :上传
      * @return void
      * @return void
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
@@ -96,12 +98,13 @@ class FileController
             return $hash;
             return $hash;
         }
         }
         $url = $this->path;
         $url = $this->path;
-        $res =  $this->request->file('image')->move($url);
+        $fileName = uniqid().rand(10000,99999).'.'.$files->getClientOriginalExtension();
+        $res =  $files->move($url,$fileName);
         if ($res === false) {
         if ($res === false) {
             return $this->response($files->getError(), Code::USER_ERROR);
             return $this->response($files->getError(), Code::USER_ERROR);
         }
         }
         $data = [
         $data = [
-            'path' => $url.'/'.$res->getClientOriginalName(),
+            'path' => $url.$fileName,
             '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,
@@ -111,7 +114,7 @@ class FileController
         if ($rs === false) {
         if ($rs === false) {
             return $this->response('添加失败', Code::USER_ERROR);
             return $this->response('添加失败', Code::USER_ERROR);
         }
         }
-        return $hash;
+        return $this->response('资源',Code::SUCCESS,['file'=>$hash]);
     }
     }
     /**
     /**
      * 多文件上传
      * 多文件上传
@@ -133,12 +136,13 @@ class FileController
                 continue;
                 continue;
             }
             }
             $url = $this->path;
             $url = $this->path;
-            $res = $file->move($url);
+            $fileName = uniqid().rand(10000,99999).'.'.$files->getClientOriginalExtension();
+            $res = $file->move($url,$fileName);
             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.'/'.$res->getClientOriginalName(),
+                'path' => $url.$fileName,
                 '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,
@@ -147,7 +151,7 @@ class FileController
             $data[] = $hash;
             $data[] = $hash;
         }
         }
         $fileModel->insert($save_data);
         $fileModel->insert($save_data);
-        return $data;
+        return $this->response('资源',Code::SUCCESS,['files'=>$data]);
     }
     }
     /**
     /**
      * @name 统一返回参数
      * @name 统一返回参数
@@ -161,10 +165,46 @@ class FileController
         $result = [
         $result = [
             'msg' => $msg == ' ' ? $code->description : $msg,
             'msg' => $msg == ' ' ? $code->description : $msg,
             'code' => $code->value,
             'code' => $code->value,
-            'data' => $data,
+            'data' => $this->_extents($data),
         ];
         ];
         $this->header['Content-Type'] = $type;
         $this->header['Content-Type'] = $type;
         $response =  response($result,$result_code,$this->header);
         $response =  response($result,$result_code,$this->header);
         throw new HttpResponseException($response);
         throw new HttpResponseException($response);
     }
     }
+
+    /**
+     * @param $data
+     * @name :返回参数处理
+     * @return array|string
+     * @author :liyuhang
+     * @method
+     */
+    protected function _extents($data) {
+
+        if (empty($data) || !is_array($data)) {
+            return empty($data) ? is_array($data) ? [] : '' : $data;
+        }
+        foreach ($data as $k => $v) {
+            if (is_array($v)) {
+                $data[$k] = $this->_extents($v);
+            } else {
+                if (is_null($v)) {
+                    $data[$k] = '';
+                    continue;
+                }
+                switch ((string) $k) {
+                    case 'file':
+                        $data['file_link'] = url('/b/file_hash/' . $v .'/'.rand(100,999));
+                        break;
+                    case 'files':
+                        $v = explode(',',$v);
+                        foreach ($v as $k1=>$v1){
+                            $data['files_link'][$k1] = url('/b/file_hash/' . $v1 . '/'.rand(100,999));
+                        }
+                        break;
+                }
+            }
+        }
+        return $data;
+    }
 }
 }

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\type;
 use App\Http\Controllers\type;
 use App\Http\Controllers\统一返回参数;
 use App\Http\Controllers\统一返回参数;
 use App\Models\File\Image as ImageModel;
 use App\Models\File\Image as ImageModel;
+use App\Models\User\User as UserModel;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Storage;
@@ -24,6 +25,8 @@ class ImageController
                 'Content-Description' => 'File Transfer',
                 'Content-Description' => 'File Transfer',
             ],
             ],
     ];
     ];
+    const TYPE = 1;
+
     public $path = '';
     public $path = '';
 
 
     public $config = '';
     public $config = '';
@@ -36,10 +39,11 @@ class ImageController
     {
     {
         $this->request = request();
         $this->request = request();
         $this->config = config('filesystems.disks.upload');
         $this->config = config('filesystems.disks.upload');
-        $this->path = $this->config['root'];
+        $this->uploads = config('upload.default_image');
+        $this->path = $this->config['root'].$this->uploads['path'].'/';
     }
     }
 
 
-    public function index($hash = '', $w = 0 ,$h = 0){
+    public function index($hash = '',$type = self::TYPE, $w = 0 ,$h = 0 ){
         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;
@@ -50,6 +54,7 @@ class ImageController
             $this->response('指定图片不存在!', Code::USER_ERROR);
             $this->response('指定图片不存在!', Code::USER_ERROR);
         }
         }
         //查看缩略图是否存在
         //查看缩略图是否存在
+//        $header['Content-Type'] = 'image/'.$info['type'];
         $filename = $this->path . $info['hash'] . $w . '_' . $h;
         $filename = $this->path . $info['hash'] . $w . '_' . $h;
         if(is_file($filename)){
         if(is_file($filename)){
             $last_modified_time = gmdate(time() + ((30 * 60 * 60 * 24))) . " GMT";
             $last_modified_time = gmdate(time() + ((30 * 60 * 60 * 24))) . " GMT";
@@ -78,7 +83,12 @@ class ImageController
         $img_type = $info['type'];
         $img_type = $info['type'];
         $content = base64_encode($content);
         $content = base64_encode($content);
         $img_base64 = 'data:image/' . $img_type . ';base64,' . $content;
         $img_base64 = 'data:image/' . $img_type . ';base64,' . $content;
-        return response($img_base64, 200, $header);
+        if($type != self::TYPE){
+            header('Content-Type: image/' . $img_type);
+            echo base64_decode($content);
+            exit;
+        }
+        return response($img_base64,200,$header);
     }
     }
 
 
     /**
     /**
@@ -114,15 +124,16 @@ class ImageController
         $imageModel = new ImageModel();
         $imageModel = new ImageModel();
         $image_hash = $imageModel->read(['hash'=>$hash]);
         $image_hash = $imageModel->read(['hash'=>$hash]);
         if($image_hash !== false){
         if($image_hash !== false){
-            return $hash;
+            return $this->response('图片资源',Code::SUCCESS,['image'=>$hash]);
         }
         }
         $url = $this->path;
         $url = $this->path;
-        $res =  $this->request->file('image')->move($url);
+        $fileName = uniqid().rand(10000,99999).'.'.$files->getClientOriginalExtension();
+        $res =  $files->move($url,$fileName);
         if ($res === false) {
         if ($res === false) {
             return $this->response($files->getError(), Code::USER_ERROR);
             return $this->response($files->getError(), Code::USER_ERROR);
         }
         }
         $data = [
         $data = [
-            'path' => $url.'/'.$res->getClientOriginalName(),
+            'path' => $url.$fileName,
             '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,
@@ -132,7 +143,7 @@ class ImageController
         if ($rs === false) {
         if ($rs === false) {
             return $this->response('添加失败', Code::USER_ERROR);
             return $this->response('添加失败', Code::USER_ERROR);
         }
         }
-        return $hash;
+        return $this->response('图片资源',Code::SUCCESS,['image'=>$hash]);
     }
     }
     /**
     /**
      * 生成缩略图缓存
      * 生成缩略图缓存
@@ -154,6 +165,7 @@ class ImageController
      * @return type
      * @return type
      */
      */
     private function multi($files) {
     private function multi($files) {
+
         if (!is_array($files)) {
         if (!is_array($files)) {
             $files = [$files];
             $files = [$files];
         }
         }
@@ -168,12 +180,13 @@ class ImageController
                 continue;
                 continue;
             }
             }
             $url = $this->path;
             $url = $this->path;
-            $res = $file->move($url);
+            $fileName = uniqid().rand(10000,99999).'.'.$file->getClientOriginalExtension();
+            $res = $file->move($url,$fileName);
             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.'/'.$file->getClientOriginalName(),
+                'path' => $url.$fileName,
                 'created_at' => date('Y-m-d H:i:s',time()),
                 'created_at' => date('Y-m-d H:i:s',time()),
                 'updated_at'=>date('Y-m-d H:i:s',time()),
                 'updated_at'=>date('Y-m-d H:i:s',time()),
                 'size' => $res->getSize(),
                 'size' => $res->getSize(),
@@ -183,7 +196,7 @@ class ImageController
             $data[] = $hash;
             $data[] = $hash;
         }
         }
         $imageModel->insert($save_data);
         $imageModel->insert($save_data);
-        return $data;
+        return $this->response('图片资源',Code::SUCCESS,['image'=>$data]);
     }
     }
 
 
     //下载
     //下载
@@ -203,10 +216,50 @@ class ImageController
         $result = [
         $result = [
             'msg' => $msg == ' ' ? $code->description : $msg,
             'msg' => $msg == ' ' ? $code->description : $msg,
             'code' => $code->value,
             'code' => $code->value,
-            'data' => $data,
+            'data' => $this->_extents($data),
         ];
         ];
         $this->header['Content-Type'] = $type;
         $this->header['Content-Type'] = $type;
         $response =  response($result,$result_code,$this->header);
         $response =  response($result,$result_code,$this->header);
         throw new HttpResponseException($response);
         throw new HttpResponseException($response);
     }
     }
+
+    /**
+     * @param $data
+     * @name :返回参数处理
+     * @return array|string
+     * @author :liyuhang
+     * @method
+     */
+    protected function _extents($data) {
+
+        if (empty($data) || !is_array($data)) {
+            return empty($data) ? is_array($data) ? [] : '' : $data;
+        }
+        foreach ($data as $k => $v) {
+            if (is_array($v)) {
+                $data[$k] = $this->_extents($v);
+            } else {
+                if (is_null($v)) {
+                    $data[$k] = '';
+                    continue;
+                }
+                //获取操作人
+                switch ((string) $k) {
+                    case 'image':
+                        $data['image_link'] = url('/b/image/' . $v);
+                        break;
+                    case 'images':
+                        $v = explode(',',$v);
+                        foreach ($v as $k1=>$v1){
+                            $data['images_link'][$k1] = url('/b/image/' . $v1);
+                        }
+                        break;
+                    case 'file':
+                        $data['file_link'] = url('/b/file_hash/' . $v);
+                        break;
+                }
+            }
+        }
+        return $data;
+    }
 }
 }

@@ -17,6 +17,19 @@ class AyrReleaseLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @name   :()release_info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/9 16:27
+     */
+    public function release_info(){
+        $info = $this->model->read($this->param);
+        if($info === false){
+            $this->fail('error');
+        }
+        return $this->success($info);
+    }
+    /**
      * @name   :(发布社交写入数据库)release_add
      * @name   :(发布社交写入数据库)release_add
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post

@@ -40,8 +40,14 @@ class WebSettingFromLogic extends BaseLogic
         try {
         try {
             //删除以前的数据
             //删除以前的数据
             $this->model->del(['project_id'=>$this->user['project_id']]);
             $this->model->del(['project_id'=>$this->user['project_id']]);
+            foreach ($this->param['data'] as $k => $v){
+                $v['created_at'] = date('Y-m-d H:i:s');
+                $v['updated_at'] = date('Y-m-d H:i:s');
+                $v['project_id'] = $this->user['project_id'];
+                $this->param['data'][$k] = $v;
+            }
             //新增
             //新增
-            $this->model->add_all($this->param['data']);
+            $this->model->insert($this->param['data']);
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('error');
             $this->fail('error');
         }
         }

@@ -37,9 +37,11 @@ class WebSettingReceivingLogic extends BaseLogic
             $this->model->del(['project_id'=>$this->user['project_id']]);
             $this->model->del(['project_id'=>$this->user['project_id']]);
             foreach ($this->param['data'] as $k => $v){
             foreach ($this->param['data'] as $k => $v){
                 $v['project_id'] = $this->user['project_id'];
                 $v['project_id'] = $this->user['project_id'];
+                $v['created_at'] = date('Y-m-d H:i:s');
+                $v['updated_at'] = date('Y-m-d H:i:s');
                 $this->param['data'][$k] = $v;
                 $this->param['data'][$k] = $v;
             }
             }
-            $this->model->add_all($this->param['data']);
+            $this->model->insert($this->param['data']);
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('error');
             $this->fail('error');
         }
         }

@@ -36,17 +36,21 @@ class WebSettingServiceLogic extends BaseLogic
      * @time   :2023/5/4 11:10
      * @time   :2023/5/4 11:10
      */
      */
     public function setting_service_save(){
     public function setting_service_save(){
+        DB::beginTransaction();
         try {
         try {
             $this->param['data'] = Common::uniqueMultiArray($this->param['data']);
             $this->param['data'] = Common::uniqueMultiArray($this->param['data']);
             //删除以前的数据
             //删除以前的数据
             $this->model->del(['project_id'=>$this->user['project_id']]);
             $this->model->del(['project_id'=>$this->user['project_id']]);
             foreach ($this->param['data'] as $k => $v){
             foreach ($this->param['data'] as $k => $v){
-                //查询数据是否在数组中存在
                 $v['project_id'] = $this->user['project_id'];
                 $v['project_id'] = $this->user['project_id'];
+                $v['created_at'] = date('Y-m-d H:i:s');
+                $v['updated_at'] = date('Y-m-d H:i:s');
                 $this->param['data'][$k] = $v;
                 $this->param['data'][$k] = $v;
             }
             }
-            $this->model->add_all($this->param['data']);
+            $this->model->insert($this->param['data']);
+            DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
+            DB::rollBack();
             $this->fail('error');
             $this->fail('error');
         }
         }
         return $this->success();
         return $this->success();

@@ -51,8 +51,7 @@ class WebSettingTextLogic extends BaseLogic
      */
      */
     public function setting_text_save(){
     public function setting_text_save(){
         $web_setting = new WebSetting();
         $web_setting = new WebSetting();
-        $setting_info = $this->setting_read();
-        if(count($this->param['data']) > $setting_info['anchor_num']){
+        if(count($this->param['data']) > $this->param['anchor_num']){
             $this->fail('超过最大设置限制');
             $this->fail('超过最大设置限制');
         }
         }
         DB::beginTransaction();
         DB::beginTransaction();
@@ -66,10 +65,12 @@ class WebSettingTextLogic extends BaseLogic
             $web_setting->edit($data,['project_id'=>$this->user['project_id']]);
             $web_setting->edit($data,['project_id'=>$this->user['project_id']]);
             $this->model->del(['project_id'=>$this->user['project_id']]);
             $this->model->del(['project_id'=>$this->user['project_id']]);
             foreach ($this->param['data'] as $k => $v){
             foreach ($this->param['data'] as $k => $v){
+                $v['created_at'] = date('Y-m-d H:i:s');
+                $v['updated_at'] = date('Y-m-d H:i:s');
                 $v['project_id'] = $this->user['project_id'];
                 $v['project_id'] = $this->user['project_id'];
                 $this->param['data'][$k] = $v;
                 $this->param['data'][$k] = $v;
             }
             }
-            $this->model->add_all($this->param['data']);
+            $this->model->insert($this->param['data']);
             DB::commit();
             DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();

@@ -114,16 +114,6 @@ class Base extends Model
     }
     }
 
 
     /**
     /**
-     * @name   :(获取数据条数)count
-     * @author :lyh
-     * @method :post
-     * @time   :2023/5/8 15:51
-     */
-    public function get_count($condition){
-        $query = $this->formatQuery($condition);
-        $query->count();
-    }
-    /**
      * @name :新增
      * @name :新增
      * @return void
      * @return void
      * @author :liyuhang
      * @author :liyuhang
@@ -136,20 +126,6 @@ class Base extends Model
     }
     }
 
 
     /**
     /**
-     * @name   :(批量插入)add_all
-     * @author :lyh
-     * @method :post
-     * @time   :2023/5/8 17:41
-     */
-    public function add_all($data){
-        foreach ($data as $k => $v){
-            $v['created_at'] = date('Y-m-d H:i:s');
-            $v['updated_at'] = date('Y-m-d H:i:s');
-            $data[$k] = $v;
-        }
-        return $this->insert($data);
-    }
-    /**
      * @name :编辑
      * @name :编辑
      * @return void
      * @return void
      * @author :liyuhang
      * @author :liyuhang

@@ -14,12 +14,19 @@ return [
         ],
         ],
         'path'  =>  '/product'
         'path'  =>  '/product'
     ],
     ],
-    //用户头像
-    'user'  =>[
+    //默认
+    'default_image'  =>[
         'size' => [
         'size' => [
             'max'   =>  1024*1024*2,    // 2M
             'max'   =>  1024*1024*2,    // 2M
         ],
         ],
-        'path'  =>  '/user'
+        'path'  =>  '/image'
+    ],
+    //默认视频
+    'default_file'  =>[
+        'size' => [
+            'max'   =>  1024*1024*200,    // 2M
+        ],
+        'path'  =>  '/file'
     ],
     ],
     //博客图
     //博客图
     'blog'  =>[
     'blog'  =>[

@@ -216,12 +216,21 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/create', [\App\Http\Controllers\Bside\AyrShare\AyrShareController::class, 'create_account'])->name('ayr_create_account');
         Route::any('/create', [\App\Http\Controllers\Bside\AyrShare\AyrShareController::class, 'create_account'])->name('ayr_create_account');
         Route::any('/del', [\App\Http\Controllers\Bside\AyrShare\AyrShareController::class, 'del_account'])->name('ayr_del_account');
         Route::any('/del', [\App\Http\Controllers\Bside\AyrShare\AyrShareController::class, 'del_account'])->name('ayr_del_account');
         Route::any('/bind', [\App\Http\Controllers\Bside\AyrShare\AyrShareController::class, 'bind_account'])->name('ayr_bind_account');
         Route::any('/bind', [\App\Http\Controllers\Bside\AyrShare\AyrShareController::class, 'bind_account'])->name('ayr_bind_account');
+        //社交绑定
+        Route::prefix('release')->group(function () {
+            Route::any('/', [\App\Http\Controllers\Bside\AyrShare\AyrReleaseController::class, 'info'])->name('ayr_release_info');
+            Route::any('/send', [\App\Http\Controllers\Bside\AyrShare\AyrReleaseController::class, 'send_post'])->name('ayr_release_send');
+        });
     });
     });
 
 
+<<<<<<< HEAD
 
 
 
 
 
 
     // 模板
     // 模板
+=======
+    // 自定义页面
+>>>>>>> dev
     Route::prefix('template')->group(function () {
     Route::prefix('template')->group(function () {
         Route::get('/', [\App\Http\Controllers\Bside\TemplateController::class, 'index'])->name('bside_template');
         Route::get('/', [\App\Http\Controllers\Bside\TemplateController::class, 'index'])->name('bside_template');
         Route::any('/use-template', [\App\Http\Controllers\Bside\TemplateController::class, 'info'])->name('bside_template_use');
         Route::any('/use-template', [\App\Http\Controllers\Bside\TemplateController::class, 'info'])->name('bside_template_use');
@@ -257,6 +266,6 @@ 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('/file_hash/{hash}', [\App\Http\Controllers\file\FileController::class,'index'])->name('file_show');
+    Route::any('/image/{hash}/{type?}/{w?}/{h?}', [\App\Http\Controllers\file\ImageController::class,'index'])->name('image_show');
+    Route::any('/file_hash/{hash}/{type?}/', [\App\Http\Controllers\file\FileController::class,'index'])->name('file_show');
 });
 });