|
@@ -2,12 +2,17 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/app/Enum/ApiEnum.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php" 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/Jobs/CameraListExcel.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.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$/public/template/摄像头列表导入模板_v1.0.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/public/template/摄像头列表导入模板_v1.0.xlsx" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Camera/Routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Routes/api.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Mine/Routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Routes/api.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/Helpers.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Helpers.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/resources/lang/en/auth.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/en/auth.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -21,73 +26,79 @@
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/MenusController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="253">
|
|
|
- <caret line="82" column="36" selection-start-line="82" selection-start-column="36" selection-end-line="82" selection-end-column="36" />
|
|
|
+ <state relative-caret-position="252">
|
|
|
+ <caret line="21" column="73" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="73" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="336">
|
|
|
+ <caret line="16" column="28" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="28" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="285">
|
|
|
- <caret line="223" column="37" lean-forward="true" selection-start-line="223" selection-start-column="37" selection-end-line="223" selection-end-column="37" />
|
|
|
+ <state relative-caret-position="252">
|
|
|
+ <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
|
|
|
<folding>
|
|
|
- <element signature="e#51#107#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#139#183#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Helpers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1340">
|
|
|
- <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
|
|
|
+ <state relative-caret-position="208">
|
|
|
+ <caret line="64" column="23" selection-start-line="64" selection-start-column="23" selection-end-line="64" selection-end-column="23" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="252">
|
|
|
- <caret line="21" column="73" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="73" />
|
|
|
+ <state relative-caret-position="117">
|
|
|
+ <caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="399">
|
|
|
- <caret line="110" column="12" selection-start-line="110" selection-start-column="12" selection-end-line="110" selection-end-column="12" />
|
|
|
- <folding>
|
|
|
- <element signature="e#129#166#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="102" column="40" selection-start-line="102" selection-start-column="23" selection-end-line="102" selection-end-column="40" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="367">
|
|
|
- <caret line="207" column="16" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
|
|
|
+ <state relative-caret-position="137">
|
|
|
+ <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
|
|
|
<folding>
|
|
|
- <element signature="e#128#165#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Enum/ApiEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="123">
|
|
|
- <caret line="6" column="54" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="54" />
|
|
|
+ <state relative-caret-position="525">
|
|
|
+ <caret line="30" column="24" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="24" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -96,7 +107,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>js</find>
|
|
|
<find>NONE</find>
|
|
|
<find>convert</find>
|
|
|
<find>weadmin.css.map</find>
|
|
@@ -126,6 +136,7 @@
|
|
|
<find>formSelects.</find>
|
|
|
<find>formSelects:</find>
|
|
|
<find>formSelects</find>
|
|
|
+ <find>sendLoginResponse</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
@@ -134,16 +145,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/app/Http/Kernel.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Resources/views/login.blade.php" />
|
|
|
- <option value="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" />
|
|
|
- <option value="$PROJECT_DIR$/app/User.php" />
|
|
|
- <option value="$PROJECT_DIR$/app/Providers/AuthServiceProvider.php" />
|
|
|
- <option value="$PROJECT_DIR$/config/auth.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Database/Migrations/2021_04_15_025757_create_menus_table.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Entities/Menu.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Services/MenuService.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/AdminController.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/sub.blade.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Http/Requests/MenusRequest.php" />
|
|
@@ -155,8 +156,6 @@
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/master.blade.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_16_083654_create_mine_list_table.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Entities/MineList.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Routes/web.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Entities/CameraFieldList.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Enum/CommonEnum.php" />
|
|
@@ -178,13 +177,25 @@
|
|
|
<option value="$PROJECT_DIR$/storage/app/menulist.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Services/MenusService.php" />
|
|
|
- <option value="$PROJECT_DIR$/app/Helpers.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" />
|
|
|
+ <option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
|
|
|
+ <option value="$PROJECT_DIR$/app/Helpers.php" />
|
|
|
+ <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-25.log" />
|
|
|
+ <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log" />
|
|
|
+ <option value="$PROJECT_DIR$/resources/lang/en/auth.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -327,7 +338,33 @@
|
|
|
<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="app" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Controllers" 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>
|
|
|
+ <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Admin" 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="Admin" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Enum" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -338,7 +375,52 @@
|
|
|
<path>
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="routes" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Camera" 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" />
|
|
|
+ <item name="Camera" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Controllers" 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="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="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="Mine" 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" />
|
|
|
+ <item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Controllers" 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="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Routes" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
@@ -384,12 +466,12 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1618368322468</updated>
|
|
|
<workItem from="1618368323697" duration="143000" />
|
|
|
- <workItem from="1618368497550" duration="110237000" />
|
|
|
+ <workItem from="1618368497550" duration="120868000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="110380000" />
|
|
|
+ <option name="totallyTimeSpent" value="121011000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -420,379 +502,377 @@
|
|
|
<option name="version" value="1" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Entities/Menu.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
- <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/index.blade.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineList.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="189">
|
|
|
- <caret line="10" column="33" selection-start-line="10" selection-start-column="33" selection-end-line="10" selection-end-column="33" />
|
|
|
+ <state relative-caret-position="253">
|
|
|
+ <caret line="232" column="64" selection-start-line="232" selection-start-column="50" selection-end-line="232" selection-end-column="64" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/AdminController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="256">
|
|
|
- <caret line="28" column="32" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="236">
|
|
|
+ <caret line="206" column="28" selection-start-line="206" selection-start-column="23" selection-end-line="206" selection-end-column="28" />
|
|
|
<folding>
|
|
|
- <element signature="e#50#94#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#136#193#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-21.log">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="63">
|
|
|
- <caret line="8" selection-start-line="8" selection-end-line="15" selection-end-column="19" />
|
|
|
+ <state relative-caret-position="105">
|
|
|
+ <caret line="5" column="4" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Enum/CommonEnum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_082221_create_camera_list_table.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
- <caret line="15" column="41" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="15" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="294">
|
|
|
+ <caret line="16" column="29" lean-forward="true" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_071702_create_camera_field_list.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Resources/views/layouts/master.blade.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="315">
|
|
|
- <caret line="17" column="32" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="676">
|
|
|
+ <caret line="45" column="59" selection-start-line="45" selection-start-column="59" selection-end-line="45" selection-end-column="59" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="252">
|
|
|
- <caret line="21" column="59" selection-start-line="21" selection-start-column="59" selection-end-line="21" selection-end-column="59" />
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="19" column="32" lean-forward="true" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_tree_item.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/symfony/console/Helper/Helper.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-57" />
|
|
|
+ <state relative-caret-position="-2075" />
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_tree_list.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/app/menulist.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="263">
|
|
|
- <caret line="59" column="53" selection-start-line="59" selection-start-column="35" selection-end-line="59" selection-end-column="53" />
|
|
|
+ <state relative-caret-position="620">
|
|
|
+ <caret line="196" column="24" selection-start-line="196" selection-start-column="24" selection-end-line="196" selection-end-column="24" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TreeAuxiliary.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="253">
|
|
|
- <caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
|
|
|
+ <state relative-caret-position="297">
|
|
|
+ <caret line="211" column="60" selection-start-line="211" selection-start-column="60" selection-end-line="211" selection-end-column="60" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#50#81#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TableAuxiliary.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/overtrue/pinyin/src/Pinyin.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="291">
|
|
|
- <caret line="101" column="58" selection-start-line="101" selection-start-column="11" selection-end-line="101" selection-end-column="58" />
|
|
|
+ <state relative-caret-position="438">
|
|
|
+ <caret line="296" column="59" lean-forward="true" selection-start-line="296" selection-start-column="59" selection-end-line="296" selection-end-column="59" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#7#208#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraFieldList.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/overtrue/pinyin/src/const.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="42">
|
|
|
- <caret line="2" selection-start-line="2" selection-end-line="14" selection-end-column="1" />
|
|
|
+ <state relative-caret-position="126">
|
|
|
+ <caret line="13" column="18" lean-forward="true" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/login.blade.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="105">
|
|
|
- <caret line="6" column="16" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
|
|
|
+ <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/Traits/ClassifyMethod.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/sub.blade.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="172">
|
|
|
- <caret line="113" column="20" selection-start-line="113" selection-start-column="20" selection-end-line="113" selection-end-column="20" />
|
|
|
+ <state relative-caret-position="-710">
|
|
|
+ <caret line="104" lean-forward="true" selection-start-line="104" selection-end-line="104" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/UsersService.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/master.blade.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="463">
|
|
|
- <caret line="104" column="23" selection-start-line="99" selection-start-column="8" selection-end-line="104" selection-end-column="23" />
|
|
|
- <folding>
|
|
|
- <element signature="e#128#141#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="171" column="16" selection-start-line="171" selection-start-column="16" selection-end-line="171" selection-end-column="16" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_from.blade.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="310">
|
|
|
- <caret line="44" column="49" lean-forward="true" selection-start-line="42" selection-start-column="8" selection-end-line="44" selection-end-column="49" />
|
|
|
+ <state relative-caret-position="287">
|
|
|
+ <caret line="232" column="56" selection-start-line="232" selection-start-column="45" selection-end-line="232" selection-end-column="56" />
|
|
|
<folding>
|
|
|
- <element signature="e#49#93#0#PHP" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/symfony/http-foundation/File/UploadedFile.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/MenusController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="260">
|
|
|
- <caret line="87" column="20" selection-start-line="87" selection-start-column="20" selection-end-line="87" selection-end-column="20" />
|
|
|
+ <state relative-caret-position="253">
|
|
|
+ <caret line="82" column="36" selection-start-line="82" selection-start-column="36" selection-end-line="82" selection-end-column="36" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="168">
|
|
|
- <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
|
|
|
+ <state relative-caret-position="252">
|
|
|
+ <caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/index.blade.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.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="232" column="64" selection-start-line="232" selection-start-column="50" selection-end-line="232" selection-end-column="64" />
|
|
|
+ <state relative-caret-position="168">
|
|
|
+ <caret line="13" column="34" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="34" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="236">
|
|
|
- <caret line="206" column="28" selection-start-line="206" selection-start-column="23" selection-end-line="206" selection-end-column="28" />
|
|
|
+ <state relative-caret-position="399">
|
|
|
+ <caret line="110" column="12" selection-start-line="110" selection-start-column="12" selection-end-line="110" selection-end-column="12" />
|
|
|
<folding>
|
|
|
- <element signature="e#136#193#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#129#166#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-21.log">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-22.log">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="105">
|
|
|
- <caret line="5" column="4" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
|
|
|
+ <state relative-caret-position="21">
|
|
|
+ <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_082221_create_camera_list_table.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="294">
|
|
|
- <caret line="16" column="29" lean-forward="true" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="29" />
|
|
|
+ <state relative-caret-position="367">
|
|
|
+ <caret line="207" column="16" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#128#165#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Resources/views/layouts/master.blade.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/.env">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Bus/Dispatchable.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="676">
|
|
|
- <caret line="45" column="59" selection-start-line="45" selection-start-column="59" selection-end-line="45" selection-end-column="59" />
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/routes/web.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
- <caret line="19" column="32" lean-forward="true" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="-416">
|
|
|
+ <caret line="17" column="6" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/symfony/console/Helper/Helper.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-2075" />
|
|
|
+ <state relative-caret-position="497">
|
|
|
+ <caret line="233" column="29" selection-start-line="233" selection-start-column="29" selection-end-line="233" selection-end-column="29" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#51#107#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/app/menulist.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="620">
|
|
|
- <caret line="196" column="24" selection-start-line="196" selection-start-column="24" selection-end-line="196" selection-end-column="24" />
|
|
|
+ <state relative-caret-position="123">
|
|
|
+ <caret line="6" column="54" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="54" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="297">
|
|
|
- <caret line="211" column="60" selection-start-line="211" selection-start-column="60" selection-end-line="211" selection-end-column="60" />
|
|
|
- <folding>
|
|
|
- <element signature="e#50#81#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <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/overtrue/pinyin/src/Pinyin.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="438">
|
|
|
- <caret line="296" column="59" lean-forward="true" selection-start-line="296" selection-start-column="59" selection-end-line="296" selection-end-column="59" />
|
|
|
- <folding>
|
|
|
- <element signature="e#7#208#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="316">
|
|
|
+ <caret line="53" column="43" lean-forward="true" selection-start-line="53" selection-start-column="43" selection-end-line="53" selection-end-column="43" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/overtrue/pinyin/src/const.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="126">
|
|
|
- <caret line="13" column="18" lean-forward="true" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
|
|
|
+ <caret line="6" column="15" selection-start-line="6" selection-start-column="15" selection-end-line="6" selection-end-column="15" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/login.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.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 relative-caret-position="252">
|
|
|
+ <caret line="17" column="30" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="30" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/sub.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-710">
|
|
|
- <caret line="104" lean-forward="true" selection-start-line="104" selection-end-line="104" />
|
|
|
+ <state relative-caret-position="168">
|
|
|
+ <caret line="13" column="51" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="51" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/master.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.env">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="260">
|
|
|
- <caret line="171" column="16" selection-start-line="171" selection-start-column="16" selection-end-line="171" selection-end-column="16" />
|
|
|
+ <state relative-caret-position="84">
|
|
|
+ <caret line="13" selection-start-line="13" selection-end-line="15" selection-end-column="3" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Helpers.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="630">
|
|
|
- <caret line="35" column="34" selection-start-line="35" selection-start-column="34" selection-end-line="35" selection-end-column="34" />
|
|
|
+ <state relative-caret-position="252">
|
|
|
+ <caret line="21" column="73" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="73" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_from.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="287">
|
|
|
- <caret line="232" column="56" selection-start-line="232" selection-start-column="45" selection-end-line="232" selection-end-column="56" />
|
|
|
+ <state relative-caret-position="373">
|
|
|
+ <caret line="32" column="44" selection-start-line="30" selection-start-column="9" selection-end-line="32" selection-end-column="44" />
|
|
|
<folding>
|
|
|
- <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="e#49#93#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/MenusController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="253">
|
|
|
- <caret line="82" column="36" selection-start-line="82" selection-start-column="36" selection-end-line="82" selection-end-column="36" />
|
|
|
+ <state relative-caret-position="631">
|
|
|
+ <caret line="164" column="5" selection-start-line="146" selection-start-column="4" selection-end-line="164" selection-end-column="5" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="605">
|
|
|
- <caret line="157" column="45" selection-start-line="144" selection-start-column="7" selection-end-line="157" selection-end-column="45" />
|
|
|
- <folding>
|
|
|
- <element signature="e#136#149#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="295">
|
|
|
+ <caret line="26" column="14" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="252">
|
|
|
- <caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
|
|
|
+ <state relative-caret-position="147">
|
|
|
+ <caret line="12" column="44" selection-start-line="12" selection-start-column="44" selection-end-line="12" selection-end-column="44" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Enum/ApiEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="63">
|
|
|
- <caret line="8" selection-start-line="8" selection-end-line="11" selection-end-column="1" />
|
|
|
+ <state relative-caret-position="525">
|
|
|
+ <caret line="30" column="24" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="24" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="168">
|
|
|
- <caret line="13" column="34" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="34" />
|
|
|
+ <state relative-caret-position="336">
|
|
|
+ <caret line="16" column="28" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="252">
|
|
|
- <caret line="21" column="73" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="73" />
|
|
|
+ <state relative-caret-position="137">
|
|
|
+ <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="252">
|
|
|
- <caret line="17" column="30" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="30" />
|
|
|
+ <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#139#183#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="399">
|
|
|
- <caret line="110" column="12" selection-start-line="110" selection-start-column="12" selection-end-line="110" selection-end-column="12" />
|
|
|
+ <state relative-caret-position="2996">
|
|
|
+ <caret line="157" column="45" selection-start-line="144" selection-start-column="7" selection-end-line="157" selection-end-column="45" />
|
|
|
<folding>
|
|
|
- <element signature="e#129#166#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#136#149#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-22.log">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Helpers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="21">
|
|
|
- <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
|
|
|
+ <state relative-caret-position="208">
|
|
|
+ <caret line="64" column="23" selection-start-line="64" selection-start-column="23" selection-end-line="64" selection-end-column="23" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-25.log">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Validation/ValidationException.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="367">
|
|
|
- <caret line="207" column="16" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
|
|
|
- <folding>
|
|
|
- <element signature="e#128#165#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="323">
|
|
|
+ <caret line="71" column="42" selection-start-line="71" selection-start-column="42" selection-end-line="71" selection-end-column="42" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Bus/Dispatchable.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/resources/lang/en/auth.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="260">
|
|
|
- <caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="336">
|
|
|
+ <caret line="16" column="46" selection-start-line="16" selection-start-column="46" selection-end-line="16" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="123">
|
|
|
- <caret line="6" column="54" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="54" />
|
|
|
+ <state relative-caret-position="168">
|
|
|
+ <caret line="8" column="45" lean-forward="true" selection-start-line="8" selection-start-column="45" selection-end-line="8" selection-end-column="45" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1340">
|
|
|
- <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="102" column="40" selection-start-line="102" selection-start-column="23" selection-end-line="102" selection-end-column="40" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="285">
|
|
|
- <caret line="223" column="37" lean-forward="true" selection-start-line="223" selection-start-column="37" selection-end-line="223" selection-end-column="37" />
|
|
|
- <folding>
|
|
|
- <element signature="e#51#107#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="117">
|
|
|
+ <caret line="46" column="5" selection-start-line="46" selection-start-column="5" selection-end-line="46" selection-end-column="5" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|