Commit 75549dc0 by Huang Linyu

change RsmwServer connection from proceed to thread

parent 67d1acfc
...@@ -34,7 +34,7 @@ public class SipPhoneService extends BaseService { ...@@ -34,7 +34,7 @@ public class SipPhoneService extends BaseService {
* rsmwUrl 格式请参考 RSMW 2 API 文档 * rsmwUrl 格式请参考 RSMW 2 API 文档
*/ */
// private static String rsmwUrl = "http://112.65.124.86:18080/rsmw/api/2.0/"; // 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 { ...@@ -47,7 +47,7 @@ public class SipPhoneService extends BaseService {
private static int connectTimeout = 2000; private static int connectTimeout = 2000;
private static int readTimeout = 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){ public SimpleResponse redirect(String channel, String context, String exten){
return rsmwServer.redirect(channel,context, exten); return rsmwServer.redirect(channel,context, exten);
...@@ -325,18 +325,18 @@ public class SipPhoneService extends BaseService { ...@@ -325,18 +325,18 @@ public class SipPhoneService extends BaseService {
return rsmwServer.getQueueStatus(); return rsmwServer.getQueueStatus();
} }
/*
public static void main(String[] args) { public static void main(String[] args) {
// SimpleResponse redirectResponse = rsmwServer.redirect("SIP/8001-XXXXXXXX","_moh", "13391026171"); // SimpleResponse redirectResponse = rsmwServer.redirect("SIP/8001-XXXXXXXX","_moh", "13391026171");
GetQueueStatusResponse redirectResponse1 = rsmwServer.getQueueStatus(); GetQueueStatusResponse redirectResponse1 = rsmwServer.getQueueStatus();
System.out.println(redirectResponse1.toJsonString()); System.out.println(redirectResponse1.toJsonString());
} }
/*public static void main(String[] args){ public static void main(String[] args){
SipPhoneControl control = new SipPhoneControl(); SipPhoneControl control = new SipPhoneControl();
System.out.println( control.getGatewayStatus().toJsonString()); System.out.println( control.getGatewayStatus().toJsonString());
}*/ }
public static void main1(String[] args) { public static void main1(String[] args) {
//这里调用了所有的接口方法,您在测试某个接口时,请先注释掉其他的调用,以免影响您查看测试结果 //这里调用了所有的接口方法,您在测试某个接口时,请先注释掉其他的调用,以免影响您查看测试结果
...@@ -475,6 +475,6 @@ public class SipPhoneService extends BaseService { ...@@ -475,6 +475,6 @@ public class SipPhoneService extends BaseService {
GetQueueStatusResponse getQueueStatusResponse = rsmwServer.getQueueStatus(); GetQueueStatusResponse getQueueStatusResponse = rsmwServer.getQueueStatus();
System.out.println(getQueueStatusResponse.toJsonString()); System.out.println(getQueueStatusResponse.toJsonString());
} }*/
} }
...@@ -71,7 +71,7 @@ public final class UserDetailsService extends BaseService implements org.springf ...@@ -71,7 +71,7 @@ public final class UserDetailsService extends BaseService implements org.springf
dbAuths = new ArrayList<GrantedAuthority>(dbAuthsSet); dbAuths = new ArrayList<GrantedAuthority>(dbAuthsSet);
} }
//将当前用户添加到callcenter中的 Agent /*//将当前用户添加到callcenter中的 Agent
AgentSipPhoneBindInfoResponse aspbiresp = sipPhoneService.getBindInfo(adminUserBean.getUserName(), null); AgentSipPhoneBindInfoResponse aspbiresp = sipPhoneService.getBindInfo(adminUserBean.getUserName(), null);
if("SUCCESS".equals( aspbiresp.getErrMsg()) &&StringUtils.isNotBlank(aspbiresp.getSipPhoneName())){ if("SUCCESS".equals( aspbiresp.getErrMsg()) &&StringUtils.isNotBlank(aspbiresp.getSipPhoneName())){
// adminUserBean.setSipPhone(aspbiresp.getSipPhoneName()); // adminUserBean.setSipPhone(aspbiresp.getSipPhoneName());
...@@ -85,6 +85,12 @@ public final class UserDetailsService extends BaseService implements org.springf ...@@ -85,6 +85,12 @@ public final class UserDetailsService extends BaseService implements org.springf
//同步Agent //同步Agent
sipPhoneService.agentSave(adminUserBean.getUserName(),adminUserBean.getUserName(), 0l); 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); return new User(adminUserBean.getUserName(), adminUserBean.getPassword(), adminUserBean.isEnable(), true, true, true, dbAuths);
} else { } else {
logger.error(String.format("[get] status: %d, msg: %s", response.getStatus(), response.getMessage())); 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 ...@@ -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(), 0l);
}
}
}
public boolean updatePassword(String userId, AdminUserBean bean) { public boolean updatePassword(String userId, AdminUserBean bean) {
String uri = super.getServiceUri("uri.adminUser.updatePassword"); String uri = super.getServiceUri("uri.adminUser.updatePassword");
boolean retVal = false; boolean retVal = false;
......
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 sign in to comment