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

#75 增加欢迎消息

Browse Source
This commit is contained in:
Hai Liang Wang 2018-09-12 14:07:15 +08:00
parent 6942be43f3
commit 0266d4e353
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contact-center/app/src/main/java/com/chatopera/cc/webim/util/server/handler/ChatbotEventHandler.java
View File

@ -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.AgentStatusMessage;
import com.chatopera.cc.webim.util.server.message.ChatMessage; import com.chatopera.cc.webim.util.server.message.ChatMessage;
import com.chatopera.cc.webim.util.server.message.NewRequestMessage; import com.chatopera.cc.webim.util.server.message.NewRequestMessage;
import com.chatopera.cc.webim.web.model.AgentService; import com.chatopera.cc.webim.web.model.*;
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.corundumstudio.socketio.AckRequest; import com.corundumstudio.socketio.AckRequest;
import com.corundumstudio.socketio.SocketIOClient; import com.corundumstudio.socketio.SocketIOClient;
import com.corundumstudio.socketio.SocketIOServer; 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.OnDisconnect;
import com.corundumstudio.socketio.annotation.OnEvent; import com.corundumstudio.socketio.annotation.OnEvent;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.Date; import java.util.Date;
public class ChatbotEventHandler { public class ChatbotEventHandler {
private static final Logger logger = LoggerFactory.getLogger(ChatbotEventHandler.class);
protected SocketIOServer server; protected SocketIOServer server;
@Autowired @Autowired
@ -62,6 +63,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("[chatbot socket.io] onConnect user {}, orgi {}, appid {}, aiid {}", user, orgi, appid, aiid);
if (StringUtils.isNotBlank(user)) { if (StringUtils.isNotBlank(user)) {
// /** // /**

6
contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/api/rest/ApiChatbotController.java
View File

@ -281,7 +281,7 @@ public class ApiChatbotController extends Handler {
if (StringUtils.isNotBlank(welcome)) { if (StringUtils.isNotBlank(welcome)) {
c.setWelcome(welcome); c.setWelcome(welcome);
invite.setAimsg(welcome); invite.setAisuccesstip(welcome);
} }
if (StringUtils.isNotBlank(name)) { if (StringUtils.isNotBlank(name)) {
@ -392,7 +392,7 @@ public class ApiChatbotController extends Handler {
if (invite != null) { if (invite != null) {
invite.setAi(false); invite.setAi(false);
invite.setAiname(null); invite.setAiname(null);
invite.setAimsg(null); invite.setAisuccesstip(null);
invite.setAifirst(false); invite.setAifirst(false);
invite.setAiid(null); invite.setAiid(null);
consultInviteRes.save(invite); consultInviteRes.save(invite);
@ -554,7 +554,7 @@ public class ApiChatbotController extends Handler {
invite.setAifirst(StringUtils.equals(ChatbotUtils.CHATBOT_FIRST, workmode)); invite.setAifirst(StringUtils.equals(ChatbotUtils.CHATBOT_FIRST, workmode));
invite.setAiid(c.getId()); invite.setAiid(c.getId());
invite.setAiname(c.getName()); invite.setAiname(c.getName());
invite.setAimsg(c.getWelcome()); invite.setAisuccesstip(c.getWelcome());
consultInviteRes.save(invite); consultInviteRes.save(invite);
OnlineUserUtils.cacheCousult(invite); OnlineUserUtils.cacheCousult(invite);
chatbotRes.save(c); chatbotRes.save(c);

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

@ -452,7 +452,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!''}&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.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>');
socket.on('connect',function(){ socket.on('connect',function(){
<#if contacts?? && contacts.name??> <#if contacts?? && contacts.name??>
socket.emit('new', { socket.emit('new', {