Refactor code to add end-to-end encryption flag in OperatorConfig entity and TaskService

src/operator_config/entities/operator-config.entiy.ts

@@ -46,4 +46,7 @@ export class OperatorConfig {
 
     @Column({ default: 0 })
     minTaskNum: number
+
+    @Column({ default: false })
+    endToEndEncryption: boolean
 }

src/task/task.service.ts

@@ -1,3 +1,4 @@
+import { OperatorConfigService } from './../operator_config/operator_config.service'
 import { PhoneListService } from './../phone-list/phone-list.service'
 import {
     forwardRef,
@@ -61,9 +62,9 @@ export class TaskService implements OnModuleInit {
         private readonly deviceService: DeviceService,
         private readonly sysConfigService: SysConfigService,
         private readonly balanceService: BalanceService,
-        private readonly userService: UsersService
-    ) {
-    }
+        private readonly userService: UsersService,
+        private readonly operatorConfigService: OperatorConfigService
+    ) {}
 
     onModuleInit() {
         this.lock.acquire('dispatchTask', async () => {
@@ -128,6 +129,10 @@ export class TaskService implements OnModuleInit {
         }
         task.total = phones.length
         task.country = phoneList.country
+        if (task.country) {
+            task.endToEndEncryption =
+                (await this.operatorConfigService.findByCountry(task.country))?.endToEndEncryption || false
+        }
         // 定时任务
         let cost = 0
         if (task.startedAt) {
@@ -651,8 +656,7 @@ export class TaskService implements OnModuleInit {
                     if (durianRes.data.code === 200) {
                         res.durian = durianRes.data.data.score
                     }
-                } catch (e) {
-                }
+                } catch (e) {}
             })(),
             (async () => {
                 try {
@@ -666,8 +670,7 @@ export class TaskService implements OnModuleInit {
                     if (parts[0] === '0') {
                         res.xyz = parts[1] < 0 ? 0 : parts[1]
                     }
-                } catch (e) {
-                }
+                } catch (e) {}
             })(),
             (async () => {
                 try {
@@ -680,8 +683,7 @@ export class TaskService implements OnModuleInit {
                     if (cloud033Res.data.code === '1001') {
                         res.cloud033 = cloud033Res.data.data.integral
                     }
-                } catch (e) {
-                }
+                } catch (e) {}
             })(),
             (async () => {
                 try {
@@ -694,8 +696,7 @@ export class TaskService implements OnModuleInit {
                     if (cloud034Res.data.code === '1001') {
                         res.cloud034 = cloud034Res.data.data.integral
                     }
-                } catch (e) {
-                }
+                } catch (e) {}
             })(),
             (async () => {
                 try {
@@ -708,8 +709,7 @@ export class TaskService implements OnModuleInit {
                     if (cloud037Res.data.code === '1001') {
                         res.cloud037 = cloud037Res.data.data.integral
                     }
-                } catch (e) {
-                }
+                } catch (e) {}
             })()
         ])
         return res
@@ -721,7 +721,7 @@ export class TaskService implements OnModuleInit {
 
         return await this.taskItemRepository
             .createQueryBuilder()
-            .select(['COUNT(*) AS sent', 'DATE_FORMAT(sendAt, \'%Y-%m-%d %H:00:00\') AS hour'])
+            .select(['COUNT(*) AS sent', "DATE_FORMAT(sendAt, '%Y-%m-%d %H:00:00') AS hour"])
             .where('sendAt BETWEEN :start AND :end', { start: twelveHoursAgo, end: new Date() })
             .groupBy('hour')
             .orderBy('hour', 'DESC')
@@ -747,10 +747,7 @@ export class TaskService implements OnModuleInit {
         yesterday.setHours(0, 0, 0, 0)
         const res = await this.taskRepository
             .createQueryBuilder()
-            .select([
-                'sum(total) as value',
-                'country as name'
-            ])
+            .select(['sum(total) as value', 'country as name'])
             .where(where)
             .andWhere('country is not null')
             .andWhere('status = :status', { status: TaskStatus.COMPLETED })
@@ -767,10 +764,7 @@ export class TaskService implements OnModuleInit {
         sixDaysAgo.setHours(0, 0, 0, 0)
         const totalRes = await this.taskRepository
             .createQueryBuilder()
-            .select([
-                'sum(total) as value',
-                'country as name'
-            ])
+            .select(['sum(total) as value', 'country as name'])
             .where(where)
             .andWhere('country is not null')
             .andWhere('createdAt between :start and :end', {
@@ -785,7 +779,6 @@ export class TaskService implements OnModuleInit {
             completedData: res,
             totalData: totalRes
         }
-
     }
 
     async getSuccessNum(id: number) {