|
@@ -1,7 +1,24 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="" />
|
|
|
+ <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
|
+ <change afterPath="$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/Modules/Camera/Entities/CameraFieldList.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/Modules/Mine/Entities/MineList.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.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/Admin/Enum/UserEnum.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Admin/Routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Routes/web.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Admin/Services/UsersService.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Services/UsersService.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_16_083654_create_mine_list_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_16_083654_create_mine_list_table.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Mine/Routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Routes/web.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/modules_statuses.json" beforeDir="false" afterPath="$PROJECT_DIR$/modules_statuses.json" afterDir="false" />
|
|
|
+ </list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -14,89 +31,35 @@
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/AdminController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="277">
|
|
|
- <caret line="29" column="30" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="30" />
|
|
|
- <folding>
|
|
|
- <element signature="e#50#94#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/UsersService.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="214">
|
|
|
- <caret line="107" column="33" selection-start-line="107" selection-start-column="33" selection-end-line="107" selection-end-column="33" />
|
|
|
- <folding>
|
|
|
- <element signature="e#128#141#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="273">
|
|
|
+ <caret line="22" column="35" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="35" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="254">
|
|
|
- <caret line="28" column="42" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="42" />
|
|
|
+ <state relative-caret-position="424">
|
|
|
+ <caret line="105" column="37" selection-start-line="105" selection-start-column="37" selection-end-line="105" selection-end-column="37" />
|
|
|
<folding>
|
|
|
- <element signature="e#136#149#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#51#95#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</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="126">
|
|
|
- <caret line="15" column="44" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="44" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="378">
|
|
|
- <caret line="20" column="42" selection-start-line="20" selection-start-column="42" selection-end-line="20" selection-end-column="42" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="173">
|
|
|
- <caret line="19" column="10" selection-start-line="19" selection-start-column="10" selection-end-line="19" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="273">
|
|
|
- <caret line="18" column="24" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="24" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
</file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>requ</find>
|
|
|
- <find>passport</find>
|
|
|
- <find>Laravel\Passport\Passport</find>
|
|
|
- <find>providers</find>
|
|
|
- <find>loginView</find>
|
|
|
- <find>home</find>
|
|
|
- <find>Illuminate\Auth\RequestGuard::attempt</find>
|
|
|
- <find>attempt</find>
|
|
|
<find>url()</find>
|
|
|
<find>Auth::guard('admin')</find>
|
|
|
<find>sortMenu</find>
|
|
@@ -119,19 +82,22 @@
|
|
|
<find>登录</find>
|
|
|
<find>items</find>
|
|
|
<find>permissionsList</find>
|
|
|
+ <find>增加</find>
|
|
|
+ <find>删除</find>
|
|
|
+ <find>$actionBtns</find>
|
|
|
+ <find>UserEnum</find>
|
|
|
+ <find>select</find>
|
|
|
+ <find>checkbox</find>
|
|
|
+ <find>CAMERA_FIELD_ALREADY_EXIST</find>
|
|
|
+ <find>CAMERA_FIELD_NOT_EXIST</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
+ <component name="Git.Settings">
|
|
|
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
+ </component>
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/routes/web.php" />
|
|
|
- <option value="$PROJECT_DIR$/public/css/admin/font.css" />
|
|
|
- <option value="$PROJECT_DIR$/public/css/admin/weadmin.css" />
|
|
|
- <option value="$PROJECT_DIR$/.env" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Database/Migrations/2021_04_14_071806_create_admin_table.php" />
|
|
|
- <option value="$PROJECT_DIR$/database/migrations/2021_04_14_073645_update_users_table.php" />
|
|
|
- <option value="$PROJECT_DIR$/app/Http/Controllers/HomeController.php" />
|
|
|
- <option value="$PROJECT_DIR$/app/Http/Controllers/Auth/ResetPasswordController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Http/Controllers/Auth/RegisterController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Http/Middleware/Authenticate.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php" />
|
|
@@ -163,12 +129,26 @@
|
|
|
<option value="$PROJECT_DIR$/Modules/Enum/UserEnum.php" />
|
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-16.log" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/master.blade.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Services/UsersService.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_16_083654_create_mine_list_table.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Routes/web.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.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" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Admin/Services/UsersService.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_071702_create_camera_field_list.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_082221_create_camera_list_table.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
|
|
|
+ <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -288,6 +268,7 @@
|
|
|
<option name="width" value="1440" />
|
|
|
<option name="height" value="900" />
|
|
|
</component>
|
|
|
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
|
<navigator proportions="" version="1">
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
@@ -322,6 +303,33 @@
|
|
|
<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" />
|
|
|
+ <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Admin" 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" />
|
|
|
+ </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="Entities" 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>
|
|
@@ -340,6 +348,13 @@
|
|
|
<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="Services" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="routes" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
@@ -386,12 +401,12 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1618368322468</updated>
|
|
|
<workItem from="1618368323697" duration="143000" />
|
|
|
- <workItem from="1618368497550" duration="46972000" />
|
|
|
+ <workItem from="1618368497550" duration="73977000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="47115000" />
|
|
|
+ <option name="totallyTimeSpent" value="74120000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -422,316 +437,288 @@
|
|
|
<option name="version" value="1" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/composer.json">
|
|
|
+ <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="214">
|
|
|
- <caret line="15" column="41" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="840">
|
|
|
+ <caret line="40" column="9" lean-forward="true" selection-start-line="40" selection-start-column="9" selection-end-line="40" selection-end-column="9" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#a#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#i#0;n#a#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/app.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Http/Request.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="378">
|
|
|
- <caret line="164" column="56" selection-start-line="164" selection-start-column="56" selection-end-line="164" selection-end-column="56" />
|
|
|
+ <state relative-caret-position="126">
|
|
|
+ <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/routes/web.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Requests/MenusRequest.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
- <caret line="19" column="35" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="35" />
|
|
|
+ <state relative-caret-position="147">
|
|
|
+ <caret line="12" column="6" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Authenticate.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/overtrue/pinyin/src/const.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 relative-caret-position="84">
|
|
|
+ <caret line="11" column="8" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/overtrue/pinyin/src/Pinyin.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="159">
|
|
|
- <caret line="53" column="44" lean-forward="true" selection-start-line="53" selection-start-column="44" selection-end-line="53" selection-end-column="44" />
|
|
|
+ <state relative-caret-position="6342">
|
|
|
+ <caret line="309" lean-forward="true" selection-start-line="309" selection-end-line="309" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/resources/views/auth/login.blade.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Auth/ThrottlesLogins.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Helpers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="260">
|
|
|
- <caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
|
|
|
+ <state relative-caret-position="445">
|
|
|
+ <caret line="48" column="5" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Providers/AppServiceProvider.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-15.log">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="504">
|
|
|
- <caret line="24" column="23" lean-forward="true" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
|
|
|
+ <state relative-caret-position="208">
|
|
|
+ <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
|
|
|
<folding>
|
|
|
- <element signature="e#33#71#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#23#63#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Auth/RequestGuard.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/passport/src/Passport.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/FilterService.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="260">
|
|
|
- <caret line="90" column="18" selection-start-line="90" selection-start-column="18" selection-end-line="90" selection-end-column="18" />
|
|
|
+ <state relative-caret-position="-269">
|
|
|
+ <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$/vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.env">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="509">
|
|
|
- <caret line="120" column="30" lean-forward="true" selection-start-line="120" selection-start-column="30" selection-end-line="120" selection-end-column="30" />
|
|
|
- </state>
|
|
|
+ <state relative-caret-position="-51" />
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Auth/SessionGuard.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_table_view.blade.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="343">
|
|
|
- <caret line="96" column="27" lean-forward="true" selection-start-line="96" selection-start-column="27" selection-end-line="96" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="10" column="27" lean-forward="true" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/auth.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="141">
|
|
|
- <caret line="38" column="12" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="12" />
|
|
|
+ <state relative-caret-position="559">
|
|
|
+ <caret line="120" column="26" lean-forward="true" selection-start-line="104" selection-start-column="14" selection-end-line="120" selection-end-column="26" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-16.log">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="354">
|
|
|
- <caret line="78" column="27" selection-start-line="78" selection-start-column="27" selection-end-line="78" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="372">
|
|
|
+ <caret line="732" column="70" selection-start-line="732" selection-start-column="55" selection-end-line="732" selection-end-column="70" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="312">
|
|
|
- <caret line="78" column="15" selection-start-line="78" selection-start-column="15" selection-end-line="78" selection-end-column="15" />
|
|
|
- <folding>
|
|
|
- <element signature="e#50#100#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Providers/AuthServiceProvider.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="571">
|
|
|
- <caret line="38" column="16" selection-start-line="38" selection-start-column="16" selection-end-line="38" selection-end-column="16" />
|
|
|
- <folding>
|
|
|
- <element signature="e#33#116#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/.gitkeep">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/login.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Database/Migrations/2021_04_15_025757_create_menus_table.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="245">
|
|
|
- <caret line="162" column="41" selection-start-line="162" selection-start-column="41" selection-end-line="162" selection-end-column="41" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="441">
|
|
|
+ <caret line="23" column="45" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Database/Migrations/2021_04_15_025757_create_menus_table.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="546">
|
|
|
- <caret line="28" column="62" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
|
|
|
+ <state relative-caret-position="-2792">
|
|
|
+ <caret line="12" column="6" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/public/index.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Database/Schema/ColumnDefinition.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-125" />
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="14" column="3" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
|
|
|
+ </state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/index.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/composer.json">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state>
|
|
|
- <caret column="27" selection-start-column="27" selection-end-column="27" />
|
|
|
- </state>
|
|
|
+ <state relative-caret-position="-989" />
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/breadcrumb.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/side_menu.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_16_083654_create_mine_list_table.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="21">
|
|
|
- <caret line="1" column="42" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="42" />
|
|
|
+ <state relative-caret-position="379">
|
|
|
+ <caret line="22" column="27" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/symfony/console/Helper/Helper.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/MenusController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1430" />
|
|
|
+ <state relative-caret-position="-833">
|
|
|
+ <caret line="24" column="45" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="45" />
|
|
|
+ </state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/sub.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Entities/Menu.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="840">
|
|
|
- <caret line="40" column="9" lean-forward="true" selection-start-line="40" selection-start-column="9" selection-end-line="40" selection-end-column="9" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#a#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#i#0;n#a#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_tree_list.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineList.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="231">
|
|
|
- <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
|
|
|
+ <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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Http/Request.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/AdminController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="126">
|
|
|
- <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
|
|
|
+ <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" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#50#94#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Requests/MenusRequest.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="147">
|
|
|
- <caret line="12" column="6" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
|
|
|
+ <state relative-caret-position="-2975">
|
|
|
+ <caret line="32" column="32" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="32" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#128#165#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/overtrue/pinyin/src/const.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="84">
|
|
|
- <caret line="11" column="8" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
|
|
|
+ <state relative-caret-position="63">
|
|
|
+ <caret line="8" selection-start-line="8" selection-end-line="15" selection-end-column="19" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/overtrue/pinyin/src/Pinyin.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Enum/CommonEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="6342">
|
|
|
- <caret line="309" lean-forward="true" selection-start-line="309" selection-end-line="309" />
|
|
|
+ <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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Helpers.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="445">
|
|
|
- <caret line="48" column="5" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
|
|
|
+ <state relative-caret-position="105">
|
|
|
+ <caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-15.log">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/User.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_071702_create_camera_field_list.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="208">
|
|
|
- <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
|
|
|
- <folding>
|
|
|
- <element signature="e#23#63#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/FilterService.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-269">
|
|
|
- <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="252">
|
|
|
+ <caret line="21" column="59" selection-start-line="21" selection-start-column="59" selection-end-line="21" selection-end-column="59" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_tree_item.blade.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="42">
|
|
|
- <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="14" selection-end-column="19" />
|
|
|
- <folding>
|
|
|
- <element signature="e#128#165#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
+ <state relative-caret-position="-57" />
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/.env">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_tree_list.blade.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-51" />
|
|
|
+ <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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_table_view.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TreeAuxiliary.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
- <caret line="10" column="27" lean-forward="true" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
|
|
|
+ <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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Entities/Menu.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TableAuxiliary.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 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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TableAuxiliary.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="302">
|
|
|
- <caret line="112" column="30" lean-forward="true" selection-start-line="112" selection-start-column="30" selection-end-line="112" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="273">
|
|
|
+ <caret line="15" column="35" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="35" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_from.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraFieldList.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="245">
|
|
|
- <caret line="68" column="8" lean-forward="true" selection-start-line="68" selection-start-column="8" selection-end-line="68" selection-end-column="8" />
|
|
|
- <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" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="42">
|
|
|
+ <caret line="2" selection-start-line="2" selection-end-line="14" selection-end-column="1" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/MenusController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="140">
|
|
|
- <caret line="24" column="45" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="45" />
|
|
|
+ <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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/master.blade.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="559">
|
|
|
- <caret line="120" column="26" lean-forward="true" selection-start-line="104" selection-start-column="14" selection-end-line="120" selection-end-column="26" />
|
|
|
+ <state relative-caret-position="488">
|
|
|
+ <caret line="34" column="55" selection-start-line="34" selection-start-column="47" selection-end-line="34" selection-end-column="55" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-16.log">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="372">
|
|
|
- <caret line="732" column="70" selection-start-line="732" selection-start-column="55" selection-end-line="732" selection-end-column="70" />
|
|
|
+ <state relative-caret-position="242">
|
|
|
+ <caret line="160" column="28" selection-start-line="160" selection-start-column="20" selection-end-line="160" selection-end-column="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="273">
|
|
|
- <caret line="18" column="24" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="24" />
|
|
|
+ <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>
|
|
|
</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="151">
|
|
|
- <caret line="224" column="23" selection-start-line="224" selection-start-column="23" selection-end-line="224" selection-end-column="23" />
|
|
|
+ <state relative-caret-position="491">
|
|
|
+ <caret line="192" column="58" selection-start-line="192" selection-start-column="45" selection-end-line="192" selection-end-column="58" />
|
|
|
<folding>
|
|
|
<element signature="e#136#193#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -740,55 +727,75 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Services/UsersService.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="214">
|
|
|
- <caret line="107" column="33" selection-start-line="107" selection-start-column="33" selection-end-line="107" selection-end-column="33" />
|
|
|
+ <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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/AdminController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="277">
|
|
|
- <caret line="29" column="30" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="1473">
|
|
|
+ <caret line="96" column="37" selection-start-line="96" selection-start-column="37" selection-end-line="96" selection-end-column="37" />
|
|
|
<folding>
|
|
|
- <element signature="e#50#94#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#136#149#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.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="126">
|
|
|
- <caret line="15" column="44" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="44" />
|
|
|
+ <state relative-caret-position="-4022">
|
|
|
+ <caret line="146" column="48" lean-forward="true" selection-start-line="146" selection-start-column="48" selection-end-line="146" selection-end-column="48" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="173">
|
|
|
- <caret line="19" column="10" selection-start-line="19" selection-start-column="10" selection-end-line="19" selection-end-column="10" />
|
|
|
+ <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/Http/Controllers/UsersController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="254">
|
|
|
- <caret line="28" column="42" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="42" />
|
|
|
+ <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" />
|
|
|
<folding>
|
|
|
- <element signature="e#136#149#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#49#93#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="164">
|
|
|
+ <caret line="19" column="40" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="40" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#129#166#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">
|
|
|
+ <state relative-caret-position="273">
|
|
|
+ <caret line="22" column="35" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="35" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="378">
|
|
|
- <caret line="20" column="42" selection-start-line="20" selection-start-column="42" selection-end-line="20" selection-end-column="42" />
|
|
|
+ <state relative-caret-position="424">
|
|
|
+ <caret line="105" column="37" selection-start-line="105" selection-start-column="37" selection-end-line="105" selection-end-column="37" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#51#95#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|