Jelajahi Sumber

add zoneinfo

jxyowen 7 tahun lalu
induk
melakukan
2a2352bf62
5 mengubah file dengan 24 tambahan dan 28 penghapusan
  1. 1 16
      Gopkg.lock
  2. 5 0
      Gopkg.toml
  3. 6 0
      sdk/resource/tzdata.go
  4. 2 0
      sdk/resource/zoneinfo.go
  5. 10 12
      sdk/utils/utils.go

+ 1 - 16
Gopkg.lock

@@ -55,24 +55,9 @@
   revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
   version = "v1.2.1"
 
-[[projects]]
-  branch = "master"
-  name = "golang.org/x/crypto"
-  packages = ["ssh/terminal"]
-  revision = "2b6c08872f4b66da917bb4ce98df4f0307330f78"
-
-[[projects]]
-  branch = "master"
-  name = "golang.org/x/sys"
-  packages = [
-    "unix",
-    "windows"
-  ]
-  revision = "79b0c6888797020a994db17c8510466c72fe75d9"
-
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "bc688a70dca76f7e57da66641e374b6fcd0c715afb0b38f71cbfaebdbd02075f"
+  inputs-digest = "96660ce7f50e00da6200e363b7b0d129c5f57e3f2307bab1dbfe386f6737534f"
   solver-name = "gps-cdcl"
   solver-version = 1

+ 5 - 0
Gopkg.toml

@@ -24,6 +24,11 @@
 #   go-tests = true
 #   unused-packages = true
 
+#ignored = [
+#  "golang.org/x/sys/unix",
+#  "golang.org/x/sys/windows",
+#  "golang.org/x/crypto/ssh/terminal",
+#]
 
 [[constraint]]
   name = "github.com/jmespath/go-jmespath"

+ 6 - 0
sdk/resource/tzdata.go

@@ -0,0 +1,6 @@
+package resource
+
+func GetTZData(name string) ([]byte, bool) {
+	data, ok := files["zoneinfo/"+name]
+	return data, ok
+}

File diff ditekan karena terlalu besar
+ 2 - 0
sdk/resource/zoneinfo.go


+ 10 - 12
sdk/utils/utils.go

@@ -45,14 +45,17 @@ func GetMD5Base64(bytes []byte) (base64Value string) {
 	return
 }
 
-func GetTimeInFormatISO8601() (timeStr string) {
-	var gmt *time.Location
-	var err error
+func GetGMTLocation() (*time.Location, error) {
 	if LoadLocationFromTZData != nil && TZData != nil {
-		gmt, err = LoadLocationFromTZData("GMT", TZData)
+		return LoadLocationFromTZData("GMT", TZData)
 	} else {
-		gmt, err = time.LoadLocation("GMT")
+		return time.LoadLocation("GMT")
 	}
+}
+
+func GetTimeInFormatISO8601() (timeStr string) {
+	gmt, err := GetGMTLocation()
+
 	if err != nil {
 		panic(err)
 	}
@@ -60,13 +63,8 @@ func GetTimeInFormatISO8601() (timeStr string) {
 }
 
 func GetTimeInFormatRFC2616() (timeStr string) {
-	var gmt *time.Location
-	var err error
-	if LoadLocationFromTZData != nil && TZData != nil {
-		gmt, err = LoadLocationFromTZData("GMT", TZData)
-	} else {
-		gmt, err = time.LoadLocation("GMT")
-	}
+	gmt, err := GetGMTLocation()
+
 	if err != nil {
 		panic(err)
 	}

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini