Merge pull request #11 from wsrh8888/feature-rh

Feature rh

Author: wsrh8888

.cursor/rules/rule.mdc

@@ -3,38 +3,21 @@ alwaysApply: true
 ---
 # 项目概述
 
-这是一个开源的IM（即时通讯）项目，对标大厂和开源IM产品。本项目使用分为3层
+这是一个开源的IM（即时通讯）项目，对标大厂和开源IM产品。
 
 ### 技术架构
-vite+ electron+vue3
+vite+ eluniappectron+vue3
 
 ### ts别名
-commonModule: path.resolve(__dirname, 'src/common'),
-mainModule: path.resolve(__dirname, 'src/main'),
-renderModule: path.resolve(__dirname, 'src/render'),
-preloadModule: path.resolve(__dirname, 'src/preload'),
-
 
 ### 文件命名
 - 所有的文件不能以大写字母开头， 如果是多个单词采用驼峰命名
 - 文件名字如果我文件夹已经携带了xx， 这个子文件就不要在携带xxx开头的了
 
 ### css的编写
-- 我使用less， 你的css开发的时候采用嵌套结构
-
-### axios规范
-- 我的axios底层是renderModule/utils/request/ajax， 这里返回的数据是.data已经包好的， 同时没有异常
-- renderModule/utils/request/ajax 底层封装了header相关的，各个模块不要在加了。
-- 主进程的api在 mainModule/api 渲染进程的在 renderModule/api
-- axios的接口的定义在 commonModule/type/ajax
-
-### vue文件编写规范
-- 不要 script lang="ts" setup 这种组件， 采用export default defineComponent这样的代码
-# 注意事项
+- 我使用scss， 你的css开发的时候采用嵌套结构
 
 ### 切记
 - 不要过度开发
 - 不要写md文件
-- 尽可能使用别名不要使用../之类的相对路径
-- 不要运行任何的npm run 命令
-- 不要运行任何的npm run build-electron  命令
+- 尽可能使用别名不要使用../之类的相对路径

build/shell/beaver.nsi

@@ -1,4 +1,3 @@
-; 定义安装程序的常量
 !define PRODUCT_NAME "º£ÀêIM"
 !define PRODUCT_VERSION ${VERSION}
 !define RESOURCE_DIR ${RESOURCEDIR}
@@ -11,7 +10,7 @@
 !define PRODUCT_USER_KEY "HKCU"
 !define PRODUCT_CLIENT_TYPE 0
 
-!define DAEMON_DIR_REGKEY "Software\HLW\beaver"
+!define DAEMON_DIR_REGKEY "Software\beaver"
 
 !define AUTORUN_REGKEY "Software\Microsoft\Windows\CurrentVersion\Run"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -20,73 +19,59 @@
 SetCompressor lzma
 !addincludedir .\include
 
-; 包含必要的NSIS库和模块
-!include "MUI2.nsh" ; 使用现代用户界面2 (MUI2) 模块
-!include "FileFunc.nsh" ; 文件操作模块
-!include "LogicLib.nsh" ; 逻辑操作模块
+!include "MUI2.nsh" ; 
+!include "FileFunc.nsh" ; 
+!include "LogicLib.nsh" ; 
 !include "WordFunc.nsh" ; 
 !include "beaver.nsh" ;
 
-; 定义MUI界面设置
 !define MUI_ABORTWARNING
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
 
-; 安装过程页面定义
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_DIRECTORY ; 添加目录选择页面
+!insertmacro MUI_PAGE_DIRECTORY 
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
 
-; 卸载过程页面定义
 !insertmacro MUI_UNPAGE_WELCOME
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 !insertmacro MUI_UNPAGE_FINISH
 
-; 定义语言设置
 !insertmacro MUI_LANGUAGE "SimpChinese"
 
-; 保留InstallOptions插件
 ReserveFile /plugin "InstallOptions.dll"
 
-; 定义安装程序的基本信息
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "${OUTPUT_DIR}"
-InstallDir "$APPDATA\beaver" ; 设置默认安装路径
+InstallDir "$APPDATA\beaver"
 ShowInstDetails show
 ShowUnInstDetails show
 
-; 定义版本信息
 VIProductVersion ${PRODUCT_VERSION}
 VIAddVersionKey FileDescription "${PRODUCT_PROCESS_NAME}"
 VIAddVersionKey FileVersion "${PRODUCT_VERSION}"
 VIAddVersionKey ProductName "${PRODUCT_NAME}"
 VIAddVersionKey OriginalFilename "${PRODUCT_PROCESS_NAME}"
 
-; 请求管理员权限
 RequestExecutionLevel admin
 
-; 主安装部分
 Section "MainSection" SEC01
   SetOutPath "$INSTDIR"
   SetOverwrite on
   !insertmacro INSTALL_BEAVER $INSTDIR ${RESOURCE_DIR} ${PRODUCT_VERSION}
 
-  ; 创建卸载程序
   WriteUninstaller "$INSTDIR\uninstall.exe"
 
