feat:upgrade mao-gutils & mao-glog & mao-gerrors

mao888 · Jan 23, 2024 · 905bd98 · 905bd98
1 parent 7605561
commit 905bd98
Show file tree

Hide file tree

Showing 42 changed files with 66 additions and 194 deletions.
diff --git a/go.mod b/go.mod
@@ -1,12 +1,15 @@
 module github.com/mao888/golang-guide
 
-go 1.18
+go 1.19
 
 require (
 	github.com/qiniu/qmgo v1.1.4
 	go.mongodb.org/mongo-driver v1.11.1
 	gorm.io/driver/mysql v1.4.5
 	gorm.io/gorm v1.25.3
+	github.com/mao888/mao-gutils v1.3.0
+	github.com/mao888/mao-gerrors v1.1.0
+	github.com/mao888/mao-glog v1.1.0
 )
 
 require (
@@ -47,9 +50,6 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/mao888/go-errors v1.0.0 // indirect
-	github.com/mao888/go-log v1.0.7
-	github.com/mao888/go-utils v1.1.6
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect

diff --git a/go.sum b/go.sum
diff --git a/golang/go-Interview/data-structure/linear_list/link_list/circular_linked_list_test.go b/golang/go-Interview/data-structure/linear_list/link_list/circular_linked_list_test.go
@@ -2,7 +2,7 @@ package linkedlist
 
 import (
 	"fmt"
-	"github.com/mao888/go-utils/constants"
+	"github.com/mao888/mao-gutils/constants"
 	"testing"
 )
 

diff --git a/golang/go-Interview/data-structure/linear_list/sequence_list/sq_list.go b/golang/go-Interview/data-structure/linear_list/sequence_list/sq_list.go
@@ -3,7 +3,7 @@ package sequence_list
 import (
 	"fmt"
 
-	"github.com/mao888/go-utils/constants"
+	"github.com/mao888/mao-gutils/constants"
 )
 
 // 数据结构之线性表--顺序表

diff --git a/golang/go-study/exercise/Demo/go-zap/go-log.go b/golang/go-study/exercise/Demo/go-zap/go-log.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"context"
-	glog "github.com/mao888/go-log"
-	"github.com/mao888/go-utils/constants"
+	glog "github.com/mao888/mao-glog"
+	"github.com/mao888/mao-gutils/constants"
 )
 
 func init() {

diff --git a/golang/go-study/exercise/Go/Time/test2.go b/golang/go-study/exercise/Go/Time/test2.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/mao888/go-utils/constants"
+	"github.com/mao888/mao-gutils/constants"
 	"time"
 )
 

