Merge branch 'f-6.6.3' into release

src/main/java/com/ctrip/fun/admin/controller/callcenter/SipPhoneControl.java

@@ -37,6 +37,7 @@ import cc.rssoft.rsmw.sdk.command.response.OriginateResponse;
 import cc.rssoft.rsmw.sdk.command.response.QueueMemberPauseResponse;
 
 import com.ctrip.fun.admin.service.callcenter.SipPhoneService;
+import com.ctrip.fun.admin.utility.SpringSecurityUtil;
 import com.ctrip.fun.common.vo.Response;
 
 
@@ -111,7 +112,8 @@ public class SipPhoneControl {
 	@RequestMapping(value = "/bind", method = RequestMethod.POST)
 	@ResponseBody
 	public SimpleResponse bind(HttpServletRequest request) {
-		String agentAid = request.getAttribute("userName").toString();
+//		String agentAid = request.getAttribute("userName").toString();
+		String agentAid = SpringSecurityUtil.getCurrentUserName();
 		String sipPhoneName = request.getParameter("sipPhoneName");
 		return sipPhoneService.bind(agentAid, sipPhoneName);
 	}
@@ -217,9 +219,9 @@ public class SipPhoneControl {
 	@RequestMapping(value = "/originateOne", method = RequestMethod.POST)
 	@ResponseBody
 	public OriginateResponse originateOne(@RequestParam("dst") String dst){
-		UserDetails user = (UserDetails)SecurityContextHolder.getContext().getAuthentication().getPrincipal();  
-		String userName = user.getUsername();
-
+//		UserDetails user = (UserDetails)SecurityContextHolder.getContext().getAuthentication().getPrincipal();  
+//		String userName = user.getUsername();
+		String userName = SpringSecurityUtil.getCurrentUserName();
 
 		String dstGateway = null;
 		String dstAccessNumber = null;

src/main/java/com/ctrip/fun/admin/service/system/UserDetailsService.java

@@ -86,7 +86,7 @@ public final class UserDetailsService extends BaseService implements org.springf
 					sipPhoneService.agentSave(adminUserBean.getUserName(),adminUserBean.getUserName(), 0l);
 				}
 				*/
-				Ruisheng ruisheng = new Ruisheng();
+//				Ruisheng ruisheng = new Ruisheng();
 				Runnable myRunnable = new Ruisheng(adminUserBean); 
 				Thread  ruishengThread = new Thread(myRunnable);
 				ruishengThread.start();
@@ -116,7 +116,6 @@ public final class UserDetailsService extends BaseService implements org.springf
 		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);
 			}