From ccddf910834e97af3c85d96032ecc2e308da1056 Mon Sep 17 00:00:00 2001
From: yedongfu <dongfuye@163.com>
Date: Wed, 26 May 2021 10:14:47 +0800
Subject: [PATCH] update

---
 common/types.go |  4 ++--
 go.mod          | 11 -----------
 go.sum          |  2 ++
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/common/types.go b/common/types.go
index 741d6ac..9603235 100644
--- a/common/types.go
+++ b/common/types.go
@@ -82,8 +82,8 @@ func GetDsn(conf map[string]string) string {
 }
 
 func ReplaceDsnPassword(dsn string) string {
-	reg := regexp.MustCompile(`:(.*)@`)
-	return reg.ReplaceAllString(dsn, "****")
+	reg := regexp.MustCompile(`:.*@`)
+	return reg.ReplaceAllString(dsn, ":****@")
 }
 
 func DbGet(conf map[string]string) *MyDb {
diff --git a/go.mod b/go.mod
index d43e9b9..2ce4ef1 100644
--- a/go.mod
+++ b/go.mod
@@ -4,24 +4,13 @@ go 1.15
 
 require (
 	github.com/bwmarrin/snowflake v0.3.0
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-admin-team/go-admin-core v1.3.4
 	github.com/go-playground/assert/v2 v2.0.1
 	github.com/go-redis/redis/v8 v8.8.2
 	github.com/go-resty/resty/v2 v2.6.0
-	github.com/joho/godotenv v1.3.0
 	github.com/json-iterator/go v1.1.10
-	github.com/magiconair/properties v1.8.1
-	// github.com/pkg/errors v0.9.1 // indirect
 	github.com/sirupsen/logrus v1.7.0
-	github.com/sleagon/ginfmt v1.1.1
-	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d
 	github.com/spf13/viper v1.7.1
-	github.com/streadway/amqp v1.0.0
-	github.com/stretchr/testify v1.7.0
-	// google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
 	gopkg.in/go-playground/assert.v1 v1.2.1
 	gorm.io/driver/mysql v1.0.3
 	gorm.io/gorm v1.20.12
diff --git a/go.sum b/go.sum
index 108ed0e..512315a 100644
--- a/go.sum
+++ b/go.sum
@@ -121,6 +121,7 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
@@ -564,6 +565,7 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=