From 2c85024a0802f7e78073ff20d13e20e996601bd9 Mon Sep 17 00:00:00 2001 From: suyiiyii Date: Tue, 21 Jan 2025 23:25:49 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"refactor(app/user):=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=B9=B6=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E4=BE=9D=E8=B5=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit cedec8b669a814b75f930c04412b9ce328a0eb9d. --- app/user/conf/conf.go | 9 ++++----- app/user/go.mod | 1 + app/user/go.sum | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/user/conf/conf.go b/app/user/conf/conf.go index 419dc3d..95a5676 100644 --- a/app/user/conf/conf.go +++ b/app/user/conf/conf.go @@ -71,22 +71,21 @@ func initConf() { //if err != nil { // panic(err) //} - fmt.Println("configFile", configFile) conf = new(Config) err := yaml.Unmarshal(configFile, conf) // viper 获取远程配置测试 err = viper.AddRemoteProvider("consul", conf.Registry.RegistryAddress[0], "USER") - fmt.Println("registry", conf.Registry.RegistryAddress[0]) - fmt.Println("MYSQL_DSN", viper.GetString("MYSQL_DSN")) if err != nil { - panic(err) + return } viper.SetConfigType("yaml") err = viper.ReadRemoteConfig() if err != nil { - panic(err) + return } + fmt.Println(conf.Registry.RegistryAddress[0]) + fmt.Println(viper.GetString("MYSQL_DSN")) conf.MySQL.DSN = viper.GetString("MYSQL_DSN") diff --git a/app/user/go.mod b/app/user/go.mod index 545f83e..55ca14d 100644 --- a/app/user/go.mod +++ b/app/user/go.mod @@ -6,6 +6,7 @@ replace github.com/apache/thrift => github.com/apache/thrift v0.13.0 require ( github.com/cloudwego/kitex v0.12.1 + github.com/joho/godotenv v1.5.1 github.com/kitex-contrib/obs-opentelemetry/logging/logrus v0.0.0-20241120035129-55da83caab1b github.com/kitex-contrib/registry-consul v0.0.0-20240508100819-2905e45155c1 github.com/kr/pretty v0.3.1 diff --git a/app/user/go.sum b/app/user/go.sum index d891273..e0e499c 100644 --- a/app/user/go.sum +++ b/app/user/go.sum @@ -320,6 +320,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=