|
|
@@ -2,8 +2,8 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="694fa49d-7430-4dc6-80e8-d6e73ebd57e6" 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$/public/api/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/api/index.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/App/Api/Controller/User/Lists.php" beforeDir="false" afterPath="$PROJECT_DIR$/App/Api/Controller/User/Lists.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/App/Api/Controller/User/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/App/Api/Controller/User/User.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
@@ -67,58 +67,65 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Frame/Controller.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/guzzlehttp/promises/src/TaskQueue.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="148">
|
|
|
- <caret line="41" selection-start-line="41" selection-end-line="41" />
|
|
|
+ <state relative-caret-position="259">
|
|
|
+ <caret line="28" selection-start-line="28" selection-end-line="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/Frame/Dispatcher.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="104">
|
|
|
- <caret line="120" selection-start-line="120" selection-end-line="120" />
|
|
|
- <folding>
|
|
|
- <element signature="e#33#57#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="224">
|
|
|
+ <caret line="58" selection-start-line="58" selection-end-line="58" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/guzzlehttp/promises/src/TaskQueue.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/public/api/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="259">
|
|
|
- <caret line="28" selection-start-line="28" selection-end-line="28" />
|
|
|
+ <state relative-caret-position="313">
|
|
|
+ <caret line="49" column="28" lean-forward="true" selection-start-line="49" selection-start-column="28" selection-end-line="49" selection-end-column="28" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#h2#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#p#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="224">
|
|
|
- <caret line="58" selection-start-line="58" selection-end-line="58" />
|
|
|
+ <state relative-caret-position="506">
|
|
|
+ <caret line="34" column="7" lean-forward="true" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/public/api/index.html">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="522">
|
|
|
- <caret line="56" column="41" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="266">
|
|
|
+ <caret line="30" column="8" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="73" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.php">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Lists.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="31">
|
|
|
- <caret line="9" column="1" lean-forward="true" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
|
|
|
+ <state relative-caret-position="361">
|
|
|
+ <caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -185,8 +192,6 @@
|
|
|
<option value="$PROJECT_DIR$/App/Api/Controller/Mail/Lists.php" />
|
|
|
<option value="$PROJECT_DIR$/vendor/php-imap/php-imap/src/PhpImap/Mailbox.php" />
|
|
|
<option value="$PROJECT_DIR$/App/Api/Controller/Mail/Count/Unread.php" />
|
|
|
- <option value="$PROJECT_DIR$/App/Api/Controller/User/Lists.php" />
|
|
|
- <option value="$PROJECT_DIR$/App/Api/Controller/User/User.php" />
|
|
|
<option value="$PROJECT_DIR$/Frame/Helper.php" />
|
|
|
<option value="$PROJECT_DIR$/Frame/Init.php" />
|
|
|
<option value="$PROJECT_DIR$/public/api/ysmailclient/js/index.js" />
|
|
|
@@ -194,6 +199,8 @@
|
|
|
<option value="$PROJECT_DIR$/App/Script/Controller/Server.php" />
|
|
|
<option value="$PROJECT_DIR$/App/Api/Controller/User/Auth.php" />
|
|
|
<option value="$PROJECT_DIR$/public/api/index.html" />
|
|
|
+ <option value="$PROJECT_DIR$/App/Api/Controller/User/User.php" />
|
|
|
+ <option value="$PROJECT_DIR$/App/Api/Controller/User/Lists.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -296,7 +303,7 @@
|
|
|
<option name="number" value="Default" />
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1559905385308</updated>
|
|
|
- <workItem from="1559905386946" duration="26366000" />
|
|
|
+ <workItem from="1559905386946" duration="27032000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="11111">
|
|
|
<created>1560129466821</created>
|
|
|
@@ -319,11 +326,18 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1560129954048</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="4" />
|
|
|
+ <task id="LOCAL-00004" summary="11111">
|
|
|
+ <created>1560130392359</created>
|
|
|
+ <option name="number" value="00004" />
|
|
|
+ <option name="presentableId" value="LOCAL-00004" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1560130392359</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="5" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="26366000" />
|
|
|
+ <option name="totallyTimeSpent" value="27032000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="1440" y="-180" width="1920" height="1080" extended-state="0" />
|
|
|
@@ -627,16 +641,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/User.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="399">
|
|
|
- <caret line="37" column="113" lean-forward="true" selection-start-line="37" selection-start-column="26" selection-end-line="37" selection-end-column="113" />
|
|
|
- <folding>
|
|
|
- <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/Frame/Init.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="257">
|
|
|
@@ -682,16 +686,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Lists.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="380">
|
|
|
- <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
|
|
|
- <folding>
|
|
|
- <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/Frame/Controller.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="148">
|
|
|
@@ -760,17 +754,41 @@
|
|
|
<entry file="file://$PROJECT_DIR$/public/api/ysmailclient/.project">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/public/api/index.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="313">
|
|
|
+ <caret line="49" column="28" lean-forward="true" selection-start-line="49" selection-start-column="28" selection-end-line="49" selection-end-column="28" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#h2#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#p#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="31">
|
|
|
- <caret line="9" column="1" lean-forward="true" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
|
|
|
+ <state relative-caret-position="506">
|
|
|
+ <caret line="34" column="7" lean-forward="true" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/public/api/index.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="522">
|
|
|
- <caret line="56" column="41" selection-start-line="56" selection-start-column="41" selection-end-line="56" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="266">
|
|
|
+ <caret line="30" column="8" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="73" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Lists.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="361">
|
|
|
+ <caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|