Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

application/library/Our/Controller/AbstractApi.php

@@ -21,9 +21,9 @@ abstract class Controller_AbstractApi extends \Our\Controller_Abstract {
      * api控制器直接输出json格式数据，不需要渲染视图
      */
     public function init() {
-        echo 1;exit;
         $this->req=$this->getRequest()->getPost();
         $this->checkEncrypt();
+        echo 2342;exit;
         if(empty($this->req['data']['key'])){
             ErrorModel::throwException(CodeConfigModel::illegalAccess);
         }