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
40d63bb9
authored
Oct 18, 2017
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
来电弹屏功能优化
parent
7f8bf0a4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
18 deletions
src/main/java/com/ctrip/fun/admin/controller/callcenter/SipPhoneControl.java
src/main/java/com/ctrip/fun/admin/controller/tools/CallCenterController.java
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateWebSocket.java
src/main/webapp/WEB-INF/templates/tools/validCode.ftl
src/main/webapp/resource/js/app/op.js
src/main/java/com/ctrip/fun/admin/controller/callcenter/SipPhoneControl.java
View file @
40d63bb9
...
...
@@ -115,7 +115,7 @@ public class SipPhoneControl {
// String agentAid = request.getAttribute("userName").toString();
String
agentAid
=
SpringSecurityUtil
.
getCurrentUserName
();
String
sipPhoneName
=
request
.
getParameter
(
"sipPhoneName"
);
System
.
out
.
println
(
"bbbbbbbbbbbbbbbbbbbbb:"
+
agentAid
+
" "
+
sipPhoneName
+
" "
);
//
System.out.println("bbbbbbbbbbbbbbbbbbbbb:"+agentAid+" "+ sipPhoneName+" ");
return
sipPhoneService
.
bind
(
agentAid
,
sipPhoneName
);
}
...
...
src/main/java/com/ctrip/fun/admin/controller/tools/CallCenterController.java
View file @
40d63bb9
...
...
@@ -20,6 +20,7 @@ import org.springframework.ui.ModelMap;
import
org.springframework.validation.BindingResult
;
import
org.springframework.validation.FieldError
;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
...
...
@@ -104,6 +105,12 @@ public class CallCenterController {
}
}
@RequestMapping
(
value
=
"/tools/validCode/{mobileNo}"
,
method
=
RequestMethod
.
GET
)
public
String
validFail
(
HttpServletRequest
request
,
@PathVariable
String
mobileNo
,
ModelMap
model
)
{
model
.
put
(
"mobileNo"
,
mobileNo
);
return
"/tools/validCode"
;
}
/**
*
* @return
...
...
src/main/java/com/ctrip/fun/admin/eventhandler/NewStateWebSocket.java
View file @
40d63bb9
...
...
@@ -82,7 +82,7 @@ public class NewStateWebSocket {
}
if
(
""
.
equals
(
uid
)){
System
.
out
.
println
(
"Callcenter pop window:手机号码"
+
mobileNo
+
"没有注册!"
);
message
=
"/
tools/validCode
"
+
mobileNo
;
message
=
"/
cc/tools/validCode/
"
+
mobileNo
;
}
try
{
session
.
getBasicRemote
().
sendText
(
message
);
...
...
src/main/webapp/WEB-INF/templates/tools/validCode.ftl
View file @
40d63bb9
...
...
@@ -94,16 +94,6 @@
$("#btnSendCode").val("请在" + curCount + "秒后再获取验证码");
}
}
document.onreadystatechange = function(e){
if (document.readyState === 'complete')
window.addEventListener('message', function(e){
var params = e.data;
$("#oriMobileNo").val(params[0][1]);
$("#mobileNo").val(params[0][1]);
});
}
}
</script>
...
...
@@ -111,10 +101,10 @@
<@com.layout title="电话注册 " module="system" pageJs=pageJsContent>
该电话用户未注册,请先注册
<form action="/cc/userRegister" method="post">
<input type="hidden" id="oriMobileNo" name="oriMobileNo" />
<input type="hidden" id="oriMobileNo" name="oriMobileNo"
value="${mobileNo!}"
/>
<div>
手机号码:
<input type="text" name="mobileNo" id="mobileNo" title="请输入手机号" placeholder="请输入正确手机号" />
<input type="text" name="mobileNo" id="mobileNo" title="请输入手机号" placeholder="请输入正确手机号"
value="${mobileNo!}"
/>
<input type="button" id="btnSendCode" class="btn btn-primary" value="获取验证码"
onclick="sendValidCode()" />
...
...
src/main/webapp/resource/js/app/op.js
View file @
40d63bb9
...
...
@@ -9,15 +9,17 @@
webSocket
.
onerror
=
function
(
event
)
{};
webSocket
.
onopen
=
function
(
event
)
{};
webSocket
.
onmessage
=
function
(
event
)
{
if
(
event
.
data
.
startsWith
(
"/tools/validCode"
)){
var
message
=
event
.
data
;
if
(
event
.
data
.
startsWith
(
"/
cc/
tools/validCode"
)){
/*
var message = event.data;
var msgArr = message.split(" ");
var
popupwin
=
window
.
open
(
event
.
data
,
"用户来电通知"
);
var popupwin = window.open(
msgArr[0]
, "用户来电通知");
var params = new Array();
params[0] = new Array("mobileNo",msgArr[1]);
popupwin.onload = function(e){
popupwin.postMessage(params,"http://"+window.location.host);
}
}*/
window
.
open
(
event
.
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