|
@@ -2,10 +2,20 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="ff358f50-3bf4-4e8f-b62d-63302d20ccc3" name="Default Changelist" comment="九方2.0版本">
|
|
|
+ <change afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/LoginController.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/app/Http/Middleware/CheckLogin.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/app/Model/EmployeeManagerDepart.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/app/Model/EmployeeRole.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/app/Service/TokenService.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/EmployeeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/EmployeeController.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/Http/Kernel.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Kernel.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/Service/EmployeeService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/EmployeeService.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/config/logging.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/logging.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" afterDir="false" />
|
|
|
</list>
|
|
|
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -13,6 +23,7 @@
|
|
|
</component>
|
|
|
<component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
|
|
|
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
|
|
|
+ <execution />
|
|
|
</component>
|
|
|
<component name="DatabaseView">
|
|
|
<option name="SHOW_INTERMEDIATE" value="true" />
|
|
@@ -28,154 +39,6 @@
|
|
|
<expand />
|
|
|
<select />
|
|
|
</component>
|
|
|
- <component name="FUSProjectUsageTrigger">
|
|
|
- <session id="846866044">
|
|
|
- <usages-collector id="statistics.lifecycle.project">
|
|
|
- <counts>
|
|
|
- <entry key="project.closed" value="3" />
|
|
|
- <entry key="project.open.time.1" value="3" />
|
|
|
- <entry key="project.open.time.11" value="1" />
|
|
|
- <entry key="project.open.time.14" value="2" />
|
|
|
- <entry key="project.open.time.27" value="1" />
|
|
|
- <entry key="project.open.time.29" value="1" />
|
|
|
- <entry key="project.open.time.33" value="1" />
|
|
|
- <entry key="project.open.time.9" value="1" />
|
|
|
- <entry key="project.opened" value="10" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- <usages-collector id="statistics.file.extensions.open">
|
|
|
- <counts>
|
|
|
- <entry key="env" value="8" />
|
|
|
- <entry key="gitignore" value="3" />
|
|
|
- <entry key="json" value="3" />
|
|
|
- <entry key="md" value="1" />
|
|
|
- <entry key="php" value="132" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- <usages-collector id="statistics.file.types.open">
|
|
|
- <counts>
|
|
|
- <entry key="JSON" value="3" />
|
|
|
- <entry key="Markdown" value="1" />
|
|
|
- <entry key="PHP" value="132" />
|
|
|
- <entry key="PLAIN_TEXT" value="11" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- <usages-collector id="statistics.file.extensions.edit">
|
|
|
- <counts>
|
|
|
- <entry key="dummy" value="34" />
|
|
|
- <entry key="env" value="24" />
|
|
|
- <entry key="php" value="11103" />
|
|
|
- <entry key="txt" value="9" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- <usages-collector id="statistics.file.types.edit">
|
|
|
- <counts>
|
|
|
- <entry key="PHP" value="11103" />
|
|
|
- <entry key="PLAIN_TEXT" value="67" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- <usages-collector id="statistics.vcs.git.usages">
|
|
|
- <counts>
|
|
|
- <entry key="git.branch.checkout.local" value="1" />
|
|
|
- <entry key="git.branch.create.new" value="1" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- <usages-collector id="statistics.js.language.service.starts">
|
|
|
- <counts>
|
|
|
- <entry key="TypeScriptServerServiceImpl" value="1" />
|
|
|
- </counts>
|
|
|
- </usages-collector>
|
|
|
- </session>
|
|
|
- </component>
|
|
|
- <component name="FileEditorManager">
|
|
|
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/routes/api.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="324">
|
|
|
- <caret line="18" column="16" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="16" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Api/EmployeeController.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="6228">
|
|
|
- <caret line="348" column="34" selection-start-line="348" selection-start-column="34" selection-end-line="348" selection-end-column="34" />
|
|
|
- <folding>
|
|
|
- <element signature="e#45#77#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Service/EmployeeService.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="18">
|
|
|
- <caret line="270" column="9" lean-forward="true" selection-start-line="270" selection-start-column="9" selection-end-line="270" selection-end-column="9" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Service/SysMenuService.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1386">
|
|
|
- <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Service/Order/OrderTransportService.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="234">
|
|
|
- <caret line="18" selection-start-line="18" selection-end-line="18" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/.env">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1008">
|
|
|
- <caret line="56" selection-start-line="56" selection-end-line="56" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/routes/channels.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Providers/RouteServiceProvider.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/helpers.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="4626">
|
|
|
- <caret line="257" selection-start-line="257" selection-end-line="261" selection-end-column="1" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Model/OrdersProductBom.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="234">
|
|
|
- <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- </leaf>
|
|
|
- </component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
<find>$return</find>
|
|
@@ -369,6 +232,12 @@
|
|
|
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
|
|
|
<path value="$PROJECT_DIR$/vendor/asm89/stack-cors" />
|
|
|
<path value="$PROJECT_DIR$/vendor/fruitcake/laravel-cors" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/code-unit" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/firebase/php-jwt" />
|
|
|
</include_path>
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
@@ -376,6 +245,7 @@
|
|
|
<option name="width" value="1680" />
|
|
|
<option name="height" value="921" />
|
|
|
</component>
|
|
|
+ <component name="ProjectId" id="2QUoRMwkvzBgqjd4yl5kjBQlWqI" />
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
|
<navigator proportions="" version="1">
|
|
@@ -433,6 +303,10 @@
|
|
|
</pane>
|
|
|
</panes>
|
|
|
</component>
|
|
|
+ <component name="ProjectViewState">
|
|
|
+ <option name="hideEmptyMiddlePackages" value="true" />
|
|
|
+ <option name="showLibraryContents" value="true" />
|
|
|
+ </component>
|
|
|
<component name="PropertiesComponent">
|
|
|
<property name="WebServerToolWindowFactoryState" value="true" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.highlight.mappings" value="true" />
|
|
@@ -440,32 +314,23 @@
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/app/Model" />
|
|
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
|
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
|
|
<property name="nodejs_package_manager_path" value="npm" />
|
|
|
<property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
|
|
|
+ <property name="vue.rearranger.settings.migration" value="true" />
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
+ <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Model" />
|
|
|
+ <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Http\Middleware" />
|
|
|
+ <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Service" />
|
|
|
+ <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Http\Controllers\Api" />
|
|
|
<recent name="$PROJECT_DIR$/app/Http/Controllers/Api" />
|
|
|
- <recent name="$PROJECT_DIR$/app/Model" />
|
|
|
- <recent name="$PROJECT_DIR$/app/Service" />
|
|
|
- <recent name="$PROJECT_DIR$/app/Service/Order" />
|
|
|
- <recent name="$PROJECT_DIR$/app" />
|
|
|
</key>
|
|
|
</component>
|
|
|
- <component name="RunDashboard">
|
|
|
- <option name="ruleStates">
|
|
|
- <list>
|
|
|
- <RuleState>
|
|
|
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
|
- </RuleState>
|
|
|
- <RuleState>
|
|
|
- <option name="name" value="StatusDashboardGroupingRule" />
|
|
|
- </RuleState>
|
|
|
- </list>
|
|
|
- </option>
|
|
|
- </component>
|
|
|
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
|
|
|
<component name="SvnConfiguration">
|
|
|
<configuration />
|
|
|
</component>
|
|
@@ -486,6 +351,8 @@
|
|
|
<workItem from="1678970669012" duration="1211000" />
|
|
|
<workItem from="1679507244910" duration="14000" />
|
|
|
<workItem from="1684983506430" duration="4421000" />
|
|
|
+ <workItem from="1685417514339" duration="679000" />
|
|
|
+ <workItem from="1685418210972" duration="744000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="九方2.0版本">
|
|
|
<created>1675657293693</created>
|
|
@@ -595,7 +462,7 @@
|
|
|
</layout-to-restore>
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
- <option name="version" value="1" />
|
|
|
+ <option name="version" value="3" />
|
|
|
</component>
|
|
|
<component name="VcsContentAnnotationSettings">
|
|
|
<option name="myLimit" value="2678400000" />
|