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
95cd57e3
authored
Oct 19, 2017
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rm expired code
parent
8ac26110
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
src/main/java/com/ctrip/fun/admin/controller/tools/CallCenterController.java
src/main/webapp/resource/js/app/op.js
src/main/java/com/ctrip/fun/admin/controller/tools/CallCenterController.java
View file @
95cd57e3
...
...
@@ -127,7 +127,7 @@ public class CallCenterController {
JSONObject
commandJSONObject
=
null
;
commandJSONObject
=
JSON
.
parseObject
(
eventJsonString
);
String
event
=
commandJSONObject
.
getString
(
"event"
);
System
.
out
.
println
(
"bbbbbbbbbbb: "
+
event
);
//
System.out.println("bbbbbbbbbbb: "+event);
if
(
StringUtils
.
isBlank
(
event
)){
result
=
"收到的消息缺少event字段: "
+
eventJsonString
;
logger
.
warn
(
result
);
...
...
src/main/webapp/resource/js/app/op.js
View file @
95cd57e3
...
...
@@ -9,7 +9,7 @@
webSocket
.
onerror
=
function
(
event
)
{};
webSocket
.
onopen
=
function
(
event
)
{};
webSocket
.
onmessage
=
function
(
event
)
{
if
(
event
.
data
.
startsWith
(
"/cc/tools/validCode"
)){
//
if(event.data.startsWith("/cc/tools/validCode")){
/*var message = event.data;
var msgArr = message.split(" ");
var popupwin = window.open(msgArr[0], "用户来电通知");
...
...
@@ -20,7 +20,7 @@
}*/
window
.
open
(
event
.
data
);
}
//
}
};
webSocket
.
onclose
=
function
(
event
){};
...
...
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