diff --git a/wai-server/core/baileys/index.js b/wai-server/core/baileys/index.js
index 025afea..aa578ed 100644
--- a/wai-server/core/baileys/index.js
+++ b/wai-server/core/baileys/index.js
@@ -14,6 +14,7 @@ const { writeFile } = require('fs/promises');
 const generateId = require('../../utils/generateId.util');
 const NodeCache = require('node-cache');
 const P = require('pino');
+const { format } = require('path');
 
 const logger = P({ timestamp: () => `,"time":"${new Date().toJSON()}"` }, P.destination('./wa-logs.txt'))
 logger.level = 'trace'
@@ -34,25 +35,44 @@ setInterval(() => {
 // start a connection
 const createWhatsApp = async (phone) => {
   const channelId = generateId()
+  const whatsAppNo = phone
   const { state, saveCreds } = await useMultiFileAuthState('baileys_auth_info_' + phone + '_' + channelId)
   // fetch latest version of WA Web
   const { version, isLatest } = await fetchLatestBaileysVersion()
   const waVersion = version.join('.') + ', ' + (isLatest ? 'latest' : 'out')
-  const myEmitter = new EventEmitter();
-  myEmitter.on('connection.open', (p) => {
-    console.info('EventEmitter: connection.open')
-  });
+  const waEmitter = new EventEmitter();
+
+  const formatPhoneNumber = (number) => {
+    if (number.indexOf('@g.us') > -1) {
+      return number
+    } else if (number.indexOf('@broadcast') > -1) {
+      return number
+    } else {
+      return number + '@s.whatsapp.net'
+    }
+  }
+
+  const parsePhoneNumber = (number) => {
+    if (number.indexOf('@s.whatsapp.net') > -1) {
+      return number.split('@')[0]
+    } else {
+      return number
+    }
+  }
 
   const on = (eventName, listener) => {
-    myEmitter.on(eventName, listener);
+    waEmitter.on(eventName, listener);
   }
 
   const sendTextMessage = (whatsAppNo, content) => {
-    waSocket.sendMessage(whatsAppNo + '@s.whatsapp.net', { text: content })
+    const number = formatPhoneNumber(whatsAppNo)
+    console.info('formatPhoneNumber: ', number)
+    waSocket.sendMessage(number, { text: content })
   }
 
   const sendImageMessage = (whatsAppNo, imageUrl) => {
-    waSocket.sendMessage(whatsAppNo + '@s.whatsapp.net', {
+    const number = formatPhoneNumber(whatsAppNo)
+    waSocket.sendMessage(number, {
       image: { url: imageUrl},
     })
   }
@@ -91,8 +111,7 @@ const createWhatsApp = async (phone) => {
           }
         } else if(connection === 'open') {
           console.info('链接成功')
-          myEmitter.emit('connection.open', waSocket);
-          await waSocket.sendMessage('8617607730395' + '@s.whatsapp.net', { text: 'OPEN: ' + new Date().toString() })
+          waEmitter.emit('connection.open', waSocket);
         } else if(qr !== undefined) {
           // WebSocket 创建成功等待扫码，如果没有扫码会更新 qr
           resolve(qr)
@@ -127,7 +146,7 @@ const createWhatsApp = async (phone) => {
               console.log('writeFile', messageType)
             }
 
-            const fromWhatsAppNo = msg.key.remoteJid.split('@')[0]
+            const fromWhatsAppNo = parsePhoneNumber(msg.key.remoteJid)
 
             if (msg.message?.conversation || msg.message?.extendedTextMessage?.text) {
               const text = msg.message?.conversation || msg.message?.extendedTextMessage?.text
@@ -136,6 +155,73 @@ const createWhatsApp = async (phone) => {
                 sendImageMessage(fromWhatsAppNo, 'https://images.asiahighlights.com/allpicture/2022/07/8a7d9ced5936463bb904c82a_cut_750x850_349.webp')
               } else if (text.indexOf('文本') > -1){
                 sendTextMessage(fromWhatsAppNo, '文本消息' + new Date().toString())
+              } else if (text.indexOf('发群') > -1){
+                sendTextMessage('120363335516526642@g.us', '这是群消息：' + new Date().toString())
+              }
+
+              // status: sent read delivered failed
+              // 2 sent, 3 delivered, 4 read, 0 error
+              // Time: 2008-07-07 15:37:07
+
+              const formatStatus = (number) => {
+                if (number === 2)  return 'sent'
+                else if (number === 3)  return 'delivered'
+                else if (number === 4)  return 'read'
+                else if (number === 0)  return 'error'
+                else return 'played'
+              }
+              const formatTimestamp = (timestamp) => {
+                if (timestamp === null) return ''
+
+                const datetime = new Date(msg.messageTimestamp * 1000)
+
+                return datetime.getFullYear() + '-' + (datetime.getMonth() + 1) + '-' + datetime.getDay() + ' ' + datetime.getHours() + ':' + datetime.getMinutes() + ':'  + datetime.getSeconds()
+              }
+
+              if (msg.key.fromMe) {
+                waEmitter.emit('message.updated', {
+                  "id":  msg.key.id,
+                  "wamid": msg.key.id,
+                  "status": formatStatus(msg.status),
+                  "from":  whatsAppNo,
+                  "to": fromWhatsAppNo,
+                  "type": "text",
+                  "text": {
+                      "body": text
+                  },
+                  conversation: {
+                    id: msg.key.participant,
+                    type: '不区分',
+                    name: msg.pushName
+                  },
+                  "createTime": formatTimestamp(msg.messageTimestamp),
+                  "updateTime": formatTimestamp(new Date().getTime()),
+                  "sendTime": formatTimestamp(msg.messageTimestamp),
+                  "deliverTime": formatTimestamp(msg.messageTimestamp),
+                  "readTime": formatTimestamp(msg.messageTimestamp),
+                });
+              } else {
+                waEmitter.emit('message.received', {
+                  "id":  msg.key.id,
+                  "wamid": msg.key.id,
+                  "status": "",
+                  "from":  fromWhatsAppNo,
+                  "to": whatsAppNo,
+                  "type": "text",
+                  "text": {
+                      "body": text
+                  },
+                  conversation: {
+                    id: msg.key.participant,
+                    type: '不区分',
+                    name: msg.pushName
+                  },
+                  "createTime": formatTimestamp(msg.messageTimestamp),
+                  "updateTime": formatTimestamp(new Date().getTime()),
+                  "sendTime": formatTimestamp(msg.messageTimestamp),
+                  "deliverTime": formatTimestamp(msg.messageTimestamp),
+                  "readTime": formatTimestamp(msg.messageTimestamp),
+                });
               }
             }
           }