Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/System.php

@@ -150,6 +150,36 @@ class System extends BaseController
         }
     }
 
+    /**
+     * 显示编辑资源表单页.
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function upload_video()
+    {
+        $post  =$this->request->post();
+//        $token = isset($post['token']) ? trim($post['token']) : "";
+//        if($token==""){
+//            return error_show(101,'token不能为空');
+//        }
+//        $effetc = VerifyTokens($token);
+//        if(!empty($effetc) && $effetc['code']!=0){
+//            return error_show($effetc['code'],$effetc['message']);
+//        }
+        $files = $this->request->file('video');
+        $list="";
+        if($files!=""){
+            $list=UploadVideo($files);
+        }
+
+        if(is_array($list)&&!empty($list)){
+            return app_show(0, "上传成功！",$list);
+        }else{
+            return error_show(1005, "上传失败！".$list);
+        }
+    }
+
     /**
      * 保存更新的资源
      *

app/admin/route/app.php

@@ -150,6 +150,7 @@ Route::rule("versionlist","admin/System/version");
 Route::rule("lastversion","admin/System/LastVersion");
 Route::rule("uploadimg","admin/System/upload");
 Route::rule("uploadfile","admin/System/upload_file");
+Route::rule("uploadvideo","admin/System/upload_video");
 
 Route::rule("wareadd","admin/WareHouse/add");
 Route::rule("wareinfo","admin/WareHouse/info");

app/common.php

@@ -220,7 +220,8 @@ function UploadFile($files)
     $files = !is_array($files) ? [$files] : $files;
     try {
         //验证
-        validate(['imgFile' => ['fileSize' => 10240000,'fileExt' => 'xlsx,xls,pdf']])->check(['imgFile' => $files]);
+        validate(['imgFile' => ['fileSize' => 10240000,'fileExt' => 'xlsx,xls,pdf,zip,rar,7z']])->check(['imgFile' =>
+            $files]);
 
         foreach ($files as $file) {
             $url = Filesystem::disk('public')->putFile('files/' . date("Ymd"), $file, function () use ($file) {
@@ -238,6 +239,33 @@ function UploadFile($files)
     }
 }
 
+/**
+ * @param $files
+ * @return array
+ */
+function UploadVideo($files)
+{
+    $savename = [];
+    $files = !is_array($files) ? [$files] : $files;
+    try {
+        //验证
+        validate(['videoFile' => ['fileSize' => 10240000,'fileExt' => 'mp4,mp3,avi']])->check(['videoFile' => $files]);
+
+        foreach ($files as $file) {
+            $url = Filesystem::disk('public')->putFile('video/' . date("Ymd"), $file, function () use ($file) {
+                return str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName() . "_" . date('YmdHis'));
+            });
+            $name = str_replace('.' . $file->getOriginalExtension(), '', $file->getOriginalName());
+            $temp = ["url" => $url, "name" => $name];
+            $savename[] = $temp;
+        }
+
+        return $savename;
+    } catch (\think\exception\ValidateException $e) {
+
+        return $e->getMessage();
+    }
+}
 /**
  * @param $token
  * @param $condition