Merge remote-tracking branch 'origin/develop' into develop

@@ -38,7 +38,7 @@ class InquiryDelay extends Command
     {
     {
         $inquiryInfoModel = new InquiryInfo();
         $inquiryInfoModel = new InquiryInfo();
         $param = $inquiryInfoModel->formatQuery(['status'=>$inquiryInfoModel::STATUS_FOUR])->orderBy('send_time','asc')->first();
         $param = $inquiryInfoModel->formatQuery(['status'=>$inquiryInfoModel::STATUS_FOUR])->orderBy('send_time','asc')->first();
-        if($param !== false){
+        if(!empty($param)){
             $time = date('Y-m-d H:i:s');
             $time = date('Y-m-d H:i:s');
             if($time >= $param['send_time']){
             if($time >= $param['send_time']){
                 $data = [];
                 $data = [];

@@ -184,7 +184,8 @@ class LoginController extends BaseController
         $message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR);
         $message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR);
         $jsonData = json_encode($message);
         $jsonData = json_encode($message);
         $arrayData = json_decode($jsonData, true);
         $arrayData = json_decode($jsonData, true);
-        $data = $this->setWechat($arrayData['ToUserName'],$arrayData['EventKey']);
+        //gh_27174ac5c9d8,gh_27174ac5c9d8
+        $data = $this->setWechat($arrayData['FromUserName'],$arrayData['EventKey']);
         if($data['code'] == 0){//登录失败，请先绑定
         if($data['code'] == 0){//登录失败，请先绑定
             $resMessage = $data['message'];
             $resMessage = $data['message'];
         }elseif($data['code'] == 1){
         }elseif($data['code'] == 1){
@@ -296,21 +297,4 @@ class LoginController extends BaseController
         return $data;
         return $data;
     }
     }
 
 
-    public function ceshi(){
-        $templateModel = new TemplateModule();
-        $list = $templateModel->list();
-        $imageModel = new ImageModel();
-        foreach ($list as $k=>$v){
-            if (strpos($v['image'], '.') !== false) {
-                $v['image'] = '/upload'.$v['image'];
-            }else{
-                $info = $imageModel->read(['hash'=>$v['image']]);
-                if($info !== false){
-                    $v['image'] = $info['path'];
-                }
-            }
-            $templateModel->edit(['image'=>$v['image']],['id'=>$v['id']]);
-        }
-        $this->response('success');
-    }
 }
 }