Merge branch 'main' of github.com:hainatravel/global-sales

src/channel/bubbleMsgUtils.js

@@ -671,11 +671,11 @@ export const whatsappMsgTypeMapped = {
     type: 'location',
     data: (msg) => ({
       id: msg.wamid,
-      title: `位置信息 ${msg.location.name || ''} 已转高德地图, ↓点击打开`,
-      text: msg.location.address, // 地址
-      // src: `https://uri.amap.com/marker?position=${msg.location.longitude},${msg.location.latitude}&callnative=1`,
+      title: `位置信息 ${msg.location?.name || ''} 已转高德地图, ↓点击打开`,
+      text: msg.location?.address, // 地址
+      // src: `https://uri.amap.com/marker?position=${msg.location?.longitude},${msg.location?.latitude}&callnative=1`,
       src: 'https://cdn.pixabay.com/photo/2016/03/22/04/23/map-1272165_1280.png',
-      href: `https://uri.amap.com/marker?position=${msg.location.longitude},${msg.location.latitude}&callnative=1`,
+      href: `https://uri.amap.com/marker?position=${msg.location?.longitude},${msg.location?.latitude}&callnative=1`,
       data: {
         longitude: msg.location?.longitude,
         latitude: msg.location?.latitude,
@@ -717,6 +717,7 @@ export const parseRenderMessageItem = (msg) => {
   // console.log('parseRenderMessageItem', msg);
   const thisMsgType = Object.keys(whatsappMsgTypeMapped).includes(msg.type) ? msg.type : 'unsupported';
   return {
+    ...msg,
     opi_sn: msg.opi_sn || '',
     msgOrigin: msg,
     date: msg?.sendTime || msg?.createTime || '',

src/stores/ConversationStore.js

@@ -36,6 +36,7 @@ const conversationRow = {
   customer_name: '',
   whatsapp_phone_number: '',
   top_state: 0,
+  session_type: 0,
 };
 
 const initialConversationState = {
@@ -447,7 +448,8 @@ const messageSlice = (set, get) => ({
         customer_name: message.to, // message?.senderName || message?.sender || '',
         conversation_expiretime: message?.conversation?.expireTime || '', // 保留使用UTC时间
         whatsapp_phone_number: message.type === 'email' ? null : message.to,
-        show_default: message.to || '',
+        show_default: message?.conversation?.name || message.to || '',
+        session_type: message?.conversation?.type === 'group' ? 1 : 0,
         last_message: message,
         channels: {
           "email": message.type === 'email' ? message.from : null,
@@ -495,7 +497,8 @@ const messageSlice = (set, get) => ({
             whatsapp_name: message?.senderName || message?.sender || '',
             customer_name: message?.senderName || message?.sender || '',
             whatsapp_phone_number: message.type === 'email' ? null : message.from,
-            show_default: message?.senderName || message?.sender || message.from || '',
+            show_default: message?.conversation?.name || message?.senderName || message?.sender || message.from || '',
+            session_type: message?.conversation?.type === 'group' ? 1 : 0,
             last_message: message,
             channels: {
               "email": message.type === 'email' ? message.from : null,

src/views/Conversations/Online/Components/ChatListItem.jsx

@@ -188,7 +188,7 @@ const ChatListItem = (({item, refreshConversationList,setListUpdateFlag,onSwitch
           items: [
             { label: item.top_state === 1 ? '取消置顶' : '置顶会话', key: 'top' },
             { label: item.unread_msg_count > 998 ? '标为已读' : '标记为未读', key: 'unread' },
-            { label: item.top_state === -1 ? '取消静音' : '设为静音', key: 'mute' },
+            // { label: item.top_state === -1 ? '取消静音' : '设为静音', key: 'mute' },
             {
               label: '设置标签',
               key: 'tags',
@@ -280,8 +280,8 @@ const ChatListItem = (({item, refreshConversationList,setListUpdateFlag,onSwitch
               : item.top_state === 1
               ? 'bg-stone-100'
               : '',
-            'hover:bg-slate-100',
-            (item.sn) === (currentHandleChat?.sn) ? ' bg-slate-100 text-slate-500' : '',
+            'hover:bg-slate-50',
+            (item.sn) === (currentHandleChat?.sn) ? ' bg-slate-50 text-slate-500' : '',
             // String(item.sn) === String(tabSelectedConversation?.sn) ? ' bg-neutral-200' : '',
           ].join(' ')}>
           {/* <div className='pl-4 pt-1 text-xs text-right'>

wai-server/middleware/components/request_log.middleware.js

@@ -1,15 +1,18 @@
+const { isEmpty } = require('../../utils/commons.util');
 const { createRequestLog } = require('../../services/request_logs.service');
 
 module.exports = async (ctx, next) => {
   try {
     await next();
-  } catch (err) {
-  } finally {
+
+    if (ctx.method === 'GET' && ['/', '/api/v1/channels/sessions'].includes(ctx.path)) {
+      return false;
+    }
     await createRequestLog({
       method: ctx.method,
       path: ctx.method === 'GET' ? ctx.path : ctx.url,
-      request_data: ctx.method === 'GET' ? JSON.stringify(ctx.query) : JSON.stringify(ctx.request.body),
+      request_data: ctx.method === 'GET' ? (isEmpty(ctx.query) ? null : JSON.stringify(ctx.query)) : JSON.stringify(ctx.request.body),
       ip: ctx.ip,
     });
-  }
+  } catch (err) {}
 };