소스 검색

修改接口自动切换码流功能

qiuzijian 3 년 전
부모
커밋
cb6ee08a9b
3개의 변경된 파일12개의 추가작업 그리고 12개의 파일을 삭제
  1. 9 10
      .idea/workspace.xml
  2. 2 1
      Modules/Camera/Http/Controllers/Api/HaiKangController.php
  3. 1 1
      app/Http/Controllers/TestsController.php

+ 9 - 10
.idea/workspace.xml

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.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$/app/Http/Controllers/TestsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -33,7 +32,7 @@
         <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="570">
-              <caret line="34" column="26" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="26" />
+              <caret line="34" column="68" selection-start-line="34" selection-start-column="68" selection-end-line="34" selection-end-column="68" />
               <folding>
                 <element signature="e#126#164#0#PHP" expanded="true" />
               </folding>
@@ -56,8 +55,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="587">
-              <caret line="262" column="58" selection-start-line="262" selection-start-column="58" selection-end-line="262" selection-end-column="58" />
+            <state relative-caret-position="484">
+              <caret line="266" column="45" selection-start-line="266" selection-start-column="45" selection-end-line="266" selection-end-column="45" />
               <folding>
                 <element signature="e#141#185#0#PHP" expanded="true" />
               </folding>
@@ -189,8 +188,8 @@
         <option value="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
-        <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
+        <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
       </list>
     </option>
   </component>
@@ -427,12 +426,12 @@
       <workItem from="1641785500605" duration="61000" />
       <workItem from="1641786030534" duration="477000" />
       <workItem from="1641800375826" duration="26685000" />
-      <workItem from="1643085370753" duration="19626000" />
+      <workItem from="1643085370753" duration="19872000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="449677000" />
+    <option name="totallyTimeSpent" value="449923000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -807,8 +806,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="587">
-          <caret line="262" column="58" selection-start-line="262" selection-start-column="58" selection-end-line="262" selection-end-column="58" />
+        <state relative-caret-position="484">
+          <caret line="266" column="45" selection-start-line="266" selection-start-column="45" selection-end-line="266" selection-end-column="45" />
           <folding>
             <element signature="e#141#185#0#PHP" expanded="true" />
           </folding>
@@ -818,7 +817,7 @@
     <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="570">
-          <caret line="34" column="26" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="26" />
+          <caret line="34" column="68" selection-start-line="34" selection-start-column="68" selection-end-line="34" selection-end-column="68" />
           <folding>
             <element signature="e#126#164#0#PHP" expanded="true" />
           </folding>

+ 2 - 1
Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -259,11 +259,12 @@ class HaiKangController extends BaseController
         //请求参数
         $params             = [];
         $params['pageNo']   = 1;
-        $params['pageSize'] = 1;
+        $params['pageSize'] = 1000;
         $params['regionIndexCode'] = Input::get('indexCode');
 
         $this->sign = $this->get_sign($url);
         $result     = $this->curlPost($this->pre_url . $url, json_encode($params));
+        $result = json_decode($result, true);
         return $result;
     }
 

+ 1 - 1
app/Http/Controllers/TestsController.php

@@ -32,7 +32,7 @@ class TestsController {
                 'url'       => trim($query->ip, '/') . ':' . $query->port,
                 'key'       => $query->key,
                 'secret'    => $query->secret,
-                'indexCode' => '43e3d57b-60ea-486b-9aea-d6aa73c25d28',
+                'indexCode' => '0e3a70a1-6f76-4eb7-9f65-c5ea630c0357',
             ]
         );
         $haikang   = new HaiKangController();