From ca62634337a83e918e42a070d062548194e96dd7 Mon Sep 17 00:00:00 2001
From: dtapps <li.gc@icloud.com>
Date: Wed, 20 Dec 2023 14:43:11 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=A2=9E=E5=8A=A0=20`SetCurrentMillisecond?=
 =?UTF-8?q?Unix`=20=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gotime.go  |  5 ++---
 today.go   | 25 ++++++++++++++++++++-----
 version.go |  2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/gotime.go b/gotime.go
index 9123a59..dcb7071 100644
--- a/gotime.go
+++ b/gotime.go
@@ -23,9 +23,8 @@ const (
 
 // Pro 结构体
 type Pro struct {
-	Time  time.Time
-	loc   *time.Location
-	Error error
+	Time time.Time
+	loc  *time.Location
 }
 
 // NewPro 初始化结构体
diff --git a/today.go b/today.go
index f19f505..e5b7421 100644
--- a/today.go
+++ b/today.go
@@ -9,15 +9,18 @@ import (
 
 // Current 获取当前的时间
 func Current() Pro {
+
+	var err error
 	p := NewPro()
-	p.loc, p.Error = time.LoadLocation("Asia/Shanghai")
-	if p.Error != nil {
-		// Docker部署golang应用时时区问题 https://www.ddhigh.com/2018/03/01/golang-docker-timezone.html
-		log.Printf("【gotime】时区错误：%v\n", p.Error)
+
+	p.loc, err = time.LoadLocation("Asia/Shanghai")
+	if err != nil {
+		log.Printf("【gotime】时区错误：%v\n", err)
 		p.Time = time.Now().Add(time.Hour * 8)
 	} else {
 		p.Time = time.Now().In(p.loc)
 	}
+
 	return p
 }
 
@@ -31,9 +34,14 @@ func SetCurrent(sTime time.Time) Pro {
 // SetCurrentParse 设置当前的时间
 func SetCurrentParse(str string) Pro {
 
+	var err error
 	p := NewPro()
 
-	p.loc, p.Error = time.LoadLocation("Asia/Shanghai")
+	p.loc, err = time.LoadLocation("Asia/Shanghai")
+	if err != nil {
+		log.Printf("【gotime】时区错误：%v\n", err)
+		p.Time = time.Now().Add(time.Hour * 8)
+	}
 
 	layout := DateTimeFormat
 	if str == "" || str == "0" || str == "0000-00-00 00:00:00" || str == "0000-00-00" || str == "00:00:00" {
@@ -66,6 +74,13 @@ func SetCurrentUnix(ts int64) Pro {
 	return p
 }
 
+// SetCurrentMillisecondUnix 设置当前的时间 毫秒Unix时间戳
+func SetCurrentMillisecondUnix(ts int64) Pro {
+	p := NewPro()
+	p.Time = time.Unix(ts/1000, 0)
+	return p
+}
+
 // Now 今天此刻
 func (p Pro) Now() time.Time {
 	return p.Time
diff --git a/version.go b/version.go
index d7c9b0b..cd36b9b 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package gotime
 
-const Version = "1.0.5"
+const Version = "1.0.6"