diff --git a/golang/go-study/exercise/Go/interface/类型断言.go b/golang/go-study/exercise/Go/interface/类型断言.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	gutil "github.com/mao888/go-utils/interfaces"
+	gutil "github.com/mao888/mao-gutils/interfaces"
 )
 
 func main() {

diff --git a/golang/go-study/exercise/Go/test/expand.go b/golang/go-study/exercise/Go/test/expand.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	gutil "github.com/mao888/go-utils/os"
+	gutil "github.com/mao888/mao-gutils/os"
 )
 
 func main() {

diff --git a/golang/go-study/exercise/Go/数组与切片/Go 输出两个slice切片的差集.go b/golang/go-study/exercise/Go/数组与切片/Go 输出两个slice切片的差集.go
@@ -1,13 +1,17 @@
-/**
-    @author:Hasee
-    @data:2022/11/25
-    @note:
-**/
+/*
+*
+
+	@author:Hasee
+	@data:2022/11/25
+	@note:
+
+*
+*/
 package main
 
 import (
 	"fmt"
-	"github.com/mao888/go-utils/slice"
+	"github.com/mao888/mao-gutils/slice"
 )
 
 func main() {

diff --git a/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_audience.go b/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_audience.go
@@ -3,9 +3,9 @@ package ad_conf_centre
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_conf_centre/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_audience_include_relations.go b/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_audience_include_relations.go
@@ -3,9 +3,9 @@ package ad_conf_centre
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_conf_centre/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_audience_isegmentation_relations.go b/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_audience_isegmentation_relations.go
@@ -3,9 +3,9 @@ package ad_conf_centre
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_conf_centre/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_copywriting.go b/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_copywriting.go
@@ -3,9 +3,9 @@ package ad_conf_centre
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_conf_centre/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_country.go b/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_country.go
@@ -3,9 +3,9 @@ package ad_conf_centre
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_conf_centre/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_position.go b/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_position.go
@@ -3,9 +3,9 @@ package ad_conf_centre
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_conf_centre/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_scheme.go b/project/data-sync/mongo-to-mysql/ad_conf_centre/ad_conf_scheme.go
@@ -3,9 +3,9 @@ package ad_conf_centre
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_conf_centre/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/ad_material/ad_material.go b/project/data-sync/mongo-to-mysql/ad_material/ad_material.go
@@ -3,9 +3,9 @@ package ad_material
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_material/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 	"reflect"
 	"strconv"

diff --git a/project/data-sync/mongo-to-mysql/ad_material/ad_material_person_relations.go b/project/data-sync/mongo-to-mysql/ad_material/ad_material_person_relations.go
@@ -3,9 +3,9 @@ package ad_material
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_material/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 	"strings"
 	"sync"

diff --git a/project/data-sync/mongo-to-mysql/ad_material/ad_material_sync_success.go b/project/data-sync/mongo-to-mysql/ad_material/ad_material_sync_success.go
@@ -3,9 +3,9 @@ package ad_material
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/ad_material/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 	"sync"
 )

diff --git a/project/data-sync/mongo-to-mysql/art_asset/art_asset_1.go b/project/data-sync/mongo-to-mysql/art_asset/art_asset_1.go
@@ -3,9 +3,9 @@ package art_asset
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/art_asset/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/art_asset/art_asset_2.go b/project/data-sync/mongo-to-mysql/art_asset/art_asset_2.go
@@ -3,9 +3,9 @@ package art_asset
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/art_asset/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/art_asset/art_asset_tag_relations.go b/project/data-sync/mongo-to-mysql/art_asset/art_asset_tag_relations.go
@@ -3,9 +3,9 @@ package art_asset
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/art_asset/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/art_asset/art_asset_tags.go b/project/data-sync/mongo-to-mysql/art_asset/art_asset_tags.go
@@ -3,9 +3,9 @@ package art_asset
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/art_asset/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/art_asset/art_need_asset_relations.go b/project/data-sync/mongo-to-mysql/art_asset/art_need_asset_relations.go
@@ -3,9 +3,9 @@ package art_asset
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
 	"github.com/mao888/golang-guide/project/data-sync/mongo-to-mysql/art_asset/bean"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 	"strconv"
 	"strings"

diff --git a/project/data-sync/mongo-to-mysql/art_need/art_attachments.go b/project/data-sync/mongo-to-mysql/art_need/art_attachments.go
@@ -3,8 +3,8 @@ package art_need
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 
@@ -27,7 +27,7 @@ func RunArtAttachment() {
 	for _, attachment := range mArtAttachments {
 
 		//fmt.Println(attachment.AssetLanguage)
-		
+
 		// TaskID
 		// 根据 需求id查询子任务id
 		artTask := make([]*ArtTask, 0)

diff --git a/project/data-sync/mongo-to-mysql/art_need/art_need_language_relations.go b/project/data-sync/mongo-to-mysql/art_need/art_need_language_relations.go
@@ -3,8 +3,8 @@ package art_need
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/art_need/art_need_material_size_relations.go b/project/data-sync/mongo-to-mysql/art_need/art_need_material_size_relations.go
@@ -3,8 +3,8 @@ package art_need
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 	"time"
 )

diff --git a/project/data-sync/mongo-to-mysql/art_need/art_need_person_relations.go b/project/data-sync/mongo-to-mysql/art_need/art_need_person_relations.go
@@ -3,8 +3,8 @@ package art_need
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/art_need/art_need_tag_relations.go b/project/data-sync/mongo-to-mysql/art_need/art_need_tag_relations.go
@@ -3,8 +3,8 @@ package art_need
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 	"strings"
 	"time"

diff --git a/project/data-sync/mongo-to-mysql/art_need/art_tasks.go b/project/data-sync/mongo-to-mysql/art_need/art_tasks.go
@@ -3,8 +3,8 @@ package art_need
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 )
 

diff --git a/project/data-sync/mongo-to-mysql/art_need/supply_desc.go b/project/data-sync/mongo-to-mysql/art_need/supply_desc.go
@@ -3,8 +3,8 @@ package art_need
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/constants"
 	"go.mongodb.org/mongo-driver/bson"
 	"sort"
 )

diff --git a/project/data-sync/mongo-to-mysql/bi_data/bi_data.go b/project/data-sync/mongo-to-mysql/bi_data/bi_data.go
@@ -3,9 +3,9 @@ package bi_data
 import (
 	"context"
 	"fmt"
-	gerrors "github.com/mao888/go-errors"
-	gutil "github.com/mao888/go-utils/json"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	gerrors "github.com/mao888/mao-gerrors"
+	gutil "github.com/mao888/mao-gutils/json"
 	"go.mongodb.org/mongo-driver/bson"
 	"time"
 )

diff --git a/project/data-sync/mongo-to-mysql/remote-config/remote_config.go b/project/data-sync/mongo-to-mysql/remote-config/remote_config.go
@@ -3,9 +3,9 @@ package remote_config
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
-	gutil "github.com/mao888/go-utils/json"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/constants"
+	gutil "github.com/mao888/mao-gutils/json"
 	"go.mongodb.org/mongo-driver/bson"
 	"time"
 )

diff --git a/project/data-sync/mongo-to-mysql/sdk_release/sdk_release_record.go b/project/data-sync/mongo-to-mysql/sdk_release/sdk_release_record.go
@@ -3,10 +3,10 @@ package sdk_release
 import (
 	"context"
 	"fmt"
-	"github.com/mao888/go-utils/constants"
-	"github.com/mao888/go-utils/json"
-	"github.com/mao888/go-utils/version"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/constants"
+	gutil "github.com/mao888/mao-gutils/json"
+	"github.com/mao888/mao-gutils/version"
 	"go.mongodb.org/mongo-driver/bson"
 	"time"
 )

diff --git a/project/data-sync/mongo-to-mysql/sdk_release/version_number_to_version_ordinal.go b/project/data-sync/mongo-to-mysql/sdk_release/version_number_to_version_ordinal.go
@@ -2,8 +2,8 @@ package sdk_release
 
 import (
 	"fmt"
-	"github.com/mao888/go-utils/version"
 	db2 "github.com/mao888/golang-guide/project/data-sync/db"
+	"github.com/mao888/mao-gutils/version"
 )
 
 func VersionNumberToOrdinal() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ package main @@
     import (
     	"fmt"
-    	"github.com/mao888/go-utils/constants"
+    	"github.com/mao888/mao-gutils/constants"
     	"time"
     )
@@ Expand Down @@