refactor: 修复 错误的微信名称拼写

src/db/models/base.ts

@@ -1,6 +1,6 @@
 import { PrimaryGeneratedColumn, Column, Entity, TableInheritance, ChildEntity, CreateDateColumn } from 'typeorm'
-import { IBaseMessage } from '@/interfaces/wexin-message'
-import { IBaseEvent } from '@/interfaces/wexin-event'
+import { IBaseMessage } from '@/interfaces/wechat-message'
+import { IBaseEvent } from '@/interfaces/wechat-event'
 
 @Entity()
 @TableInheritance({ column: { type: 'varchar', name: 'type' } })

src/db/models/event.ts

@@ -1,6 +1,6 @@
 import { Column, ChildEntity } from 'typeorm'
 import { BaseEvent } from './base'
-import { IClickEvent, ILocationEvent, IScanEvent, ISubscribeAndScanEvent, ISubscribeEvent, IViewEvent } from '@/interfaces/wexin-event'
+import { IClickEvent, ILocationEvent, IScanEvent, ISubscribeAndScanEvent, ISubscribeEvent, IViewEvent } from '@/interfaces/wechat-event'
 
 @ChildEntity()
 export class SubscribeEvent extends BaseEvent implements ISubscribeEvent {

src/db/models/message.ts

@@ -1,6 +1,6 @@
 import { Column, ChildEntity } from 'typeorm'
 import { BaseMessage } from './base'
-import { IImageMessage, ILinkMessage, ILocationMessage, IShortVideoMessage, ITextMessage, IVideoMessage, IVoiceMessage } from '@/interfaces/wexin-message'
+import { IImageMessage, ILinkMessage, ILocationMessage, IShortVideoMessage, ITextMessage, IVideoMessage, IVoiceMessage } from '@/interfaces/wechat-message'
 
 @ChildEntity()
 export class TextMessage extends BaseMessage implements ITextMessage {

src/interfaces/wechat-event-body.ts

@@ -0,0 +1,7 @@
+import { CamelCaseObject } from './utils'
+import { WechatEvent } from './wechat-event'
+import { WechatMessage } from './wechat-message'
+
+export type WechatEventBody = WechatMessage | WechatEvent
+
+export type IWechatEventBody = CamelCaseObject<WechatEventBody>

src/interfaces/wexin-event.ts → src/interfaces/wechat-event.ts

@@ -124,6 +124,6 @@ export interface ViewEvent extends BaseEvent {
 
 export type IViewEvent = CamelCaseObject<ViewEvent>
 
-export type WexinEvent = SubscribeEvent | SubscribeAndScanEvent | ScanEvent | LocationEvent | ClickEvent | ViewEvent
+export type WechatEvent = SubscribeEvent | SubscribeAndScanEvent | ScanEvent | LocationEvent | ClickEvent | ViewEvent
 
-export type IWexinEvent = CamelCaseObject<WexinEvent>
+export type IWechatEvent = CamelCaseObject<WechatEvent>

src/interfaces/wexin-message.ts → src/interfaces/wechat-message.ts

@@ -142,7 +142,7 @@ export interface LinkMessage extends BaseMessage {
 
 export type ILinkMessage = CamelCaseObject<LinkMessage>
 
-export type WexinMessage = TextMessage | ImageMessage | VoiceMessage | VideoMessage | IShortVideoMessage | LocationMessage | LinkMessage
+export type WechatMessage = TextMessage | ImageMessage | VoiceMessage | VideoMessage | IShortVideoMessage | LocationMessage | LinkMessage
 
-export type IWexinMessage = CamelCaseObject<WexinMessage>
+export type IWechatMessage = CamelCaseObject<WechatMessage>
 

src/interfaces/wexin-reply-message.ts → src/interfaces/wechat-reply-message.ts

@@ -143,6 +143,6 @@ export interface ReplyNewsMessage extends BaseReplyMessage {
 
 export type IReplyNewsMessage = CamelCaseObject<ReplyNewsMessage>
 
-export type WexinReplyMessage = ReplyTextMessage | ReplyImageMessage | ReplyVoiceMessage | ReplyVideoMessage | ReplyMusicMessage | ReplyNewsMessage
+export type WechatReplyMessage = ReplyTextMessage | ReplyImageMessage | ReplyVoiceMessage | ReplyVideoMessage | ReplyMusicMessage | ReplyNewsMessage
 
-export type IWexinReplyMessage = CamelCaseObject<WexinReplyMessage>
+export type IWechatReplyMessage = CamelCaseObject<WechatReplyMessage>

src/routes/event.ts

@@ -4,7 +4,7 @@ import { to } from 'await-to-js'
 import { sha1, toCamelCase, xml2json } from '@/utils/helper'
 import { WX_TOKEN } from '@/env'
 import winstonLogger from '@/utils/logger'
-import { WexinEventBody } from '@/interfaces/wexin-event-body'
+import { WechatEventBody } from '@/interfaces/wechat-event-body'
 import { handleEvent } from '@/services/event'
 // 接收微信推送事件
 const app = new Hono()
@@ -48,7 +48,7 @@ app.post('/', async (c) => {
     if (error) {
         throw new HTTPException(400, { message: `Invalid XML: \n${error.message}` })
     }
-    const body = toCamelCase(xmlData as WexinEventBody)
+    const body = toCamelCase(xmlData as WechatEventBody)
 
     winstonLogger.isDebugEnabled() && winstonLogger.debug(`Body parameters: \n${JSON.stringify(body)}`)
 

src/services/event.ts

@@ -3,8 +3,8 @@ import { BaseMessage } from '@/db/models/base'
 import { ClickEvent, LocationEvent, ScanEvent, SubscribeAndScanEvent, SubscribeEvent, ViewEvent } from '@/db/models/event'
 import { ImageMessage, LinkMessage, LocationMessage, ShortVideoMessage, TextMessage, VideoMessage, VoiceMessage } from '@/db/models/message'
 import { CamelCaseObject } from '@/interfaces/utils'
-import { WexinEventBody } from '@/interfaces/wexin-event-body'
-import { WexinReplyMessage } from '@/interfaces/wexin-reply-message'
+import { WechatEventBody } from '@/interfaces/wechat-event-body'
+import { WechatReplyMessage } from '@/interfaces/wechat-reply-message'
 import { json2xml, toPascalCase } from '@/utils/helper'
 
 /**
@@ -14,7 +14,7 @@ import { json2xml, toPascalCase } from '@/utils/helper'
  * @date 2024-09-24
  * @param data
  */
-export function replyMessage(data: Partial<CamelCaseObject<WexinReplyMessage>>) {
+export function replyMessage(data: Partial<CamelCaseObject<WechatReplyMessage>>) {
     return json2xml(toPascalCase({
         createTime: Math.floor(Date.now() / 1000),
         ...data,
@@ -29,7 +29,7 @@ export function replyMessage(data: Partial<CamelCaseObject<WexinReplyMessage>>)
  * @export
  * @param body
  */
-export async function handleEvent(body: CamelCaseObject<WexinEventBody>) {
+export async function handleEvent(body: CamelCaseObject<WechatEventBody>) {
     const { fromUserName, toUserName, msgType } = body
     // 存储用户消息到数据库
     const entityManager = (await getDataSource()).manager
@@ -122,7 +122,7 @@ export async function handleEvent(body: CamelCaseObject<WexinEventBody>) {
  * @export
  * @param body
  */
-export async function saveEvent(body: CamelCaseObject<WexinEventBody>) {
+export async function saveEvent(body: CamelCaseObject<WechatEventBody>) {
     const { msgType } = body
     const entityManager = (await getDataSource()).manager
     switch (msgType) {