|
@@ -3,7 +3,7 @@
|
|
|
<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$/app/Console/Commands/UpdateHkList.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -16,50 +16,60 @@
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="499">
|
|
|
- <caret line="590" column="63" lean-forward="true" selection-start-line="590" selection-start-column="63" selection-end-line="590" selection-end-column="63" />
|
|
|
- <folding>
|
|
|
- <element signature="e#129#150#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="168">
|
|
|
+ <caret line="17" column="48" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="48" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="205">
|
|
|
- <caret line="97" column="20" selection-start-line="97" selection-start-column="20" selection-end-line="97" selection-end-column="20" />
|
|
|
- <folding>
|
|
|
- <element signature="e#140#184#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="126">
|
|
|
+ <caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="418">
|
|
|
+ <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Routing/Controller.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="571">
|
|
|
- <caret line="29" column="23" lean-forward="true" selection-start-line="29" selection-start-column="7" selection-end-line="56" selection-end-column="18" />
|
|
|
- <folding>
|
|
|
- <element signature="e#6#91#0#PHP" expanded="true" />
|
|
|
- <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="457">
|
|
|
+ <caret line="31" column="32" lean-forward="true" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="578">
|
|
|
- <caret line="47" column="49" lean-forward="true" selection-start-line="47" selection-start-column="49" selection-end-line="47" selection-end-column="49" />
|
|
|
- <folding>
|
|
|
- <element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="334">
|
|
|
+ <caret line="53" column="47" selection-start-line="53" selection-start-column="47" selection-end-line="53" selection-end-column="47" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="126">
|
|
|
+ <caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -76,11 +86,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2632">
|
|
|
- <caret line="127" column="21" selection-start-line="127" selection-start-column="21" selection-end-line="127" selection-end-column="21" />
|
|
|
+ <state relative-caret-position="1176">
|
|
|
+ <caret line="56" column="21" lean-forward="true" selection-start-line="56" selection-start-column="21" selection-end-line="56" selection-end-column="21" />
|
|
|
<folding>
|
|
|
<element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -88,15 +98,6 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="253">
|
|
|
- <caret line="64" column="10" selection-start-line="64" selection-start-column="10" selection-end-line="64" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
@@ -107,6 +108,7 @@
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -261,6 +263,12 @@
|
|
|
<path>
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="app" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
@@ -274,24 +282,20 @@
|
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Camera" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Routes" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Camera" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Controllers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Camera" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Controllers" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Api" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Routes" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -370,7 +374,7 @@
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="1924000" />
|
|
|
+ <option name="totallyTimeSpent" value="3620000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -411,40 +415,46 @@
|
|
|
<state x="431" y="155" width="672" height="678" key="search.everywhere.popup/0.0.1536.834@0.0.1536.834" timestamp="1647916157876" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="578">
|
|
|
- <caret line="47" column="49" lean-forward="true" selection-start-line="47" selection-start-column="49" selection-end-line="47" selection-end-column="49" />
|
|
|
+ <state relative-caret-position="571">
|
|
|
+ <caret line="29" column="23" lean-forward="true" selection-start-line="29" selection-start-column="7" selection-end-line="56" selection-end-column="18" />
|
|
|
<folding>
|
|
|
- <element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#6#91#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Console/Kernel.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="571">
|
|
|
- <caret line="29" column="23" lean-forward="true" selection-start-line="29" selection-start-column="7" selection-end-line="56" selection-end-column="18" />
|
|
|
+ <state relative-caret-position="1176">
|
|
|
+ <caret line="56" column="21" lean-forward="true" selection-start-line="56" selection-start-column="21" selection-end-line="56" selection-end-column="21" />
|
|
|
<folding>
|
|
|
- <element signature="e#6#91#0#PHP" expanded="true" />
|
|
|
- <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/TdwyController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="611">
|
|
|
- <caret line="191" column="22" selection-start-line="191" selection-start-column="15" selection-end-line="191" selection-end-column="22" />
|
|
|
+ <state relative-caret-position="205">
|
|
|
+ <caret line="97" column="20" selection-start-line="97" selection-start-column="20" selection-end-line="97" selection-end-column="20" />
|
|
|
<folding>
|
|
|
- <element signature="e#141#185#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#140#184#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/api.php">
|
|
|
+ <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="499">
|
|
|
+ <state relative-caret-position="3619">
|
|
|
<caret line="590" column="63" lean-forward="true" selection-start-line="590" selection-start-column="63" selection-end-line="590" selection-end-column="63" />
|
|
|
<folding>
|
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
@@ -452,18 +462,91 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Console/Kernel.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="253">
|
|
|
+ <caret line="64" column="10" selection-start-line="64" selection-start-column="10" selection-end-line="64" selection-end-column="10" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="126">
|
|
|
+ <caret line="15" column="34" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="168">
|
|
|
+ <caret line="17" column="48" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="48" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="252">
|
|
|
+ <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
|
|
|
+ </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="797">
|
|
|
+ <caret line="47" column="49" lean-forward="true" selection-start-line="47" selection-start-column="49" selection-end-line="47" selection-end-column="49" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2632">
|
|
|
- <caret line="127" column="21" selection-start-line="127" selection-start-column="21" selection-end-line="127" selection-end-column="21" />
|
|
|
+ <state relative-caret-position="611">
|
|
|
+ <caret line="191" column="22" selection-start-line="191" selection-start-column="15" selection-end-line="191" selection-end-column="22" />
|
|
|
<folding>
|
|
|
- <element signature="e#40#71#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#141#185#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="334">
|
|
|
+ <caret line="53" column="47" selection-start-line="53" selection-start-column="47" selection-end-line="53" selection-end-column="47" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="126">
|
|
|
+ <caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Routing/ControllerMiddlewareOptions.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="268">
|
|
|
+ <caret line="19" column="20" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Routing/Controller.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="457">
|
|
|
+ <caret line="31" column="32" lean-forward="true" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="418">
|
|
|
+ <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
</project>
|