Przeglądaj źródła

添加上传封面图功能

qiuzijian 3 lat temu
rodzic
commit
faf2e7dce4

+ 19 - 26
.idea/workspace.xml

@@ -2,15 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/video_system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/video_system.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Modules/Camera/Routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Routes/web.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/filesystems.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/filesystems.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -32,11 +25,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="466">
-              <caret line="455" column="42" selection-start-line="455" selection-start-column="42" selection-end-line="455" selection-end-column="42" />
+            <state relative-caret-position="254">
+              <caret line="186" column="28" selection-start-line="186" selection-start-column="28" selection-end-line="186" selection-end-column="28" />
               <folding>
                 <element signature="e#51#107#0#PHP" expanded="true" />
               </folding>
@@ -76,11 +69,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="348">
-              <caret line="842" column="30" selection-start-line="842" selection-start-column="30" selection-end-line="842" selection-end-column="30" />
+            <state relative-caret-position="537">
+              <caret line="850" column="22" lean-forward="true" selection-start-line="850" selection-start-column="22" selection-end-line="850" selection-end-column="22" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -177,10 +170,10 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
         <option value="$PROJECT_DIR$/config/filesystems.php" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-08-10.log" />
         <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
       </list>
     </option>
   </component>
@@ -407,7 +400,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="346646000" />
+    <option name="totallyTimeSpent" value="346999000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -776,9 +769,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-08-10.log">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/vendor/aliyuncs/oss-sdk-php/src/OSS/OssClient.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -786,22 +776,25 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
+    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-08-10.log">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="455" column="42" selection-start-line="455" selection-start-column="42" selection-end-line="455" selection-end-column="42" />
+        <state relative-caret-position="537">
+          <caret line="850" column="22" lean-forward="true" selection-start-line="850" selection-start-column="22" selection-end-line="850" selection-end-column="22" />
           <folding>
-            <element signature="e#51#107#0#PHP" expanded="true" />
+            <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="348">
-          <caret line="842" column="30" selection-start-line="842" selection-start-column="30" selection-end-line="842" selection-end-column="30" />
+        <state relative-caret-position="254">
+          <caret line="186" column="28" selection-start-line="186" selection-start-column="28" selection-end-line="186" selection-end-column="28" />
           <folding>
-            <element signature="e#129#150#0#PHP" expanded="true" />
+            <element signature="e#51#107#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>

+ 3 - 8
Modules/Camera/Http/Controllers/CameraController.php

@@ -184,6 +184,7 @@ class CameraController extends BaseController
     //添加摄像头列表操作
     public function cameraListAddPost(Request $request)
     {
+        dd($request->input());
         if (!$request->input('mine_id')) {
             return $this->error(1, '请选择矿区单位');
         }
@@ -446,18 +447,12 @@ class CameraController extends BaseController
     //上传摄像头封面图片
     public function cameraUploadCpicture(Request $request)
     {
-//        Log::info($request->file());
-//        Log::info('===============');
-//        Log::info($request->file('image')->getClientOriginalName());
-//        Log::info('===============');
-//        Log::info($request->file('image')->getRealPath());
         $file = $request->file('image');
 
         $file_name = CameraServices::uploadFile($file);
 
-        Log::info($file_name);
-
         $result = CameraServices::uploadOssFile($file_name);
-//        Log::info($result);
+
+        return $this->success($result);
     }
 }

+ 0 - 5
Modules/Camera/Services/CameraServices.php

@@ -839,9 +839,6 @@ class CameraServices
     {
         $file_path = public_path() . '/files/';
 
-        Log::info($file_name);
-        Log::info('-----------');
-        Log::info($file_path . $file_name);
         try{
             $oss = new OssClient(
                 Config::get('filesystems.disks.oss_view.access_key'),
@@ -850,9 +847,7 @@ class CameraServices
             );
 
             $res = $oss->uploadFile(Config::get('filesystems.disks.oss_view.bucket'), '摄像头封面/oss-' . $file_name, $file_path . $file_name);
-            Log::info($res);
         } catch(OssException $e) {
-            Log::info($e);
             printf(__FUNCTION__ . ": FAILED\n");
             printf($e->getMessage() . "\n");
             return;