fix(cls): timezone to Asia/Shanghai

Author: yugasun

src/modules/cls/index.ts

@@ -1,5 +1,4 @@
 import { Cls as ClsClient } from '@tencent-sdk/cls';
-import dayjs, { Dayjs } from 'dayjs';
 import {
   ClsDelopyIndexInputs,
   ClsDeployInputs,
@@ -12,10 +11,9 @@ import {
 } from './interface';
 import { CapiCredentials, RegionType } from './../interface';
 import { ApiError } from '../../utils/error';
+import { dtz, TIME_FORMAT, Dayjs } from '../../utils/dayjs';
 import { createLogset, createTopic, updateIndex, getSearchSql } from './utils';
 
-const TimeFormat = 'YYYY-MM-DD HH:mm:ss';
-
 export default class Cls {
   credentials: CapiCredentials;
   region: RegionType;
@@ -214,11 +212,11 @@ export default class Cls {
 
     // 默认获取从当前到一个小时前时间段的日志
     if (!endTime) {
-      endDate = dayjs();
+      endDate = dtz();
       startDate = endDate.add(-1, 'hour');
     } else {
-      endDate = dayjs(endTime);
-      startDate = dayjs(endDate.valueOf() - Number(interval) * 1000);
+      endDate = dtz(endTime);
+      startDate = dtz(endDate.valueOf() - Number(interval) * 1000);
     }
 
     const sql = getSearchSql({
@@ -229,8 +227,8 @@ export default class Cls {
     const searchParameters = {
       logset_id: data.logsetId,
       topic_ids: data.topicId,
-      start_time: startDate.format(TimeFormat),
-      end_time: endDate.format(TimeFormat),
+      start_time: startDate.format(TIME_FORMAT),
+      end_time: endDate.format(TIME_FORMAT),
       // query_string 必须用 cam 特有的 url 编码方式
       query_string: sql,
       limit: data.limit || 10,
@@ -244,8 +242,8 @@ export default class Cls {
         logsetId: data.logsetId,
         topicId: data.topicId,
         reqId: curReq.requestId,
-        startTime: startDate.format(TimeFormat),
-        endTime: endDate.format(TimeFormat),
+        startTime: startDate.format(TIME_FORMAT),
+        endTime: endDate.format(TIME_FORMAT),
       });
       curReq.message = (detailLog || [])
         .map(({ content }: { content: string }) => {
@@ -274,7 +272,7 @@ export default class Cls {
       debug: false,
     });
 
-    data.startTime = data.startTime || dayjs(data.endTime).add(-1, 'hour').format(TimeFormat);
+    data.startTime = data.startTime || dtz(data.endTime).add(-1, 'hour').format(TIME_FORMAT);
 
     const sql = `SCF_RequestId:${data.reqId} AND SCF_RetryNum:0`;
     const searchParameters = {

src/modules/scf/entities/scf.ts

@@ -2,7 +2,7 @@ import { Capi } from '@tencent-sdk/capi';
 import { waitResponse } from '@ygkit/request';
 import dayjs from 'dayjs';
 import { ApiTypeError, ApiError } from '../../../utils/error';
-import { formatDate } from '../../../utils';
+import { formatDate } from '../../../utils/dayjs';
 import CONFIGS from '../config';
 import Cls from '../../cls';
 import { formatInputs } from '../utils';

src/utils/dayjs.ts

@@ -0,0 +1,20 @@
+import dayjs, { Dayjs, ConfigType } from 'dayjs';
+import tz from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
+
+dayjs.extend(tz);
+dayjs.extend(utc);
+
+dayjs.tz.setDefault('Asia/Shanghai');
+
+const dtz = (date: ConfigType = Date.now()) => {
+  return dayjs.tz(date);
+};
+
+const TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+
+function formatDate(date: ConfigType): string {
+  return dtz(date).format(TIME_FORMAT);
+}
+
+export { dayjs, dtz, Dayjs, TIME_FORMAT, formatDate };

src/utils/index.ts

@@ -1,12 +1,9 @@
 import fs from 'fs';
 import path from 'path';
 import { PascalCase } from 'type-fest';
-import dayjs, { Dayjs } from 'dayjs';
 
 // TODO: 将一些库换成 lodash
 
-export const TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
-
 /**
  * simple deep clone object
  * @param {object} obj object
@@ -250,7 +247,3 @@ export function getYestoday() {
   const yestoday = getToday(new Date(timestamp));
   return yestoday;
 }
-
-export function formatDate(str: string | number | Dayjs): string {
-  return dayjs(str).format(TIME_FORMAT);
-}