11111

.idea/workspace.xml

@@ -2,7 +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$/App/Api/Controller/User/Lists.php" beforeDir="false" afterPath="$PROJECT_DIR$/App/Api/Controller/User/Lists.php" 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/Mail/Lists.php" beforeDir="false" afterPath="$PROJECT_DIR$/App/Api/Controller/Mail/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" />
@@ -37,94 +38,101 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Library/Vestacp.php">
+        <entry file="file://$PROJECT_DIR$/vendor/proficlos/vestacp-api/src/VestaCP/Module/Mails.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="272">
-              <caret line="35" selection-start-line="35" selection-end-line="35" />
-              <folding>
-                <element signature="e#36#65#0#PHP" expanded="true" />
-              </folding>
+            <state relative-caret-position="294">
+              <caret line="73" selection-start-line="73" selection-end-line="73" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/vendor/proficlos/vestacp-api/src/VestaCP/Client.php">
+        <entry file="file://$PROJECT_DIR$/public/api/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="161">
-              <caret line="148" selection-start-line="148" selection-end-line="148" />
+            <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/proficlos/vestacp-api/src/VestaCP/Module/Mails.php">
+        <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="294">
-              <caret line="73" selection-start-line="73" selection-end-line="73" />
+            <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="false">
-        <entry file="file://$PROJECT_DIR$/vendor/guzzlehttp/promises/src/TaskQueue.php">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/User.php">
           <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="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>
           </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/Lists.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="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" />
+              <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$/public/api/index.html">
+        <entry file="file://$PROJECT_DIR$/App/Api/Controller/Mail/Lists.php">
           <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" />
+            <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="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" />
+                <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">
+        <entry file="file://$PROJECT_DIR$/App/Api/Controller/Index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <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 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>
           </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$/public/api/js/ysmail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="563">
+              <caret line="76" column="2" selection-start-line="76" selection-start-column="2" selection-end-line="76" selection-end-column="11" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Lists.php">
+      <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="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" />
+            <state relative-caret-position="544">
+              <caret line="221" column="27" lean-forward="true" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
               <folding>
-                <element signature="e#52#93#0#PHP" expanded="true" />
+                <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>
           </provider>
@@ -142,11 +150,13 @@
       <find>mail/lists</find>
       <find>$.YSM.ml</find>
       <find>mail/count/unread</find>
-      <find>$.YSM.mcu</find>
       <find>imap_search</find>
       <find>$.YSM.mc</find>
       <find>authKey</find>
       <find>$.YSM.u</find>
+      <find>unread</find>
+      <find>mlu</find>
+      <find>$.YSM.mcu</find>
     </findStrings>
     <replaceStrings>
       <replace>Heanup</replace>
@@ -180,7 +190,6 @@
         <option value="$PROJECT_DIR$/App/Api/Package/Database/Mail.php" />
         <option value="$PROJECT_DIR$/App/Api/Controller/Cloudflare.php" />
         <option value="$PROJECT_DIR$/App/Api/Controller/Imap.php" />
-        <option value="$PROJECT_DIR$/App/Api/Controller/Index.php" />
         <option value="$PROJECT_DIR$/App/Api/Template/Index.phtml" />
         <option value="$PROJECT_DIR$/public/api/index.php" />
         <option value="$PROJECT_DIR$/App/Api/Template/Detail.phtml" />
@@ -189,7 +198,6 @@
         <option value="$PROJECT_DIR$/App/Api/Template/Domain.phtml" />
         <option value="$PROJECT_DIR$/App/Api/Controller/Vestacp/Domain.php" />
         <option value="$PROJECT_DIR$/public/api/ysmailclient/js/ysmail.js" />
-        <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$/Frame/Helper.php" />
@@ -199,8 +207,11 @@
         <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" />
+        <option value="$PROJECT_DIR$/App/Api/Controller/Index.php" />
+        <option value="$PROJECT_DIR$/public/api/js/ysmail.js" />
+        <option value="$PROJECT_DIR$/App/Api/Controller/Mail/Lists.php" />
+        <option value="$PROJECT_DIR$/App/Api/Controller/User/User.php" />
       </list>
     </option>
   </component>
@@ -246,6 +257,23 @@
               <item name="Api" type="462c0819:PsiDirectoryNode" />
               <item name="Controller" 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" />
+            </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" />
+            </path>
             <path>
               <item name="MailApi" type="b2602c69:ProjectViewProjectNode" />
               <item name="MailApi" type="462c0819:PsiDirectoryNode" />
@@ -303,7 +331,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1559905385308</updated>
-      <workItem from="1559905386946" duration="27032000" />
+      <workItem from="1559905386946" duration="28366000" />
     </task>
     <task id="LOCAL-00001" summary="11111">
       <created>1560129466821</created>
@@ -333,11 +361,32 @@
       <option name="project" value="LOCAL" />
       <updated>1560130392359</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="11111">
+      <created>1560130981126</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1560130981126</updated>
+    </task>
+    <task id="LOCAL-00006" summary="11111">
+      <created>1560131183003</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1560131183003</updated>
+    </task>
+    <task id="LOCAL-00007" summary="11111">
+      <created>1560132043996</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1560132043997</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="27032000" />
+    <option name="totallyTimeSpent" value="28366000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1440" y="-180" width="1920" height="1080" extended-state="0" />
@@ -528,13 +577,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/App/Api/Controller/Index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="18" column="24" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/App/Api/Template/Index.phtml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="152">
@@ -648,13 +690,6 @@
         </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="51">
-          <caret line="10" column="32" lean-forward="true" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/public/api/js/jquery.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="19">
@@ -662,30 +697,6 @@
         </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="228">
-          <caret line="89" column="27" selection-start-line="89" selection-start-column="27" selection-end-line="89" selection-end-column="27" />
-          <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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/App/Api/Controller/Mail/Lists.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="23" column="29" lean-forward="true" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
-          <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">
@@ -772,20 +783,58 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/User.php">
+    <entry file="file://$PROJECT_DIR$/App/Api/Controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <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>
+      </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">
+          <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="544">
+          <caret line="221" column="27" lean-forward="true" selection-start-line="221" selection-start-column="27" selection-end-line="221" selection-end-column="27" />
           <folding>
-            <element signature="e#52#93#0#PHP" expanded="true" />
+            <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>
       </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" />
+        <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" />
+          <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">
+      <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>
+      </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" />
           <folding>
             <element signature="e#52#93#0#PHP" expanded="true" />
           </folding>

App/Api/Controller/Mail/Lists.php

@@ -6,6 +6,7 @@ namespace Heanup\App\Api\Controller\Mail;
 
 use Heanup\App\Api\Package\Database\Mail;
 use Heanup\App\Api\RestfulController;
+use PhpImap\Exceptions\InvalidParameterException;
 use PhpImap\Mailbox;
 
 class Lists extends RestfulController
@@ -14,7 +15,7 @@ class Lists extends RestfulController
     /**
      * Get Method|获取数据
      * @return void
-     * @throws \PhpImap\Exceptions\InvalidParameterException
+     * @throws InvalidParameterException
      */
     protected function getData()
     {

App/Api/Controller/User/User.php

@@ -21,9 +21,10 @@ class User extends RestfulController
     protected function getData()
     {
         $domains=[
-          'heanup.me',
-          'a4sky.com',
-          '08dvd.com'
+          'qq-mail.ga',
+          'qq-mail.gq',
+          'qq-mail.ml',
+          'qq-mail.tk',
         ];
         $domain = $domains[rand(0,count($domains)-1)];
         $email = Helper::getStrongCode(6);