From 1037ae39236bb8601fb6805e3f6e0f9c45ed2bbc Mon Sep 17 00:00:00 2001 From: Shikong <919411476@qq.com> Date: Fri, 24 Mar 2023 11:34:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E7=A6=BB=E5=85=AC=E5=85=B1=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/const.go | 0 backend/golang/matrix-common/go.mod | 3 +++ .../golang/matrix-middle-service/.idea/codestream.xml | 2 +- backend/golang/matrix-middle-service/cmd/service/main.go | 2 +- backend/golang/matrix-middle-service/go.mod | 9 ++++++--- backend/golang/matrix-middle-service/go.sum | 4 ++-- 6 files changed, 13 insertions(+), 7 deletions(-) rename backend/golang/{matrix-middle-service => matrix-common}/constants/const.go (100%) create mode 100644 backend/golang/matrix-common/go.mod diff --git a/backend/golang/matrix-middle-service/constants/const.go b/backend/golang/matrix-common/constants/const.go similarity index 100% rename from backend/golang/matrix-middle-service/constants/const.go rename to backend/golang/matrix-common/constants/const.go diff --git a/backend/golang/matrix-common/go.mod b/backend/golang/matrix-common/go.mod new file mode 100644 index 0000000..916a6fe --- /dev/null +++ b/backend/golang/matrix-common/go.mod @@ -0,0 +1,3 @@ +module matrix-common + +go 1.19 diff --git a/backend/golang/matrix-middle-service/.idea/codestream.xml b/backend/golang/matrix-middle-service/.idea/codestream.xml index ad2dbe4..91472bd 100644 --- a/backend/golang/matrix-middle-service/.idea/codestream.xml +++ b/backend/golang/matrix-middle-service/.idea/codestream.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/backend/golang/matrix-middle-service/cmd/service/main.go b/backend/golang/matrix-middle-service/cmd/service/main.go index 3a6e45e..8dfd53e 100644 --- a/backend/golang/matrix-middle-service/cmd/service/main.go +++ b/backend/golang/matrix-middle-service/cmd/service/main.go @@ -3,7 +3,7 @@ package service import ( "github.com/fsnotify/fsnotify" "github.com/spf13/viper" - "matrix-middle-service/constants" + "matrix-common/constants" _ "matrix-middle-service/docs" "matrix-middle-service/internel/app" "matrix-middle-service/pkg/config/toml" diff --git a/backend/golang/matrix-middle-service/go.mod b/backend/golang/matrix-middle-service/go.mod index aadc38e..ad78c85 100644 --- a/backend/golang/matrix-middle-service/go.mod +++ b/backend/golang/matrix-middle-service/go.mod @@ -8,9 +8,11 @@ require ( github.com/go-playground/universal-translator v0.18.1 github.com/go-playground/validator/v10 v10.11.2 github.com/go-sql-driver/mysql v1.7.0 + github.com/goccy/go-json v0.8.1 github.com/gofiber/fiber/v2 v2.42.0 github.com/gofiber/swagger v0.1.9 github.com/golang-jwt/jwt/v4 v4.5.0 + github.com/gookit/goutil v0.6.6 github.com/matoous/go-nanoid v1.5.0 github.com/mitchellh/mapstructure v1.5.0 github.com/pelletier/go-toml/v2 v2.0.6 @@ -19,6 +21,7 @@ require ( github.com/swaggo/swag v1.8.10 go.uber.org/atomic v1.9.0 go.uber.org/zap v1.21.0 + matrix-common v0.0.0-00010101000000-000000000000 xorm.io/xorm v1.3.2 ) @@ -31,10 +34,8 @@ require ( github.com/go-openapi/jsonreference v0.19.6 // indirect github.com/go-openapi/spec v0.20.4 // indirect github.com/go-openapi/swag v0.19.15 // indirect - github.com/goccy/go-json v0.8.1 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/gookit/goutil v0.6.6 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -65,7 +66,6 @@ require ( go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.5.0 // indirect golang.org/x/net v0.5.0 // indirect - golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.5.0 // indirect golang.org/x/text v0.7.0 // indirect golang.org/x/tools v0.1.12 // indirect @@ -74,3 +74,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect ) + +// go mod edit -replace matrix-common=../matrix-common +replace matrix-common => ../matrix-common diff --git a/backend/golang/matrix-middle-service/go.sum b/backend/golang/matrix-middle-service/go.sum index 98de9a3..ff8eddf 100644 --- a/backend/golang/matrix-middle-service/go.sum +++ b/backend/golang/matrix-middle-service/go.sum @@ -234,6 +234,7 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gookit/color v1.5.2 h1:uLnfXcaFjlrDnQDT+NCBcfhrXqYTx/rcCa6xn01Y8yI= github.com/gookit/goutil v0.6.6 h1:XdvnPocHpKDXA+eykfc/F846Y1V2Vyo3+cV8rfliG90= github.com/gookit/goutil v0.6.6/go.mod h1:D++7kbQd/6vECyYTxB5tq6AKDIG9ZYwZNhubWJvN9dw= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -552,6 +553,7 @@ github.com/valyala/fasthttp v1.44.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seB github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -717,8 +719,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=