Merge branch 'chat_0818' into test

application/api/controller/Shop.php

@@ -93,14 +93,14 @@ class Shop extends Basic
                 //面积 room_area最小面积  room_area2最大面积 参考老版本
                 //面积 room_area最小面积  room_area2最大面积 参考老版本
                 if (isset($params['area_start']) && isset($params['area_end'])) {
-                    $conditions['a.room_area']  = array( 'between', array( $params['area_start'], $params['area_end'] ) );
+                    $conditions['a.room_area'] = array( 'between', array( $params['area_start'], $params['area_end'] ) );
                     //街铺只有一个room_area
-                    if($params['shangpu_type'] == 0){
+                    if ($params['shangpu_type'] == 0) {
                         $conditions['a.room_area2'] = array( 'between', array( $params['area_start'], $params['area_end'] ) );
                     }
                 } else if (isset($params['area_start']) && !isset($params['area_end'])) { //100米以上不用传结束面积
-                    $conditions['a.room_area']  = array( 'egt', $params['area_start'] );
-                    if($params['shangpu_type'] == 0){
+                    $conditions['a.room_area'] = array( 'egt', $params['area_start'] );
+                    if ($params['shangpu_type'] == 0) {
                         $conditions['a.room_area2'] = array( 'egt', $params['area_start'] );
                     }
                 }
@@ -178,7 +178,7 @@ class Shop extends Basic
         $result["api_path"] = IMG_PATH;
         $param["house_id"]  = $params['id'];
         //todo 这里的是否要更改成b端后台上传的类型
-        $param["imgtype"] = 2;
+        $param["imgtype"]      = 2;
         $result["images"]      = $this->dbImg->getHouseImages($param, 15);
         $param["imgtype"]      = 4;//图片类型:1效果图，2实景图，3样板图，4户型图，5交通图
         $result["plan_images"] = $this->dbImg->getHouseImages($param, 4);

application/api_broker/controller/FollowUp.php

+<?php
+
+use app\api_broker\extend\Basic;
+
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/24
+ * Time : 14:24
+ * Intro:
+ */
+
+class FollowUp extends Basic{
+    public function __construct($request = null)
+    {
+        parent::__construct($request);
+    }
+
+    /**
+     * 报备
+     */
+    public function report(){
+        $params = $this->params;
+        $params = array(
+            "user_id" => 1,
+            "shop_ids"=> "1,2,3",
+            ""
+        );
+
+        $this->response("200","request success",[]);
+    }
+}
\ No newline at end of file

application/chat/service/GroupService.php

+<?php
+
+namespace app\chat\service;
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/23
+ * Time : 14:15
+ * Intro:
+ */
+
+class GroupService
+{
+//todo
+}
\ No newline at end of file

application/chat/utils/RPush.php

+<?php
+
+namespace app\chat\utils;
+
+use app\chat\consts\ConfigConst;
+use Think\Log;
+use think\Cache;
+
+
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/8
+ * Time : 17:17
+ * Intro: 发送消息类
+ */
+class RPush
+{
+
+    /**
+     * 发送消息
+     * @param $user_name
+     * @param $target_type
+     * @param $target
+     * @param $msg_content
+     * @param $from
+     * @param $type
+     * @param $access_token
+     * @param $callback
+     */
+    public function send($user_name,$target_type, $target, $msg_content, $from, $type, $access_token, $callback)
+    {
+        //todo
+        if(Cache::get('save_message_num')){
+            $save_message_num=Cache::get('save_message_num');
+            if($save_message_num>10){
+                sleep(1);
+                Cache::set('save_message_num', 0);
+            }else{
+                $save_message_num=$save_message_num+1;
+                Cache::set('save_message_num', $save_message_num);
+            }
+        }else{
+            Cache::set('save_message_num', 0);
+        }
+
+        $response = $this->sendRequestByCurl($user_name,$target_type, $target, $msg_content, $from, $type, $access_token);
+
+        call_user_func_array([ $callback[0], $callback[1] ], [ $response, $target, $from, $msg_content ]);
+
+    }
+
+    /** curl参数拼凑
+     * @param $user_name
+     * @param $target_type users 给用户发消息。chatgroups: 给群发消息，chatrooms: 给聊天室发消息
+     * @param $target  注意这里需要用数组，数组长度建议不大于20，即使只有一个用户，也要用数组 ['u1']，给用户发送时数组元素是用户名，
+     *                 给群组发送时数组元素是groupid
+     * @param $type //目前只有文本的消息
+     * @param $msg_content
+     * @param $from
+     * @param $type
+     * @param $access_token
+     * @return \app\chat\utils\CurlResponse|bool
+     */
+    public function sendRequestByCurl($user_name,$target_type, $target, $msg_content, $from, $type, $access_token)
+    {
+        $arr           = array(
+            'target_type' => $target_type,
+            'target'      => $target,
+            'msg'         => [ "type" => "txt", "msg" => $msg_content ],
+            'from'        => $from,
+            'ext'         => [ "msg_type" => $type ,"user_name"=>$user_name]
+        );
+        $data          = json_encode($arr);
+        $curl          = new \app\chat\utils\CurlUtil();
+        $curl->headers = [
+            "Accept"        => "application/json",
+            "Content-Type"  => "application/json;charset=utf-8",
+            'Authorization' => "Bearer " . $access_token,
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        $url           = $this->buildSendUrl();
+        $response      = $curl->post($url, $data);
+        Log::record('info -------------' . json_encode($response), "info");
+        return $response;
+    }
+
+    /**
+     * 请求api
+     * @return string
+     */
+    private function buildSendUrl()
+    {
+        return ConfigConst::API_PATH . ConfigConst::ORG_NAME . "/" . ConfigConst::APP_NAME . "/messages";
+    }
+}
\ No newline at end of file

application/chat/utils/RegisterUtil.php

+<?php
+
+namespace app\chat\utils;
+
+use app\chat\consts\ConfigConst;
+use app\chat\utils;
+
+
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/18
+ * Time : 14:47
+ * Intro: 注册环信用户
+ */
+class RegisterUtil
+{
+    const IM_REGISTER_USER = "/users";
+
+    const IM_DELETE_USER = "/users";
+
+    /**
+     * @param $username
+     * @param $password
+     * @return CurlResponse|bool
+     */
+    public function registerByCurl($username, $password)
+    {
+        $arr = array(
+            'username' => $username,
+            'password' => $password,
+        );
+        $data = json_encode($arr);
+
+        $curl          = new CurlUtil();
+        $curl->headers = [
+            "Accept"       => "application/json",
+            "Content-Type" => "application/json;charset=utf-8",
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        $url           = $this->buildSendUrl() . self::IM_REGISTER_USER;
+        $response      = $curl->post($url, $data);
+        return $response;
+    }
+
+    /**
+     * @param $username
+     * @param $access_token
+     * @return CurlResponse|bool
+     */
+    public function deleteByCurl($username, $access_token)
+    {
+        $arr = array(
+            'username' => $username,
+        );
+
+        $data = json_encode($arr);
+
+        $curl = new CurlUtil();
+        $curl->delete();
+        $curl->headers = [
+            "Accept"        => "application/json",
+            "Content-Type"  => "application/json;charset=utf-8",
+            'Authorization' => $access_token,
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        $url           = $this->buildSendUrl() . self::IM_DELETE_USER;
+        $response      = $curl->post($url, $data);
+        return $response;
+    }
+
+    /**
+     * 请求api
+     * @return string
+     */
+    private function buildSendUrl()
+    {
+        return ConfigConst::API_PATH . ConfigConst::ORG_NAME . "/" . ConfigConst::APP_NAME;
+    }
+}
\ No newline at end of file

application/chat/utils/UGroup.php

+<?php
+
+namespace app\chat\utils;
+
+use app\chat\consts\ConfigConst;
+use Think\Log;
+
+
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/8
+ * Time : 17:17
+ * Intro: 发送消息类
+ */
+class UGroup
+{
+
+
+
+    /** 创建一个群
+     * 朱伟 2018年01月25日
+     */
+    public function createGroup($group_name, $group_users, $group_users_admin='admin',$access_token)
+    {
+        $arr= array(
+            "groupname"=>$group_name, //群组名称，此属性为必须的
+            "desc"=>"good", //群组描述，此属性为必须的
+            "public"=>true, //是否是公开群，此属性为必须的
+            "maxusers"=>300, //群组成员最大数（包括群主），值为数值类型，默认值200，最大值2000，此属性为可选的
+            "members_only"=>true, // 加入群是否需要群主或者群管理员审批，默认是false
+            "allowinvites"=> true,  //是否允许群成员邀请别人加入此群。 true：允许群成员邀请人加入此群，false：只有群主或者管理员才可以往群里加人。
+            "owner"=>$group_users_admin, //群组的管理员，此属性为必须的
+            "members"=>$group_users //群组成员，此属性为可选的，但是如果加了此项，数组元素至少一个（注：群主jma1不需要写入到members里面）
+        );
+        $data          = json_encode($arr);
+        $curl          = new \app\chat\utils\CurlUtil();
+        $curl->headers = [
+            "Accept"        => "application/json",
+            "Content-Type"  => "application/json;charset=utf-8",
+            'Authorization' => "Bearer " . $access_token,
+
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        $url           = $this->buildSendUrl();
+        $response      = $curl->post($url, $data);
+        Log::record('------createGroup-------' . json_encode($response), "info");
+        return $response;
+    }
+
+    /** del一个群
+     * 朱伟 2018年01月25日
+     */
+    public function deleteGroup($group_id,$access_token)
+    {
+        $arr= array();
+        $data          = json_encode($arr);
+        $curl          = new \app\chat\utils\CurlUtil();
+        $curl->headers = [
+            "Accept"        => "application/json",
+            "Content-Type"  => "application/json;charset=utf-8",
+            'Authorization' => "Bearer " . $access_token,
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        $url           = $this->buildSendUrl().$group_id;
+        $response      = $curl->delete($url, $data);
+        Log::record('-------deleteGroup------' . json_encode($response), "info");
+        return $response;
+    }
+
+    /** 获取群成员
+     * 朱伟 2018年01月26日
+     */
+    public function getGroupUser($group_id,$pagenum,$pagesize,$access_token)
+    {
+        $arr= array();
+        $data          = json_encode($arr);
+        $curl          = new \app\chat\utils\CurlUtil();
+        $curl->headers = [
+            "Accept"        => "application/json",
+            "Content-Type"  => "application/json;charset=utf-8",
+            'Authorization' => "Bearer " . $access_token,
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        $url           = $this->buildSendUrl().$group_id.'users?pagenum='.$pagenum.'&pagesize='.$pagesize;
+        $response      = $curl->get($url, $data);
+        Log::record('-------deleteGroup------' . json_encode($response), "info");
+        return $response;
+    }
+    /** 添加群组成员
+     * 朱伟 2018年01月26日
+     */
+    public function addGroupUserByIds($group_id,$username,$access_token)
+    {
+        $arr= array();
+        $data          = json_encode($arr);
+        $curl          = new \app\chat\utils\CurlUtil();
+        $curl->headers = [
+            "Accept"        => "application/json",
+            "Content-Type"  => "application/json;charset=utf-8",
+            'Authorization' => "Bearer " . $access_token,
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        $url           = $this->buildSendUrl().$group_id.'/users/'.$username;
+        $response      = $curl->post($url, $data);
+        Log::record('-------addGroupUserByIds------' . json_encode($response), "info");
+        return $response;
+    }
+
+    /**
+     * 移除群组成员
+     * 朱伟 2018年01月29日
+     * @param $group_id
+     * @param $username
+     * @param $access_token
+     * @return CurlResponse|bool
+     */
+    public function delGroupUserByIds($group_id,$username,$access_token)
+    {
+        $arr= array();
+        $data          = json_encode($arr);
+        $curl          = new \app\chat\utils\CurlUtil();
+        $curl->headers = [
+            "Accept"        => "application/json",
+            "Content-Type"  => "application/json;charset=utf-8",
+            'Authorization' => "Bearer " . $access_token,
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        $url           = $this->buildSendUrl().$group_id.'/users/'.$username;
+        $response      = $curl->post($url, $data);
+        Log::record('-------delGroupUserByIds------' . json_encode($response), "info");
+        return $response;
+    }
+    /**
+     * 添加群组管理员
+     * 朱伟 2018年01月29日
+     * @param $group_id
+     * @param $username
+     * @param $access_token
+     * @return CurlResponse|bool
+     */
+    public function addGroupManage($group_id,$username,$access_token)
+    {
+        $arr= array("newadmin"=>$username);
+        $data          = json_encode($arr);
+        $curl          = new \app\chat\utils\CurlUtil();
+        $curl->headers = [
+            "Accept"        => "application/json",
+            "Content-Type"  => "application/json;charset=utf-8",
+            'Authorization' => "Bearer " . $access_token,
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        //Path: /{org_name}/{app_name}/chatgroups/{group_id}/admin
+        $url           = $this->buildSendUrl().$group_id.'/admin';
+        $response      = $curl->delete($url, $data);
+        Log::record('-------delGroupUserByIds------' . json_encode($response), "info");
+        return $response;
+    }
+    /**
+     * 移除群组管理员
+     * 朱伟 2018年01月29日
+     * @param $group_id
+     * @param $username
+     * @param $access_token
+     * @return CurlResponse|bool
+     */
+    public function delGroupManage($group_id,$username,$access_token)
+    {
+        $arr= array();
+        $data          = json_encode($arr);
+        $curl          = new \app\chat\utils\CurlUtil();
+        $curl->headers = [
+            "Accept"        => "application/json",
+            "Content-Type"  => "application/json;charset=utf-8",
+            'Authorization' => "Bearer " . $access_token,
+        ];
+        $curl->options = [
+            "CURLOPT_SSL_VERIFYPEER" => 0,
+            "CURLOPT_SSL_VERIFYHOST" => 2,
+        ];
+        //
+        $url           = $this->buildSendUrl().$group_id.'/admin/'.$username;
+        $response      = $curl->delete($url, $data);
+        Log::record('-------delGroupUserByIds------' . json_encode($response), "info");
+        return $response;
+    }
+    /**
+     * 请求api
+     * @return string
+     */
+    private function buildSendUrl()
+    {
+        return ConfigConst::API_PATH . ConfigConst::ORG_NAME . "/" . ConfigConst::APP_NAME.'/chatgroups/' ;
+    }
+}
\ No newline at end of file

application/chat/utils/curl_cookie.txt

+# Netscape HTTP Cookie File
+# http://curl.haxx.se/docs/http-cookies.html
+# This file was generated by libcurl! Edit at your own risk.
+
+a1.easemob.com	FALSE	/	FALSE	1517538110	rememberMe	deleteMe

application/index/controller/Auth.php

@@ -208,6 +208,33 @@ class Auth extends Basic
 //        echo $group_id;
 //        exit;
         if ($this->request->isPost()) {
+=======
+    
+    public function test(){
+//        $this->authRuleModel  = new AuthRule();
+//        dump($this->authRuleModel);die;
+//       $list=  $this->authRuleModel->find();
+        
+     //   return $this->response(200, '', $list);
+    }
+
+    
+
+    /**
+     * 权限分配
+     * @param  integer $group_id 组ID
+     * @return [type] [description]
+     * @date   2018-01-22
+     * @author zfc
+     */
+    public function accessLook($group_id=0){
+         $table= New AuthGroup();
+         $table2= New AuthRule();
+        $data['title']='权限分配';
+//        echo $group_id;
+//        exit;
+        if (IS_POST && $group_id=0) {
+>>>>>>> 8e62fd6... 合并test
             //添加or修改
             $data['id']    = $group_id;
             $menu_auth     = input('post.menu_auth/a','');//获取所有授权菜单id

application/model/Agents.php

@@ -9,39 +9,38 @@ class Agents extends Model
 {
     /**
      * 查询经纪人
-     * @param int $pageNo
-     * @param int $pageSize
-     * @param string $order_
-     * @param $field
-     * @param $params
-     * @param string $house_id
-     * @return false|\PDOStatement|string|\think\Collection
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
+     *
+     * @param type $pageNo
+     * @param type $pageSize
+     * @param type $order_
+     * @param type $field
+     * @param type $params
+     * @param type $house_id 查询该街铺和商铺的经纪人评论信息
+     * @return type
      */
-    public function getUser($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $house_id = '') {
+    public function getUser($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $house_id = '')
+    {
         if ($house_id == '') {
             $data = $this->field($field)->alias('a')
-                    ->join('u_evaluate b', 'a.id = b.agents_id', 'left')
-                    ->where($params)
-                    ->where('level=2 or level=5')
-                    ->group('a.id')
-                    ->order($order_)
-                    ->limit($pageSize)
-                    ->page($pageNo)
-                    ->select();
+                ->join('u_evaluate b', 'a.id = b.agents_id', 'left')
+                ->where($params)
+                ->where('level=2 or level=5')
+                ->group('a.id')
+                ->order($order_)
+                ->limit($pageSize)
+                ->page($pageNo)
+                ->select();
         } else {
             $data = $this->field($field)->alias('a')
-                    ->join('u_evaluate b','a.id = b.agents_id','left')
-                    ->where('find_in_set('.$house_id.', house_ids) or find_in_set('.$house_id.', house_ids2)')
-                    ->where($params)
-                    ->where('level=2 or level=5')
-                    ->group('a.id')
-                    ->order($order_)
-                    ->limit($pageSize)
-                    ->page($pageNo)
-                    ->select();
+                ->join('u_evaluate b', 'a.id = b.agents_id', 'left')
+                ->where('find_in_set(' . $house_id . ', house_ids) or find_in_set(' . $house_id . ', house_ids2)')
+                ->where($params)
+                ->where('level=2 or level=5')
+                ->group('a.id')
+                ->order($order_)
+                ->limit($pageSize)
+                ->page($pageNo)
+                ->select();
         }
 
         return $data;
@@ -104,6 +103,22 @@ class Agents extends Model
         return $data;
     }
 
+    /**
+     * 获取经纪人 by zw
+     * @param $field
+     * @param $id
+     * @return array|false|\PDOStatement|string|Model
+     */
+    public function getAgentsById($field , $id)
+    {
+        return $this
+            ->field($field)
+            ->where('inuse = 1 and id = ' . $id)
+            ->find();
+        return $data;
+    }
+
+
     /**
      * 查询经纪人列表
      *

application/model/ChatGroup.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/18
+ * Time : 15:33
+ * Intro:
+ */
+
+namespace app\model;
+
+use think\Model;
+use think\Db;
+
+class ChatGroup extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'chat_group';
+    protected $db;
+
+    public function __construct()
+    {
+        $this->db = Db::name($this->table);
+    }
+
+    public function addChatMsgExt($params)
+    {
+        Db::startTrans();
+        try {
+            $this->db->insert($params);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+        }
+        return 0;
+    }
+}
\ No newline at end of file

application/model/ChatGroupMember.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/18
+ * Time : 15:33
+ * Intro:
+ */
+
+namespace app\model;
+
+use think\Model;
+use think\Db;
+
+class ChatGroupMember extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'chat_group_member';
+    protected $db;
+
+    public function __construct()
+    {
+        $this->db = Db::name($this->table);
+    }
+
+    public function addChatMsgExt($params)
+    {
+        Db::startTrans();
+        try {
+            $this->db->insert($params);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+        }
+        return 0;
+    }
+}
+

application/model/ChatMsg.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/18
+ * Time : 15:33
+ * Intro:
+ */
+
+namespace app\model;
+
+use think\Model;
+use think\Db;
+
+class ChatMsg extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'chat_msg';
+    protected $db;
+
+    public function __construct()
+    {
+        $this->db = Db($this->table);
+    }
+
+    public function addChatMsg($params)
+    {
+        Db::startTrans();
+        try {
+            $this->save($params);
+            $id = $this->id;
+            Db::commit();
+            return $id;
+        } catch (\Exception $e) {
+            Db::rollback();
+
+        }
+        return 0;
+    }
+
+    /**
+     * @param $params
+     * @param $field
+     * @param $page_no
+     * @param $page_size
+     * @return false|\PDOStatement|string|\think\Collection
+     */
+    public function getChatHistory($params, $field, $page_no, $page_size)
+    {
+
+        if (isset($params["from"])) {
+            $where_["a.from_id"] = $params["from"];
+            $where_or["a.to_id"] = $params["from"];
+        }
+        if (isset($params["target"])) {
+            $where_["a.to_id"]     = $params["target"];
+            $where_or["a.from_id"] = $params["target"];
+        }
+        if (isset($params["is_group"])) {
+            $where_["a.is_group"] = $params["is_group"];
+        }
+        if (isset($params["body"])) {
+            $where_["b.body"] = array( 'like', "%" . trim($params["body"]) . "%" );
+        }
+
+        $where_["a.is_del"] = 0;
+        $data = $this->field($field)
+            ->alias("a")
+            ->join('chat_msg_ext b', 'a.id = b.msg_id', 'LEFT')
+            ->where($where_)
+            ->whereOr(function ($query) use ($where_or) {
+                $query->where($where_or);
+            })
+            ->order("a.created_at desc")
+            ->limit($page_size)
+            ->page($page_no)
+            ->select();
+        return $data;
+    }
+
+}
\ No newline at end of file

application/model/ChatMsgExt.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/18
+ * Time : 15:33
+ * Intro:
+ */
+
+namespace app\model;
+
+use think\Model;
+use think\Db;
+
+class ChatMsgExt extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'chat_msg_ext';
+    protected $db;
+
+    public function __construct()
+    {
+        $this->db = Db::name($this->table);
+    }
+
+    public function addChatMsgExt($params)
+    {
+        Db::startTrans();
+        try {
+            $this->db->insert($params);
+            Db::commit();
+        } catch (\Exception $e) {
+            dump($e);
+            Db::rollback();
+
+        }
+        return 0;
+    }
+
+}
\ No newline at end of file

application/model/ChatMsgStatus.php

+<?php
+namespace app\model;
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/26
+ * Time : 16:08
+ * Intro:
+ */
+
+use think\Model;
+use think\Db;
+
+class ChatMsgStatus extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'chat_msg_status';
+    protected $db;
+
+    public function __construct()
+    {
+        $this->db = Db::name($this->table);
+    }
+
+    public function addChatMsgStatus($params)
+    {
+        Db::startTrans();
+        try {
+            $this->db->insert($params);
+            Db::commit();
+        } catch (\Exception $e) {
+            dump($e);
+            Db::rollback();
+
+        }
+        return 0;
+    }
+
+}
\ No newline at end of file

application/model/ChatRelation.php

+<?php
+
+namespace app\model;
+
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/2/6
+ * Time : 16:07
+ * Intro:
+ */
+
+use think\Model;
+use think\Db;
+
+class ChatRelation extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'chat_relation';
+    protected $db_;
+
+    public function __construct()
+    {
+        $this->db_ = Db($this->table);
+    }
+
+    /**
+     * 获取关系是否存在
+     * @param $params
+     * @param string $field
+     * @return false|\PDOStatement|string|\think\Collection
+     */
+    public function getChatRelation($params, $field = "id,to_id,from_id")
+    {
+        $where_ = $whereOr_ = [];
+
+        if (isset($params["target"])) {
+            $where_["to_id"]     = $params["target"];
+            $whereOr_["from_id"] = $params["target"];
+        }
+        if (isset($params["from"])) {
+            $where_["to_id"]     = $params["from"];
+            $whereOr_["from_id"] = $params["from"];
+        }
+        $where_["disable"]   = 0;
+        $whereOr_["disable"] = 0;
+        return $this->field($field)
+            ->where($where_)
+            ->whereOr(function ($query) use ($whereOr_) {
+                $query->where($whereOr_);
+            })
+            ->select();
+
+    }
+
+    public function addChatRelation($params)
+    {
+        $where_ = [];
+        if (isset($params["target"])) {
+            $where_["to_id"] = $params["target"];
+        }
+        if (isset($params["from"])) {
+            $where_["from_id"] = $params["from"];
+        }
+
+        $where_["create_time"] = date("Y-m-d H:i:s",time());
+        $where_["update_time"] = date("Y-m-d H:i:s",time());
+
+        Db::startTrans();
+        try {
+            $this->insert($where_);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+        }
+    }
+
+}
\ No newline at end of file

application/model/ChatUser.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/1/18
+ * Time : 15:33
+ * Intro:
+ */
+
+namespace app\model;
+
+use think\Model;
+use think\Db;
+
+class ChatUser extends Model
+{
+    // 设置当前模型对应的完整数据表名称
+    protected $table = 'chat_user';
+    protected $db;
+
+    public function __construct()
+    {
+        $this->db = Db($this->table);
+    }
+
+    public function getChatUser($params, $field = "only_id,phone")
+    {
+        $data = $this->db->field($field)
+            ->where($params)
+            ->select();
+        return $data;
+    }
+
+    public function addChatUser($params)
+    {
+        Db::startTrans();
+        try {
+            $this->save($params);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+
+        }
+    }
+
+}
\ No newline at end of file

application/model/HouseImgs.php

@@ -31,4 +31,12 @@ class HouseImgs extends Model
             ->limit($limit_)
             ->select();
     }
+
+    function getHouseImgs($id,$imgtype)
+    {
+        $HouseImgsre = $this->db ->where(['house_id'=>$id,'imgtype'=>$imgtype])
+            ->field('id,imagename')
+            ->select();
+        return $HouseImgsre;
+    }
 }

application/model/HouseInfos.php

@@ -102,5 +102,15 @@ class HouseInfos extends Model
             ->select();
     }
 
+    function getHousepusmessage($id)
+    {
+        $HouseInfosre = $this->dbHouseInfo ->where('id', $id)
+            ->field('id,title,room_area,room_area2,price,rent_type')
+            ->select();
+        return $HouseInfosre;
+    }
+
+
+
 
 }

application/model/HouseinfoExts.php

+<?php
+
+namespace app\model;
+
+
+use think\Model;
+
+
+class HouseinfoExts extends Model
+{
+    protected $table = 'houseinfo_exts';
+    protected $HouseinfoExts;
+
+    function __construct()
+    {
+        $this->HouseinfoExts = Db($this->table);
+    }
+
+
+
+    function getHouse_ext($id)
+    {
+        $HouseinfoExtsInfosre = $this->HouseinfoExts
+            ->where('house_id', $id)
+            //->field('id,house_id,foreign_name,address_detail_c,province_c,province_code,city_c,city_code,district_c,district_code,foreign_advantage,created,modified')
+            ->select();
+        return $HouseinfoExtsInfosre;
+    }
+
+
+
+
+}

application/model/Users.php

@@ -32,8 +32,14 @@ class Users extends Model
         }
         return $data;
     }
-
-    /**
+    public function getUserByWhere($param, $fields = 'id,user_phone')
+    {
+        $data = $this
+            ->field($fields)
+            ->where($param)
+            ->select();
+        return $data;
+    }    /**
      * 查询用户和经纪人
      *
      * @param int $pageNo

application/route.php

@@ -231,26 +231,6 @@ Route::group('broker', [
     'collectingBill'        => [ 'api_broker/OrderLog/collectingBill', [ 'method' => 'get|post' ] ],
     'refund'                => [ 'api_broker/OrderLog/refund', [ 'method' => 'get|post' ] ],
     'bargain'               => [ 'api_broker/OrderLog/bargain', [ 'method' => 'get|post' ] ],
-    'statusBargain'         => [ 'api_broker/OrderLog/statusBargain', [ 'method' => 'get|post' ] ],
-    'login'                 => [ 'api_broker/Broker/login', [ 'method' => 'post' ] ], //经纪人登陆
-    'editAgent'             => [ 'api_broker/Broker/editAgent', [ 'method' => 'post' ] ], //经纪人修改密码
-    'uploadHeadImg'         => [ 'api_broker/Broker/uploadHeadImg', [ 'method' => 'post' ] ], //经纪人上传头像
-    'editClient'            => [ 'api_broker/Client/editClient', [ 'method' => 'get|post' ] ],//添加和编辑客户
-    'getBroker'             => [ 'api_broker/broker/getBroker',['method'=>'get']],//获取经纪人列表
-    'labelEdit'             => [ 'api_broker/label/index',['method'=>'get|post']],  //编辑标签
-    'getLabelsList'         => [ 'api_broker/label/getLabelsList',['method'=>'get']],  //标签列表
-    'add_phone_follow_up'   => [ 'api_broker/broker/add_phone_follow_up',['method'=>'get|post']],//新增-客户电话跟进
-    'useraction_search'     => [ 'api_broker/broker/useraction_search',['method'=>'get|post']],//新增-客户电话跟进
-    'user_search'           => [ 'api_broker/broker/user_search',['method'=>'get|post']],//客户搜索
-    'bindAXB'               => [ 'api_broker/CellPhone/bindAXB', [ 'method' => 'post' ] ],//隐私号码
-    'agentsUnBind'          => [ 'api_broker/CellPhone/agentsUnBind', [ 'method' => 'post' ] ],//解除绑定关系
-    'updateBindAXB' => ['api_broker/CellPhone/updateBindAXB', [ 'method' => 'post' ] ], //更新绑定关系隐私号码
-
-
-    //商铺
-    'getShopList' => ['api_broker/Shop/getShopList', [ 'method' => 'get|post' ] ],
-    'getShopDetail' => ['api_broker/Shop/getShopDetail', [ 'method' => 'get' ] ],
-
 ]);
 
 //Route::miss('api/index/miss');//处理错误的url
\ No newline at end of file