陈德本 7 лет назад
Родитель
Сommit
678da93d1e
2 измененных файлов с 129 добавлено и 97 удалено
  1. 78 46
      .idea/workspace.xml
  2. 51 51
      public/api/index.html

+ 78 - 46
.idea/workspace.xml

@@ -2,9 +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$/public/runtime/config/1c179f6584a2d3c3256af3b8bedd73df.inc" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/runtime/pf/50995cdeb10e956d2a50a495c7781c1d.bat" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/runtime/pf/cef82a618e6605b575193bc807ea6149.bat" beforeDir="false" />
+      <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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -25,23 +24,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <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">
-            <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>
-      </file>
       <file pinned="false" current-in-tab="false">
         <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" lean-forward="true" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
+              <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>
@@ -119,10 +106,19 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/public/api/ysmailclient/index.html">
+        <entry file="file://$PROJECT_DIR$/public/api/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="351">
-              <caret line="51" column="8" lean-forward="true" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
+            <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>
+          </provider>
+        </entry>
+      </file>
+      <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="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>
           </provider>
         </entry>
@@ -191,12 +187,13 @@
         <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$/App/Api/Controller/User/Auth.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" />
         <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" />
       </list>
     </option>
   </component>
@@ -227,7 +224,28 @@
             <path>
               <item name="MailApi" type="b2602c69:ProjectViewProjectNode" />
               <item name="MailApi" type="462c0819:PsiDirectoryNode" />
-              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="App" 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" />
+            </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" />
+            </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" />
             </path>
           </expand>
           <select />
@@ -245,6 +263,9 @@
     <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/public/api" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/public/api" />
       <recent name="$PROJECT_DIR$/App/Api" />
@@ -275,7 +296,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1559905385308</updated>
-      <workItem from="1559905386946" duration="25805000" />
+      <workItem from="1559905386946" duration="26366000" />
     </task>
     <task id="LOCAL-00001" summary="11111">
       <created>1560129466821</created>
@@ -284,14 +305,29 @@
       <option name="project" value="LOCAL" />
       <updated>1560129466821</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="11111">
+      <created>1560129846605</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1560129846605</updated>
+    </task>
+    <task id="LOCAL-00003" summary="11111">
+      <created>1560129954048</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1560129954048</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25805000" />
+    <option name="totallyTimeSpent" value="26366000" />
   </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" />
@@ -342,13 +378,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Config/Route.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Frame/Logger.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="400">
@@ -540,7 +569,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/api/ysmailclient/zeroclipboard/ZeroClipboard.js">
+    <entry file="file://$PROJECT_DIR$/public/api/zeroclipboard/ZeroClipboard.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="256">
           <caret line="721" column="28" selection-start-line="721" selection-start-column="28" selection-end-line="721" selection-end-column="28" />
@@ -591,13 +620,6 @@
         </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="219">
-          <caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Frame/Helper.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="369">
@@ -622,21 +644,21 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/api/ysmailclient/js/ysmail.js">
+    <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/ysmailclient/js/jquery.js">
+    <entry file="file://$PROJECT_DIR$/public/api/js/jquery.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="19">
           <caret line="11" column="1231" selection-start-line="11" selection-start-column="1231" selection-end-line="11" selection-end-column="1231" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/api/ysmailclient/js/index.js">
+    <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" />
@@ -728,17 +750,27 @@
     <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" lean-forward="true" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
+          <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/index.html">
+    <entry file="file://$PROJECT_DIR$/public/api/ysmailclient/.project">
+      <provider selected="true" editor-type-id="text-editor" />
+    </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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/api/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="351">
-          <caret line="51" column="8" lean-forward="true" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
+        <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>
       </provider>
     </entry>

+ 51 - 51
public/api/index.html

@@ -1,76 +1,76 @@
 <html lang="en">
-  <head>
+<head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="临时邮箱,匿名邮箱">
-    <meta name="author" content="悠树">
 
-    <title>悠树版临时邮箱</title>
+    <title>临时邮箱</title>
 
