|  | @@ -1,10 +1,7 @@
 | 
												
													
														
															|  |  <?xml version="1.0" encoding="UTF-8"?>
 |  |  <?xml version="1.0" encoding="UTF-8"?>
 | 
												
													
														
															|  |  <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="">
 |  | 
 | 
												
													
														
															|  | -      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
 |  | 
 | 
												
													
														
															|  | -      <change beforePath="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel1.php" afterDir="false" />
 |  | 
 | 
												
													
														
															|  | -    </list>
 |  | 
 | 
												
													
														
															|  | 
 |  | +    <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="" />
 | 
												
													
														
															|  |      <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" />
 | 
												
													
														
															|  |      <option name="HIGHLIGHT_CONFLICTS" value="true" />
 |  |      <option name="HIGHLIGHT_CONFLICTS" value="true" />
 | 
												
											
												
													
														
															|  | @@ -40,11 +37,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/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="424">
 |  | 
 | 
												
													
														
															|  | -              <caret line="239" column="28" lean-forward="true" selection-start-line="239" selection-start-column="28" selection-end-line="239" selection-end-column="28" />
 |  | 
 | 
												
													
														
															|  | 
 |  | +            <state relative-caret-position="277">
 | 
												
													
														
															|  | 
 |  | +              <caret line="220" lean-forward="true" selection-start-line="220" selection-end-line="220" />
 | 
												
													
														
															|  |                <folding>
 |  |                <folding>
 | 
												
													
														
															|  |                  <element signature="e#51#107#0#PHP" expanded="true" />
 |  |                  <element signature="e#51#107#0#PHP" expanded="true" />
 | 
												
													
														
															|  |                </folding>
 |  |                </folding>
 | 
												
											
												
													
														
															|  | @@ -53,22 +50,10 @@
 | 
												
													
														
															|  |          </entry>
 |  |          </entry>
 | 
												
													
														
															|  |        </file>
 |  |        </file>
 | 
												
													
														
															|  |        <file pinned="false" current-in-tab="false">
 |  |        <file pinned="false" current-in-tab="false">
 | 
												
													
														
															|  | -        <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel1.php">
 |  | 
 | 
												
													
														
															|  | -          <provider selected="true" editor-type-id="text-editor">
 |  | 
 | 
												
													
														
															|  | -            <state relative-caret-position="3171">
 |  | 
 | 
												
													
														
															|  | -              <caret line="151" column="5" lean-forward="true" selection-start-line="43" selection-start-column="4" selection-end-line="151" selection-end-column="5" />
 |  | 
 | 
												
													
														
															|  | -              <folding>
 |  | 
 | 
												
													
														
															|  | -                <element signature="e#39#68#0#PHP" expanded="true" />
 |  | 
 | 
												
													
														
															|  | -              </folding>
 |  | 
 | 
												
													
														
															|  | -            </state>
 |  | 
 | 
												
													
														
															|  | -          </provider>
 |  | 
 | 
												
													
														
															|  | -        </entry>
 |  | 
 | 
												
													
														
															|  | -      </file>
 |  | 
 | 
												
													
														
															|  | -      <file pinned="false" current-in-tab="true">
 |  | 
 | 
												
													
														
															|  |          <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
 |  |          <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
 | 
												
													
														
															|  |            <provider selected="true" editor-type-id="text-editor">
 |  |            <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  | -            <state relative-caret-position="2793">
 |  | 
 | 
												
													
														
															|  | -              <caret line="133" column="43" selection-start-line="133" selection-start-column="43" selection-end-line="133" selection-end-column="43" />
 |  | 
 | 
												
													
														
															|  | 
 |  | +            <state relative-caret-position="294">
 | 
												
													
														
															|  | 
 |  | +              <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
 | 
												
													
														
															|  |                <folding>
 |  |                <folding>
 | 
												
													
														
															|  |                  <element signature="e#39#68#0#PHP" expanded="true" />
 |  |                  <element signature="e#39#68#0#PHP" expanded="true" />
 | 
												
													
														
															|  |                </folding>
 |  |                </folding>
 | 
												
											
												
													
														
															|  | @@ -80,7 +65,6 @@
 | 
												
													
														
															|  |    </component>
 |  |    </component>
 | 
												
													
														
															|  |    <component name="FindInProjectRecents">
 |  |    <component name="FindInProjectRecents">
 | 
												
													
														
															|  |      <findStrings>
 |  |      <findStrings>
 | 
												
													
														
															|  | -      <find>登录</find>
 |  | 
 | 
												
													
														
															|  |        <find>items</find>
 |  |        <find>items</find>
 | 
												
													
														
															|  |        <find>permissionsList</find>
 |  |        <find>permissionsList</find>
 | 
												
													
														
															|  |        <find>增加</find>
 |  |        <find>增加</find>
 | 
												
											
												
													
														
															|  | @@ -110,6 +94,7 @@
 | 
												
													
														
															|  |        <find>getCamerasList</find>
 |  |        <find>getCamerasList</find>
 | 
												
													
														
															|  |        <find>queue</find>
 |  |        <find>queue</find>
 | 
												
													
														
															|  |        <find>Module</find>
 |  |        <find>Module</find>
 | 
												
													
														
															|  | 
 |  | +      <find>QUEUE_CONNECTION</find>
 | 
												
													
														
															|  |      </findStrings>
 |  |      </findStrings>
 | 
												
													
														
															|  |    </component>
 |  |    </component>
 | 
												
													
														
															|  |    <component name="Git.Settings">
 |  |    <component name="Git.Settings">
 | 
												
											
												
													
														
															|  | @@ -162,13 +147,13 @@
 | 
												
													
														
															|  |          <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
 |  |          <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
 | 
												
													
														
															|  |          <option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
 |  |          <option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
 | 
												
													
														
															|  |          <option value="$PROJECT_DIR$/app/Helpers.php" />
 |  |          <option value="$PROJECT_DIR$/app/Helpers.php" />
 | 
												
													
														
															|  | -        <option value="$PROJECT_DIR$/.env" />
 |  | 
 | 
												
													
														
															|  |          <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/Services/CameraServices.php" />
 |  |          <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
 | 
												
													
														
															|  |          <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/Routes/api.php" />
 |  |          <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
 | 
												
													
														
															|  |          <option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
 |  |          <option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
 | 
												
													
														
															|  | 
 |  | +        <option value="$PROJECT_DIR$/.env" />
 | 
												
													
														
															|  |        </list>
 |  |        </list>
 | 
												
													
														
															|  |      </option>
 |  |      </option>
 | 
												
													
														
															|  |    </component>
 |  |    </component>
 | 
												
											
												
													
														
															|  | @@ -410,12 +395,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="137959000" />
 |  | 
 | 
												
													
														
															|  | 
 |  | +      <workItem from="1618368497550" duration="138715000" />
 | 
												
													
														
															|  |      </task>
 |  |      </task>
 | 
												
													
														
															|  |      <servers />
 |  |      <servers />
 | 
												
													
														
															|  |    </component>
 |  |    </component>
 | 
												
													
														
															|  |    <component name="TimeTrackingManager">
 |  |    <component name="TimeTrackingManager">
 | 
												
													
														
															|  | -    <option name="totallyTimeSpent" value="138102000" />
 |  | 
 | 
												
													
														
															|  | 
 |  | +    <option name="totallyTimeSpent" value="138858000" />
 | 
												
													
														
															|  |    </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" />
 | 
												
											
												
													
														
															|  | @@ -446,13 +431,6 @@
 | 
												
													
														
															|  |      <option name="version" value="1" />
 |  |      <option name="version" value="1" />
 | 
												
													
														
															|  |    </component>
 |  |    </component>
 | 
												
													
														
															|  |    <component name="editorHistoryManager">
 |  |    <component name="editorHistoryManager">
 | 
												
													
														
															|  | -    <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/login.blade.php">
 |  | 
 | 
												
													
														
															|  | -      <provider selected="true" editor-type-id="text-editor">
 |  | 
 | 
												
													
														
															|  | -        <state relative-caret-position="239">
 |  | 
 | 
												
													
														
															|  | -          <caret line="136" lean-forward="true" selection-start-line="136" selection-end-line="136" />
 |  | 
 | 
												
													
														
															|  | -        </state>
 |  | 
 | 
												
													
														
															|  | -      </provider>
 |  | 
 | 
												
													
														
															|  | -    </entry>
 |  | 
 | 
												
													
														
															|  |      <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/sub.blade.php">
 |  |      <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/sub.blade.php">
 | 
												
													
														
															|  |        <provider selected="true" editor-type-id="text-editor">
 |  |        <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  |          <state relative-caret-position="-710">
 |  |          <state relative-caret-position="-710">
 | 
												
											
												
													
														
															|  | @@ -699,13 +677,6 @@
 | 
												
													
														
															|  |      <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log">
 |  |      <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log">
 | 
												
													
														
															|  |        <provider selected="true" editor-type-id="text-editor" />
 |  |        <provider selected="true" editor-type-id="text-editor" />
 | 
												
													
														
															|  |      </entry>
 |  |      </entry>
 | 
												
													
														
															|  | -    <entry file="file://$PROJECT_DIR$/.env">
 |  | 
 | 
												
													
														
															|  | -      <provider selected="true" editor-type-id="text-editor">
 |  | 
 | 
												
													
														
															|  | -        <state relative-caret-position="656">
 |  | 
 | 
												
													
														
															|  | -          <caret line="46" column="44" lean-forward="true" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="44" />
 |  | 
 | 
												
													
														
															|  | -        </state>
 |  | 
 | 
												
													
														
															|  | -      </provider>
 |  | 
 | 
												
													
														
															|  | -    </entry>
 |  | 
 | 
												
													
														
															|  |      <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
 |  |      <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
 | 
												
													
														
															|  |        <provider selected="true" editor-type-id="text-editor">
 |  |        <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  |          <state relative-caret-position="168">
 |  |          <state relative-caret-position="168">
 | 
												
											
												
													
														
															|  | @@ -765,11 +736,6 @@
 | 
												
													
														
															|  |          </state>
 |  |          </state>
 | 
												
													
														
															|  |        </provider>
 |  |        </provider>
 | 
												
													
														
															|  |      </entry>
 |  |      </entry>
 | 
												
													
														
															|  | -    <entry file="file://$PROJECT_DIR$/config/queue.php">
 |  | 
 | 
												
													
														
															|  | -      <provider selected="true" editor-type-id="text-editor">
 |  | 
 | 
												
													
														
															|  | -        <state relative-caret-position="-814" />
 |  | 
 | 
												
													
														
															|  | -      </provider>
 |  | 
 | 
												
													
														
															|  | -    </entry>
 |  | 
 | 
												
													
														
															|  |      <entry file="file://$PROJECT_DIR$/database/migrations/2021_04_26_100533_create_jobs_table.php">
 |  |      <entry file="file://$PROJECT_DIR$/database/migrations/2021_04_26_100533_create_jobs_table.php">
 | 
												
													
														
															|  |        <provider selected="true" editor-type-id="text-editor">
 |  |        <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  |          <state relative-caret-position="315">
 |  |          <state relative-caret-position="315">
 | 
												
											
												
													
														
															|  | @@ -777,16 +743,6 @@
 | 
												
													
														
															|  |          </state>
 |  |          </state>
 | 
												
													
														
															|  |        </provider>
 |  |        </provider>
 | 
												
													
														
															|  |      </entry>
 |  |      </entry>
 | 
												
													
														
															|  | -    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
 |  | 
 | 
												
													
														
															|  | -      <provider selected="true" editor-type-id="text-editor">
 |  | 
 | 
												
													
														
															|  | -        <state relative-caret-position="424">
 |  | 
 | 
												
													
														
															|  | -          <caret line="239" column="28" lean-forward="true" selection-start-line="239" selection-start-column="28" selection-end-line="239" selection-end-column="28" />
 |  | 
 | 
												
													
														
															|  | -          <folding>
 |  | 
 | 
												
													
														
															|  | -            <element signature="e#51#107#0#PHP" expanded="true" />
 |  | 
 | 
												
													
														
															|  | -          </folding>
 |  | 
 | 
												
													
														
															|  | -        </state>
 |  | 
 | 
												
													
														
															|  | -      </provider>
 |  | 
 | 
												
													
														
															|  | -    </entry>
 |  | 
 | 
												
													
														
															|  |      <entry file="file://$PROJECT_DIR$/vendor/nwidart/laravel-modules/src/FileRepository.php">
 |  |      <entry file="file://$PROJECT_DIR$/vendor/nwidart/laravel-modules/src/FileRepository.php">
 | 
												
													
														
															|  |        <provider selected="true" editor-type-id="text-editor">
 |  |        <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  |          <state relative-caret-position="-871">
 |  |          <state relative-caret-position="-871">
 | 
												
											
												
													
														
															|  | @@ -806,13 +762,44 @@
 | 
												
													
														
															|  |      </entry>
 |  |      </entry>
 | 
												
													
														
															|  |      <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
 |  |      <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
 | 
												
													
														
															|  |        <provider selected="true" editor-type-id="text-editor">
 |  |        <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  | -        <state relative-caret-position="2793">
 |  | 
 | 
												
													
														
															|  | -          <caret line="133" column="43" selection-start-line="133" selection-start-column="43" selection-end-line="133" selection-end-column="43" />
 |  | 
 | 
												
													
														
															|  | 
 |  | +        <state relative-caret-position="294">
 | 
												
													
														
															|  | 
 |  | +          <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
 | 
												
													
														
															|  |            <folding>
 |  |            <folding>
 | 
												
													
														
															|  |              <element signature="e#39#68#0#PHP" expanded="true" />
 |  |              <element signature="e#39#68#0#PHP" expanded="true" />
 | 
												
													
														
															|  |            </folding>
 |  |            </folding>
 | 
												
													
														
															|  |          </state>
 |  |          </state>
 | 
												
													
														
															|  |        </provider>
 |  |        </provider>
 | 
												
													
														
															|  |      </entry>
 |  |      </entry>
 | 
												
													
														
															|  | 
 |  | +    <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Support/helpers.php">
 | 
												
													
														
															|  | 
 |  | +      <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  | 
 |  | +        <state relative-caret-position="260">
 | 
												
													
														
															|  | 
 |  | +          <caret line="640" column="13" selection-start-line="640" selection-start-column="13" selection-end-line="640" selection-end-column="13" />
 | 
												
													
														
															|  | 
 |  | +        </state>
 | 
												
													
														
															|  | 
 |  | +      </provider>
 | 
												
													
														
															|  | 
 |  | +    </entry>
 | 
												
													
														
															|  | 
 |  | +    <entry file="file://$PROJECT_DIR$/config/queue.php">
 | 
												
													
														
															|  | 
 |  | +      <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  | 
 |  | +        <state relative-caret-position="354">
 | 
												
													
														
															|  | 
 |  | +          <caret line="63" column="39" selection-start-line="63" selection-start-column="28" selection-end-line="63" selection-end-column="39" />
 | 
												
													
														
															|  | 
 |  | +        </state>
 | 
												
													
														
															|  | 
 |  | +      </provider>
 | 
												
													
														
															|  | 
 |  | +    </entry>
 | 
												
													
														
															|  | 
 |  | +    <entry file="file://$PROJECT_DIR$/.env">
 | 
												
													
														
															|  | 
 |  | +      <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  | 
 |  | +        <state relative-caret-position="279">
 | 
												
													
														
															|  | 
 |  | +          <caret line="17" column="22" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
 | 
												
													
														
															|  | 
 |  | +        </state>
 | 
												
													
														
															|  | 
 |  | +      </provider>
 | 
												
													
														
															|  | 
 |  | +    </entry>
 | 
												
													
														
															|  | 
 |  | +    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
 | 
												
													
														
															|  | 
 |  | +      <provider selected="true" editor-type-id="text-editor">
 | 
												
													
														
															|  | 
 |  | +        <state relative-caret-position="277">
 | 
												
													
														
															|  | 
 |  | +          <caret line="220" lean-forward="true" selection-start-line="220" selection-end-line="220" />
 | 
												
													
														
															|  | 
 |  | +          <folding>
 | 
												
													
														
															|  | 
 |  | +            <element signature="e#51#107#0#PHP" expanded="true" />
 | 
												
													
														
															|  | 
 |  | +          </folding>
 | 
												
													
														
															|  | 
 |  | +        </state>
 | 
												
													
														
															|  | 
 |  | +      </provider>
 | 
												
													
														
															|  | 
 |  | +    </entry>
 | 
												
													
														
															|  |    </component>
 |  |    </component>
 | 
												
													
														
															|  |  </project>
 |  |  </project>
 |