diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/util/server/handler/ChatbotEventHandler.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/util/server/handler/ChatbotEventHandler.java index 979d858a..e3967678 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/webim/util/server/handler/ChatbotEventHandler.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/util/server/handler/ChatbotEventHandler.java @@ -28,10 +28,7 @@ import com.chatopera.cc.webim.util.router.OutMessageRouter; import com.chatopera.cc.webim.util.server.message.AgentStatusMessage; import com.chatopera.cc.webim.util.server.message.ChatMessage; import com.chatopera.cc.webim.util.server.message.NewRequestMessage; -import com.chatopera.cc.webim.web.model.AgentService; -import com.chatopera.cc.webim.web.model.AiUser; -import com.chatopera.cc.webim.web.model.CousultInvite; -import com.chatopera.cc.webim.web.model.MessageOutContent; +import com.chatopera.cc.webim.web.model.*; import com.corundumstudio.socketio.AckRequest; import com.corundumstudio.socketio.SocketIOClient; import com.corundumstudio.socketio.SocketIOServer; @@ -39,12 +36,16 @@ import com.corundumstudio.socketio.annotation.OnConnect; import com.corundumstudio.socketio.annotation.OnDisconnect; import com.corundumstudio.socketio.annotation.OnEvent; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import java.net.InetSocketAddress; import java.util.Date; public class ChatbotEventHandler { + private static final Logger logger = LoggerFactory.getLogger(ChatbotEventHandler.class); + protected SocketIOServer server; @Autowired @@ -62,6 +63,7 @@ public class ChatbotEventHandler { String aiid = client.getHandshakeData().getSingleUrlParam("aiid"); // String agent = client.getHandshakeData().getSingleUrlParam("agent") ; // String skill = client.getHandshakeData().getSingleUrlParam("skill") ; + logger.info("[chatbot socket.io] onConnect user {}, orgi {}, appid {}, aiid {}", user, orgi, appid, aiid); if (StringUtils.isNotBlank(user)) { // /** diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/api/rest/ApiChatbotController.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/api/rest/ApiChatbotController.java index 464c090f..9052d35e 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/api/rest/ApiChatbotController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/api/rest/ApiChatbotController.java @@ -281,7 +281,7 @@ public class ApiChatbotController extends Handler { if (StringUtils.isNotBlank(welcome)) { c.setWelcome(welcome); - invite.setAimsg(welcome); + invite.setAisuccesstip(welcome); } if (StringUtils.isNotBlank(name)) { @@ -392,7 +392,7 @@ public class ApiChatbotController extends Handler { if (invite != null) { invite.setAi(false); invite.setAiname(null); - invite.setAimsg(null); + invite.setAisuccesstip(null); invite.setAifirst(false); invite.setAiid(null); consultInviteRes.save(invite); @@ -554,7 +554,7 @@ public class ApiChatbotController extends Handler { invite.setAifirst(StringUtils.equals(ChatbotUtils.CHATBOT_FIRST, workmode)); invite.setAiid(c.getId()); invite.setAiname(c.getName()); - invite.setAimsg(c.getWelcome()); + invite.setAisuccesstip(c.getWelcome()); consultInviteRes.save(invite); OnlineUserUtils.cacheCousult(invite); chatbotRes.save(c); 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 63b0c747..d3fdeee9 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 @@ -452,7 +452,7 @@ // 参数连接 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 username??>&nickname=${username}<#if agent??>&agent=${agent}<#if title??>&title=${title?url}<#if traceid??>&url=${url?url}<#if traceid??>&traceid=${traceid}'); + 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 username??>&nickname=${username}<#if agent??>&agent=${agent}<#if title??>&title=${title?url}<#if traceid??>&url=${url?url}<#if traceid??>&traceid=${traceid}<#if aiid??>&aiid=${aiid}'); socket.on('connect',function(){ <#if contacts?? && contacts.name??> socket.emit('new', {