gx

@@ -172,8 +172,12 @@ class LoginController extends BaseController
         $message = file_get_contents("php://input");
         $message = file_get_contents("php://input");
         $message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR);
         $message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR);
         $data = $this->wechatLogin($message->FromUserName);
         $data = $this->wechatLogin($message->FromUserName);
-        $socket = new Socket();
-        $socket->socket(json_encode($data));
+        if($data == 0){//登录失败，请先绑定
+            $resMessage = $data['message'];
+        }else{
+            $resMessage = $data['message'];
+            $info = $data['info'];
+        }
         $arr = [
         $arr = [
             'ToUserName' => 'gh_27174ac5c9d8',
             'ToUserName' => 'gh_27174ac5c9d8',
             'FromUserName' => 'oMbcI6gRzvfrU8ssGsEyvzXOO94w',
             'FromUserName' => 'oMbcI6gRzvfrU8ssGsEyvzXOO94w',
@@ -188,7 +192,7 @@ class LoginController extends BaseController
                 <FromUserName><![CDATA[$message->ToUserName]]></FromUserName>
                 <FromUserName><![CDATA[$message->ToUserName]]></FromUserName>
                 <CreateTime>".time()."</CreateTime>
                 <CreateTime>".time()."</CreateTime>
                 <MsgType><![CDATA[text]]></MsgType>
                 <MsgType><![CDATA[text]]></MsgType>
-                <Content><![CDATA[扫码成功了]]></Content>
+                <Content><![CDATA[$resMessage]]></Content>
             </xml>";
             </xml>";
     }
     }
 
 
@@ -232,7 +236,7 @@ class LoginController extends BaseController
         $info = $userModel->read(['wechat'=>$wechat]);
         $info = $userModel->read(['wechat'=>$wechat]);
         if($info === false){
         if($info === false){
             $data = [
             $data = [
-                'code'=>Code::USER_LOGIN_ERROE,
+                'code'=>0,
                 'message'=>'当前用户未绑定账户，请绑定后',
                 'message'=>'当前用户未绑定账户，请绑定后',
             ];
             ];
         }else {
         }else {
@@ -250,8 +254,8 @@ class LoginController extends BaseController
             //更新用户信息
             //更新用户信息
             $this->model->edit(['token'=>$token],['id'=>$info['id']]);
             $this->model->edit(['token'=>$token],['id'=>$info['id']]);
             $data = [
             $data = [
-                'code'=>Code::SUCCESS,
-                'message'=>'当前用户未绑定账户，请绑定后',
+                'code'=>1,
+                'message'=>'登陆成功',
                 'data'=>$info
                 'data'=>$info
             ];
             ];
         }
         }

@@ -170,6 +170,9 @@ class MonthCountLogic extends BaseLogic
             if(!isset($groupedData[$month])){
             if(!isset($groupedData[$month])){
                 $groupedData[$month] = [];
                 $groupedData[$month] = [];
             }
             }
+            if(empty($v['country'])){
+                $v['country'] = ['中国'=>0];
+            }
             $groupedData[$month][] = $v;
             $groupedData[$month][] = $v;
         }
         }
         return $this->success($groupedData);
         return $this->success($groupedData);