...
|
...
|
@@ -2,7 +2,8 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/extra/verify.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -16,13 +17,12 @@ |
|
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="612">
|
|
|
<caret line="106" column="21" lean-forward="true" selection-start-line="106" selection-start-column="21" selection-end-line="106" selection-end-column="21" />
|
|
|
<state relative-caret-position="294">
|
|
|
<caret line="49" column="44" lean-forward="true" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" />
|
|
|
<folding>
|
|
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
<element signature="e#391#463#0#PHP" expanded="false" />
|
|
|
<element signature="e#469#1207#0#PHP" expanded="false" />
|
|
|
<element signature="e#1212#2875#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -76,6 +76,7 @@ |
|
|
<option value="$PROJECT_DIR$/.gitignore" />
|
|
|
<option value="$PROJECT_DIR$/public/.gitignore" />
|
|
|
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
|
|
|
<option value="$PROJECT_DIR$/application/extra/verify.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -93,9 +94,9 @@ |
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="283" />
|
|
|
<option name="y" value="38" />
|
|
|
<component name="ProjectFrameBounds" extendedState="1">
|
|
|
<option name="x" value="57" />
|
|
|
<option name="y" value="102" />
|
|
|
<option name="width" value="1940" />
|
|
|
<option name="height" value="1074" />
|
|
|
</component>
|
...
|
...
|
@@ -126,7 +127,26 @@ |
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
...
|
...
|
@@ -171,15 +191,15 @@ |
|
|
<workItem from="1574062081278" duration="18239000" />
|
|
|
<workItem from="1574122453532" duration="15780000" />
|
|
|
<workItem from="1574141466352" duration="745000" />
|
|
|
<workItem from="1574143209694" duration="768000" />
|
|
|
<workItem from="1574143209694" duration="1269000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="45461000" />
|
|
|
<option name="totallyTimeSpent" value="45962000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="283" y="38" width="1940" height="1074" extended-state="0" />
|
|
|
<frame x="57" y="102" width="1940" height="1074" extended-state="1" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14893617" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
|
...
|
...
|
@@ -233,13 +253,6 @@ |
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="500">
|
|
|
<caret line="29" column="61" lean-forward="false" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="925">
|
...
|
...
|
@@ -479,14 +492,6 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Validate.php" />
|
|
|
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="312">
|
|
|
<caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
...
|
...
|
@@ -498,6 +503,7 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -505,6 +511,7 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-6011">
|
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -534,6 +541,7 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="450">
|
|
|
<caret line="26" column="60" lean-forward="false" selection-start-line="26" selection-start-column="60" selection-end-line="26" selection-end-column="60" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -577,15 +585,30 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="3">
|
|
|
<caret line="99" column="38" lean-forward="true" selection-start-line="99" selection-start-column="38" selection-end-line="99" selection-end-column="38" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="100">
|
|
|
<caret line="4" column="53" lean-forward="false" selection-start-line="4" selection-start-column="53" selection-end-line="4" selection-end-column="53" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="612">
|
|
|
<caret line="106" column="21" lean-forward="true" selection-start-line="106" selection-start-column="21" selection-end-line="106" selection-end-column="21" />
|
|
|
<state relative-caret-position="294">
|
|
|
<caret line="49" column="44" lean-forward="true" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" />
|
|
|
<folding>
|
|
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
<element signature="e#391#463#0#PHP" expanded="false" />
|
|
|
<element signature="e#469#1207#0#PHP" expanded="false" />
|
|
|
<element signature="e#1212#2875#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
|