github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

Fixed #117 解决机器人回复卡顿

Browse Source
This commit is contained in:
Hai Liang Wang 2018-10-24 21:42:10 +08:00
parent 39be3178ef
commit 0b272744a5
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contact-center/app/src/main/java/com/chatopera/cc/app/config/IMServerConfiguration.java
View File

@ -87,7 +87,7 @@ public class IMServerConfiguration
FileInputStream in = new FileInputStream(sslFile); FileInputStream in = new FileInputStream(sslFile);
sslProperties.load(in); sslProperties.load(in);
in.close(); 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"))); config.setKeyStorePassword(MainUtils.decryption(sslProperties.getProperty("key-store-password")));
InputStream stream = new FileInputStream(new File(path , "ssl/"+sslProperties.getProperty("key-store"))); InputStream stream = new FileInputStream(new File(path , "ssl/"+sslProperties.getProperty("key-store")));
config.setKeyStore(stream); config.setKeyStore(stream);
@ -96,7 +96,7 @@ public class IMServerConfiguration
// config.setSSLProtocol("https"); // 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.setWorkerThreads(workThreads);
// config.setStoreFactory(new HazelcastStoreFactory()); // config.setStoreFactory(new HazelcastStoreFactory());
config.setAuthorizationListener(new AuthorizationListener() { config.setAuthorizationListener(new AuthorizationListener() {

1
contact-center/app/src/main/java/com/chatopera/cc/app/handler/resource/MediaController.java
View File

@ -74,7 +74,6 @@ public class MediaController extends Handler {
@Valid String id, @Valid String id,
@RequestParam(value = "original", required = false) boolean original, @RequestParam(value = "original", required = false) boolean original,
@RequestParam(value = "cooperation", required = false) boolean cooperation) throws IOException, SQLException { @RequestParam(value = "cooperation", required = false) boolean cooperation) throws IOException, SQLException {
logger.info("index id {}, original {}, cooperation {}", id, original, cooperation);
StreamingFile sf = streamingFileRepository.findOne(id); StreamingFile sf = streamingFileRepository.findOne(id);
if (sf != null) { if (sf != null) {
response.setHeader("Content-Type", sf.getMime()); response.setHeader("Content-Type", sf.getMime());

2
contact-center/app/src/main/java/com/chatopera/cc/app/im/handler/ChatbotEventHandler.java
View File

@ -66,6 +66,7 @@ public class ChatbotEventHandler {
@OnConnect @OnConnect
public void onConnect(SocketIOClient client) { public void onConnect(SocketIOClient client) {
try { try {
String user = client.getHandshakeData().getSingleUrlParam("userid"); String user = client.getHandshakeData().getSingleUrlParam("userid");
String nickname = client.getHandshakeData().getSingleUrlParam("nickname"); String nickname = client.getHandshakeData().getSingleUrlParam("nickname");
String orgi = client.getHandshakeData().getSingleUrlParam("orgi"); String orgi = client.getHandshakeData().getSingleUrlParam("orgi");
@ -74,6 +75,7 @@ public class ChatbotEventHandler {
String aiid = client.getHandshakeData().getSingleUrlParam("aiid"); String aiid = client.getHandshakeData().getSingleUrlParam("aiid");
// String agent = client.getHandshakeData().getSingleUrlParam("agent") ; // String agent = client.getHandshakeData().getSingleUrlParam("agent") ;
// String skill = client.getHandshakeData().getSingleUrlParam("skill") ; // String skill = client.getHandshakeData().getSingleUrlParam("skill") ;
logger.info("onConnect userid {}, nickname {}", user, nickname);
Date now = new Date(); Date now = new Date();
if (StringUtils.isNotBlank(user)) { if (StringUtils.isNotBlank(user)) {

5
contact-center/app/src/main/resources/templates/apps/im/chatbot/index.html
View File

@ -453,9 +453,9 @@
// 参数连接 // 参数连接
var hostname = location.hostname ; var hostname = location.hostname ;
var protocol = window.location.protocol.replace(/:/g,''); 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(){ socket.on('connect',function(){
<#if contacts?? && contacts.name??> <#if contacts?? && contacts.name??>
socket.emit('new', { socket.emit('new', {
name : "${contacts.name!''}", name : "${contacts.name!''}",
phone:"${contacts.phone!''}", phone:"${contacts.phone!''}",
@ -489,7 +489,6 @@
} }
}) })
socket.on('message', function(data) { socket.on('message', function(data) {
console.log("[chatbot io] message ", data);
var chat=document.getElementsByClassName('chatting-left').innerText; var chat=document.getElementsByClassName('chatting-left').innerText;
chat = data.message; chat = data.message;
if(data.messageType == "image"){ if(data.messageType == "image"){

2
contact-center/app/src/main/resources/templates/apps/im/chatbot/mobile.html
View File

@ -283,7 +283,7 @@
// 参数连接 // 参数连接
var hostname = location.hostname ; var hostname = location.hostname ;
var protocol = window.location.protocol.replace(/:/g,''); 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(){ socket.on('connect',function(){
//service.sendRequestMessage(); //service.sendRequestMessage();
//output('<span id="callOutConnect-message">'+ new Date().format("yyyy-MM-dd hh:mm:ss") + ' 开始沟通' +'</span>' , 'message callOutConnect-message'); //output('<span id="callOutConnect-message">'+ new Date().format("yyyy-MM-dd hh:mm:ss") + ' 开始沟通' +'</span>' , 'message callOutConnect-message');

6
contact-center/app/src/main/resources/templates/apps/im/index.html
View File

@ -452,9 +452,10 @@
// 参数连接 // 参数连接
var hostname = location.hostname ; var hostname = location.hostname ;
var protocol = window.location.protocol.replace(/:/g,''); 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(){ socket.on('connect',function(){
<#if contacts?? && contacts.name??> console.log("on connect ...");
<#if contacts?? && contacts.name??>
socket.emit('new', { socket.emit('new', {
name : "${contacts.name!''}", name : "${contacts.name!''}",
phone:"${contacts.phone!''}", phone:"${contacts.phone!''}",
@ -488,6 +489,7 @@
} }
}) })
socket.on('message', function(data) { socket.on('message', function(data) {
console.log("on message", data);
var chat=document.getElementsByClassName('chatting-left').innerText; var chat=document.getElementsByClassName('chatting-left').innerText;
chat = data.message; chat = data.message;
if(data.messageType == "image"){ if(data.messageType == "image"){

2
contact-center/app/src/main/resources/templates/apps/im/mobile.html
View File

@ -281,7 +281,7 @@
// 参数连接 // 参数连接
var hostname = location.hostname ; var hostname = location.hostname ;
var protocol = window.location.protocol.replace(/:/g,''); 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(){ socket.on('connect',function(){
//service.sendRequestMessage(); //service.sendRequestMessage();
//output('<span id="callOutConnect-message">'+ new Date().format("yyyy-MM-dd hh:mm:ss") + ' 开始沟通' +'</span>' , 'message callOutConnect-message'); //output('<span id="callOutConnect-message">'+ new Date().format("yyyy-MM-dd hh:mm:ss") + ' 开始沟通' +'</span>' , 'message callOutConnect-message');