|
@@ -1,7 +1,30 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="52cc2ceb-e100-4a5f-a9e2-bb6b61bdbebd" name="Default Changelist" comment="" />
|
|
|
+ <list default="true" id="52cc2ceb-e100-4a5f-a9e2-bb6b61bdbebd" name="Default Changelist" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/admin/controller/Usermanage.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Usermanage.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/log/202006/01.log" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/log/202006/02.log" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/01e433db5e5517b7a2c4587da42797aa.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/14d50cc59972e0ab82b71f4b5f381353.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/193b3c530962981d3a4dc850749aaa8b.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/42d182ba955a14984e138f63987ed1b0.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/a43dd06f39d809c109c800ec9d9d065a.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/a5b87fd77913dd9b0ad9dd783203b8ce.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/a8ba287c844b92a9904d92bc00486605.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/a8f8b134a87427ac15fa2ed97d90c5b0.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/b04ecd3398bf75dee5dd9dee974fadba.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/ap/log/202006/01.log" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/cache/0b/dc60c1eb9bd2792cd1fa7f85d9c865.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/cache/b5/0db2208db974a3bc060e4d7255aa98.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/cache/ca/361393b5a02e8a62e8dd6d5373a473.php" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/session/sess_3f972420e5bb26ed1e69c519f52d4119" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/session/sess_ab4726e650d984353a6b41b449abf891" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/web/log/202006/03.log" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/view/admin/common/footer.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/common/footer.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/view/admin/common/header.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/common/header.html" afterDir="false" />
|
|
|
+ </list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -10,6 +33,7 @@
|
|
|
</component>
|
|
|
<component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
|
|
|
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
|
|
|
+<<<<<<< HEAD
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
@@ -56,6 +80,11 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
</leaf>
|
|
|
+=======
|
|
|
+ <execution>
|
|
|
+ <executable />
|
|
|
+ </execution>
|
|
|
+>>>>>>> 7e92d3cb42d4730eb55f2aba5ba9458985027f3e
|
|
|
</component>
|
|
|
<component name="FileTemplateManagerImpl">
|
|
|
<option name="RECENT_TEMPLATES">
|
|
@@ -65,6 +94,7 @@
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
+<<<<<<< HEAD
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
<find>addBtn</find>
|
|
@@ -162,6 +192,11 @@
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
+=======
|
|
|
+ <component name="Git.Settings">
|
|
|
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
|
|
|
+ </component>
|
|
|
+>>>>>>> 7e92d3cb42d4730eb55f2aba5ba9458985027f3e
|
|
|
<component name="PhpDebugGeneral" xdebug_debug_port="9001" />
|
|
|
<component name="PhpServers">
|
|
|
<servers>
|
|
@@ -259,6 +294,7 @@
|
|
|
<option name="width" value="1936" />
|
|
|
<option name="height" value="1056" />
|
|
|
</component>
|
|
|
+<<<<<<< HEAD
|
|
|
<component name="ProjectId" id="1ctnleN8j690xCq59TAgesU0WFc" />
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
@@ -335,6 +371,10 @@
|
|
|
<pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
+=======
|
|
|
+ <component name="ProjectId" id="1co8uzAslAyal5L1wa9gCotxcze" />
|
|
|
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
+>>>>>>> 7e92d3cb42d4730eb55f2aba5ba9458985027f3e
|
|
|
<component name="PropertiesComponent">
|
|
|
<property name="DefaultHtmlFileTemplate" value="HTML File" />
|
|
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
@@ -344,11 +384,21 @@
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
|
|
|
+<<<<<<< HEAD
|
|
|
<property name="last_opened_file_path" value="D:/company/any_admin" />
|
|
|
+=======
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
+ <property name="node.js.detected.package.eslint" value="true" />
|
|
|
+ <property name="node.js.detected.package.tslint" value="true" />
|
|
|
+ <property name="node.js.path.for.package.eslint" value="project" />
|
|
|
+ <property name="node.js.path.for.package.tslint" value="project" />
|
|
|
+ <property name="node.js.selected.package.eslint" value="(autodetect)" />
|
|
|
+ <property name="node.js.selected.package.tslint" value="(autodetect)" />
|
|
|
+>>>>>>> 7e92d3cb42d4730eb55f2aba5ba9458985027f3e
|
|
|
<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="Docker" />
|
|
|
+ <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
@@ -477,6 +527,7 @@
|
|
|
<workItem from="1590983110728" duration="16565000" />
|
|
|
<workItem from="1591065028261" duration="19190000" />
|
|
|
<workItem from="1591146974136" duration="26205000" />
|
|
|
+<<<<<<< HEAD
|
|
|
<workItem from="1591232554457" duration="31102000" />
|
|
|
<workItem from="1591318731601" duration="30652000" />
|
|
|
</task>
|
|
@@ -536,9 +587,29 @@
|
|
|
<window_info anchor="right" id="Cargo" order="5" />
|
|
|
</layout-to-restore>
|
|
|
</component>
|
|
|
+=======
|
|
|
+ <workItem from="1591183816465" duration="961000" />
|
|
|
+ <workItem from="1591269488801" duration="6395000" />
|
|
|
+ </task>
|
|
|
+ <servers />
|
|
|
+ </component>
|
|
|
+>>>>>>> 7e92d3cb42d4730eb55f2aba5ba9458985027f3e
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
<option name="version" value="1" />
|
|
|
</component>
|
|
|
+ <component name="Vcs.Log.Tabs.Properties">
|
|
|
+ <option name="TAB_STATES">
|
|
|
+ <map>
|
|
|
+ <entry key="MAIN">
|
|
|
+ <value>
|
|
|
+ <State>
|
|
|
+ <option name="COLUMN_ORDER" />
|
|
|
+ </State>
|
|
|
+ </value>
|
|
|
+ </entry>
|
|
|
+ </map>
|
|
|
+ </option>
|
|
|
+ </component>
|
|
|
<component name="XDebuggerManager">
|
|
|
<breakpoint-manager>
|
|
|
<breakpoints>
|
|
@@ -570,6 +641,7 @@
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
+<<<<<<< HEAD
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/Article.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -978,4 +1050,6 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</component>
|
|
|
+=======
|
|
|
+>>>>>>> 7e92d3cb42d4730eb55f2aba5ba9458985027f3e
|
|
|
</project>
|