Skip to content

T
tl_estate
Commit ff5b8018 authored by clone's avatar clone
Browse files
Options

bug

parent 7043b84a
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 42 deletions
application/chat/controller/AppChat.php
View file @ ff5b8018
......@@ -111,21 +111,21 @@ class AppChat extends Basic
public function pushMsg()
{
$params = $this->params;
if (!isset($params['target_type']) || !isset($params['target']) || !isset($params['type']) || !isset($params['msg_content'])
|| !isset($params['source']) || !isset($params['is_user']) || !isset($params['from'])) {
return $this->response(ErrorCodeConst::ERROR_CODE_PARAM_NOT_EXIST, "请求参数错误");
}
/*$params = array(
'msg_content' => '111',
'target_type' => 'users',
'source' => '1',
'from' => 'app_64',
'type' => '1',
'is_user' => '0',
'target' => '18112347151',
);*/
$params = $this->params;
if (!isset($params['target_type']) || !isset($params['target']) || !isset($params['type']) || !isset($params['msg_content'])
|| !isset($params['source']) || !isset($params['is_user']) || !isset($params['from'])) {
return $this->response(ErrorCodeConst::ERROR_CODE_PARAM_NOT_EXIST, "请求参数错误");
}
/* $params = array(
'msg_content' => '111',
'target_type' => 'users',
'source' => '1',
'from' => 'app_64',
'type' => '1',
'is_user' => '0',
'target' => '18112347151',
);*/
$target_type = $params['target_type']; // 消息类型 users 给用户发消息。chatgroups: 给群发消息，chatrooms: 给聊天室发消息
$target = $params['target']; //接受人 if target_type 群 者表示群id
$source = $params['source']; //消息来源 1c端app 2b端app 3其他
......
application/chat/service/ChatService.php
View file @ ff5b8018
......@@ -99,7 +99,7 @@ class ChatService
$userResult = $this->userModel->selectUser($userId);
if ($userResult->id)
$onlyId = self::SOURCE_TYPE_APP . $userId;
$onlyId = self::SOURCE_TYPE_APP . $userResult->id;
break;
}
if (!$onlyId) {
......@@ -143,7 +143,7 @@ class ChatService
$rPush = new RPush();
//todo 消息接收人必须是数据
$rPush->send($target_type, [$target], $type, $msg_content, $from, $accessToken, [ $this, 'saveSendStatus' ]);
// $rPush->send($target_type, [$target], $type, $msg_content, $from, $accessToken, [ $this, 'saveSendStatus' ]);
//返回消息发送成功
return true;
}
......@@ -157,10 +157,10 @@ class ChatService
*/
public function saveSendStatus($response, $target, $sender, $msg_content)
{
/* $response = json_decode($response, true);
$response['time'] = date('Y-m-d H:i:s');
$status = $response['statusCode'] == RPush::PUSH_STATUS_SUCCESS ? MsgStatus::STATUS_SUCCESS : MsgStatus::STATUS_FAILURE;
$this->insertPushLog($sender, $target, $msg_content, $status, $response['statusMsg']);*/
/* $response = json_decode($response, true);
$response['time'] = date('Y-m-d H:i:s');
$status = $response['statusCode'] == RPush::PUSH_STATUS_SUCCESS ? MsgStatus::STATUS_SUCCESS : MsgStatus::STATUS_FAILURE;
$this->insertPushLog($sender, $target, $msg_content, $status, $response['statusMsg']);*/
}
/**
......@@ -188,6 +188,7 @@ class ChatService
$msgModel = new ChatMsg();
$id = $msgModel->addChatMsg($params);
if ($id > 0) {
//todo 插入msg_ext
$group_id = 0;
......@@ -208,16 +209,16 @@ class ChatService
*/
private function insetMsgExt($id, $type, $msg_content, $is_group, $group_id)
{
$params["msg_id"] = $id;
$params["type"] = $type;
$params["body"] = $msg_content;
$params["send_type"] = $is_group;
$params["group_id"] = $group_id;
$params["create_at"] = date("Y-m-d H:i:s", time());
$params["updated_at"] = date("Y-m-d H:i:s", time());
$param["msg_id"] = $id;
$param["type"] = $type;
$param["body"] = $msg_content;
$param["send_type"] = $is_group;
$param["group_id"] = $group_id;
$param["create_at"] = date("Y-m-d H:i:s", time());
$param["updated_at"] = date("Y-m-d H:i:s", time());
$msgExtModel = new ChatMsgExt();
$msgExtModel->addChatMsgExt($params);
$msgExtModel->addChatMsgExt($param);
}
/** 获取聊天记录
......
application/chat/utils/RPush.php
View file @ ff5b8018
......@@ -2,6 +2,7 @@
namespace app\chat\utils;
use app\chat\consts\ConfigConst;
use Think\Log;
/**
......@@ -53,6 +54,7 @@ class RPush
'from' => $from,
);
$data = json_encode($arr);
echo $data;echo "-------------";
$curl = new \app\chat\utils\CurlUtil();
$curl->headers = [
"Accept" => "application/json",
......@@ -65,7 +67,7 @@ class RPush
];
$url = $this->buildSendUrl();
$response = $curl->post($url, $data);
dump($response);
Log::record('info -------------', json_encode($response));
return $response;
}
......
application/chat/utils/curl_cookie.txt
View file @ ff5b8018
......@@ -2,4 +2,4 @@
# http://curl.haxx.se/docs/http-cookies.html
# This file was generated by libcurl! Edit at your own risk.
a1.easemob.com FALSE / FALSE 1516416547 rememberMe deleteMe
a1.easemob.com FALSE / FALSE 1516419232 rememberMe deleteMe
application/model/AttentionModel.php
View file @ ff5b8018
......@@ -40,22 +40,22 @@ class AttentionModel extends Model
->select();
if (count($result) > 0) {
$saveWhere["id"] = $params["id"];
$arr["is_del"] = 1;
$arr["is_del"] = 1;
} else {
return [ "code" => "101", "msg" => "数据不存在" ];
}
} else {//关注
//保存的时候可能是上次取消关注过的所以改遍状态就行了
$where_["user_id"] = $params['user_id'];
$where_["user_id"] = $params['user_id'];
$where_["house_id"] = $params['house_id'];
$res = $this
$res = $this
->where($where_)
->select();
if (count($res) > 0) {
$saveWhere["id"] = $res[0]["id"];
$arr["is_del"] = 0;
$id = $res[0]["id"];
$arr["is_del"] = 0;
$id = $res[0]["id"];
} else {
$arr["create_time"] = date("Y-m-d H:i:s", time());
$arr["update_time"] = date("Y-m-d H:i:s", time());
......@@ -90,7 +90,7 @@ class AttentionModel extends Model
public function myAttentionList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $param)
{
$params["a.user_id"] = $param["user_id"];
$params["a.is_del"] = $param["is_del"];
$params["a.is_del"] = $param["is_del"];
//$params["b.room_num_left"] = array( "<>", 0 ); //剩余数为0 的商品不显示
$params["b.show_all"] = array( "eq", 0 ); //只显示公开的楼盘
return $this->field($field)
......
application/model/ChatMsg.php
View file @ ff5b8018
......@@ -29,8 +29,8 @@ class ChatMsg extends Model
try {
$this->save($params);
$id = $this->id;
return $id;
Db::commit();
return $id;
} catch (\Exception $e) {
Db::rollback();
......
application/model/ChatMsgExt.php
View file @ ff5b8018
......@@ -20,18 +20,17 @@ class ChatMsgExt extends Model
public function __construct()
{
$this->db = Db($this->table);
$this->db = Db::name($this->table);
}
public function addChatMsgExt($params)
{
Db::startTrans();
try {
$this->save($params);
$id = $this->id;
return $id;
$this->db->insert($params);
Db::commit();
} catch (\Exception $e) {
dump($e);
Db::rollback();
}
......
log.txt
View file @ ff5b8018
......@@ -258,3 +258,29 @@ response body = <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<statusMsg>IP鉴权失败</statusMsg>
</Response>
request body = <TemplateSMS>
<to>18756256666</to>
<appId>8a216da85f5c89b1015f7718e2b90a63</appId>
<templateId>214759</templateId>
<datas><data>3450</data><data>5分钟</data></datas>
</TemplateSMS>
request url = https://app.cloopen.com:8883/2013-12-26/Accounts/8a48b55153eae51101540e763d3b3888/SMS/TemplateSMS?sig=40EE1C43A1B08B698B610DC95026AF74
response body = <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Response>
<statusCode>160053</statusCode>
<statusMsg>IP鉴权失败</statusMsg>
</Response>
request body = <TemplateSMS>
<to>18756255555</to>
<appId>8a216da85f5c89b1015f7718e2b90a63</appId>
<templateId>214759</templateId>
<datas><data>5919</data><data>5分钟</data></datas>
</TemplateSMS>
request url = https://app.cloopen.com:8883/2013-12-26/Accounts/8a48b55153eae51101540e763d3b3888/SMS/TemplateSMS?sig=8DABD7C3A3D79365F4AA65E92613F6A1
response body = <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Response>
<statusCode>160053</statusCode>
<statusMsg>IP鉴权失败</statusMsg>
</Response>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment