diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/config/IMServerConfiguration.java b/contact-center/app/src/main/java/com/chatopera/cc/app/config/IMServerConfiguration.java
index 9f0ea440..8f1ebfb6 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/app/config/IMServerConfiguration.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/app/config/IMServerConfiguration.java
@@ -87,7 +87,7 @@ public class IMServerConfiguration
FileInputStream in = new FileInputStream(sslFile);
sslProperties.load(in);
in.close();
- if(!StringUtils.isBlank(sslProperties.getProperty("key-store")) && !StringUtils.isBlank(sslProperties.getProperty("key-store-password"))){
+ if(StringUtils.isNotBlank(sslProperties.getProperty("key-store")) && StringUtils.isNotBlank(sslProperties.getProperty("key-store-password"))){
config.setKeyStorePassword(MainUtils.decryption(sslProperties.getProperty("key-store-password")));
InputStream stream = new FileInputStream(new File(path , "ssl/"+sslProperties.getProperty("key-store")));
config.setKeyStore(stream);
@@ -96,7 +96,7 @@ public class IMServerConfiguration
// config.setSSLProtocol("https");
- int workThreads = !StringUtils.isBlank(threads) && threads.matches("[\\d]{1,6}") ? Integer.parseInt(threads) : 100 ;
+ int workThreads = StringUtils.isNotBlank(threads) && threads.matches("[\\d]{1,6}") ? Integer.parseInt(threads) : 100 ;
config.setWorkerThreads(workThreads);
// config.setStoreFactory(new HazelcastStoreFactory());
config.setAuthorizationListener(new AuthorizationListener() {
diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/resource/MediaController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/resource/MediaController.java
index b08c2de2..c9fc61b9 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/resource/MediaController.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/resource/MediaController.java
@@ -74,7 +74,6 @@ public class MediaController extends Handler {
@Valid String id,
@RequestParam(value = "original", required = false) boolean original,
@RequestParam(value = "cooperation", required = false) boolean cooperation) throws IOException, SQLException {
- logger.info("index id {}, original {}, cooperation {}", id, original, cooperation);
StreamingFile sf = streamingFileRepository.findOne(id);
if (sf != null) {
response.setHeader("Content-Type", sf.getMime());
diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/im/handler/ChatbotEventHandler.java b/contact-center/app/src/main/java/com/chatopera/cc/app/im/handler/ChatbotEventHandler.java
index 40de2613..6aaf9bac 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/app/im/handler/ChatbotEventHandler.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/app/im/handler/ChatbotEventHandler.java
@@ -66,6 +66,7 @@ public class ChatbotEventHandler {
@OnConnect
public void onConnect(SocketIOClient client) {
try {
+
String user = client.getHandshakeData().getSingleUrlParam("userid");
String nickname = client.getHandshakeData().getSingleUrlParam("nickname");
String orgi = client.getHandshakeData().getSingleUrlParam("orgi");
@@ -74,6 +75,7 @@ public class ChatbotEventHandler {
String aiid = client.getHandshakeData().getSingleUrlParam("aiid");
// String agent = client.getHandshakeData().getSingleUrlParam("agent") ;
// String skill = client.getHandshakeData().getSingleUrlParam("skill") ;
+ logger.info("onConnect userid {}, nickname {}", user, nickname);
Date now = new Date();
if (StringUtils.isNotBlank(user)) {
diff --git a/contact-center/app/src/main/resources/templates/apps/im/chatbot/index.html b/contact-center/app/src/main/resources/templates/apps/im/chatbot/index.html
index 75952ee4..ee208327 100644
--- a/contact-center/app/src/main/resources/templates/apps/im/chatbot/index.html
+++ b/contact-center/app/src/main/resources/templates/apps/im/chatbot/index.html
@@ -453,9 +453,9 @@
// 参数连接
var hostname = location.hostname ;
var protocol = window.location.protocol.replace(/:/g,'');
- var socket = io.connect(protocol + '://'+hostname+':${port}/im/chatbot?userid=${userid!''}&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}#if><#if username??>&nickname=${username}#if><#if agent??>&agent=${agent}#if><#if title??>&title=${title?url}#if><#if traceid??>&url=${url?url}#if><#if traceid??>&traceid=${traceid}#if><#if aiid??>&aiid=${aiid}#if>');
+ var socket = io(protocol + '://'+hostname+':${port}/im/chatbot?userid=${userid!''}&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}#if><#if username??>&nickname=${username}#if><#if agent??>&agent=${agent}#if><#if title??>&title=${title?url}#if><#if traceid??>&url=${url?url}#if><#if traceid??>&traceid=${traceid}#if><#if aiid??>&aiid=${aiid}#if>', {transports: ['websocket', 'polling']});
socket.on('connect',function(){
- <#if contacts?? && contacts.name??>
+ <#if contacts?? && contacts.name??>
socket.emit('new', {
name : "${contacts.name!''}",
phone:"${contacts.phone!''}",
@@ -489,7 +489,6 @@
}
})
socket.on('message', function(data) {
- console.log("[chatbot io] message ", data);
var chat=document.getElementsByClassName('chatting-left').innerText;
chat = data.message;
if(data.messageType == "image"){
diff --git a/contact-center/app/src/main/resources/templates/apps/im/chatbot/mobile.html b/contact-center/app/src/main/resources/templates/apps/im/chatbot/mobile.html
index 2fcb6b5f..244437ac 100644
--- a/contact-center/app/src/main/resources/templates/apps/im/chatbot/mobile.html
+++ b/contact-center/app/src/main/resources/templates/apps/im/chatbot/mobile.html
@@ -283,7 +283,7 @@
// 参数连接
var hostname = location.hostname ;
var protocol = window.location.protocol.replace(/:/g,'');
- var socket = io.connect(protocol + '://'+hostname+':${port}/im/chatbot?userid=${userid!''}<#if aiid??>&aiid=${aiid}#if>&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}#if><#if agent??>&agent=${agent}#if>');
+ var socket = io(protocol + '://'+hostname+':${port}/im/chatbot?userid=${userid!''}<#if aiid??>&aiid=${aiid}#if>&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}#if><#if agent??>&agent=${agent}#if>', {transports: ['websocket', 'polling']});
socket.on('connect',function(){
//service.sendRequestMessage();
//output(''+ new Date().format("yyyy-MM-dd hh:mm:ss") + ' 开始沟通' +'' , 'message callOutConnect-message');
diff --git a/contact-center/app/src/main/resources/templates/apps/im/index.html b/contact-center/app/src/main/resources/templates/apps/im/index.html
index ec5f2e52..46f61448 100644
--- a/contact-center/app/src/main/resources/templates/apps/im/index.html
+++ b/contact-center/app/src/main/resources/templates/apps/im/index.html
@@ -452,9 +452,10 @@
// 参数连接
var hostname = location.hostname ;
var protocol = window.location.protocol.replace(/:/g,'');
- var socket = io.connect(protocol + '://'+hostname+':${port}/im/user?userid=${userid!''}&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}#if><#if username??>&nickname=${username}#if><#if agent??>&agent=${agent}#if><#if title??>&title=${title?url}#if><#if traceid??>&url=${url?url}#if><#if traceid??>&traceid=${traceid}#if>');
+ var socket = io(protocol + '://'+hostname+':${port}/im/user?userid=${userid!''}&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}#if><#if username??>&nickname=${username}#if><#if agent??>&agent=${agent}#if><#if title??>&title=${title?url}#if><#if traceid??>&url=${url?url}#if><#if traceid??>&traceid=${traceid}#if>', {transports: ['websocket', 'polling']});
socket.on('connect',function(){
- <#if contacts?? && contacts.name??>
+ console.log("on connect ...");
+ <#if contacts?? && contacts.name??>
socket.emit('new', {
name : "${contacts.name!''}",
phone:"${contacts.phone!''}",
@@ -488,6 +489,7 @@
}
})
socket.on('message', function(data) {
+ console.log("on message", data);
var chat=document.getElementsByClassName('chatting-left').innerText;
chat = data.message;
if(data.messageType == "image"){
diff --git a/contact-center/app/src/main/resources/templates/apps/im/mobile.html b/contact-center/app/src/main/resources/templates/apps/im/mobile.html
index e0496030..801e5e7d 100644
--- a/contact-center/app/src/main/resources/templates/apps/im/mobile.html
+++ b/contact-center/app/src/main/resources/templates/apps/im/mobile.html
@@ -281,7 +281,7 @@
// 参数连接
var hostname = location.hostname ;
var protocol = window.location.protocol.replace(/:/g,'');
- var socket = io.connect(protocol + '://'+hostname+':${port}/im/user?userid=${userid!''}<#if aiid??>&aiid=${aiid}#if>&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}#if><#if username??>&nickname=${username}#if><#if agent??>&agent=${agent}#if>');
+ var socket = io(protocol + '://'+hostname+':${port}/im/user?userid=${userid!''}<#if aiid??>&aiid=${aiid}#if>&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}#if><#if username??>&nickname=${username}#if><#if agent??>&agent=${agent}#if>', {transports: ['websocket', 'polling']});
socket.on('connect',function(){
//service.sendRequestMessage();
//output(''+ new Date().format("yyyy-MM-dd hh:mm:ss") + ' 开始沟通' +'' , 'message callOutConnect-message');