Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/config-manage into develop

app/Console/Commands/apollo.php

@@ -80,6 +80,7 @@ class Apollo extends Command
             if ($error) {
                 Log::info("Apollo Hand error :" . $error);
             }
+            sleep(60);
         } while ($error && $restart);
     }
 }

app/Http/Controllers/UploadController.php

@@ -3,34 +3,62 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 
 class UploadController extends Controller
 {
     public function uploadImage(Request $request)
     {
-        if($request->hasFile('image') && $request->file('image')->isValid()){
-            $path = $request->get('path') ? $request->get('path').'/' : date('Ym').'/';
+        if ($request->hasFile('image') && $request->file('image')->isValid()) {
+            $path = $request->get('path') ? $request->get('path') . '/' : date('Ym') . '/';
             //获取文件的原文件名 包括扩展名
 //            $yuanname= $request->file('image')->getClientOriginalName();
 //            //获取文件的扩展名
-            $kuoname=$request->file('image')->getClientOriginalExtension();
+            $kuoname = $request->file('image')->getClientOriginalExtension();
 //            //获取文件的类型
 //            $type=$request->file('image')->getClientMimeType();
 //            //获取文件的绝对路径，但是获取到的在本地不能打开
-            $filePath=$request->file('image')->getRealPath();
+            $filePath = $request->file('image')->getRealPath();
             //要保存的文件名 时间+扩展名
-            $filename=time() . '_' . uniqid() .'.'.$kuoname;
-            $imageUrl = Storage::put($path.$filename, file_get_contents($filePath));
-            if($imageUrl){
+            $filename = time() . '_' . uniqid() . '.' . $kuoname;
+            $imageUrl = Storage::put($path . $filename, file_get_contents($filePath));
+            if ($imageUrl) {
                 return [
-                    'data' => ['url' => $path.$filename]
+                    'data' => ['url' => $path . $filename]
                 ];
-            }else{
+            } else {
                 return $this->response->error('图片上传失败,请重试', 500);
             }
-        }else{
+        } else {
             return $this->response->error('图片上传失败,请重试', 500);
         }
     }
+
+    public function uploadImages(Request $request)
+    {
+        $files = $request->file('image');
+        $fileCount = count($files);
+        $urls = [];
+        for ($i = 0; $i < $fileCount; $i++) {
+            $kuoname = $files[$i]->getClientOriginalExtension();
+            $filePath = $files[$i]->getRealPath();
+            //要保存的文件名 时间+扩展名
+            $filename = time() . '_' . uniqid() . '.' . $kuoname;
+            $imageUrl = Storage::put($filename, file_get_contents($filePath));
+            if ($imageUrl) {
+                array_push($urls, $filename);
+            } else {
+                Log::debug('文件上传失败。' . $filename);
+            }
+        }
+        if ($urls) {
+            return [
+                'data' => $urls
+            ];
+        } else {
+            return $this->response->error('图片上传失败,请重试', 500);
+        }
+
+    }
 }

routes/api.php

@@ -17,6 +17,7 @@ $api->version('v1', [
     'namespace' => 'App\Http\Controllers',
 ], function ($api) {
     //百度编辑器
+    $api->get('ueupload', 'UeditorController@index');
     $api->post('ueupload', 'UeditorController@index');
     //上传
     $api->post('upload', 'UploadController@uploadImage');