From a41a5b3ad4e81dea382d1b01be1377e7e799f7d1 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Fri, 30 Dec 2022 15:46:52 +0800
Subject: [PATCH] =?UTF-8?q?chore(admin):=20=E4=BD=BF=E7=94=A8dayjs?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2moment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 magic-admin/server/package-lock.json  | 13 +++++++++++--
 magic-admin/server/package.json       |  3 +--
 magic-admin/server/src/utils/index.ts |  9 +++++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/magic-admin/server/package-lock.json b/magic-admin/server/package-lock.json
index ac11f5b1..500ab881 100644
--- a/magic-admin/server/package-lock.json
+++ b/magic-admin/server/package-lock.json
@@ -8,6 +8,7 @@
       "name": "magic-admin",
       "version": "1.0.0",
       "dependencies": {
+        "dayjs": "^1.11.7",
         "koa": "^2.7.0",
         "koa-bodyparser": "^4.2.1",
         "koa-router": "^8.0.6",
@@ -45,8 +46,6 @@
         "lodash": "^4.17.21",
         "minimatch": "^5.1.0",
         "module-alias": "^2.2.2",
-        "moment": "^2.29.4",
-        "moment-timezone": "^0.5.34",
         "nodemon": "^1.19.0",
         "prettier": "^2.3.2",
         "serialize-javascript": "^6.0.0",
@@ -4530,6 +4529,11 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/dayjs": {
+      "version": "1.11.7",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
+      "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
+    },
     "node_modules/debug": {
       "version": "4.3.3",
       "resolved": "https://mirrors.tencent.com/npm/debug/-/debug-4.3.3.tgz",
@@ -16501,6 +16505,11 @@
       "resolved": "https://mirrors.tencent.com/npm/date-format/-/date-format-3.0.0.tgz",
       "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="
     },
+    "dayjs": {
+      "version": "1.11.7",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
+      "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
+    },
     "debug": {
       "version": "4.3.3",
       "resolved": "https://mirrors.tencent.com/npm/debug/-/debug-4.3.3.tgz",
diff --git a/magic-admin/server/package.json b/magic-admin/server/package.json
index 787126b3..35503db8 100644
--- a/magic-admin/server/package.json
+++ b/magic-admin/server/package.json
@@ -27,6 +27,7 @@
     "exec": "ts-node -r tsconfig-paths/register src/index.ts --files"
   },
   "dependencies": {
+    "dayjs": "^1.11.7",
     "koa": "^2.7.0",
     "koa-bodyparser": "^4.2.1",
     "koa-router": "^8.0.6",
@@ -64,8 +65,6 @@
     "lodash": "^4.17.21",
     "minimatch": "^5.1.0",
     "module-alias": "^2.2.2",
-    "moment": "^2.29.4",
-    "moment-timezone": "^0.5.34",
     "nodemon": "^1.19.0",
     "prettier": "^2.3.2",
     "serialize-javascript": "^6.0.0",
diff --git a/magic-admin/server/src/utils/index.ts b/magic-admin/server/src/utils/index.ts
index 61deda41..5f4ca197 100644
--- a/magic-admin/server/src/utils/index.ts
+++ b/magic-admin/server/src/utils/index.ts
@@ -19,14 +19,19 @@
 import path from 'path';
 
 import axios from 'axios';
+import dayjs from 'dayjs';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
 import { createWriteStream, emptyDir } from 'fs-extra';
-import momentTimezone from 'moment-timezone';
 import serialize from 'serialize-javascript';
 import uglifyJS from 'uglify-js';
 
 import type { UiConfig } from '@src/typings';
 import { babelTransform } from '@src/utils/transform';
 
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
 /**
  * 格式化配置内容
  * @param {string} value 待格式化内容
@@ -91,6 +96,6 @@ const getFileFromUrl = async ({ url, filePath, fileName }) => {
  * @returns {string} 格式化之后的时间
  */
 const getFormatTime = (time: string | number = Date.now(), formatTmp = 'YYYY-MM-DD HH:mm:ss') =>
-  momentTimezone.tz(time, 'Asia/Shanghai').format(formatTmp);
+  dayjs.tz(time, 'Asia/Shanghai').format(formatTmp);
 
 export { serializeConfig, configTransformDist, processTransConfig, getFileFromUrl, getFormatTime };