diff --git a/contact-center/app/src/main/java/com/chatopera/cc/concurrent/chatbot/ChatbotEventProducer.java b/contact-center/app/src/main/java/com/chatopera/cc/concurrent/chatbot/ChatbotEventProducer.java index 5cc29ed4..bc993109 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/concurrent/chatbot/ChatbotEventProducer.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/concurrent/chatbot/ChatbotEventProducer.java @@ -17,9 +17,12 @@ package com.chatopera.cc.concurrent.chatbot; import com.chatopera.cc.concurrent.user.UserDataEvent; import com.lmax.disruptor.RingBuffer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("rawtypes") public class ChatbotEventProducer { + private final static Logger logger = LoggerFactory.getLogger(ChatbotEventProducer.class); private final RingBuffer ringBuffer; public ChatbotEventProducer(RingBuffer ringBuffer) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/util/StreamingFileUtils.java b/contact-center/app/src/main/java/com/chatopera/cc/util/StreamingFileUtils.java index 35a9ae99..1fac8044 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/util/StreamingFileUtils.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/util/StreamingFileUtils.java @@ -27,7 +27,7 @@ public class StreamingFileUtils { private StreamingFileUtils() { extMap.put(Constants.ATTACHMENT_TYPE_IMAGE, "gif,jpg,jpeg,png,bmp"); - extMap.put(Constants.ATTACHMENT_TYPE_FILE, "doc,docx,xls,xlsx,ppt,htm,html,txt,zip,rar,gz,bz2,c66"); + extMap.put(Constants.ATTACHMENT_TYPE_FILE, "pdf,doc,docx,xls,xlsx,ppt,htm,html,txt,zip,rar,gz,bz2,c66"); extMap.put("flash", "swf,flv"); extMap.put("media", "swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb"); } diff --git a/contact-center/app/src/main/resources/templates/apps/agent/contacts.html b/contact-center/app/src/main/resources/templates/apps/agent/contacts.html index 61e1370e..3f07de58 100644 --- a/contact-center/app/src/main/resources/templates/apps/agent/contacts.html +++ b/contact-center/app/src/main/resources/templates/apps/agent/contacts.html @@ -9,7 +9,7 @@ <#if contacts.gender?? && contacts.gender == '-1'>未知
  • - 生日:${contacts.birthday!''} + 生日:${contacts.cusbirthday!''}
  • 电话:${contacts.phone!''} diff --git a/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html b/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html index 38be8402..eecbb719 100644 --- a/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html +++ b/contact-center/app/src/main/resources/templates/apps/business/contacts/detail.html @@ -143,7 +143,7 @@
    - ${contacts.birthday!''} + ${contacts.cusbirthday!''}
    diff --git a/contact-center/app/src/main/resources/templates/apps/business/customer/add.html b/contact-center/app/src/main/resources/templates/apps/business/customer/add.html index 7d48f34e..49764fa5 100644 --- a/contact-center/app/src/main/resources/templates/apps/business/customer/add.html +++ b/contact-center/app/src/main/resources/templates/apps/business/customer/add.html @@ -178,7 +178,7 @@
    -
    @@ -284,4 +284,4 @@ } }); - \ No newline at end of file + diff --git a/contact-center/app/src/main/resources/templates/apps/service/online/contacts.html b/contact-center/app/src/main/resources/templates/apps/service/online/contacts.html index 1a27387e..3b16438e 100644 --- a/contact-center/app/src/main/resources/templates/apps/service/online/contacts.html +++ b/contact-center/app/src/main/resources/templates/apps/service/online/contacts.html @@ -9,7 +9,7 @@ <#if contacts.gender?? && contacts.gender == '-1'>未知
  • - 生日:${contacts.birthday!''} + 生日:${contacts.cusbirthday!''}
  • 电话:${contacts.phone!''} @@ -43,4 +43,4 @@ }); - \ No newline at end of file + diff --git a/contact-center/app/src/main/resources/templates/apps/service/processed/process.html b/contact-center/app/src/main/resources/templates/apps/service/processed/process.html index 5503c0f3..168703b6 100644 --- a/contact-center/app/src/main/resources/templates/apps/service/processed/process.html +++ b/contact-center/app/src/main/resources/templates/apps/service/processed/process.html @@ -35,7 +35,7 @@
    - ${contacts.birthday!''} + ${contacts.cusbirthday!''}
    @@ -202,4 +202,4 @@ var element = layui.element(); element.init(); }); - \ No newline at end of file + diff --git a/contact-center/app/src/main/resources/templates/apps/service/summary/process.html b/contact-center/app/src/main/resources/templates/apps/service/summary/process.html index c48d5011..15cd3505 100644 --- a/contact-center/app/src/main/resources/templates/apps/service/summary/process.html +++ b/contact-center/app/src/main/resources/templates/apps/service/summary/process.html @@ -35,7 +35,7 @@
    - ${contacts.birthday!''} + ${contacts.cusbirthday!''}
    @@ -202,4 +202,4 @@ var element = layui.element(); element.init(); }); - \ No newline at end of file +