From c6f55b8f42d969104f0f65df93154e7ed5bf69fe Mon Sep 17 00:00:00 2001 From: Hai Liang Wang Date: Wed, 17 Oct 2018 18:32:26 +0800 Subject: [PATCH] #88 fix nickname for mobile web page --- .../app/handler/apps/internet/IMController.java | 2 ++ .../cc/app/im/handler/IMEventHandler.java | 4 ++-- .../com/chatopera/cc/util/OnlineUserUtils.java | 2 ++ .../templates/apps/im/chatbot/index.html | 8 ++++---- .../templates/apps/im/chatbot/mobile.html | 16 +++++++++------- .../main/resources/templates/apps/im/index.html | 2 +- .../main/resources/templates/apps/im/mobile.html | 8 ++++---- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/internet/IMController.java b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/internet/IMController.java index ac7fd2ab..b9df9f4f 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/internet/IMController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/handler/apps/internet/IMController.java @@ -344,6 +344,7 @@ public class IMController extends Handler { @Valid String purl) throws Exception { ModelAndView view = request(super.createRequestPageTempletResponse("/apps/im/index")); BlackEntity black = (BlackEntity) CacheHelper.getSystemCacheBean().getCacheObject(userid, MainContext.SYSTEM_ORGI); + logger.info("index userId {}", userid); if (StringUtils.isNotBlank(appid) && (black == null || (black.getEndtime() != null && black.getEndtime().before(new Date())))) { CousultInvite invite = OnlineUserUtils.cousult(appid, orgi, inviteRepository); String userID = null; @@ -353,6 +354,7 @@ public class IMController extends Handler { userID = MainUtils.genIDByKey(sessionid); } String nickname = "Guest_" + userID; + logger.info("nick name {}", nickname); boolean consult = true; //是否已收集用户信息 SessionConfig sessionConfig = AutomaticServiceDist.initSessionConfig(orgi); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/app/im/handler/IMEventHandler.java b/contact-center/app/src/main/java/com/chatopera/cc/app/im/handler/IMEventHandler.java index 0e57e0f8..46dc9391 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/app/im/handler/IMEventHandler.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/app/im/handler/IMEventHandler.java @@ -68,7 +68,7 @@ public class IMEventHandler { String nickname = client.getHandshakeData().getSingleUrlParam("nickname"); - if (!StringUtils.isBlank(user)) { + if (StringUtils.isNotBlank(user)) { /** * 用户进入到对话连接 ， 排队用户请求 , 如果返回失败，表示当前坐席全忙，用户进入排队状态，当前提示信息 显示 当前排队的队列位置，不可进行对话，用户发送的消息作为留言处理 */ @@ -80,7 +80,7 @@ public class IMEventHandler { // */ NettyClients.getInstance().putIMEventClient(user, client); // - if (newRequestMessage != null && !StringUtils.isBlank(newRequestMessage.getMessage())) { + if (newRequestMessage != null && StringUtils.isNotBlank(newRequestMessage.getMessage())) { MessageOutContent outMessage = new MessageOutContent(); outMessage.setMessage(newRequestMessage.getMessage()); outMessage.setMessageType(MainContext.MessageTypeEnum.MESSAGE.toString()); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/util/OnlineUserUtils.java b/contact-center/app/src/main/java/com/chatopera/cc/util/OnlineUserUtils.java index 23669882..f3ac8c73 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/util/OnlineUserUtils.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/util/OnlineUserUtils.java @@ -908,6 +908,8 @@ public class OnlineUserUtils { if (!StringUtils.isBlank(ip)) { ipdata = IPTools.getInstance().findGeography(ip); } + + logger.info("set new Request message nickname {}", nickname); if (StringUtils.isBlank(nickname)) { nickname = "Guest_" + userid; } 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 2c1a5fc4..381d5cd4 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 @@ -269,9 +269,9 @@ <#if !exchange?? || exchange == "true">
  • 人工坐席
    • -
  • 智能坐席
    • +
  • 智能客服
    • <#else> -
  • 智能坐席
    • +
  • 智能客服
    • @@ -312,7 +312,7 @@
    - +
    @@ -498,7 +498,7 @@ chat = "
    "+data.filename+"
    "+(data.filesize/1024).toFixed(3)+"Kb
    " ; } if(data.calltype == "呼入"){ - output('
    '+chat+'
    ' , "chat-block"); + output('
    '+chat+'
    ' , "chat-block"); }else if(data.calltype == "呼出"){ output('
    '+chat+'
    ' , "chat-block"); R3Ajax.audioplayer('audioplane', newmessage, false); // 播放 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 9f749aab..ab82f67b 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 @@ -174,12 +174,14 @@
      - <#if models?? && models["chatbot"]?? && models["chatbot"] == true && inviteData.ai?? && inviteData.ai == true && aiid??> -
    • 智能客服
      • -
    • 人工坐席
      • + <#if models?? && models["chatbot"]?? && models["chatbot"] == true && inviteData.ai && aiid??> + <#if !exchange?? || exchange == "true"> +
    • 人工坐席
      • + +
    • 智能客服
      • <#else> -
    • 人工坐席
      • - +
    • 智能客服
      • +
    @@ -308,9 +310,9 @@ drawCanvasImage(data.attachmentid) ; } if(data.calltype == "呼入"){ - output('
    '+chat+'
    ' , "chat-block"); + output('
    '+chat+'
    ' , "chat-block"); }else if(data.calltype == "呼出"){ - output('
    '+chat+'
    ' , "chat-block"); + output('
    '+chat+'
    ' , "chat-block"); } }); 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 5f7f611e..cd1b0b11 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 @@ -311,7 +311,7 @@
    - +
    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 b4e1b1ae..12efd967 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 @@ -174,7 +174,7 @@
      - <#if models?? && models["xiaoe"]?? && models["xiaoe"] == true && inviteData.ai?? && inviteData.ai == true && aiid??> + <#if models?? && models["chatbot"]?? && models["chatbot"] == true && inviteData.ai?? && inviteData.ai == true && aiid??>
    • 智能客服
    • 人工坐席
      • <#else> @@ -223,8 +223,8 @@ src="<#if inviteData?? && inviteData.consult_dialog_headimg??>/res/image.html?id=${inviteData.consult_dialog_headimg?url}<#else>/images/agent.png" alt="">
      - + +
      @@ -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}&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}<#if agent??>&agent=${agent}'); + var socket = io.connect(protocol + '://'+hostname+':${port}/im/user?userid=${userid!''}<#if aiid??>&aiid=${aiid}&orgi=${orgi!''}&session=${sessionid!''}&appid=${appid!''}&osname=${(osname!'')?url}&browser=${(browser!'')?url}<#if skill??>&skill=${skill}<#if username??>&nickname=${username}<#if agent??>&agent=${agent}'); socket.on('connect',function(){ //service.sendRequestMessage(); //output(''+ new Date().format("yyyy-MM-dd hh:mm:ss") + ' 开始沟通' +'' , 'message callOutConnect-message');