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
1e316c5b
authored
Sep 21, 2017
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.3' into release
parents
3989704d
75549dc0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
7 deletions
src/main/java/com/ctrip/fun/admin/service/callcenter/SipPhoneService.java
src/main/java/com/ctrip/fun/admin/service/system/UserDetailsService.java
src/main/java/com/ctrip/fun/admin/service/callcenter/SipPhoneService.java
View file @
1e316c5b
...
...
@@ -34,7 +34,7 @@ public class SipPhoneService extends BaseService {
* rsmwUrl 格式请参考 RSMW 2 API 文档
*/
// private static String rsmwUrl = "http://112.65.124.86:18080/rsmw/api/2.0/";
private
static
String
rsmwUrl
=
"http://192.168.10.7:18080/rsmw/api/2.0/"
;
private
String
rsmwUrl
=
"http://192.168.10.7:18080/rsmw/api/2.0/"
;
/**
* 注意!!!!!!!!
...
...
@@ -47,7 +47,7 @@ public class SipPhoneService extends BaseService {
private
static
int
connectTimeout
=
2000
;
private
static
int
readTimeout
=
2000
;
private
static
RsmwServer
rsmwServer
=
new
RsmwServer
(
rsmwUrl
,
apiSecret
,
connectTimeout
,
readTimeout
);
private
RsmwServer
rsmwServer
=
new
RsmwServer
(
rsmwUrl
,
apiSecret
,
connectTimeout
,
readTimeout
);
public
SimpleResponse
redirect
(
String
channel
,
String
context
,
String
exten
){
return
rsmwServer
.
redirect
(
channel
,
context
,
exten
);
...
...
@@ -325,18 +325,18 @@ public class SipPhoneService extends BaseService {
return
rsmwServer
.
getQueueStatus
();
}
/*
public static void main(String[] args) {
// SimpleResponse redirectResponse = rsmwServer.redirect("SIP/8001-XXXXXXXX","_moh", "13391026171");
GetQueueStatusResponse redirectResponse1 = rsmwServer.getQueueStatus();
System.out.println(redirectResponse1.toJsonString());
}
/*
public static void main(String[] args){
public static void main(String[] args){
SipPhoneControl control = new SipPhoneControl();
System.out.println( control.getGatewayStatus().toJsonString());
}
*/
}
public static void main1(String[] args) {
//这里调用了所有的接口方法,您在测试某个接口时,请先注释掉其他的调用,以免影响您查看测试结果
...
...
@@ -475,6 +475,6 @@ public class SipPhoneService extends BaseService {
GetQueueStatusResponse getQueueStatusResponse = rsmwServer.getQueueStatus();
System.out.println(getQueueStatusResponse.toJsonString());
}
}
*/
}
src/main/java/com/ctrip/fun/admin/service/system/UserDetailsService.java
View file @
1e316c5b
...
...
@@ -71,7 +71,7 @@ public final class UserDetailsService extends BaseService implements org.springf
dbAuths
=
new
ArrayList
<
GrantedAuthority
>(
dbAuthsSet
);
}
//将当前用户添加到callcenter中的 Agent
/
*/
/将当前用户添加到callcenter中的 Agent
AgentSipPhoneBindInfoResponse aspbiresp = sipPhoneService.getBindInfo(adminUserBean.getUserName(), null);
if("SUCCESS".equals( aspbiresp.getErrMsg()) &&StringUtils.isNotBlank(aspbiresp.getSipPhoneName())){
// adminUserBean.setSipPhone(aspbiresp.getSipPhoneName());
...
...
@@ -85,6 +85,12 @@ public final class UserDetailsService extends BaseService implements org.springf
//同步Agent
sipPhoneService.agentSave(adminUserBean.getUserName(),adminUserBean.getUserName(), 0l);
}
*/
Ruisheng
ruisheng
=
new
Ruisheng
();
Runnable
myRunnable
=
new
Ruisheng
(
adminUserBean
);
Thread
ruishengThread
=
new
Thread
(
myRunnable
);
ruishengThread
.
start
();
return
new
User
(
adminUserBean
.
getUserName
(),
adminUserBean
.
getPassword
(),
adminUserBean
.
isEnable
(),
true
,
true
,
true
,
dbAuths
);
}
else
{
logger
.
error
(
String
.
format
(
"[get] status: %d, msg: %s"
,
response
.
getStatus
(),
response
.
getMessage
()));
...
...
@@ -96,6 +102,29 @@ public final class UserDetailsService extends BaseService implements org.springf
}
class
Ruisheng
implements
Runnable
{
private
AdminUserBean
adminUserBean
;
public
Ruisheng
(){
}
public
Ruisheng
(
AdminUserBean
adminUserBean
){
this
.
adminUserBean
=
adminUserBean
;
}
@Override
public
void
run
()
{
AgentSipPhoneBindInfoResponse
aspbiresp
=
sipPhoneService
.
getBindInfo
(
adminUserBean
.
getUserName
(),
null
);
if
(
"SUCCESS"
.
equals
(
aspbiresp
.
getErrMsg
())
&&
StringUtils
.
isNotBlank
(
aspbiresp
.
getSipPhoneName
())){
// adminUserBean.setSipPhone(aspbiresp.getSipPhoneName());
}
else
{
sipPhoneService
.
agentSave
(
adminUserBean
.
getUserName
(),
adminUserBean
.
getUserName
(),
0
l
);
}
}
}
public
boolean
updatePassword
(
String
userId
,
AdminUserBean
bean
)
{
String
uri
=
super
.
getServiceUri
(
"uri.adminUser.updatePassword"
);
boolean
retVal
=
false
;
...
...
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