RUSTDESK/RUSTDESK-AP-SERVER-SUNLIX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up env

Browse Source
This commit is contained in:
ljw
2024-09-13 22:09:46 +08:00
parent f2ee00d49e
commit d9ed2127da
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/apimain.go
View File

@@ -33,9 +33,7 @@ import (
// @name Authorization // @name Authorization
func main() { func main() {
//配置解析 //配置解析
global.Viper = config.Init(&global.Config, func() { global.Viper = config.Init(&global.Config)
fmt.Println(global.Config)
})
//日志 //日志
global.Logger = logger.New(&logger.Config{ global.Logger = logger.New(&logger.Config{

18
conf/config.yaml
View File

@@ -7,15 +7,15 @@ gorm:
max-idle-conns: 10 max-idle-conns: 10
max-open-conns: 100 max-open-conns: 100
mysql: mysql:
username: "root" username: ""
password: "111111" password: ""
addr: "192.168.1.66:3308" addr: ""
dbname: "rustdesk2" dbname: ""
rustdesk: rustdesk:
id-server: "124.220.134.240:21116" id-server: "192.168.1.66:21116"
relay-server: "124.220.134.240:21117" relay-server: "192.168.1.66:21117"
api-server: "http://127.0.0.1:21114" api-server: "http://192.168.1.66:21114"
key: "ljw19891989" key: "123456789"
redis: redis:
addr: "127.0.0.1:6379" addr: "127.0.0.1:6379"
password: "" password: ""
@@ -28,7 +28,7 @@ cache:
type: "file" type: "file"
file-dir: "./runtime/cache" file-dir: "./runtime/cache"
redis-addr: "127.0.0.1:6379" redis-addr: "127.0.0.1:6379"
redis-pwd: "ljw19891989" redis-pwd: ""
redis-db: 0 redis-db: 0
oss: oss:
access-key-id: "" access-key-id: ""

17
config/config.go
View File

@@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
"github.com/spf13/viper" "github.com/spf13/viper"
"strings"
) )
const ( const (
@@ -26,7 +27,7 @@ type Config struct {
} }
// Init 初始化配置 // Init 初始化配置
func Init(rowVal interface{}, cb func()) *viper.Viper { func Init(rowVal interface{}) *viper.Viper {
var config string var config string
flag.StringVar(&config, "c", "", "choose config file.") flag.StringVar(&config, "c", "", "choose config file.")
flag.Parse() flag.Parse()
@@ -34,6 +35,9 @@ func Init(rowVal interface{}, cb func()) *viper.Viper {
config = DefaultConfig config = DefaultConfig
} }
v := viper.New() v := viper.New()
v.AutomaticEnv()
v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
v.SetEnvPrefix("RUSTDESK_API")
v.SetConfigFile(config) v.SetConfigFile(config)
v.SetConfigType("yaml") v.SetConfigType("yaml")
err := v.ReadInConfig() err := v.ReadInConfig()
@@ -47,10 +51,19 @@ func Init(rowVal interface{}, cb func()) *viper.Viper {
if err2 := v.Unmarshal(rowVal); err2 != nil { if err2 := v.Unmarshal(rowVal); err2 != nil {
fmt.Println(err2) fmt.Println(err2)
} }
cb()
}) })
if err := v.Unmarshal(rowVal); err != nil { if err := v.Unmarshal(rowVal); err != nil {
fmt.Println(err) fmt.Println(err)
} }
return v return v
} }
// ReadEnv 读取环境变量
func ReadEnv(rowVal interface{}) *viper.Viper {
v := viper.New()
v.AutomaticEnv()
if err := v.Unmarshal(rowVal); err != nil {
fmt.Println(err)
}
return v
}