11111

.idea/workspace.xml

@@ -3,8 +3,6 @@
   <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$/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" />
     <option name="SHOW_DIALOG" value="false" />
@@ -37,23 +35,22 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <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="294">
-              <caret line="73" selection-start-line="73" selection-end-line="73" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <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" />
+              <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="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#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>
           </provider>
@@ -62,13 +59,13 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.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="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>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="368">
@@ -80,6 +77,15 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/App/Api/Template/Index.phtml">
+          <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>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Lists.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -125,8 +131,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="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" />
+            <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" />
@@ -145,7 +151,6 @@
       <find>Phplife</find>
       <find>PhpLife</find>
       <find>MeiTu</find>
-      <find>:</find>
       <find>user/u</find>
       <find>mail/lists</find>
       <find>$.YSM.ml</find>
@@ -157,6 +162,7 @@
       <find>unread</find>
       <find>mlu</find>
       <find>$.YSM.mcu</find>
+      <find>:</find>
     </findStrings>
     <replaceStrings>
       <replace>Heanup</replace>
@@ -206,12 +212,12 @@
         <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$/public/api/index.html" />
         <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" />
+        <option value="$PROJECT_DIR$/public/api/index.html" />
       </list>
     </option>
   </component>
@@ -282,6 +288,24 @@
               <item name="Controller" type="462c0819:PsiDirectoryNode" />
               <item name="User" 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" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -331,7 +355,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1559905385308</updated>
-      <workItem from="1559905386946" duration="28366000" />
+      <workItem from="1559905386946" duration="30816000" />
     </task>
     <task id="LOCAL-00001" summary="11111">
       <created>1560129466821</created>
@@ -382,11 +406,25 @@
       <option name="project" value="LOCAL" />
       <updated>1560132043997</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="11111">
+      <created>1560150416830</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1560150416831</updated>
+    </task>
+    <task id="LOCAL-00009" summary="11111">
+      <created>1560151966906</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1560151966906</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="28366000" />
+    <option name="totallyTimeSpent" value="30816000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1440" y="-180" width="1920" height="1080" extended-state="0" />
@@ -577,13 +615,6 @@
         </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">
-          <caret line="8" selection-start-line="8" selection-end-line="17" selection-end-column="95" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_9.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="279">
@@ -765,28 +796,47 @@
     <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">
+    <entry file="file://$PROJECT_DIR$/App/Api/Controller/Index.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="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$/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" />
           <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>
-    <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.php">
+    <entry file="file://$PROJECT_DIR$/App/Api/Controller/Mail/Lists.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="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/Index.php">
+    <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/User.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 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>
+    <entry file="file://$PROJECT_DIR$/App/Api/Template/Index.phtml">
+      <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>
       </provider>
     </entry>
@@ -799,8 +849,8 @@
     </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" />
+        <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" />
@@ -811,32 +861,28 @@
         </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="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">
+    <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/Auth.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 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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/App/Api/Controller/User/User.php">
+    <entry file="file://$PROJECT_DIR$/public/api/index.html">
       <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 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="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" />
+            <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>
       </provider>

App/Script/Controller/Server.php

@@ -33,7 +33,7 @@ class Server extends Controller
                 try {
                     Vestacp::getInstance()->getModuleMail("admin")->deleteAccount($email['domain'], strtolower($email['email']));
                     Mail::update(['status'=>0], ['id'=>$email['id']]);
-                    echo sprintf("删除账号成功！[%s]\r\n", $email['email'] . "@" . $email['domain']);
+                    echo sprintf("[%s]\t删除账号成功！[%s]\r\n", date("Y-m-d H:i:s"),$email['email'] . "@" . $email['domain']);
                 } catch (ClientException $e) {
                 } catch (ProcessException $e) {
                 }