Merge branch 'dev' of https://github.com/hicccc77/WeFlow into dev

electron/services/bizService.ts

@@ -87,11 +87,14 @@ export class BizService {
 
   async listAccounts(account?: string): Promise<BizAccount[]> {
     try {
+      // 1. 获取公众号联系人列表
       const contactsResult = await chatService.getContacts({ lite: true })
       if (!contactsResult.success || !contactsResult.contacts) return []
 
       const officialContacts = contactsResult.contacts.filter(c => c.type === 'official')
       const usernames = officialContacts.map(c => c.username)
+
+      // 获取头像和昵称等补充信息
       const enrichment = await chatService.enrichSessionsContactInfo(usernames)
       const contactInfoMap = enrichment.success && enrichment.contacts ? enrichment.contacts : {}
 
@@ -100,31 +103,45 @@ export class BizService {
       const accountWxid = account || myWxid
       if (!root || !accountWxid) return []
 
-      const dbDir = join(root, accountWxid, 'db_storage', 'message')
       const bizLatestTime: Record<string, number> = {}
 
-      if (existsSync(dbDir)) {
+      try {
-        const bizDbFiles = readdirSync(dbDir).filter(f => f.startsWith('biz_message') && f.endsWith('.db'))
+        const sessionsRes = await wcdbService.getSessions()
-        for (const file of bizDbFiles) {
+        if (sessionsRes.success && sessionsRes.sessions) {
-          const dbPath = join(dbDir, file)
+          for (const session of sessionsRes.sessions) {
-          const name2idRes = await wcdbService.execQuery('message', dbPath, 'SELECT username FROM Name2Id')
+            const uname = session.username || session.strUsrName || session.userName || session.id
-          if (name2idRes.success && name2idRes.rows) {
+            // 适配日志中发现的字段，注意转为整型数字
-            for (const row of name2idRes.rows) {
+            const timeStr = session.last_timestamp || session.sort_timestamp || session.nTime || session.timestamp || '0'
-              const uname = row.username || row.user_name
+            const time = parseInt(timeStr.toString(), 10)
-              if (uname) {
+
-                const md5 = createHash('md5').update(uname).digest('hex').toLowerCase()
+            if (usernames.includes(uname) && time > 0) {
-                const tName = `Msg_${md5}`
+              bizLatestTime[uname] = time
-                const timeRes = await wcdbService.execQuery('message', dbPath, `SELECT MAX(create_time) as max_time FROM ${tName}`)
-                if (timeRes.success && timeRes.rows && timeRes.rows[0]?.max_time) {
-                  const t = parseInt(timeRes.rows[0].max_time)
-                  if (!isNaN(t)) bizLatestTime[uname] = Math.max(bizLatestTime[uname] || 0, t)
-                }
-              }
             }
           }
         }
+      } catch (e) {
+        console.error('获取 Sessions 失败:', e)
       }
 
+      // 3. 格式化时间显示
+      const formatBizTime = (ts: number) => {
+        if (!ts) return ''
+        const date = new Date(ts * 1000)
+        const now = new Date()
+        const isToday = date.toDateString() === now.toDateString()
+        if (isToday) return date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', hour12: false })
+
+        const yesterday = new Date(now)
+        yesterday.setDate(now.getDate() - 1)
+        if (date.toDateString() === yesterday.toDateString()) return '昨天'
+
+        const isThisYear = date.getFullYear() === now.getFullYear()
+        if (isThisYear) return `${date.getMonth() + 1}/${date.getDate()}`
+
+        return `${date.getFullYear().toString().slice(-2)}/${date.getMonth() + 1}/${date.getDate()}`
+      }
+
+      // 4. 组装数据
       const result: BizAccount[] = officialContacts.map(contact => {
         const uname = contact.username
         const info = contactInfoMap[uname]
@@ -135,11 +152,12 @@ export class BizService {
           avatar: info?.avatarUrl || '',
           type: 0,
           last_time: lastTime,
-          formatted_last_time: lastTime ? new Date(lastTime * 1000).toISOString().split('T')[0] : ''
+          formatted_last_time: formatBizTime(lastTime)
         }
       })
 
-      const contactDbPath = join(root, accountWxid, 'contact.db')
+      // 5. 补充公众号类型 (订阅号/服务号)
+      const contactDbPath = join(root, accountWxid, 'db_storage', 'contact', 'contact.db')
       if (existsSync(contactDbPath)) {
         const bizInfoRes = await wcdbService.execQuery('contact', contactDbPath, 'SELECT username, type FROM biz_info')
         if (bizInfoRes.success && bizInfoRes.rows) {
@@ -149,14 +167,18 @@ export class BizService {
         }
       }
 
+      // 6. 排序输出
       return result
-        .filter(acc => !acc.name.includes('朋友圈广告'))
+          .filter(acc => !acc.name.includes('广告'))
-        .sort((a, b) => {
+          .sort((a, b) => {
-          if (a.username === 'gh_3dfda90e39d6') return -1
+            if (a.username === 'gh_3dfda90e39d6') return -1 // 微信支付置顶
-          if (b.username === 'gh_3dfda90e39d6') return 1
+            if (b.username === 'gh_3dfda90e39d6') return 1
-          return b.last_time - a.last_time
+            return b.last_time - a.last_time // 按最新时间降序排列
-        })
+          })
-    } catch (e) { return [] }
+    } catch (e) {
+      console.error('获取账号列表发生错误:', e)
+      return []
+    }
   }
 
   async listMessages(username: string, account?: string, limit: number = 20, offset: number = 0): Promise<BizMessage[]> {

src/pages/BizPage.scss

@@ -125,7 +125,22 @@
       margin: 0 auto;
       display: flex;
       flex-direction: column;
-      gap: 24px;
+      gap: 16px; // 减小间距，因为有了 time-divider
+    }
+  }
+
+  .time-divider {
+    text-align: center;
+    margin: 16px 0 8px;
+    
+    span {
+      display: inline-block;
+      padding: 2px 8px;
+      background-color: var(--bg-primary);
+      color: var(--text-tertiary);
+      font-size: 11px;
+      border-radius: 4px;
+      opacity: 0.8;
     }
   }
 

src/pages/BizPage.tsx

@@ -7,7 +7,7 @@ export interface BizAccount {
   username: string;
   name: string;
   avatar: string;
-  type: number;
+  type: string;
   last_time: number;
   formatted_last_time: string;
 }
@@ -55,15 +55,24 @@ export const BizAccountList: React.FC<{
     fetch().then(_r => { } );
   }, [myWxid]);
 
+
   const filtered = useMemo(() => {
-    if (!searchKeyword) return accounts;
+    let result = accounts;
-    const q = searchKeyword.toLowerCase();
+    if (searchKeyword) {
-    return accounts.filter(a =>
+      const q = searchKeyword.toLowerCase();
-        (a.name && a.name.toLowerCase().includes(q)) ||
+      result = accounts.filter(a =>
-        (a.username && a.username.toLowerCase().includes(q))
+          (a.name && a.name.toLowerCase().includes(q)) ||
-    );
+          (a.username && a.username.toLowerCase().includes(q))
+      );
+    }
+    return result.sort((a, b) => {
+      if (a.username === 'gh_3dfda90e39d6') return -1; // 微信支付置顶
+      if (b.username === 'gh_3dfda90e39d6') return 1;
+      return b.last_time - a.last_time;
+    });
   }, [accounts, searchKeyword]);
 
+
   if (loading) return <div className="biz-loading">加载中...</div>;
 
   return (
@@ -84,18 +93,18 @@ export const BizAccountList: React.FC<{
                   <span className="biz-name">{item.name || item.username}</span>
                   <span className="biz-time">{item.formatted_last_time}</span>
                 </div>
-                {item.username === 'gh_3dfda90e39d6' && (
+                {/*{item.username === 'gh_3dfda90e39d6' && (*/}
-                    <div className="biz-badge type-service">服务号</div>
+                {/*    <div className="biz-badge type-service">微信支付</div>*/}
-                )}
+                {/*)}*/}
 
-                {/* 我看了下没有接口获取相关type，如果exec没法用的话确实无能为力，后面再适配吧 */}
+                <div className={`biz-badge ${
-                {/*<div className={`biz-badge ${*/}
+                    item.type === '1' ? 'type-service' :
-                {/*    item.type === 1 ? 'type-service' :*/}
+                        item.type === '0' ? 'type-sub' :
-                {/*        item.type === 0 ? 'type-sub' :*/}
+                            item.type === '2' ? 'type-enterprise' : 
-                {/*            item.type === 2 ? 'type-enterprise' : 'type-unknown'*/}
+                                item.type === '3' ? 'type-enterprise' : 'type-unknown'
-                {/*}`}>*/}
+                }`}>
-                {/*  {item.type === 1 ? '服务号' : item.type === 0 ? '订阅号' : item.type === 2 ? '企业号' : '未知'}*/}
+                  {item.type === '0' ? '公众号' : item.type === '1' ? '服务号' : item.type === '2' ? '企业号' : item.type === '3' ? '企业附属' :  '未知'}
-                {/*</div>*/}
+                </div>
 
               </div>
             </div>
@@ -104,7 +113,6 @@ export const BizAccountList: React.FC<{
   );
 };
 
-// 2. 公众号消息区域组件
 export const BizMessageArea: React.FC<{
   account: BizAccount | null;
 }> = ({ account }) => {
@@ -115,6 +123,8 @@ export const BizMessageArea: React.FC<{
   const [hasMore, setHasMore] = useState(true);
   const limit = 20;
   const messageListRef = useRef<HTMLDivElement>(null);
+  const lastScrollHeightRef = useRef<number>(0);
+  const isInitialLoadRef = useRef<boolean>(true);
 
   const [myWxid, setMyWxid] = useState<string>('');
 
@@ -143,6 +153,7 @@ export const BizMessageArea: React.FC<{
       setMessages([]);
       setOffset(0);
       setHasMore(true);
+      isInitialLoadRef.current = true;
       loadMessages(account.username, 0);
     }
   }, [account, myWxid]);
@@ -151,6 +162,10 @@ export const BizMessageArea: React.FC<{
     if (loading || !myWxid) return;
 
     setLoading(true);
+    if (messageListRef.current) {
+      lastScrollHeightRef.current = messageListRef.current.scrollHeight;
+    }
+
     try {
       let res;
       if (username === 'gh_3dfda90e39d6') {
@@ -158,9 +173,15 @@ export const BizMessageArea: React.FC<{
       } else {
         res = await window.electronAPI.biz.listMessages(username, myWxid, limit, currentOffset);
       }
+
       if (res) {
         if (res.length < limit) setHasMore(false);
-        setMessages(prev => currentOffset === 0 ? res : [...prev, ...res]);
+
+        setMessages(prev => {
+          const combined = currentOffset === 0 ? res : [...res, ...prev];
+          const uniqueMessages = Array.from(new Map(combined.map(item => [item.local_id || item.create_time, item])).values());
+          return uniqueMessages.sort((a, b) => a.create_time - b.create_time);
+        });
         setOffset(currentOffset + limit);
       }
     } catch (err) {
@@ -170,9 +191,26 @@ export const BizMessageArea: React.FC<{
     }
   };
 
+  useEffect(() => {
+    if (!messageListRef.current) return;
+
+    if (isInitialLoadRef.current && messages.length > 0) {
+      messageListRef.current.scrollTop = messageListRef.current.scrollHeight;
+      isInitialLoadRef.current = false;
+    } else if (messages.length > 0 && !isInitialLoadRef.current && !loading) {
+
+      const newScrollHeight = messageListRef.current.scrollHeight;
+      const heightDiff = newScrollHeight - lastScrollHeightRef.current;
+      if (heightDiff > 0 && messageListRef.current.scrollTop < 100) {
+        messageListRef.current.scrollTop += heightDiff;
+      }
+    }
+  }, [messages, loading]);
+
   const handleScroll = (e: React.UIEvent<HTMLDivElement>) => {
     const target = e.currentTarget;
-    if (target.scrollHeight - Math.abs(target.scrollTop) - target.clientHeight < 50) {
+    // 向上滚动到顶部附近触发加载更多（更旧的消息）
+    if (target.scrollTop < 50) {
       if (!loading && hasMore && account) {
         loadMessages(account.username, offset);
       }
@@ -188,6 +226,30 @@ export const BizMessageArea: React.FC<{
     );
   }
 
+  const formatMessageTime = (timestamp: number) => {
+    if (!timestamp) return '';
+    const date = new Date(timestamp * 1000);
+    const now = new Date();
+    
+    const isToday = date.toDateString() === now.toDateString();
+    if (isToday) {
+      return date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', hour12: false });
+    }
+    
+    const yesterday = new Date(now);
+    yesterday.setDate(now.getDate() - 1);
+    if (date.toDateString() === yesterday.toDateString()) {
+      return `昨天 ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
+    }
+
+    const isThisYear = date.getFullYear() === now.getFullYear();
+    if (isThisYear) {
+      return `${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
+    }
+    
+    return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`;
+  };
+
   const defaultImage = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MDAiIGhlaWdodD0iMTgwIj48cmVjdCB3aWR0aD0iNDAwIiBoZWlnaHQ9IjE4MCIgZmlsbD0iI2Y1ZjVmNSIvPjwvc3ZnPg==';
 
   return (
@@ -197,6 +259,9 @@ export const BizMessageArea: React.FC<{
         </div>
         <div className="message-container" onScroll={handleScroll} ref={messageListRef}>
           <div className="messages-wrapper">
+            {hasMore && messages.length > 0 && (
+                <div className="biz-loading-more">{loading ? '加载中...' : '向上滚动加载更多历史消息'}</div>
+            )}
             {!loading && messages.length === 0 && (
               <div className="biz-no-record-container">
                 <div className="no-record-icon">
@@ -206,40 +271,50 @@ export const BizMessageArea: React.FC<{
                 <p>该公众号在当前数据库中没有可显示的聊天历史</p>
               </div>
             )}
-            {messages.map((msg) => (
+            {messages.map((msg, index) => {
-                <div key={msg.local_id}>
+                const showTime = true;
-                  {account.username === 'gh_3dfda90e39d6' ? (
+                
-                      <div className="pay-card">
+                return (
-                        <div className="pay-header">
+                    <div key={msg.local_id || index}>
-                          {msg.merchant_icon ? <img src={msg.merchant_icon} className="pay-icon" alt=""/> : <div className="pay-icon-placeholder">¥</div>}
+                      {showTime && (
-                          <span>{msg.merchant_name || '微信支付'}</span>
+                          <div className="time-divider">
-                        </div>
+                            <span>{formatMessageTime(msg.create_time)}</span>
-                        <div className="pay-title">{msg.title}</div>
+                          </div>
-                        <div className="pay-desc">{msg.description}</div>
+                      )}
-                        <div className="pay-footer">{msg.formatted_time}</div>
+                      
-                      </div>
+                      {account.username === 'gh_3dfda90e39d6' ? (
-                  ) : (
+                          <div className="pay-card">
-                      <div className="article-card">
+                            <div className="pay-header">
-                        <div onClick={() => window.electronAPI.shell.openExternal(msg.url)} className="main-article">
+                              {msg.merchant_icon ? <img src={msg.merchant_icon} className="pay-icon" alt=""/> : <div className="pay-icon-placeholder">¥</div>}
-                          <img src={msg.cover || defaultImage} className="article-cover" alt=""/>
+                              <span>{msg.merchant_name || '微信支付'}</span>
-                          <div className="article-overlay"><h3 className="article-title">{msg.title}</h3></div>
-                        </div>
-                        {msg.des && <div className="article-digest">{msg.des}</div>}
-                        {msg.content_list && msg.content_list.length > 1 && (
-                            <div className="sub-articles">
-                              {msg.content_list.slice(1).map((item: any, idx: number) => (
-                                  <div key={idx} onClick={() => window.electronAPI.shell.openExternal(item.url)} className="sub-item">
-                                    <span className="sub-title">{item.title}</span>
-                                    {item.cover && <img src={item.cover} className="sub-cover" alt=""/>}
-                                  </div>
-                              ))}
                             </div>
-                        )}
+                            <div className="pay-title">{msg.title}</div>
-                      </div>
+                            <div className="pay-desc">{msg.description}</div>
-                  )}
+                            {/* <div className="pay-footer">{msg.formatted_time}</div> */}
-                </div>
+                          </div>
-            ))}
+                      ) : (
-            {loading && <div className="biz-loading-more">加载中...</div>}
+                          <div className="article-card">
+                            <div onClick={() => window.electronAPI.shell.openExternal(msg.url)} className="main-article">
+                              <img src={msg.cover || defaultImage} className="article-cover" alt=""/>
+                              <div className="article-overlay"><h3 className="article-title">{msg.title}</h3></div>
+                            </div>
+                            {msg.des && <div className="article-digest">{msg.des}</div>}
+                            {msg.content_list && msg.content_list.length > 1 && (
+                                <div className="sub-articles">
+                                  {msg.content_list.slice(1).map((item: any, idx: number) => (
+                                      <div key={idx} onClick={() => window.electronAPI.shell.openExternal(item.url)} className="sub-item">
+                                        <span className="sub-title">{item.title}</span>
+                                        {item.cover && <img src={item.cover} className="sub-cover" alt=""/>}
+                                      </div>
+                                  ))}
+                                </div>
+                            )}
+                          </div>
+                      )}
+                    </div>
+                );
+            })}
+            {loading && offset === 0 && <div className="biz-loading-more">加载中...</div>}
           </div>
         </div>
       </div>