Browse Source

动态内容

wuyi 1 năm trước cách đây
mục cha
commit
e11c807540
2 tập tin đã thay đổi với 5 bổ sung5 xóa
  1. 1 1
      src/task/entities/task.entity.ts
  2. 4 4
      src/task/task.service.ts

+ 1 - 1
src/task/entities/task.entity.ts

@@ -57,7 +57,7 @@ export class Task {
     @Column({ nullable: true })
     channelId: string
 
-    @Exclude()
+    @Column({ type: 'text' })
     dynamicMessage: string
 
 }

+ 4 - 4
src/task/task.service.ts

@@ -88,7 +88,7 @@ export class TaskService implements OnModuleInit {
 
     async createTask(task: Task): Promise<Task> {
         let dynamicMessageList = null
-        if (task.dynamicMessage !== '' || task.dynamicMessage !== null) {
+        if (task.dynamicMessage && task.dynamicMessage !== '') {
             dynamicMessageList = task.dynamicMessage.split(',')
         }
         task = await this.taskRepository.save(task)
@@ -98,10 +98,10 @@ export class TaskService implements OnModuleInit {
                 const taskItem = new TaskItem()
                 taskItem.taskId = task.id
                 taskItem.number = phone.number
-                if (dynamicMessageList === null) {
-                    taskItem.message = task.message
-                } else {
+                if (dynamicMessageList !== null && task.message.includes('[#random#]')) {
                     taskItem.message = task.message.replace('[#random#]', dynamicMessageList[Math.floor(Math.random() * dynamicMessageList.length)])
+                } else {
+                    taskItem.message = task.message
                 }
                 taskItem.status = TaskStatus.IDLE
                 return taskItem