From 720a07aa16e5d2c711dbe7cdc5816a1960ddbddd Mon Sep 17 00:00:00 2001 From: gouguoyin <245629560@qq.com> Date: Fri, 22 Nov 2024 15:58:19 +0800 Subject: [PATCH] `golang-module/carbon` -> `dromara/carbon` --- .github/FUNDING.yml | 2 +- .github/ISSUE_TEMPLATE/ask-question.md | 4 ++-- README.cn.md | 22 +++++++++++----------- README.jp.md | 26 +++++++++++++------------- README.md | 26 +++++++++++++------------- calendar.go | 6 +++--- calendar/julian/julian.go | 2 +- calendar/lunar/lunar.go | 4 ++-- calendar/persian/persian.go | 4 ++-- calendar_unit_test.go | 2 +- carbon.go | 2 +- encoding_unit_test.go | 4 ++-- go.mod | 2 +- outputer_unit_test.go | 2 +- parser_unit_test.go | 6 +++--- 15 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index c3176a31..bab1c39d 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -7,7 +7,7 @@ ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry liberapay: gouguoyin -issuehunt: golang-module/carbon +issuehunt: dromara/carbon otechie: # Replace with a single Otechie username lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry custom: ['https://www.gouguoyin.com/zanzhu.html'] diff --git a/.github/ISSUE_TEMPLATE/ask-question.md b/.github/ISSUE_TEMPLATE/ask-question.md index 7e0faddb..be13d685 100644 --- a/.github/ISSUE_TEMPLATE/ask-question.md +++ b/.github/ISSUE_TEMPLATE/ask-question.md @@ -10,7 +10,7 @@ Before asking a question, make sure you have: - Searched existing Stack Overflow questions. - Googled your question. -- Searched open and closed [GitHub issues](https://github.com/golang-module/carbon/issues?utf8=%E2%9C%93&q=is%3Aissue) +- Searched open and closed [GitHub issues](https://github.com/dromara/carbon/issues?utf8=%E2%9C%93&q=is%3Aissue) - Read the documentation: - - [Carbon Readme](https://github.com/golang-module/carbon) + - [Carbon Readme](https://github.com/dromara/carbon) --> diff --git a/README.cn.md b/README.cn.md index 3e36695c..baef25f4 100644 --- a/README.cn.md +++ b/README.cn.md @@ -1,8 +1,8 @@ # Carbon # [![Carbon Release](https://img.shields.io/github/release/dromara/carbon.svg)](https://github.com/dromara/carbon/releases) -[![Go Test](https://github.com/golang-module/carbon/actions/workflows/test.yml/badge.svg)](https://github.com/dromara/carbon/actions) -[![Go Report Card](https://goreportcard.com/badge/github.com/golang-module/carbon/v2)](https://goreportcard.com/report/github.com/dromara/carbon/v2) +[![Go Test](https://github.com/dromara/carbon/actions/workflows/test.yml/badge.svg)](https://github.com/dromara/carbon/actions) +[![Go Report Card](https://goreportcard.com/badge/github.com/dromara/carbon/v2)](https://goreportcard.com/report/github.com/dromara/carbon/v2) [![Go Coverage](https://codecov.io/gh/dromara/carbon/branch/master/graph/badge.svg)](https://codecov.io/gh/dromara/carbon) [![Carbon Doc](https://img.shields.io/badge/go.dev-reference-brightgreen?logo=go&logoColor=white&style=flat)](https://pkg.go.dev/github.com/dromara/carbon/v2) [![License](https://img.shields.io/github/license/dromara/carbon)](https://github.com/dromara/carbon/blob/master/LICENSE) @@ -27,28 +27,28 @@ ```go // 使用 github 库 -go get -u github.com/golang-module/carbon/v2 +go get -u github.com/dromara/carbon/v2 -import "github.com/golang-module/carbon/v2" +import "github.com/dromara/carbon/v2" // 使用 gitee 库 -go get -u gitee.com/golang-module/carbon/v2 +go get -u gitee.com/dromara/carbon/v2 -import "gitee.com/golang-module/carbon/v2" +import "gitee.com/dromara/carbon/v2" ``` ##### Golang 版本小于 1.17 (必须) ```go // 使用 github 库 -go get -u github.com/golang-module/carbon +go get -u github.com/dromara/carbon -import "github.com/golang-module/carbon" +import "github.com/dromara/carbon" // 使用 gitee 库 -go get -u gitee.com/golang-module/carbon +go get -u gitee.com/dromara/carbon -import "gitee.com/golang-module/carbon" +import "gitee.com/dromara/carbon" ``` > v1 和 v2 版本区别请查阅 常见问题，v1 版本不再更新，仅维护。 @@ -1569,7 +1569,7 @@ COPY ./zoneinfo.zip /usr/local/go/lib/time/zoneinfo.zip #### 贡献者 感谢以下所有为 `Carbon` 做出贡献的人： - + #### 赞助 diff --git a/README.jp.md b/README.jp.md index 42576f0a..b377d00b 100644 --- a/README.jp.md +++ b/README.jp.md @@ -1,8 +1,8 @@ # Carbon # [![Carbon Release](https://img.shields.io/github/release/dromara/carbon.svg)](https://github.com/dromara/carbon/releases) -[![Go Test](https://github.com/golang-module/carbon/actions/workflows/test.yml/badge.svg)](https://github.com/dromara/carbon/actions) -[![Go Report Card](https://goreportcard.com/badge/github.com/golang-module/carbon/v2)](https://goreportcard.com/report/github.com/dromara/carbon/v2) +[![Go Test](https://github.com/dromara/carbon/actions/workflows/test.yml/badge.svg)](https://github.com/dromara/carbon/actions) +[![Go Report Card](https://goreportcard.com/badge/github.com/dromara/carbon/v2)](https://goreportcard.com/report/github.com/dromara/carbon/v2) [![Go Coverage](https://codecov.io/gh/dromara/carbon/branch/master/graph/badge.svg)](https://codecov.io/gh/dromara/carbon) [![Carbon Doc](https://img.shields.io/badge/go.dev-reference-brightgreen?logo=go&logoColor=white&style=flat)](https://pkg.go.dev/github.com/dromara/carbon/v2) [![License](https://img.shields.io/github/license/dromara/carbon)](https://github.com/dromara/carbon/blob/master/LICENSE) @@ -17,9 +17,9 @@ Carbon は [awesome-go](https://github.com/avelino/awesome-go#date-and-time "awe #### 倉庫所在地 -[github.com/dromara/carbon](https://github.com/golang-module/carbon "github.com/golang-module/carbon") +[github.com/dromara/carbon](https://github.com/dromara/carbon "github.com/dromara/carbon") -[gitee.com/dromara/carbon](https://gitee.com/golang-module/carbon "gitee.com/golang-module/carbon") +[gitee.com/dromara/carbon](https://gitee.com/dromara/carbon "gitee.com/dromara/carbon") [gitcode.com/dromara/carbon](https://gitcode.com/dromara/carbon "gitcode.com/dromara/carbon") @@ -29,29 +29,29 @@ Carbon は [awesome-go](https://github.com/avelino/awesome-go#date-and-time "awe ```go // github倉庫を使う -go get -u github.com/golang-module/carbon/v2 +go get -u github.com/dromara/carbon/v2 -import "github.com/golang-module/carbon/v2" +import "github.com/dromara/carbon/v2" // gitee倉庫を使う -go get -u gitee.com/golang-module/carbon/v2 +go get -u gitee.com/dromara/carbon/v2 -import "gitee.com/golang-module/carbon/v2" +import "gitee.com/dromara/carbon/v2" ``` ##### Golangバージョンは1.17より小さいです (必要) ```go // github倉庫を使う -go get -u github.com/golang-module/carbon +go get -u github.com/dromara/carbon -import "github.com/golang-module/carbon" +import "github.com/dromara/carbon" // gitee倉庫を使う -go get -u gitee.com/golang-module/carbon +go get -u gitee.com/dromara/carbon -import "gitee.com/golang-module/carbon" +import "gitee.com/dromara/carbon" ``` > v1とv2の違いについては、人気のある問題をご覧ください，v1 は更新されなくなり、維持されるだけです。 @@ -1553,7 +1553,7 @@ invalid timezone "xxx", please see the file "$GOROOT/lib/time/zoneinfo.zip" for #### 寄稿者 `Carbon` に貢献してくれた以下のすべてに感謝します： - + #### スポンサー diff --git a/README.md b/README.md index 90d44ddc..3ee21a10 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Carbon [![Carbon Release](https://img.shields.io/github/release/dromara/carbon.svg)](https://github.com/dromara/carbon/releases) -[![Go Test](https://github.com/golang-module/carbon/actions/workflows/test.yml/badge.svg)](https://github.com/dromara/carbon/actions) -[![Go Report Card](https://goreportcard.com/badge/github.com/golang-module/carbon/v2)](https://goreportcard.com/report/github.com/dromara/carbon/v2) +[![Go Test](https://github.com/dromara/carbon/actions/workflows/test.yml/badge.svg)](https://github.com/dromara/carbon/actions) +[![Go Report Card](https://goreportcard.com/badge/github.com/dromara/carbon/v2)](https://goreportcard.com/report/github.com/dromara/carbon/v2) [![Go Coverage](https://codecov.io/gh/dromara/carbon/branch/master/graph/badge.svg)](https://codecov.io/gh/dromara/carbon) [![Carbon Doc](https://img.shields.io/badge/go.dev-reference-brightgreen?logo=go&logoColor=white&style=flat)](https://pkg.go.dev/github.com/dromara/carbon/v2) [![License](https://img.shields.io/github/license/dromara/carbon)](https://github.com/dromara/carbon/blob/master/LICENSE) @@ -16,9 +16,9 @@ by [awesome-go](https://github.com/avelino/awesome-go#date-and-time "awesome-go" #### Repository -[github.com/dromara/carbon](https://github.com/golang-module/carbon "github.com/golang-module/carbon") +[github.com/dromara/carbon](https://github.com/dromara/carbon "github.com/dromara/carbon") -[gitee.com/dromara/carbon](https://gitee.com/golang-module/carbon "gitee.com/golang-module/carbon") +[gitee.com/dromara/carbon](https://gitee.com/dromara/carbon "gitee.com/dromara/carbon") [gitcode.com/dromara/carbon](https://gitcode.com/dromara/carbon "gitcode.com/dromara/carbon") @@ -28,28 +28,28 @@ by [awesome-go](https://github.com/avelino/awesome-go#date-and-time "awesome-go" ```go // By github -go get -u github.com/golang-module/carbon/v2 +go get -u github.com/dromara/carbon/v2 -import "github.com/golang-module/carbon/v2" +import "github.com/dromara/carbon/v2" // By gitee -go get -u gitee.com/golang-module/carbon/v2 +go get -u gitee.com/dromara/carbon/v2 -import "gitee.com/golang-module/carbon/v2" +import "gitee.com/dromara/carbon/v2" ``` ##### Go version < 1.17 (must) ```go // By github -go get -u github.com/golang-module/carbon +go get -u github.com/dromara/carbon -import "github.com/golang-module/carbon" +import "github.com/dromara/carbon" // By gitee -go get -u gitee.com/golang-module/carbon +go get -u gitee.com/dromara/carbon -import "gitee.com/golang-module/carbon" +import "gitee.com/dromara/carbon" ``` > Please refer to FAQ for the difference between v1 and v2, v1 is no longer updated, only maintained. @@ -1549,7 +1549,7 @@ invalid timezone "xxx", please see the file "$GOROOT/lib/time/zoneinfo.zip" for #### Contributors Thanks to all of the following who contributed to `Carbon`: - + #### Sponsors diff --git a/calendar.go b/calendar.go index 1fdbc62a..2ef9fd3c 100755 --- a/calendar.go +++ b/calendar.go @@ -1,9 +1,9 @@ package carbon import ( - "github.com/golang-module/carbon/v2/calendar/julian" - "github.com/golang-module/carbon/v2/calendar/lunar" - "github.com/golang-module/carbon/v2/calendar/persian" + "github.com/dromara/carbon/v2/calendar/julian" + "github.com/dromara/carbon/v2/calendar/lunar" + "github.com/dromara/carbon/v2/calendar/persian" ) // Lunar converts Carbon instance to Lunar instance. diff --git a/calendar/julian/julian.go b/calendar/julian/julian.go index 5fcad29c..4cde2f28 100644 --- a/calendar/julian/julian.go +++ b/calendar/julian/julian.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/golang-module/carbon/v2/calendar" + "github.com/dromara/carbon/v2/calendar" ) var ( diff --git a/calendar/lunar/lunar.go b/calendar/lunar/lunar.go index 976f815e..4351ab43 100644 --- a/calendar/lunar/lunar.go +++ b/calendar/lunar/lunar.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/golang-module/carbon/v2/calendar" + "github.com/dromara/carbon/v2/calendar" ) var ( @@ -167,7 +167,7 @@ func (l Lunar) ToGregorian() (g Gregorian) { if l.isLeapMonth { offset += days } - // https://github.com/golang-module/carbon/issues/219 + // https://github.com/dromara/carbon/issues/219 ts := int64(offset+l.day)*86400 - int64(2206512000) + int64(l.hour)*3600 + int64(l.minute)*60 + int64(l.second) g.Time = time.Unix(ts, 0) return diff --git a/calendar/persian/persian.go b/calendar/persian/persian.go index 5ef79f28..8dc9afe7 100644 --- a/calendar/persian/persian.go +++ b/calendar/persian/persian.go @@ -6,8 +6,8 @@ import ( "math" "time" - "github.com/golang-module/carbon/v2/calendar" - "github.com/golang-module/carbon/v2/calendar/julian" + "github.com/dromara/carbon/v2/calendar" + "github.com/dromara/carbon/v2/calendar/julian" ) var ( diff --git a/calendar_unit_test.go b/calendar_unit_test.go index 1ca8931e..0930953b 100755 --- a/calendar_unit_test.go +++ b/calendar_unit_test.go @@ -202,7 +202,7 @@ func TestCarbon_CreateFromPersian(t *testing.T) { } } -// https://github.com/golang-module/carbon/issues/246 +// https://github.com/dromara/carbon/issues/246 func TestCarbon_Issue246(t *testing.T) { tests := []struct { name string diff --git a/carbon.go b/carbon.go index 6dc5718f..c0337a62 100644 --- a/carbon.go +++ b/carbon.go @@ -1,6 +1,6 @@ // @Package carbon // @Description a simple, semantic and developer-friendly golang package for datetime -// @Page github.com/golang-module/carbon +// @Page github.com/dromara/carbon // @Developer gouguoyin // @Blog www.gouguoyin.cn // @Email contact@gouguoyin.cn diff --git a/encoding_unit_test.go b/encoding_unit_test.go index 98805b04..157731de 100644 --- a/encoding_unit_test.go +++ b/encoding_unit_test.go @@ -343,7 +343,7 @@ func TestCarbon_TimestampToInt64(t *testing.T) { } } -// https://github.com/golang-module/carbon/issues/225 +// https://github.com/dromara/carbon/issues/225 func TestCarbon_Issue225(t *testing.T) { emptyStr := `{ "birthday1":"", @@ -392,7 +392,7 @@ func TestCarbon_Issue225(t *testing.T) { assert.Nil(t, nullErr) } -// https://github.com/golang-module/carbon/issues/240 +// https://github.com/dromara/carbon/issues/240 func TestCarbon_Issue240(t *testing.T) { jsonStr := `{ "birthday1":"", diff --git a/go.mod b/go.mod index cdef081c..de6e40df 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/golang-module/carbon/v2 +module github.com/dromara/carbon/v2 go 1.17 diff --git a/outputer_unit_test.go b/outputer_unit_test.go index db967ea6..a312d51e 100644 --- a/outputer_unit_test.go +++ b/outputer_unit_test.go @@ -2652,7 +2652,7 @@ func TestCarbon_ToStdTime(t *testing.T) { assert.Equal(t, expected, actual) } -// https://github.com/golang-module/carbon/issues/200 +// https://github.com/dromara/carbon/issues/200 func TestCarbon_Issue200(t *testing.T) { tests1 := []struct { name string diff --git a/parser_unit_test.go b/parser_unit_test.go index bbb12c14..1847d4e4 100755 --- a/parser_unit_test.go +++ b/parser_unit_test.go @@ -147,7 +147,7 @@ func TestCarbon_ParseByLayout(t *testing.T) { } } -// https://github.com/golang-module/carbon/issues/202 +// https://github.com/dromara/carbon/issues/202 func TestCarbon_Issue202(t *testing.T) { tests := []struct { name string @@ -193,7 +193,7 @@ func TestError_ParseByFormat(t *testing.T) { assert.NotNil(t, ParseByFormat("xxx", "Y-m-d", PRC).Error, "It should catch an exception in ParseByFormat") } -// https://github.com/golang-module/carbon/issues/206 +// https://github.com/dromara/carbon/issues/206 func TestCarbon_Issue206(t *testing.T) { tests := []struct { name string @@ -230,7 +230,7 @@ func TestCarbon_Issue206(t *testing.T) { } } -// https://github.com/golang-module/carbon/issues/232 +// https://github.com/dromara/carbon/issues/232 func TestCarbon_Issue232(t *testing.T) { tests := []struct { name string