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
c5ecc85a
Commit
c5ecc85a
authored
Jun 27, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
f531b820
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
User.php
application/api_broker/controller/User.php
+2
-0
AppChat.php
application/chat/controller/AppChat.php
+1
-1
ChatUserExt.php
application/model/ChatUserExt.php
+1
-1
No files found.
application/api_broker/controller/User.php
View file @
c5ecc85a
...
...
@@ -290,6 +290,8 @@ class User extends Basic
$return_user_list
[
$k
][
'user_phone'
]
=
substr_replace
(
$return_user_list
[
$k
][
'user_phone'
],
'****'
,
3
,
4
);
$return_user_list
[
$k
][
'site_ids_name'
]
=
$user_service
->
userSiteName
(
$v
[
"site_ids"
]);
$return_user_list
[
$k
][
'user_name'
]
=
$v
[
'user_name'
]
?
"[
{
$v
[
'concrete_industry'
]
}
]
{
$v
[
'user_name'
]
}
"
:
''
;
}
...
...
application/chat/controller/AppChat.php
View file @
c5ecc85a
...
...
@@ -210,7 +210,6 @@ class AppChat extends Basic
if
(
true
!==
$checkResult
)
{
return
$this
->
response
(
ErrorCodeConst
::
ERROR_CODE_PARAM_NOT_EXIST
,
$checkResult
);
}
$user_name
=
isset
(
$params
[
'user_name'
])
?
$params
[
'user_name'
]
:
$params
[
'from'
];
//用户昵称
$target_type
=
$params
[
'target_type'
];
// 消息类型 users 给用户发消息。chatgroups: 给群发消息,chatrooms: 给聊天室发消息
$target
=
$params
[
'target'
];
//接受人 if target_type 群 者表示群id
...
...
@@ -224,6 +223,7 @@ class AppChat extends Basic
}
$result
=
$this
->
_chat
->
sendMsg
(
$user_name
,
$target_type
,
$target
,
$source
,
$is_user
,
$type
,
$msg_content
,
$from
);
if
(
$result
)
{
return
$this
->
response
(
"200"
,
""
,
[
"msg"
=>
"消息发送成功"
]);
}
else
{
...
...
application/model/ChatUserExt.php
View file @
c5ecc85a
...
...
@@ -96,7 +96,7 @@ class ChatUserExt extends BaseModel
->
order
(
'update_time DESC'
)
->
limit
(
$limit
)
->
select
();
//echo $this->getLastSql();
//
echo $this->getLastSql();
return
$data
;
}
...
...
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