chendeben %!s(int64=8) %!d(string=hai) anos
pai
achega
bb300c2658
Modificáronse 2 ficheiros con 33 adicións e 26 borrados
  1. 31 24
      .idea/workspace.xml
  2. 2 2
      App/Api/Controller/Telegram.php

+ 31 - 24
.idea/workspace.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
-    <list default="true" id="d417c7e2-9370-4a4d-828f-09be06adcd69" name="Default" comment="">
+    <list default="true" id="d417c7e2-9370-4a4d-828f-09be06adcd69" name="Default" comment="telegram">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/App/Api/Controller/Telegram.php" afterPath="$PROJECT_DIR$/App/Api/Controller/Telegram.php" />
       <change beforePath="$PROJECT_DIR$/App/Api/Controller/Telegram.php" afterPath="$PROJECT_DIR$/App/Api/Controller/Telegram.php" />
     </list>
     </list>
@@ -74,7 +74,7 @@
         <entry file="file://$PROJECT_DIR$/Library/Telegram.php">
         <entry file="file://$PROJECT_DIR$/Library/Telegram.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="171">
             <state relative-caret-position="171">
-              <caret line="14" column="39" lean-forward="true" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
+              <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 />
               <folding />
             </state>
             </state>
           </provider>
           </provider>
@@ -83,8 +83,8 @@
       <file leaf-file-name="Telegram.php" pinned="false" current-in-tab="false">
       <file leaf-file-name="Telegram.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/vendor/eleirbag89/telegrambotphp/Telegram.php">
         <entry file="file://$PROJECT_DIR$/vendor/eleirbag89/telegrambotphp/Telegram.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-185">
-              <caret line="1627" column="20" lean-forward="false" selection-start-line="1627" selection-start-column="20" selection-end-line="1627" selection-end-column="20" />
+            <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 />
               <folding />
             </state>
             </state>
           </provider>
           </provider>
@@ -93,8 +93,8 @@
       <file leaf-file-name="Telegram.php" pinned="false" current-in-tab="true">
       <file leaf-file-name="Telegram.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/App/Api/Controller/Telegram.php">
         <entry file="file://$PROJECT_DIR$/App/Api/Controller/Telegram.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="247">
-              <caret line="21" column="73" lean-forward="false" selection-start-line="21" selection-start-column="73" selection-end-line="21" selection-end-column="73" />
+            <state relative-caret-position="323">
+              <caret line="25" column="86" lean-forward="false" selection-start-line="25" selection-start-column="86" selection-end-line="25" selection-end-column="86" />
               <folding />
               <folding />
             </state>
             </state>
           </provider>
           </provider>
@@ -436,7 +436,7 @@
       <workItem from="1517971592963" duration="1932000" />
       <workItem from="1517971592963" duration="1932000" />
       <workItem from="1518312993749" duration="367000" />
       <workItem from="1518312993749" duration="367000" />
       <workItem from="1518314640825" duration="485000" />
       <workItem from="1518314640825" duration="485000" />
-      <workItem from="1519284203957" duration="1374000" />
+      <workItem from="1519284203957" duration="2017000" />
     </task>
     </task>
     <task id="LOCAL-00001" summary="telegram">
     <task id="LOCAL-00001" summary="telegram">
       <created>1519284784104</created>
       <created>1519284784104</created>
@@ -466,11 +466,18 @@
       <option name="project" value="LOCAL" />
       <option name="project" value="LOCAL" />
       <updated>1519285721993</updated>
       <updated>1519285721993</updated>
     </task>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="telegram">
+      <created>1519285751330</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1519285751330</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="75205000" />
+    <option name="totallyTimeSpent" value="75848000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="1280" y="-280" width="1920" height="1080" extended-state="0" />
     <frame x="1280" y="-280" width="1920" height="1080" extended-state="0" />
@@ -806,14 +813,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/App/Api/Controller/Aip.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="380">
-          <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Autoload.php">
     <entry file="file://$PROJECT_DIR$/Autoload.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="513">
         <state relative-caret-position="513">
@@ -862,26 +861,34 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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">
     <entry file="file://$PROJECT_DIR$/vendor/eleirbag89/telegrambotphp/Telegram.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-185">
-          <caret line="1627" column="20" lean-forward="false" selection-start-line="1627" selection-start-column="20" selection-end-line="1627" selection-end-column="20" />
+        <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 />
           <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Library/Telegram.php">
+    <entry file="file://$PROJECT_DIR$/App/Api/Controller/Aip.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="14" column="39" lean-forward="true" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
+        <state relative-caret-position="380">
+          <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/App/Api/Controller/Telegram.php">
     <entry file="file://$PROJECT_DIR$/App/Api/Controller/Telegram.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="21" column="73" lean-forward="false" selection-start-line="21" selection-start-column="73" selection-end-line="21" selection-end-column="73" />
+        <state relative-caret-position="323">
+          <caret line="25" column="86" lean-forward="false" selection-start-line="25" selection-start-column="86" selection-end-line="25" selection-end-column="86" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>

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

@@ -16,14 +16,14 @@ class Telegram extends Controller
 {
 {
     public function  main(){
     public function  main(){
         $telegram=new \Telegram("532191649:AAGxdBNPQGrHo0Ralqpg_sSZFrJJwCh0KIk");
         $telegram=new \Telegram("532191649:AAGxdBNPQGrHo0Ralqpg_sSZFrJJwCh0KIk");
-        $msg=$telegram->Text();
+        $msg=$telegram->getData();
         if ($msg=="地址"){
         if ($msg=="地址"){
             $chat_id = $telegram->ChatID();
             $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);
             $telegram->sendMessage($content);
         }else{
         }else{
             $chat_id = $telegram->ChatID();
             $chat_id = $telegram->ChatID();
-            $content = array('chat_id' => $chat_id, 'text' => '你说:'.$msg);
+            $content = array('chat_id' => $chat_id, 'text' => '你说:'.json_encode($msg));
             $telegram->sendMessage($content);
             $telegram->sendMessage($content);
         }
         }
     }
     }