chendeben 8 лет назад
Родитель
Сommit
c13382dc66
2 измененных файлов с 38 добавлено и 31 удалено
  1. 34 27
      .idea/workspace.xml
  2. 4 4
      App/Api/Controller/Telegram.php

+ 34 - 27
.idea/workspace.xml

@@ -73,8 +73,8 @@
       <file leaf-file-name="Telegram.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Library/Telegram.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="171">
-              <caret line="14" column="33" lean-forward="true" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
+            <state relative-caret-position="190">
+              <caret line="15" column="63" lean-forward="false" selection-start-line="15" selection-start-column="59" selection-end-line="15" selection-end-column="63" />
               <folding />
             </state>
           </provider>
@@ -83,8 +83,8 @@
       <file leaf-file-name="Telegram.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/vendor/eleirbag89/telegrambotphp/Telegram.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-784">
-              <caret line="1649" column="20" lean-forward="false" selection-start-line="1649" selection-start-column="20" selection-end-line="1649" selection-end-column="20" />
+            <state relative-caret-position="15020">
+              <caret line="1627" column="20" lean-forward="false" selection-start-line="1627" selection-start-column="20" selection-end-line="1627" selection-end-column="20" />
               <folding />
             </state>
           </provider>
@@ -93,8 +93,8 @@
       <file leaf-file-name="Telegram.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/App/Api/Controller/Telegram.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="21" column="80" lean-forward="false" selection-start-line="21" selection-start-column="80" selection-end-line="21" selection-end-column="80" />
+            <state relative-caret-position="418">
+              <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
               <folding />
             </state>
           </provider>
@@ -429,7 +429,7 @@
       <workItem from="1517971592963" duration="1932000" />
       <workItem from="1518312993749" duration="367000" />
       <workItem from="1518314640825" duration="485000" />
-      <workItem from="1519284203957" duration="2786000" />
+      <workItem from="1519284203957" duration="3514000" />
     </task>
     <task id="LOCAL-00001" summary="telegram">
       <created>1519284784104</created>
@@ -487,11 +487,18 @@
       <option name="project" value="LOCAL" />
       <updated>1519287136147</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="telegram">
+      <created>1519287245630</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1519287245630</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="76617000" />
+    <option name="totallyTimeSpent" value="77345000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1280" y="-280" width="1920" height="1080" extended-state="0" />
@@ -851,22 +858,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Library/Telegram.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="14" column="33" lean-forward="true" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/eleirbag89/telegrambotphp/Telegram.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-784">
-          <caret line="1649" column="20" lean-forward="false" selection-start-line="1649" selection-start-column="20" selection-end-line="1649" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/App/Api/Controller/Aip.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="380">
@@ -899,10 +890,26 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Library/Telegram.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="15" column="63" lean-forward="false" selection-start-line="15" selection-start-column="59" selection-end-line="15" selection-end-column="63" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/eleirbag89/telegrambotphp/Telegram.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15020">
+          <caret line="1627" column="20" lean-forward="false" selection-start-line="1627" selection-start-column="20" selection-end-line="1627" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/App/Api/Controller/Telegram.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="21" column="80" lean-forward="false" selection-start-line="21" selection-start-column="80" selection-end-line="21" selection-end-column="80" />
+        <state relative-caret-position="418">
+          <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
           <folding />
         </state>
       </provider>

+ 4 - 4
App/Api/Controller/Telegram.php

@@ -17,16 +17,16 @@ class Telegram extends Controller
 {
     public function  main(){
         $telegram=new \Telegram("532191649:AAGxdBNPQGrHo0Ralqpg_sSZFrJJwCh0KIk");
-        $msg=$telegram->getData();
+        $msg=$telegram->Text();
 //        Logger::setLog("cdb@meitu.com",json_encode($msg));
         file_put_contents("/data/wwwlogs/log.txt", json_encode($msg),FILE_APPEND);
-        if ($msg=="地址"){
+        if ($msg=="/ss5"){
             $chat_id = $telegram->ChatID();
-            $content = array('chat_id' => $chat_id, 'text' => '最新的官网地址是【 https://ss5.my110.cf 】');
+            $content = array('chat_id' => $chat_id, 'text' => '最新的官网临时地址是【 https://ss5.my110.cf 】');
             $telegram->sendMessage($content);
         }else{
             $chat_id = $telegram->ChatID();
-            $content = array('chat_id' => $chat_id, 'text' => '你说:'.json_encode($msg));
+            $content = array('chat_id' => $chat_id, 'text' => '最新的官网临时地址是【 https://ss5.my110.cf 】');
             $telegram->sendMessage($content);
         }
     }