Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9cd546b6
authored
Sep 11, 2017
by
lyhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change the method of get session username
parent
7fdd9c09
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateEventHandler.java
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateEventHandler.java
View file @
9cd546b6
...
...
@@ -8,8 +8,6 @@ import org.apache.commons.lang.StringUtils;
import
org.jsoup.helper.StringUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.security.core.context.SecurityContextHolder
;
import
org.springframework.security.core.userdetails.UserDetails
;
import
org.springframework.stereotype.Controller
;
import
com.alibaba.fastjson.JSON
;
...
...
@@ -17,6 +15,7 @@ import com.alibaba.fastjson.JSONObject;
import
com.ctrip.fun.admin.exception.CommonException
;
import
com.ctrip.fun.admin.service.system.UserService
;
import
com.ctrip.fun.admin.service.tools.CallCenterService
;
import
com.ctrip.fun.admin.utility.SpringSecurityUtil
;
import
com.ctrip.fun.admin.vo.callcenter.AbstractEventHandler
;
import
com.ctrip.fun.admin.vo.callcenter.RsmwNewStateEvent
;
...
...
@@ -33,6 +32,7 @@ import com.ctrip.fun.common.vo.user.UserQuery;
//import cc.rssoft.framework.config.service.ConfigService;
//import cc.rssoft.framework.springutil.ApplicationHelper;
//import cc.rssoft.framework.websocket.WebsocketService;
...
...
@@ -87,8 +87,8 @@ public class NewStateEventHandler extends AbstractEventHandler {
//来电手机号码
String
mobileNo
=
event
.
getConnectedLineNumber
().
replaceFirst
(
"^0*"
,
""
);
// String username = SecurityContextHolder.getContext().getAuthentication().getName();
UserDetails
user
=
(
UserDetails
)
SecurityContextHolder
.
getContext
().
getAuthentication
().
getPrincipal
();
String
username
=
user
.
getUsern
ame
();
//
UserDetails user = (UserDetails)SecurityContextHolder.getContext().getAuthentication().getPrincipal();
String
username
=
SpringSecurityUtil
.
getCurrentUserN
ame
();
NewStateWebSocket
.
unicast
(
username
,
mobileNo
);
try
{
if
(
StringUtil
.
isBlank
(
mobileNo
))
{
...
...
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