-    <!-- Bootstrap core CSS -->
     <link href="bootstrap-3.1.1/css/bootstrap.min.css" rel="stylesheet">
 
     <link href="css/dashboard.css" rel="stylesheet">
-  </head>
+</head>
 
-  <body>
+<body>
 
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-      <div class="container-fluid">
+<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <div class="container-fluid">
         <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="sr-only"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+
         </div>
         <div class="navbar-collapse collapse">
-        <ul class="nav navbar-nav navbar-left nav-sidebar">
-            <li><a href="index.html">首页</a></li>
-<!--            <li><a href="http://www.youshusoft.com/?p=35">API</a></li>-->
-<!--            <li><a href="http://www.youshusoft.com/?p=58">关于</a></li>-->
-          </ul>
+            <ul class="nav navbar-nav navbar-left nav-sidebar">
+                <li><a href="index.html">首页</a></li>
+            </ul>
         </div>
-      </div>
     </div>
+</div>
 
-    <div class="container-fluid"  style="padding-left: 0px;">
-      <div>
+<div class="container-fluid" style="padding-left: 0px;">
+    <div>
         <div class="pull-left sidebar">
-          <ul class="nav nav-pills nav-stacked " id="menu">
-            <li class="dropdown">
-            </li>
-             
-          </ul>
-          
-          <div align="center" style="margin-top: 10px;">
-          	<button id="getuser" type="button" class="btn btn-primary" onclick="getUser()">获取新账号</button>
-        </div>
+            <ul class="nav nav-pills nav-stacked " id="menu">
+                <li class="dropdown">
+                </li>
+
+            </ul>
+
+            <div align="center" style="margin-top: 10px;">
+                <button id="getuser" type="button" class="btn btn-primary" onclick="getUser()">获取新账号</button>
+            </div>
         </div>
-        
+
         <div class="pull-left mailc">
-        	<!-- 邮件列表-开始 -->
-        	<div class="panel-group" id="accordion">
-	        	<div align="center">
-	        		<div align="left">
-	        			<h2>使用说明:</h2>
-			  			<img src="images/ysmail.jpg"/>	
-					</div>
-				</div>
-			</div>
-			<!-- 邮件列表 - 结束 -->
+            <!-- 邮件列表-开始 -->
+            <div class="panel-group" id="accordion">
+                <div >
+
+                        <h2 style="text-align:center">使用说明:</h2>
+                    <p style="text-align:left">
+                        点击获取新账号既可获取一个临时邮箱,临时邮箱有效期为2个小时,2个小时后将释放资源!<br>
+                        点击邮箱地址右方的倒三角符号,可以复制邮箱地址,暂不支持手动删除邮箱功能<br>
+                        注:关闭浏览器后,将无法再获取当前已获得的邮箱<br>
+                    </p>
+                    <!--			  			<img src="images/ysmail.jpg"/>	-->
+                </div>
+            </div>
+            <!-- 邮件列表 - 结束 -->
         </div>
-      </div>
     </div>
-    <script src="js/jquery-1.11.0.min.js"></script>
-    <script src="js/jquery.cookie.js"></script>
-    <script src="bootstrap-3.1.1/js/bootstrap.min.js"></script>
+</div>
+<script src="js/jquery-1.11.0.min.js"></script>
+<script src="js/jquery.cookie.js"></script>
+<script src="bootstrap-3.1.1/js/bootstrap.min.js"></script>
 <!--    <script src="zeroclipboard/ZeroClipboard.min.js"></script>-->
-    <script src="js/ysmail.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.4/clipboard.min.js"></script>
-    <!--  <script src="http://www.youshusoft.com:8080/ysmail/js/ysmail.js"></script> -->
-    <script src="js/index.js"></script>
-  </body>
+<script src="js/ysmail.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.4/clipboard.min.js"></script>
+<!--  <script src="http://www.youshusoft.com:8080/ysmail/js/ysmail.js"></script> -->
+<script src="js/index.js"></script>
+</body>
 </html>