Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
2f8c4a15
Commit
2f8c4a15
authored
Jul 16, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
550b3b4d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
AppChat.php
application/chat/controller/AppChat.php
+2
-2
GeTuiUtils.php
application/chat/utils/GeTuiUtils.php
+2
-2
RPush.php
application/chat/utils/RPush.php
+4
-3
GHouses.php
application/model/GHouses.php
+1
-0
No files found.
application/chat/controller/AppChat.php
View file @
2f8c4a15
...
@@ -148,7 +148,7 @@ class AppChat extends Basic
...
@@ -148,7 +148,7 @@ class AppChat extends Basic
{
{
$params
=
$this
->
params
;
$params
=
$this
->
params
;
$params
=
array
(
/*
$params = array(
'user_name' => 'cesh',
'user_name' => 'cesh',
'msg_content' => 'ceshi666',
'msg_content' => 'ceshi666',
'target_type' => 'users',
'target_type' => 'users',
...
@@ -157,7 +157,7 @@ class AppChat extends Basic
...
@@ -157,7 +157,7 @@ class AppChat extends Basic
'type' => '1',
'type' => '1',
'is_user' => '0',
'is_user' => '0',
'target' => 'agent_5739',
'target' => 'agent_5739',
);
);
*/
if
(
!
isset
(
$params
[
'target_type'
])
||
!
isset
(
$params
[
'target'
])
||
!
isset
(
$params
[
'type'
])
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'
]))
{
||
!
isset
(
$params
[
'msg_content'
])
||
!
isset
(
$params
[
'source'
])
||
!
isset
(
$params
[
'is_user'
])
||
!
isset
(
$params
[
'from'
]))
{
return
$this
->
response
(
ErrorCodeConst
::
ERROR_CODE_PARAM_NOT_EXIST
,
"请求参数错误"
);
return
$this
->
response
(
ErrorCodeConst
::
ERROR_CODE_PARAM_NOT_EXIST
,
"请求参数错误"
);
...
...
application/chat/utils/GeTuiUtils.php
View file @
2f8c4a15
...
@@ -70,9 +70,9 @@ class GeTuiUtils
...
@@ -70,9 +70,9 @@ class GeTuiUtils
$result
=
[];
$result
=
[];
foreach
(
$push_id
as
$k
=>
$v
)
{
foreach
(
$push_id
as
$k
=>
$v
)
{
echo
$v
;
//
echo $v;
$target
->
set_clientId
(
$v
);
$target
->
set_clientId
(
$v
);
dump
(
$target
);
//
dump($target);
$res
=
$igt
->
pushMessageToSingle
(
$message
,
$target
);
$res
=
$igt
->
pushMessageToSingle
(
$message
,
$target
);
if
(
$res
[
'result'
]
==
'ok'
)
{
if
(
$res
[
'result'
]
==
'ok'
)
{
...
...
application/chat/utils/RPush.php
View file @
2f8c4a15
...
@@ -49,7 +49,8 @@ class RPush
...
@@ -49,7 +49,8 @@ class RPush
}
}
/** curl参数拼凑
/**
* @param $user_name
* @param $user_name
* @param $target_type users 给用户发消息。chatgroups: 给群发消息,chatrooms: 给聊天室发消息
* @param $target_type users 给用户发消息。chatgroups: 给群发消息,chatrooms: 给聊天室发消息
* @param $target 注意这里需要用数组,数组长度建议不大于20,即使只有一个用户,也要用数组 ['u1'],给用户发送时数组元素是用户名,
* @param $target 注意这里需要用数组,数组长度建议不大于20,即使只有一个用户,也要用数组 ['u1'],给用户发送时数组元素是用户名,
...
@@ -58,7 +59,7 @@ class RPush
...
@@ -58,7 +59,7 @@ class RPush
* @param $msg_content
* @param $msg_content
* @param $from
* @param $from
* @param $access_token
* @param $access_token
* @return
\app\chat\utils\CurlResponse|bool
* @return
array
*/
*/
public
function
sendRequestByCurl
(
$user_name
,
$target_type
,
$target
,
$msg_content
,
$from
,
$type
,
$access_token
)
public
function
sendRequestByCurl
(
$user_name
,
$target_type
,
$target
,
$msg_content
,
$from
,
$type
,
$access_token
)
{
{
...
@@ -91,7 +92,7 @@ class RPush
...
@@ -91,7 +92,7 @@ class RPush
$response
=
$pushMessageToIgt
->
pushMessageToIgt
(
$push_arr
,
$title
,
$payload
);
return
$pushMessageToIgt
->
pushMessageToIgt
(
$push_arr
,
$title
,
$payload
);
/* $curl = new \app\chat\utils\CurlUtil();
/* $curl = new \app\chat\utils\CurlUtil();
$curl->headers = [
$curl->headers = [
"Accept" => "application/json",
"Accept" => "application/json",
...
...
application/model/GHouses.php
View file @
2f8c4a15
...
@@ -835,6 +835,7 @@ class GHouses extends BaseModel
...
@@ -835,6 +835,7 @@ class GHouses extends BaseModel
->
field
(
$field
)
->
field
(
$field
)
->
alias
(
"a"
)
->
alias
(
"a"
)
->
join
(
"o_order b"
,
"a.id = b.house_id"
,
"left"
)
->
join
(
"o_order b"
,
"a.id = b.house_id"
,
"left"
)
->
join
(
"g_houses_follow_up c"
,
"a.id = c.house_id"
,
"left"
)
->
where
(
$where_
)
->
where
(
$where_
)
->
group
(
"a.id "
)
->
group
(
"a.id "
)
->
select
();
->
select
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment