add

server/app/Http/Controllers/Admin/Dream/InfoController.php

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\Dream;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\Attachment;
 use App\Models\BaseAttachmentModel;
 use App\Models\BaseSettingsModel;
 use App\Models\DreamImages;
@@ -113,8 +114,8 @@ class InfoController extends Controller
             $data['sign'] = join(',',$data['sign']);
         }
         $pics = (array) request('pic');
-        if (request("file")) {
-            $file = request("file");
+        if (!empty(request("video"))) {
+            $file = request("video");
             $fileSize = $file->getSize();
             $size =  200 * 1024 * 1024;
             if ($fileSize > $size) {
@@ -146,7 +147,7 @@ class InfoController extends Controller
             if (!empty($pics)) {
                 foreach ($pics['url'] as $pic) {
                     $arr[] = [
-                        'pic'=>getenv('APP_URL').$pic,
+                        'pic'=>$pic,
                         'dream_id'=>$id,
                         'created_at'=>date("Y-m-d H:i:s"),
                         'updated_at'=>date("Y-m-d H:i:s"),
@@ -187,6 +188,7 @@ class InfoController extends Controller
         $data->imgs = $arr;
         $data['sign'] = explode(',',$data['sign']);
         $signs = BaseSettingsModel::where('category','sign')->orderBy('id')->get();
+//        dd($data);
         return view('admin.dream.info.edit',compact('data','signs'));
     }
 
@@ -229,7 +231,7 @@ class InfoController extends Controller
             $data['score'] = (log($care_num,$x) + ($a/$t) + $b)*100000000000000 ;
         }
         $pics = (array) request('pic');
-        if (request("file")) {
+      /*  if (request("file")) {
             $file = request("file");
             $fileSize = $file->getSize();
             $size =  200 * 1024 * 1024;
@@ -253,10 +255,22 @@ class InfoController extends Controller
             }
             $dream->video = '';
             $dream->save();
-        }
+        }*/
         if (!empty($pics)) {
 //            图片不为空
             $old_data_pics =  $this->repository->find(request('id'))->imgs->toArray();
+            $old_pics = array_column($old_data_pics,'pic');
+            //操作成功，删除原来的图片
+                foreach ($old_pics as $pic) {
+                    if (!in_array($pic, $pics['url'])) {
+                        $md5 = $this->getarea($pic);
+                        $attache = new \App\Services\Base\Attachment();
+                        $attache->deleteAttachment($md5);
+                    }
+                }
+
+
+
             $old_pics = array_column($old_data_pics,'pic');
             $a = array_diff($pics['url'],$old_pics);
             $b = array_diff($old_pics,$pics['url']);
@@ -371,4 +385,14 @@ class InfoController extends Controller
         $list = $query->with('user')->where('dream_id',$dream_id)->paginate();
         return view('admin.dream.support_dream.index',compact('list'));
     }
+
+//    获取视频图片后缀码
+    public function getarea($str)
+    {
+        $start = strripos($str, '/');
+        $first = substr($str, $start + 1);
+        $end = strripos($first, '.');
+        $last = substr($first, 0, $end);
+        return $last;
+    }
 }

server/app/Services/Base/Attachment.php

@@ -187,7 +187,7 @@ class Attachment
             $attachment->size = $fileSize;
             $attachment->file_type = $fileMimeType;
             if ($attachment->save()) {
-                return $this->_jsonMessage(200,  ['message' => "上传成功", 'fileurl' => $url_path,'name'=>$md5_filename]);
+                return $this->_jsonMessage(200,  ['message' => "上传成功", 'fileurl' => env('APP_URL').'/attachment/'.$md5,'name'=>$md5_filename]);
 
             } else {
                 @unlink($real_path);

server/app/Widget/Tools/ImgUpload.php

@@ -312,7 +312,6 @@ EOF;
         $option['max'] = $option['max']-count($imgs);
         $option['watermark'] = isset($option['watermark']) ? $option['watermark'] : "";
         if(!$option['callback'] && !empty($imgs)) {
-//                       dd($imgs);
             foreach($imgs as $key=>$val) {
                 if(is_string($val)) {
                     $img['url'] = $val;
@@ -329,7 +328,7 @@ EOF;
                         <input type=\"hidden\" name=\"{$name}[url][]\" value=\"{$img['url']}\">
                     </li>";*/
                 //echo  in_array(fileExt($img['url']), ['jpg', 'png']) ? "<div class='icon'><i class='fa fa-file'></i></div>" :" <div class='image'><img src= alt= /></div>";
-                $iconImage = in_array(fileExt($img['url']), ['jpg', 'png' , 'gif' , 'jpeg' , 'bmp']) ? " <div class='image'><img src=\"{$img['url']}\" alt= /></div>" : "<div class='icon'><i class='fa fa-file'></i></div>";
+                $iconImage = " <div class='image'><img src=\"{$img['url']}\" alt= /></div>" ;
 
                 $imgHtml .="<li >
                         <div class=\"file\">

server/app/Widget/Tools/VideoUpload.php

@@ -54,24 +54,6 @@ class VideoUpload
 
         }else{
             $file->move($filePath, $fileName);
-
-         /*   //正常缩略图
-            $ffmpeg = FFMpeg\FFMpeg::create(array(
-                'ffmpeg.binaries'  => '/usr/bin/ffmpeg',
-                'ffprobe.binaries' => '/usr/bin/ffprobe'
-            ));
-            $video = $ffmpeg->open($filePath. $fileName);
-            $vpath = $filePath;
-            if (!file_exists($vpath)) {
-                if (!@mkdir($vpath, 0755, true)) {
-                    return ErrorCode::ATTACHMENT_MKDIR_FAILED;
-                }
-            }
-            $pic = $vpath. $fileName.'.jpg';
-            \Log::info($pic);
-            $video
-                ->frame(FFMpeg\Coordinate\TimeCode::fromSeconds(1))
-                ->save( $pic );*/
         }
 
         return '/upload/' .$dir.'/'. $fileName;

server/public/base/plugins/imguploader/uploader.js

@@ -13,7 +13,7 @@ var uploadlist = "";
 var uploadObj = [];
 function upload(obj){    
     this.upobj = {
-        UploaderUrl : obj.UploaderUrl ? obj.UploaderUrl : "http://cdn.staticfile.org/webuploader/0.1.0/webuploader.js",
+        UploaderUrl : obj.UploaderUrl ? obj.UploaderUrl : "https://cdn.bootcss.com/webuploader/0.1.1/webuploader.min.js",
         UploaderServer : obj.UploaderServer ? obj.UploaderServer :"/api/attachment/webupload?elementid=&watermark=" + obj.UploadWatermark + "&_time=" + Math.random() ,
         UploaderPick : obj.UploaderPick ? obj.UploaderPick : "#upload01" ,
         UploaderMax  : obj.UploaderMax ? obj.UploaderMax : 100,
@@ -67,6 +67,7 @@ upload.prototype.loadCom = function() {
         div.layout_upload ul.ullit li small.text-danger{  color:#ed5565;  }\
         div.layout_upload ul.ullit li .file-name{ height:48px; padding:5px;}\
         div.layout_upload ul.ullit li .file-name p{ height:20px;  margin:0; overflow: hidden;}\
+        div.layout_upload ul.ullit li .webuploader-element-invisible { position: absolute; clip: rect(1px 1px 1px 1px);}\
         </style>")
     if(typeof WebUploader != 'undefined'){
         _this.upLoader();

server/resources/views/admin/dream/info/edit.blade.php

@@ -79,7 +79,7 @@
                                 <div  id="is_video" style="display: none">
                     <div class="form-group">
                         <label class="control-label col-sm-3" >视频(mp4格式,200MB内)</label>
-                        <input type="file" name="file" >
+                        <input type="file" name="video" >
                     </div>
                     <div class="form-group" @if(empty($data))
                     style="display: none"

server/resources/views/admin/share.blade.php

@@ -1,93 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{{empty($dream->user) ? '' : $dream->user->nickname}}的梦想</title>
-    <script src="/base/js/jquery-2.1.1.min.js"></script>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
-    <style>
-        body{
-            padding: 0;
-            margin: 0;
-        }
-        p{
-            -webkit-margin-before: 0.1em;
-            -webkit-margin-after: 0.1em;
-        }
-    </style>
-</head>
-<body style="overflow-x: hidden">
-<div style="height: 50px">
-    <a href="https://fir.im/jt4h">
-        <div style="float: left;color: #666;line-height: 50px;padding-left: 5px">支持({{empty($dream->user) ? '' : $dream->user->nickname}})的梦想!现在就下载喵喵</div>
-        <div style="float: right;padding: 5px">
-            <img style="width: 40px;height: 40px;" src="http://firicon.fir.im/396004d5e7b572efbefdfee976338331a457282b" alt="">
-        </div>
-    </a>
-
-</div>
-<img style="width: 100%; height: 100%;" src="{{!empty($dream->img) ? $dream->img->pic : ''}}
-
-">
-<p style="font-size: 17px; padding: 0 10px">{{$dream->name}}</p>
-<div style="border-bottom: 1px solid #DEDEDE">
-    <p id="about" style="font-size: 13px; padding: 0 10px; color: #919191;white-space: nowrap;overflow:hidden;text-overflow:ellipsis">
-        {{$dream->about}}
-    </p>
-    <p style="text-align: center">
-        <img src="/base/img/down.svg" alt="" id="down">
-        <img src="/base/img/up.svg" alt="" id="up">
-    </p>
-</div>
-<div style="border-bottom: 1px solid #DEDEDE; height: 50px; padding: 5px 10px;">
-    <div style="float:left;">
-        <p>{{$days}}</p>
-        <p style="font-size: 13px; color: #919191">剩余时间</p>
-    </div>
-    {{--判断显示--}}
-    @if( $dream->user_id == $user_id)
-        <div style="float:right;">
-            <p style="text-align: right">{{$dream->mark}}</p>
-            <p style="font-size: 13px;; color: #919191">当前获得梦想分数</p>
-        </div>
-    @endif
-</div>
-<div style="clear:both; height: 50px; padding: 5px 10px;">
-    <div style="text-align: left; float:left;">
-        <p style="">{{$dream->coin}}</p>
-        <p style="font-size: 13px; color: #919191">我要求的梦想币</p>
-    </div>
-    {{--判断显示--}}
-    @if( $dream->user_id == $user_id)
-        <div style="text-align: right;float: right">
-            <p style="color: #FF6600">{{$dream->get_coin}}</p>
-            <p style="font-size: 13px; color: #919191">目前已获梦想币</p>
-        </div>
-    @endif
-</div>
-<div style="padding: 0 10px 20px  10px">
-    <div style="background-color:#E6E6E6; width: 100%;">
-        <div style="width: {{($dream->get_coin / $dream->coin)*100}}%; background: #FF6600; height: 5px">
-        </div>
-    </div>
-</div>
-</body>
-</html>
-<script>
-    $(function () {
-        $('#up').hide();
-        var str = $('#about').html();
-        new_str = str.replace(/\n/g,"<br/>");
-        $('#about').html(new_str);
-        $('#up').click(function () {
-            $(this).hide();
-            $('#down').show();
-            $('#about').css('white-space','nowrap');
-        });
-        $('#down').click(function () {
-            $(this).hide();
-            $('#up').show();
-            $('#about').css('white-space','normal');
-        });
-    });
-</script>

server/resources/views/admin/share1.blade.php

@@ -295,7 +295,7 @@
                 <div class="swiper-wrapper">
                     @if($dream['video'])
                         <div class="swiper-slide" style="width: 320px;height: 200px;">
-                            <video style="width: 100%;height:200px;" src="{{ $dream['video']}}" controls >
+                            <video style="width: 100%;height:200px;" src="{{ env('APP_URL').'/'.$dream['video']}}" controls >
                             </video>
                         </div>
                     @endif