From ec49ba488abb1b8f1646b8ab175d5a7a1366710b Mon Sep 17 00:00:00 2001
From: METO <i@i-meto.com>
Date: Sun, 2 Jul 2017 21:15:40 +0800
Subject: [PATCH] =?UTF-8?q?[1.2.2]=20=E6=9B=B4=E6=8D=A2=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BF=AE=E5=A4=8D=20#11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Action.php | 10 +++++-----
 Plugin.php | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Action.php b/Action.php
index 2dd8e8c..5554690 100644
--- a/Action.php
+++ b/Action.php
@@ -108,13 +108,13 @@ class Meting_Action extends Typecho_Widget implements Widget_Interface_Do {
             'music'    => array(),
         );
         foreach($music as $vo){
-            $URI=Typecho_Common::url('MetingAPI?site='.$vo['source'],Helper::options()->index);
+            $URI=Typecho_Common::url('action/metingapi',Helper::options()->index);
             $player['music'][]=array(
                 'title'=>$vo['name'],
                 'author'=>implode(' / ',$vo['artist']),
-                'url'=>$URI.'&do=url&id='.$vo['url_id'],
-                'pic'=>$URI.'&do=pic&id='.$vo['pic_id'],
-                'lrc'=>$URI.'&do=lrc&id='.$vo['lyric_id'],
+                'url'=>$URI.'?site='.$vo['source'].'&do=url&id='.$vo['url_id'],
+                'pic'=>$URI.'?site='.$vo['source'].'&do=pic&id='.$vo['pic_id'],
+                'lrc'=>$URI.'?site='.$vo['source'].'&do=lrc&id='.$vo['lyric_id'],
             );
         }
         if(sizeof($player['music'])==1)$player['music']=$player['music'][0];
@@ -150,7 +150,7 @@ class Meting_Action extends Typecho_Widget implements Widget_Interface_Do {
             $data=json_decode($data,1);
             self::cacheWrite($cachekey,$data);
         }
-        if(empty($data['url']))$data['url']="https://api.i-meto.com/music/copyright?s={$site}id={$id}";
+        if(empty($data['url']))$data['url']="https://api.i-meto.com/Public/music/empty.mp3";
         $this->response->redirect($data['url']);
     }
 
diff --git a/Plugin.php b/Plugin.php
index 11d6818..5e83533 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -6,13 +6,13 @@ if(!defined('__TYPECHO_ROOT_DIR__'))exit;
  *
  * @package Meting
  * @author METO
- * @version 1.2.1
+ * @version 1.2.2
  * @dependence 14.10.10-*
  * @link https://github.com/metowolf/Meting-Typecho-Plugin
  *
  */
 
-define('METING_VERSION','1.2.1');
+define('METING_VERSION','1.2.2');
 
 class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface
 {
@@ -26,7 +26,7 @@ class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface
      */
     public static function activate(){
         Meting_Plugin::install();
-        Helper::addRoute("Meting_Route","/MetingAPI","Meting_Action",'action');
+        Helper::addAction('metingapi', 'Meting_Action');
         Typecho_Plugin::factory('Widget_Abstract_Contents')->contentEx=array('Meting_Plugin','playerReplace');
         Typecho_Plugin::factory('Widget_Abstract_Contents')->excerptEx=array('Meting_Plugin','playerReplace');
         Typecho_Plugin::factory('Widget_Archive')->header=array('Meting_Plugin','header');
@@ -45,7 +45,7 @@ class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface
      */
     public static function deactivate(){
         Meting_Plugin::uninstall();
-        Helper::removeRoute("Meting_Route");
+        Helper::removeAction("metingapi");
     }
 
     /**
@@ -150,7 +150,7 @@ class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface
             $data[]=$t;
         }
         $id=self::getPID();
-        $dir=Typecho_Common::url('MetingAPI',Helper::options()->index);
+        $dir=Typecho_Common::url('action/metingapi',Helper::options()->index);
         if(Typecho_Widget::widget('Widget_Options')->plugin('Meting')->cloudapi=='true'){
             $str="<div class=\"aplayer\" data-id=\"{$data[0]['id']}\" data-server=\"{$data[0]['server']}\" data-type=\"{$data[0]['type']}\"";
             $player=array(
@@ -175,7 +175,7 @@ class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface
     }
 
     public static function addButton(){
-        $url=Typecho_Common::url('MetingAPI?do=parse',Helper::options()->index);
+        $uri=Helper::options()->index('/action/metingapi').'?do=parse';
         $dir=Helper::options()->pluginUrl.'/Meting/assets/editer.js?v='.METING_VERSION;
         echo "<script type=\"text/javascript\">var murl='{$url}';</script>
                 <script type=\"text/javascript\" src=\"{$dir}\"></script>";