本地第二次提交 无改动
This commit is contained in:
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
253
.idea/workspace.xml
generated
253
.idea/workspace.xml
generated
@@ -1,7 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="53b2ef05-39db-445c-9291-c14399eae506" name="Default Changelist" comment="" />
|
||||
<list default="true" id="53b2ef05-39db-445c-9291-c14399eae506" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -50,14 +52,50 @@
|
||||
</counts>
|
||||
</usages-collector>
|
||||
</session>
|
||||
<session id="-53893057">
|
||||
<usages-collector id="statistics.lifecycle.project">
|
||||
<counts>
|
||||
<entry key="project.open.time.4" value="1" />
|
||||
<entry key="project.opened" value="1" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.extensions.open">
|
||||
<counts>
|
||||
<entry key="php" value="1" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.types.open">
|
||||
<counts>
|
||||
<entry key="PHP" value="1" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
</session>
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/info.txt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="435">
|
||||
<caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
|
||||
<caret line="29" selection-start-line="29" selection-end-line="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/data.sql">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="853">
|
||||
<caret line="185" selection-start-line="185" selection-end-line="185" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/config/config.inc.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="3" column="3" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -75,6 +113,9 @@
|
||||
<replace>.de</replace>
|
||||
</replaceStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
@@ -123,31 +164,29 @@
|
||||
<option name="width" value="1920" />
|
||||
<option name="height" value="1000" />
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectView">
|
||||
<navigator proportions="" version="1">
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
<path>
|
||||
<item name="users" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="users" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="users" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="External Libraries" type="bcb0276e:PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode" />
|
||||
<item name="member" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="member" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
</component>
|
||||
@@ -182,17 +221,17 @@
|
||||
<updated>1543295006709</updated>
|
||||
<workItem from="1543295007888" duration="13090000" />
|
||||
<workItem from="1543366341837" duration="13651000" />
|
||||
<workItem from="1543452741802" duration="221000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="26741000" />
|
||||
<option name="totallyTimeSpent" value="26962000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="23" width="1920" height="1000" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25239617" />
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2550586" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="Favorites" order="2" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
@@ -205,7 +244,7 @@
|
||||
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Terminal" order="10" />
|
||||
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32929516" />
|
||||
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||
@@ -220,71 +259,22 @@
|
||||
<option name="myLimit" value="2678400000" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/admin/index.php---">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="503">
|
||||
<caret line="166" column="61" selection-start-line="166" selection-start-column="14" selection-end-line="166" selection-end-column="61" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/admin/index.php---" />
|
||||
<entry file="file://$PROJECT_DIR$/user/js/jquery.date_input.pack.js" />
|
||||
<entry file="file://$PROJECT_DIR$/admin/add.php-">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/admin/add.php-" />
|
||||
<entry file="file://$PROJECT_DIR$/inclode/class.phpmailer.php" />
|
||||
<entry file="file://$PROJECT_DIR$/inclode/class.smtp.php" />
|
||||
<entry file="file://$PROJECT_DIR$/inclode/fun.inc.php" />
|
||||
<entry file="file://$PROJECT_DIR$/user/add.php-" />
|
||||
<entry file="file://$PROJECT_DIR$/admin/addadmin.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/admin/add.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="270">
|
||||
<caret line="18" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="18" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/admin/addadmin.php" />
|
||||
<entry file="file://$PROJECT_DIR$/admin/add.php" />
|
||||
<entry file="file://$PROJECT_DIR$/user/add.php" />
|
||||
<entry file="file://$PROJECT_DIR$/admin/dc.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/admin/yxindex.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-220">
|
||||
<folding>
|
||||
<element signature="n#style#0;n#a#0;n#td#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#p#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/admin/postadd.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<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="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="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$/admin/yxser.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/admin/listadmin.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/admin/jx.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/admin/dc.php" />
|
||||
<entry file="file://$PROJECT_DIR$/admin/yxindex.php" />
|
||||
<entry file="file://$PROJECT_DIR$/admin/postadd.php" />
|
||||
<entry file="file://$PROJECT_DIR$/admin/yxser.php" />
|
||||
<entry file="file://$PROJECT_DIR$/admin/listadmin.php" />
|
||||
<entry file="file://$PROJECT_DIR$/admin/jx.php" />
|
||||
<entry file="file://$USER_HOME$/Downloads/index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-61">
|
||||
@@ -292,56 +282,16 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/user/cha.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/user/listadmin.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/user/xiu.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/user/yxindex.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<folding>
|
||||
<element signature="n#style#0;n#a#0;n#td#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#p#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/user/ser.php">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/user/postadd.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<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="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="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$/user/cha.php" />
|
||||
<entry file="file://$PROJECT_DIR$/user/listadmin.php" />
|
||||
<entry file="file://$PROJECT_DIR$/user/xiu.php" />
|
||||
<entry file="file://$PROJECT_DIR$/user/yxindex.php" />
|
||||
<entry file="file://$PROJECT_DIR$/user/ser.php" />
|
||||
<entry file="file://$PROJECT_DIR$/user/postadd.php" />
|
||||
<entry file="file://$PROJECT_DIR$/user/right.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="3" column="3" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
|
||||
<folding>
|
||||
<element signature="e#6#22#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -349,9 +299,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="90">
|
||||
<caret line="6" selection-start-line="6" selection-end-line="8" selection-end-column="3" />
|
||||
<folding>
|
||||
<element signature="e#6#21#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -359,9 +306,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="585">
|
||||
<caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
|
||||
<folding>
|
||||
<element signature="e#6#21#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -369,9 +313,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1620">
|
||||
<caret line="108" column="18" selection-start-line="108" selection-start-column="13" selection-end-line="108" selection-end-column="18" />
|
||||
<folding>
|
||||
<element signature="e#6#21#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -414,19 +355,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="15">
|
||||
<caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
|
||||
<folding>
|
||||
<element signature="e#0#6#0" expanded="true" />
|
||||
<element signature="n#style#0;n#input#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#input#1;n#!!top" expanded="true" />
|
||||
<element signature="e#553#559#1" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/config.inc.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="3" column="3" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -441,9 +369,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="265">
|
||||
<caret line="30" column="64" lean-forward="true" selection-start-line="30" selection-start-column="64" selection-end-line="30" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="e#7#26#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -465,13 +390,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="441">
|
||||
<caret line="41" selection-start-line="41" selection-end-line="41" />
|
||||
<folding>
|
||||
<element signature="e#6#27#0#PHP" expanded="true" />
|
||||
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -486,13 +404,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="476">
|
||||
<caret line="40" column="64" selection-start-line="40" selection-start-column="64" selection-end-line="40" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="e#6#27#0#PHP" expanded="true" />
|
||||
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
||||
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -500,9 +411,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="711">
|
||||
<caret line="55" column="64" selection-start-line="55" selection-start-column="64" selection-end-line="55" selection-end-column="64" />
|
||||
<folding>
|
||||
<element signature="e#6#27#0#PHP" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -533,17 +441,24 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/data.sql">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="854">
|
||||
<caret line="185" lean-forward="true" selection-start-line="185" selection-end-line="185" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/info.txt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="435">
|
||||
<caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
|
||||
<caret line="29" selection-start-line="29" selection-end-line="29" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/data.sql">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="853">
|
||||
<caret line="185" selection-start-line="185" selection-end-line="185" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/config.inc.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="3" column="3" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
||||
Reference in New Issue
Block a user