|
|
@@ -2,7 +2,11 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="694fa49d-7430-4dc6-80e8-d6e73ebd57e6" name="Default Changelist" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/MailApi.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/MailApi.iml" 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/Api/Controller/Test.php" beforeDir="false" afterPath="$PROJECT_DIR$/App/Api/Controller/Test.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/App/Script/Controller/Server.php" beforeDir="false" afterPath="$PROJECT_DIR$/App/Script/Controller/Server.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
@@ -10,7 +14,8 @@
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
</component>
|
|
|
- <component name="ComposerSettings">
|
|
|
+ <component name="ComposerSettings" doNotAsk="true">
|
|
|
+ <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
|
|
|
<execution>
|
|
|
<executable />
|
|
|
</execution>
|
|
|
@@ -22,75 +27,63 @@
|
|
|
<fileColor scope="Non-Project Files (Material Palenight)" color="2f2e43" />
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
- <leaf>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Script/Controller/Server.php">
|
|
|
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/Test.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="589">
|
|
|
- <caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="272">
|
|
|
+ <caret line="19" column="51" selection-start-line="19" selection-start-column="51" selection-end-line="19" selection-end-column="51" />
|
|
|
<folding>
|
|
|
- <element signature="e#135#176#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#43#63#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</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/Package/Database/Mail.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="313">
|
|
|
- <caret line="48" column="37" lean-forward="true" selection-start-line="48" selection-start-column="37" selection-end-line="48" selection-end-column="37" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- <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="e#1795#1801#0" expanded="true" />
|
|
|
- <element signature="e#1801#1807#0" expanded="true" />
|
|
|
- <element signature="e#1807#1813#0" expanded="true" />
|
|
|
- <element signature="e#1813#1819#0" expanded="true" />
|
|
|
- <element signature="e#1894#1900#0" expanded="true" />
|
|
|
- <element signature="e#1900#1906#0" expanded="true" />
|
|
|
- <element signature="e#1906#1912#0" expanded="true" />
|
|
|
- <element signature="e#1912#1918#0" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="238">
|
|
|
+ <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Script/Controller/Server.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="411">
|
|
|
- <caret line="29" column="33" lean-forward="true" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
|
|
|
+ <state relative-caret-position="753">
|
|
|
+ <caret line="54" column="27" selection-start-line="54" selection-start-column="27" selection-end-line="54" selection-end-column="27" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#135#154#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/User.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/jamesryanbell/cloudflare/src/CloudFlare/Api.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="368">
|
|
|
- <caret line="27" column="10" lean-forward="true" selection-start-line="27" selection-start-column="10" selection-end-line="27" selection-end-column="10" />
|
|
|
- <folding>
|
|
|
- <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="23">
|
|
|
+ <caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Template/Index.phtml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/jamesryanbell/cloudflare/src/CloudFlare/Zone.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-63">
|
|
|
- <caret line="8" selection-start-line="8" selection-end-line="17" selection-end-column="95" />
|
|
|
+ <state relative-caret-position="238">
|
|
|
+ <caret line="14" column="20" lean-forward="true" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Lists.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="456">
|
|
|
- <caret line="25" column="45" lean-forward="true" selection-start-line="25" selection-start-column="45" selection-end-line="25" selection-end-column="45" />
|
|
|
+ <state>
|
|
|
+ <caret line="27" column="10" selection-start-line="27" selection-start-column="10" selection-end-line="27" selection-end-column="10" />
|
|
|
<folding>
|
|
|
<element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
@@ -99,22 +92,22 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/Mail/Lists.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Template/Index.phtml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="456">
|
|
|
- <caret line="25" column="39" lean-forward="true" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
|
|
- <folding>
|
|
|
- <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state>
|
|
|
+ <caret line="8" selection-start-line="8" selection-end-line="17" selection-end-column="95" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/Index.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/Mail/Lists.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="304">
|
|
|
- <caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
|
|
|
+ <state>
|
|
|
+ <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -122,7 +115,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/public/api/js/ysmail.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="563">
|
|
|
+ <state>
|
|
|
<caret line="76" column="2" selection-start-line="76" selection-start-column="2" selection-end-line="76" selection-end-column="11" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -131,15 +124,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/public/api/js/index.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="532">
|
|
|
- <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#button#0;n#li#0;n#!!top" expanded="true" />
|
|
|
- <element signature="e#141#147#1" expanded="true" />
|
|
|
- <element signature="n#style#0;n#span#0;n#li#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#ul#0;n#li#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state>
|
|
|
+ <caret line="28" selection-start-line="28" selection-end-line="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -163,6 +149,7 @@
|
|
|
<find>mlu</find>
|
|
|
<find>$.YSM.mcu</find>
|
|
|
<find>:</find>
|
|
|
+ <find>101230809</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace>Heanup</replace>
|
|
|
@@ -210,7 +197,6 @@
|
|
|
<option value="$PROJECT_DIR$/Frame/Init.php" />
|
|
|
<option value="$PROJECT_DIR$/public/api/ysmailclient/js/index.js" />
|
|
|
<option value="$PROJECT_DIR$/public/api/ysmailclient/index.html" />
|
|
|
- <option value="$PROJECT_DIR$/App/Script/Controller/Server.php" />
|
|
|
<option value="$PROJECT_DIR$/App/Api/Controller/User/Auth.php" />
|
|
|
<option value="$PROJECT_DIR$/App/Api/Controller/User/Lists.php" />
|
|
|
<option value="$PROJECT_DIR$/App/Api/Controller/Index.php" />
|
|
|
@@ -218,6 +204,8 @@
|
|
|
<option value="$PROJECT_DIR$/App/Api/Controller/Mail/Lists.php" />
|
|
|
<option value="$PROJECT_DIR$/App/Api/Controller/User/User.php" />
|
|
|
<option value="$PROJECT_DIR$/public/api/index.html" />
|
|
|
+ <option value="$PROJECT_DIR$/App/Script/Controller/Server.php" />
|
|
|
+ <option value="$PROJECT_DIR$/App/Api/Controller/Test.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -226,6 +214,59 @@
|
|
|
<server host="mail.x.97admin.com" id="7b5474da-07a7-46ce-9512-f0cd6d8d2166" name="mail.x.97admin.com" />
|
|
|
</servers>
|
|
|
</component>
|
|
|
+ <component name="PhpWorkspaceProjectConfiguration">
|
|
|
+ <include_path>
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpspec/prophecy" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/composer" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/eleirbag89/telegrambotphp" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/symfony/finder" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/nette/utils" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/zircote/swagger-php" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phar-io/version" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpunit/php-token-stream" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpunit/phpunit-mock-objects" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/proficlos/vestacp-api" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/psr/http-message" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpmailer/phpmailer" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/qingbing/php-config" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/qingbing/php-abstracts-component" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/qingbing/php-helper" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/qingbing/php-abstracts-store" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/qingbing/php-file-cache" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/php-imap/php-imap" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/version" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/doctrine/annotations" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/jamesryanbell/cloudflare" />
|
|
|
+ <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
|
|
|
+ </include_path>
|
|
|
+ </component>
|
|
|
<component name="ProjectFrameBounds" fullScreen="true">
|
|
|
<option name="x" value="1440" />
|
|
|
<option name="y" value="-180" />
|
|
|
@@ -238,6 +279,7 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
+ <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
|
@@ -268,55 +310,39 @@
|
|
|
<item name="MailApi" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="App" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Api" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Controller" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Mail" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Package" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="MailApi" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="MailApi" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="App" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Api" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Controller" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Mail" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Count" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Package" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Database" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="MailApi" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="MailApi" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="App" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Api" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Controller" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="User" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Script" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="MailApi" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="MailApi" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="App" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Api" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Template" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="MailApi" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="MailApi" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="MailApi" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="MailApi" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="api" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Script" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Controller" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/public/api" />
|
|
|
+ <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" />
|
|
|
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
|
|
|
@@ -355,7 +381,10 @@
|
|
|
<option name="number" value="Default" />
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1559905385308</updated>
|
|
|
- <workItem from="1559905386946" duration="30816000" />
|
|
|
+ <workItem from="1559905386946" duration="37330000" />
|
|
|
+ <workItem from="1560525571207" duration="888000" />
|
|
|
+ <workItem from="1560734670510" duration="264000" />
|
|
|
+ <workItem from="1560735923938" duration="1088000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="11111">
|
|
|
<created>1560129466821</created>
|
|
|
@@ -420,18 +449,25 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1560151966906</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="10" />
|
|
|
+ <task id="LOCAL-00010" summary="11111">
|
|
|
+ <created>1560215886735</created>
|
|
|
+ <option name="number" value="00010" />
|
|
|
+ <option name="presentableId" value="LOCAL-00010" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1560215886736</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="11" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="30816000" />
|
|
|
+ <option name="totallyTimeSpent" value="39570000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="1440" y="-180" width="1920" height="1080" extended-state="0" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
<window_info id="Favorites" order="0" side_tool="true" />
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.185836" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.19169329" />
|
|
|
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Terminal" order="0" weight="0.32961586" />
|
|
|
<window_info anchor="bottom" id="Database Changes" order="1" />
|
|
|
@@ -441,7 +477,7 @@
|
|
|
<window_info anchor="bottom" id="Message" order="5" />
|
|
|
<window_info anchor="bottom" id="Find" order="6" />
|
|
|
<window_info anchor="bottom" id="Run" order="7" />
|
|
|
- <window_info anchor="bottom" id="Debug" order="8" weight="0.39900866" />
|
|
|
+ <window_info anchor="bottom" id="Debug" order="8" weight="0.48698884" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="TODO" order="11" />
|
|
|
@@ -472,27 +508,23 @@
|
|
|
</line-breakpoint>
|
|
|
<line-breakpoint enabled="true" type="php">
|
|
|
<url>file://$PROJECT_DIR$/App/Script/Controller/Server.php</url>
|
|
|
- <line>29</line>
|
|
|
+ <line>32</line>
|
|
|
<option name="timeStamp" value="10" />
|
|
|
</line-breakpoint>
|
|
|
+ <line-breakpoint enabled="true" type="php">
|
|
|
+ <url>file://$PROJECT_DIR$/App/Api/Controller/Test.php</url>
|
|
|
+ <line>2503</line>
|
|
|
+ <option name="timeStamp" value="14" />
|
|
|
+ </line-breakpoint>
|
|
|
+ <line-breakpoint enabled="true" type="php">
|
|
|
+ <url>file://$PROJECT_DIR$/App/Api/Controller/Test.php</url>
|
|
|
+ <line>2493</line>
|
|
|
+ <option name="timeStamp" value="15" />
|
|
|
+ </line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/Frame/Logger.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="400">
|
|
|
- <caret line="264" column="13" selection-start-line="264" selection-start-column="13" selection-end-line="264" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/Test.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="76">
|
|
|
- <caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/App/Api/RestfulController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="247">
|
|
|
@@ -521,20 +553,7 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/composer.json">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="209">
|
|
|
- <caret line="11" selection-start-line="11" selection-end-line="11" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Library/Postgres.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="81">
|
|
|
- <caret line="48" column="25" lean-forward="true" selection-start-line="42" selection-start-column="7" selection-end-line="48" selection-end-column="25" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Library/Postgres.php" />
|
|
|
<entry file="file://$PROJECT_DIR$/Library/Telegram.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="247">
|
|
|
@@ -584,20 +603,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Package/Database/Mail.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="190">
|
|
|
- <caret line="10" column="37" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/vendor/jamesryanbell/cloudflare/src/CloudFlare/Api.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="365">
|
|
|
- <caret line="55" column="33" selection-start-line="55" selection-start-column="33" selection-end-line="55" selection-end-column="33" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/vendor/jamesryanbell/cloudflare/src/CloudFlare/Zone/Dns.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-1109">
|
|
|
@@ -646,16 +651,7 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/public/api/ysmailclient/README.md">
|
|
|
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
- <state split_layout="SPLIT">
|
|
|
- <first_editor relative-caret-position="171">
|
|
|
- <caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
|
|
|
- </first_editor>
|
|
|
- <second_editor />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/public/api/ysmailclient/README.md" />
|
|
|
<entry file="file://$PROJECT_DIR$/public/api/zeroclipboard/ZeroClipboard.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="256">
|
|
|
@@ -783,19 +779,7 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Script/Controller/Server.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="589">
|
|
|
- <caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
|
|
|
- <folding>
|
|
|
- <element signature="e#135#176#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <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/ysmailclient/.project" />
|
|
|
<entry file="file://$PROJECT_DIR$/App/Api/Controller/Index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="304">
|
|
|
@@ -806,27 +790,42 @@
|
|
|
<entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Lists.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="456">
|
|
|
- <caret line="25" column="45" lean-forward="true" selection-start-line="25" selection-start-column="45" selection-end-line="25" selection-end-column="45" />
|
|
|
+ <caret line="25" column="45" selection-start-line="25" selection-start-column="45" selection-end-line="25" selection-end-column="45" />
|
|
|
<folding>
|
|
|
<element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/Mail/Lists.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/composer.json">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="456">
|
|
|
- <caret line="25" column="39" lean-forward="true" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
|
|
+ <state>
|
|
|
+ <caret line="12" selection-start-line="12" selection-end-line="12" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/public/api/index.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state>
|
|
|
+ <caret line="47" selection-start-line="47" selection-end-line="47" />
|
|
|
<folding>
|
|
|
- <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <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" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state>
|
|
|
+ <caret line="29" column="33" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
|
|
|
+ </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="368">
|
|
|
- <caret line="27" column="10" lean-forward="true" selection-start-line="27" selection-start-column="10" selection-end-line="27" selection-end-column="10" />
|
|
|
+ <state>
|
|
|
+ <caret line="27" column="10" selection-start-line="27" selection-start-column="10" selection-end-line="27" selection-end-column="10" />
|
|
|
<folding>
|
|
|
<element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
@@ -835,54 +834,72 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/App/Api/Template/Index.phtml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-63">
|
|
|
+ <state>
|
|
|
<caret line="8" selection-start-line="8" selection-end-line="17" selection-end-column="95" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/Mail/Lists.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state>
|
|
|
+ <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#52#93#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/api/js/ysmail.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="563">
|
|
|
+ <state>
|
|
|
<caret line="76" column="2" selection-start-line="76" selection-start-column="2" selection-end-line="76" selection-end-column="11" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/api/js/index.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="532">
|
|
|
- <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#button#0;n#li#0;n#!!top" expanded="true" />
|
|
|
- <element signature="e#141#147#1" expanded="true" />
|
|
|
- <element signature="n#style#0;n#span#0;n#li#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#ul#0;n#li#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state>
|
|
|
+ <caret line="28" selection-start-line="28" selection-end-line="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Package/Database/Mail.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="411">
|
|
|
- <caret line="29" column="33" lean-forward="true" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
|
|
|
+ <state relative-caret-position="238">
|
|
|
+ <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/public/api/index.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/jamesryanbell/cloudflare/src/CloudFlare/Api.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="23">
|
|
|
+ <caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/jamesryanbell/cloudflare/src/CloudFlare/Zone.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="313">
|
|
|
- <caret line="48" column="37" lean-forward="true" selection-start-line="48" selection-start-column="37" selection-end-line="48" selection-end-column="37" />
|
|
|
+ <state relative-caret-position="238">
|
|
|
+ <caret line="14" column="20" lean-forward="true" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Script/Controller/Server.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="753">
|
|
|
+ <caret line="54" column="27" selection-start-line="54" selection-start-column="27" selection-end-line="54" selection-end-column="27" />
|
|
|
<folding>
|
|
|
- <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- <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="e#1795#1801#0" expanded="true" />
|
|
|
- <element signature="e#1801#1807#0" expanded="true" />
|
|
|
- <element signature="e#1807#1813#0" expanded="true" />
|
|
|
- <element signature="e#1813#1819#0" expanded="true" />
|
|
|
- <element signature="e#1894#1900#0" expanded="true" />
|
|
|
- <element signature="e#1900#1906#0" expanded="true" />
|
|
|
- <element signature="e#1906#1912#0" expanded="true" />
|
|
|
- <element signature="e#1912#1918#0" expanded="true" />
|
|
|
+ <element signature="e#135#154#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/App/Api/Controller/Test.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="272">
|
|
|
+ <caret line="19" column="51" selection-start-line="19" selection-start-column="51" selection-end-line="19" selection-end-column="51" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#43#63#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
陈德本