-  ; 创建桌面快捷方式
-  CreateShortcut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\海狸.exe" "$INSTDIR\app.ico"
+  CreateShortcut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\beaver.exe" "$INSTDIR\app.ico"
 
-  ; 注册卸载信息到注册表
   WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${PRODUCT_NAME} ${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninstall.exe"
   WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
   WriteRegStr ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
 SectionEnd
 
-; 注册部分
 Section -Post
     SetRegView 64
     System::Alloc 16
@@ -96,33 +81,24 @@ Section -Post
     !insertmacro REGISTER_BEAVER $INSTDIR ${PRODUCT_VERSION}
 SectionEnd
 
-/******************************
- *  以下是安装程序的卸载部分  *
- ******************************/
 
 Section Uninstall 
     SetRegView 64
     !insertmacro UNINSTALL_BEAVER $INSTDIR
-    ; 删除注册表中与卸载程序相关的键
     DeleteRegKey ${PRODUCT_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
 
-    ; 删除桌面快捷方式
     Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
     SetAutoClose true
 SectionEnd
 
-; 初始化函数（卸载过程）
 Function un.onInit
 FunctionEnd
 
-; 安装成功后的函数
 Function .onInstSuccess
 FunctionEnd
 
-; 卸载成功后的函数
 Function un.onUninstSuccess
 FunctionEnd
 
-; 初始化函数
 Function .onInit
 FunctionEnd

package.json

@@ -1,7 +1,7 @@
 {
   "name": "beaver",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "description": "beaverIM",
   "author": "Robert",

src/common/type/preload/notification.ts

@@ -162,6 +162,15 @@ export enum NotificationMediaViewerCommand {
    * data: { url: string, title?: string }
    */
   UPDATE_AUDIO = 'updateAudio',
+  /**
+   * 更新朋友圈数据
+   * data: any
+   */
+  UPDATE_MOMENT = 'updateMoment',
+  /**
+   * 更新升级信息
+   */
+  UPDATE_UPDATER = 'updateUpdater',
 }
 
 /**

src/main/api/emoji.ts

@@ -92,4 +92,13 @@ export const getEmojiPackageContentsByPackageIdsApi = (data: { packageIds: strin
     data,
     url: `${getBaseUrl()}/api/emoji/package-contents-by-package-ids`,
   })
+}
+
+// 获取表情包内容列表（通过关联ID列表）
+export const getEmojiPackageContentsByRelationIdsApi = (data: { relationIds: string[] }) => {
+  return ajax<EmojiPackageContentsResponse>({
+    method: 'POST',
+    data,
+    url: `${getBaseUrl()}/api/emoji/package-contents-by-relation-ids`,
+  })
 }

src/main/business/emoji/package-emoji.ts

@@ -1,6 +1,6 @@
 import type { QueueItem } from '../base/base'
 import { NotificationEmojiCommand, NotificationModule } from 'commonModule/type/preload/notification'
-import { getEmojiPackageContentsByPackageIdsApi } from 'mainModule/api/emoji'
+import { getEmojiPackageContentsByRelationIdsApi } from 'mainModule/api/emoji'
 import dBServiceEmojiPackageEmoji  from 'mainModule/database/services/emoji/package-emoji'
 import { sendMainNotification } from 'mainModule/ipc/main-to-render'
 import { BaseBusiness } from '../base/base'
@@ -46,55 +46,41 @@ class EmojiPackageEmojiBusiness extends BaseBusiness<PackageEmojiSyncItem> {
   protected async processBatchRequests(items: PackageEmojiSyncItem[]): Promise<void> {
     // 聚合所有需要同步的relationIds
     const relationIds = [...new Set(items.flatMap(item => item.relationIds))]
+    console.log('package-emoji 开始数据同步', items)
 
     if (relationIds.length === 0) {
       return
     }
 
     try {
-      // 首先尝试从本地数据库获取这些relationId对应的packageId
-      const existingRelations = await dBServiceEmojiPackageEmoji.getEmojisByRelationIds({ relationIds })
+      // 直接用relationIds获取表情包内容详情
+      const response = await getEmojiPackageContentsByRelationIdsApi({
+        relationIds: relationIds,
+      })
 
-      // 提取packageIds
-      const packageIds = [...new Set(existingRelations.map(relation => relation.packageId))]
+      if (response.result?.contents && response.result.contents.length > 0) {
+        // 更新本地数据库
+        const contentRows = response.result.contents.map((contentData: any) => ({
+          relationId: contentData.relationId,
+          packageId: contentData.packageId,
+          emojiId: contentData.emojiId,
+          sortOrder: contentData.sortOrder,
+          version: contentData.version,
+          createdAt: contentData.createdAt,
+          updatedAt: contentData.updatedAt,
+        }))
 
-      if (packageIds.length > 0) {
-        // 根据packageIds获取表情包内容详情
-        const response = await getEmojiPackageContentsByPackageIdsApi({
-          packageIds: packageIds,
-        })
-
-        if (response.result?.contents && response.result.contents.length > 0) {
-          // 过滤出需要的表情关联数据
-          const contents = response.result.contents.filter(content =>
-            relationIds.includes(content.relationId)
-          )
-
-          if (contents.length > 0) {
-            // 更新本地数据库
-            const contentRows = contents.map((contentData: any) => ({
-              relationId: contentData.relationId,
-              packageId: contentData.packageId,
-              emojiId: contentData.emojiId,
-              sortOrder: contentData.sortOrder,
-              version: contentData.version,
-              createdAt: contentData.createdAt,
-              updatedAt: contentData.updatedAt,
-            }))
+        await dBServiceEmojiPackageEmoji.batchCreate({ relations: contentRows })
 
-            await dBServiceEmojiPackageEmoji.batchCreate({ relations: contentRows })
-
-            // 发送通知到render进程，告知表情包内容数据已同步
-            sendMainNotification('*', NotificationModule.EMOJI, NotificationEmojiCommand.EMOJI_PACKAGE_CONTENT_UPDATE, {
-              updatedPackageContents: contentRows.map((content: any) => ({
-                relationId: content.relationId,
-                packageId: content.packageId,
-                emojiId: content.emojiId,
-                version: content.version,
-              })),
-            })
-          }
-        }
+        // 发送通知到render进程，告知表情包内容数据已同步
+        sendMainNotification('*', NotificationModule.EMOJI, NotificationEmojiCommand.EMOJI_PACKAGE_CONTENT_UPDATE, {
+          updatedPackageContents: contentRows.map((content: any) => ({
+            relationId: content.relationId,
+            packageId: content.packageId,
+            emojiId: content.emojiId,
+            version: content.version,
+          })),
+        })
       }
     } catch (error) {
       console.error('批量同步表情包表情关联失败:', error)

src/main/database/services/emoji/package-collect.ts

@@ -12,6 +12,10 @@ import type {
   DBGetPackageCollectByIdRes,
   DBDeletePackageCollectReq,
 } from 'commonModule/type/database/server/emoji/package-collect'
+import type { IDBEmojiPackageCollect } from 'commonModule/type/database/db/emoji'
+import Logger from 'mainModule/utils/logger'
+
+const logger = new Logger('database-emoji-package-collect')
 
 // 表情包收藏服务
 class EmojiPackageCollect extends BaseService {
@@ -24,25 +28,54 @@ class EmojiPackageCollect extends BaseService {
 
   /**
    * @description 批量创建表情包收藏（upsert操作）
+   * 注意：使用先查询再插入/更新的方式，避免 onConflictDoUpdate 消耗 AUTOINCREMENT 序列值
    */
   async batchCreate(req: DBBatchCreatePackageCollectsReq): Promise<void> {
     if (req.collects.length === 0) {
       return
     }
 
+    // 批量查询所有已存在的记录
+    const packageCollectIds = req.collects.map(c => c.packageCollectId)
+    const existingMap = await this.getPackageCollectsByIds({ ids: packageCollectIds })
+
+    // 分离需要插入和更新的记录
+    const toInsert: typeof req.collects = []
+    const toUpdate: typeof req.collects = []
+
     for (const collectData of req.collects) {
-      await this.db.insert(emojiPackageCollect)
-        .values(collectData)
-        .onConflictDoUpdate({
-          target: emojiPackageCollect.packageCollectId,
-          set: {
-            userId: collectData.userId,
-            packageId: collectData.packageId,
-            version: collectData.version,
-            updatedAt: collectData.updatedAt,
-          },
-        })
-        .run()
+      if (existingMap.has(collectData.packageCollectId)) {
+        toUpdate.push(collectData)
+      } else {
+        toInsert.push(collectData)
+      }
+    }
+
+    // 批量插入新记录
+    if (toInsert.length > 0) {
+      for (const collectData of toInsert) {
+        await this.db.insert(emojiPackageCollect).values(collectData).run()
+      }
+    }
+
+    // 批量更新已存在的记录
+    if (toUpdate.length > 0) {
+      for (const collectData of toUpdate) {
+        const updateData: any = {
+          userId: collectData.userId,
+          packageId: collectData.packageId,
+          version: collectData.version,
+        }
+        // updatedAt 是可选的，如果存在则更新
+        if ('updatedAt' in collectData && collectData.updatedAt !== undefined) {
+          updateData.updatedAt = collectData.updatedAt
+        }
+        await this.db
+          .update(emojiPackageCollect)
+          .set(updateData)
+          .where(eq(emojiPackageCollect.packageCollectId, collectData.packageCollectId))
+          .run()
+      }
     }
   }
 
@@ -61,14 +94,15 @@ class EmojiPackageCollect extends BaseService {
       .where(inArray(emojiPackageCollect.packageCollectId, req.ids as any))
 
     const collectMap = new Map<string, IDBEmojiPackageCollect>()
-    collectList.forEach((item) => {
+    collectList.forEach((item: IDBEmojiPackageCollect) => {
       collectMap.set(item.packageCollectId, item)
     })
 
     return collectMap
     }
     catch (error) {
       logger.error({ text: '表情包收藏数据获取失败2', data: { error: (error as any)?.message } })
+      return new Map()
     }
   }