|
@@ -2,9 +2,7 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
- <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" afterDir="false" />
|
|
|
|
- <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/Api/BaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -17,11 +15,11 @@
|
|
</component>
|
|
</component>
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
<leaf>
|
|
<leaf>
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="235">
|
|
|
|
- <caret line="455" column="68" selection-start-line="455" selection-start-column="68" selection-end-line="455" selection-end-column="68" />
|
|
|
|
|
|
+ <state relative-caret-position="162">
|
|
|
|
+ <caret line="448" column="19" lean-forward="true" selection-start-line="448" selection-start-column="19" selection-end-line="448" selection-end-column="19" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -29,11 +27,11 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="544">
|
|
<state relative-caret-position="544">
|
|
- <caret line="62" column="80" selection-start-line="62" selection-start-column="70" selection-end-line="62" selection-end-column="80" />
|
|
|
|
|
|
+ <caret line="62" column="47" lean-forward="true" selection-start-line="62" selection-start-column="47" selection-end-line="62" selection-end-column="47" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -45,7 +43,7 @@
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="147">
|
|
<state relative-caret-position="147">
|
|
- <caret line="16" column="67" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="67" />
|
|
|
|
|
|
+ <caret line="16" column="30" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="30" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -77,11 +75,17 @@
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="589">
|
|
|
|
- <caret line="164" column="22" selection-start-line="164" selection-start-column="15" selection-end-line="164" selection-end-column="22" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#141#185#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
|
|
+ <state relative-caret-position="-2569">
|
|
|
|
+ <caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </file>
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="718">
|
|
|
|
+ <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -90,7 +94,6 @@
|
|
</component>
|
|
</component>
|
|
<component name="FindInProjectRecents">
|
|
<component name="FindInProjectRecents">
|
|
<findStrings>
|
|
<findStrings>
|
|
- <find>CAMERA_FIELD_ALREADY_EXIST</find>
|
|
|
|
<find>CAMERA_FIELD_NOT_EXIST</find>
|
|
<find>CAMERA_FIELD_NOT_EXIST</find>
|
|
<find>f</find>
|
|
<find>f</find>
|
|
<find>uploadFile</find>
|
|
<find>uploadFile</find>
|
|
@@ -120,6 +123,7 @@
|
|
<find>streamform</find>
|
|
<find>streamform</find>
|
|
<find>getCamerasList</find>
|
|
<find>getCamerasList</find>
|
|
<find>getCamerasUrl</find>
|
|
<find>getCamerasUrl</find>
|
|
|
|
+ <find>error</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
</component>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
@@ -162,7 +166,6 @@
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log" />
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
|
|
- <option value="$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php" />
|
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
|
|
<option value="$PROJECT_DIR$/.env" />
|
|
<option value="$PROJECT_DIR$/.env" />
|
|
<option value="$PROJECT_DIR$/app/Helpers.php" />
|
|
<option value="$PROJECT_DIR$/app/Helpers.php" />
|
|
@@ -179,6 +182,7 @@
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -438,12 +442,12 @@
|
|
<option name="presentableId" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1618368322468</updated>
|
|
<updated>1618368322468</updated>
|
|
<workItem from="1618368323697" duration="143000" />
|
|
<workItem from="1618368323697" duration="143000" />
|
|
- <workItem from="1618368497550" duration="170159000" />
|
|
|
|
|
|
+ <workItem from="1618368497550" duration="170425000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="170302000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="170568000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -637,13 +641,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="252">
|
|
|
|
- <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="403">
|
|
<state relative-caret-position="403">
|
|
@@ -805,36 +802,40 @@
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="147">
|
|
<state relative-caret-position="147">
|
|
- <caret line="16" column="67" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="67" />
|
|
|
|
|
|
+ <caret line="16" column="30" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="30" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="589">
|
|
|
|
- <caret line="164" column="22" selection-start-line="164" selection-start-column="15" selection-end-line="164" selection-end-column="22" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#141#185#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
|
|
+ <state relative-caret-position="718">
|
|
|
|
+ <caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="544">
|
|
|
|
- <caret line="62" column="80" selection-start-line="62" selection-start-column="70" selection-end-line="62" selection-end-column="80" />
|
|
|
|
|
|
+ <state relative-caret-position="162">
|
|
|
|
+ <caret line="448" column="19" lean-forward="true" selection-start-line="448" selection-start-column="19" selection-end-line="448" selection-end-column="19" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#129#150#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="235">
|
|
|
|
- <caret line="455" column="68" selection-start-line="455" selection-start-column="68" selection-end-line="455" selection-end-column="68" />
|
|
|
|
|
|
+ <state relative-caret-position="-2569">
|
|
|
|
+ <caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="544">
|
|
|
|
+ <caret line="62" column="47" lean-forward="true" selection-start-line="62" selection-start-column="47" selection-end-line="62" selection-end-column="47" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="e#129#150#0#PHP" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#141#162#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|