tiglog/golib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: 小调整

Browse Source
This commit is contained in:
tiglog 2023-08-17 19:05:46 +08:00
parent 02b5c78a45
commit ac51a6a211
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gconfig/config.go
View File

@ -14,8 +14,8 @@ import (
"git.hexq.cn/tiglog/golib/gfile" "git.hexq.cn/tiglog/golib/gfile"
"gopkg.in/yaml.v2"
"git.hexq.cn/tiglog/golib/helper" "git.hexq.cn/tiglog/golib/helper"
"gopkg.in/yaml.v3"
) )
type BaseConfig struct { type BaseConfig struct {

31
gconfig/db.go
View File

@ -11,11 +11,14 @@ import "fmt"
type DbConfig struct { type DbConfig struct {
Type string `yaml:"type"` Type string `yaml:"type"`
Host string `yaml:"host"` Dsn string `yaml:"dsn"`
Username string `yaml:"user"` // Host string `yaml:"host"`
Password string `yaml:"pass"` // Username string `yaml:"user"`
Port int `yaml:"port"` // Password string `yaml:"pass"`
Name string `yaml:"name"` // Port int `yaml:"port"`
// Name string `yaml:"name"`
MaxIdle int `yaml:"max_idle"`
MaxOpen int `yaml:"max_open"`
} }
type MongoConfig struct { type MongoConfig struct {
@ -27,15 +30,15 @@ type MongoConfig struct {
PoolSize int `yaml:"pool_size"` PoolSize int `yaml:"pool_size"`
} }
func (c *DbConfig) GetUri() string { // func (c *DbConfig) GetUri() string {
switch c.Type { // switch c.Type {
case "postgres": // case "postgres":
return fmt.Sprintf("%s://host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", c.Type, c.Host, c.Port, c.Username, c.Password, c.Name) // return fmt.Sprintf("%s://host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", c.Type, c.Host, c.Port, c.Username, c.Password, c.Name)
case "mysql": // case "mysql":
return fmt.Sprintf("%s://%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=true&loc=Local", c.Type, c.Username, c.Password, c.Host, c.Port, c.Name) // return fmt.Sprintf("%s://%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=true&loc=Local", c.Type, c.Username, c.Password, c.Host, c.Port, c.Name)
} // }
return "" // return ""
} // }
func (c *MongoConfig) GetUri() string { func (c *MongoConfig) GetUri() string {
if c.Host == "" { if c.Host == "" {

2
gconfig/param.go
View File

@ -10,8 +10,8 @@ package gconfig
import ( import (
"io/ioutil" "io/ioutil"
"gopkg.in/yaml.v2"
"git.hexq.cn/tiglog/golib/gfile" "git.hexq.cn/tiglog/golib/gfile"
"gopkg.in/yaml.v3"
) )
type ParamConfig struct { type ParamConfig struct {

1
go.mod
View File

@ -20,7 +20,6 @@ require (
go.uber.org/zap v1.25.0 go.uber.org/zap v1.25.0
golang.org/x/crypto v0.10.0 golang.org/x/crypto v0.10.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1 gopkg.in/yaml.v3 v3.0.1
) )

1
go.sum
View File

@ -214,7 +214,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=