@lakutata/core 1.0.28 → 1.0.29

package/src/plugins/Formatter.ts

@@ -1,5 +1,5 @@
 import {Plugin} from '../base/Plugin'
-import moment from 'moment'
+import momentTimezone from 'moment-timezone'
 import {Configurable} from '../decorators/DependencyInjection'
 
 declare module '../Core' {
@@ -9,6 +9,11 @@ declare module '../Core' {
 }
 
 export class Formatter extends Plugin {
+
+	protected get timezone(): string {
+		return <string>process.env.TZ
+	}
+
 	/**
 	 * 默认时间格式
 	 * @type {string}
@@ -23,7 +28,7 @@ export class Formatter extends Plugin {
 	 * @returns {number}
 	 */
 	public asTimestamp(inp: string | number | Date = new Date()): number {
-		return moment(inp).unix()
+		return momentTimezone.tz(inp, this.timezone).unix()
 	}
 
 	/**
@@ -32,7 +37,7 @@ export class Formatter extends Plugin {
 	 * @returns {number}
 	 */
 	public asMillisecondTimestamp(inp: string | number | Date = new Date()): number {
-		return moment(inp).valueOf()
+		return momentTimezone.tz(inp, this.timezone).valueOf()
 	}
 
 	/**
@@ -41,7 +46,7 @@ export class Formatter extends Plugin {
 	 * @returns {Date}
 	 */
 	public asDate(inp: string | number | Date): Date {
-		return moment(inp).toDate()
+		return momentTimezone.tz(inp, this.timezone).toDate()
 	}
 
 	/**
@@ -51,7 +56,7 @@ export class Formatter extends Plugin {
 	 * @returns {string}
 	 */
 	public asDateText(inp: Date | string | number = new Date(), format?: string): string {
-		return moment(inp).format(format ? format : this.dateFormat)
+		return momentTimezone.tz(inp, this.timezone).format(format ? format : this.dateFormat)
 	}
 
 	/**

package/src/plugins/Logger.ts

@@ -27,7 +27,7 @@ export class Logger extends Plugin {
 	protected readonly console: ConsoleTransportOptions = {
 		silent: false,
 		format: format.combine(
-			format.timestamp({format: 'YYYY-MM-DD HH:mm:ss'}),
+			format.timestamp(),
 			format.colorize(),
 			format.printf(packet => {
 				return `${packet.timestamp} ${packet.level}: ${packet.message}`

package/src/tests/Main.spec.ts

@@ -29,6 +29,7 @@ import {TestException} from './exceptions/TestException'
 		const config: IApplicationConfig = {
 			id: 'test.app',
 			name: 'test app',
+			timezone: 'US/Alpine',
 			processes: [TestProcess],
 			threads: [TestThread],
 			plugins: [
@@ -38,7 +39,7 @@ import {TestException} from './exceptions/TestException'
 				},
 				{
 					class: Formatter,
-					dateFormat: 'YYYY'
+					dateFormat: 'YYYY-MM-DD HH:mm:ss'
 				},
 				{
 					class: Logger,
@@ -147,7 +148,10 @@ import {TestException} from './exceptions/TestException'
 						app.Logger.debug('this is debug')
 						// new TestThread()
 						const tt = app.Threads.get(TestThread)
-						await tt.test()
+						const threadResult = await tt.test('a', 'b', 'c', (timestamp: number) => {
+							console.log('fn', timestamp)
+						})
+						console.log('==========> threadResult:', threadResult)
 						await app.Threads.destroy(TestThread)
 						const tp = app.Processes.get(TestProcess)
 						await tp.procTest()

package/src/tests/threads/TestThread.ts

@@ -5,7 +5,9 @@ export class TestThread extends Thread {
 		console.log('this is test thread')
 	}
 
-	public async test() {
+	public async test(a, b, c, callback) {
 		console.log('this is thread test function')
+		callback(Date.now())
+		return a + b + c + 'sfsdfasdfasdfasdfasdfasdf'
 	}
 }