浏览代码

update utils.js moment test

DevYK 2 年之前
父节点
当前提交
e41eb65784
共有 4 个文件被更改,包括 40 次插入1 次删除
  1. 1 0
      model/moralis_sdk.js
  2. 2 1
      model/utils.js
  3. 36 0
      package-lock.json
  4. 1 0
      package.json

+ 1 - 0
model/moralis_sdk.js

@@ -354,6 +354,7 @@ async function computeTransferGasFree(obj, my_account_all_coins, tokenPrices) {
     logger.log('native nativePriceItem=', nativePriceItem, nativeAllBalance);
 
 
+
     if (nativePriceItem) {
         var total_all_usdprice = calculate_total_usdprice(nativeAllBalance, '18', nativePriceItem.usdPrice);
         logger.log('native total_all_usdprice=', total_all_usdprice);

+ 2 - 1
model/utils.js

@@ -3,6 +3,7 @@ var CryptoJS = require("crypto-js");
 require('dotenv').config()
 const logger = require('./logger')
 var moment = require('moment');
+const chinaTime = require('china-time');
 
 var { cryppt_config } = require('../config/config.js')
 
@@ -130,7 +131,7 @@ function getCurrentDate() {
     if (process.env.NODE_ENV == 'dev')
         return moment().locale('zh-cn').format('YYYY-MM-DD HH:mm:ss');
     else {
-        return moment(moment().locale('zh-cn').format('YYYY-MM-DD HH:mm:ss')).utc(8).format('YYYY-MM-DD HH:mm:ss');
+        return chinaTime('YYYY-MM-DD HH:mm:ss');
     }
     // return moment().locale('zh-cn').format();
 

+ 36 - 0
package-lock.json

@@ -10,6 +10,7 @@
       "dependencies": {
         "axios": "^0.27.2",
         "bignumber.js": "^9.0.2",
+        "china-time": "^0.12.3",
         "crypto-js": "^4.1.1",
         "debug": "^4.1.1",
         "dotenv": "^16.0.0",
@@ -4177,6 +4178,14 @@
       "resolved": "https://registry.npmmirror.com/charm/-/charm-0.1.2.tgz",
       "integrity": "sha512-syedaZ9cPe7r3hoQA9twWYKu5AIyCswN5+szkmPBe9ccdLrj4bYaCnLVPTLd2kgVRc7+zoX4tyPgRnFKCj5YjQ=="
     },
+    "node_modules/china-time": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmmirror.com/china-time/-/china-time-0.12.3.tgz",
+      "integrity": "sha512-veWucnJfUL/HVC++21CijGoxrS/3VwTqhok0yUn6X8dvJnEJFKEeNgvVO7fX9y9b/tRN5x2Z0TTEw+J3xc3vmw==",
+      "dependencies": {
+        "moment-timezone": "^0.5.14"
+      }
+    },
     "node_modules/chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz",
@@ -10167,6 +10176,17 @@
         "node": "*"
       }
     },
+    "node_modules/moment-timezone": {
+      "version": "0.5.34",
+      "resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.34.tgz",
+      "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==",
+      "dependencies": {
+        "moment": ">= 2.9.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/moralis": {
       "version": "1.7.0",
       "resolved": "https://registry.npmmirror.com/moralis/-/moralis-1.7.0.tgz",
@@ -19068,6 +19088,14 @@
       "resolved": "https://registry.npmmirror.com/charm/-/charm-0.1.2.tgz",
       "integrity": "sha512-syedaZ9cPe7r3hoQA9twWYKu5AIyCswN5+szkmPBe9ccdLrj4bYaCnLVPTLd2kgVRc7+zoX4tyPgRnFKCj5YjQ=="
     },
+    "china-time": {
+      "version": "0.12.3",
+      "resolved": "https://registry.npmmirror.com/china-time/-/china-time-0.12.3.tgz",
+      "integrity": "sha512-veWucnJfUL/HVC++21CijGoxrS/3VwTqhok0yUn6X8dvJnEJFKEeNgvVO7fX9y9b/tRN5x2Z0TTEw+J3xc3vmw==",
+      "requires": {
+        "moment-timezone": "^0.5.14"
+      }
+    },
     "chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz",
@@ -23920,6 +23948,14 @@
       "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.3.tgz",
       "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="
     },
+    "moment-timezone": {
+      "version": "0.5.34",
+      "resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.34.tgz",
+      "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==",
+      "requires": {
+        "moment": ">= 2.9.0"
+      }
+    },
     "moralis": {
       "version": "1.7.0",
       "resolved": "https://registry.npmmirror.com/moralis/-/moralis-1.7.0.tgz",

+ 1 - 0
package.json

@@ -11,6 +11,7 @@
   "dependencies": {
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
+    "china-time": "^0.12.3",
     "crypto-js": "^4.1.1",
     "debug": "^4.1.1",
     "dotenv": "^16.0.0",