From 02a2176f7c5733a4e4c4429c2028bbb86a967ce7 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 06 二月 2024 10:13:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
core/viper.go | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/core/viper.go b/core/viper.go
index e3dd24c..f797dd9 100644
--- a/core/viper.go
+++ b/core/viper.go
@@ -4,15 +4,14 @@
"flag"
"fmt"
"github.com/gin-gonic/gin"
+ "log"
"os"
- "path/filepath"
"srm/core/internal"
"github.com/fsnotify/fsnotify"
"github.com/spf13/viper"
"srm/global"
- _ "srm/packfile"
)
// Viper //
@@ -68,7 +67,47 @@
fmt.Println(err)
}
- // root 閫傞厤鎬� 鏍规嵁root浣嶇疆鍘绘壘鍒板搴旇縼绉讳綅缃�,淇濊瘉root璺緞鏈夋晥
- global.GVA_CONFIG.AutoCode.Root, _ = filepath.Abs("..")
+ ConfigFromEnv()
return v
}
+
+func ConfigFromEnv() {
+ DBHost := os.Getenv("DB_HOST")
+ DBName := os.Getenv("DB_NAME")
+ DBPort := os.Getenv("DB_PORT")
+ DBUser := os.Getenv("DB_USER")
+ DBPasswd := os.Getenv("DB_PASSWD")
+ if len(DBHost) > 0 &&
+ len(DBName) > 0 &&
+ len(DBPort) > 0 &&
+ len(DBUser) > 0 &&
+ len(DBPasswd) > 0 {
+ global.GVA_CONFIG.Mysql.Path = DBHost
+ global.GVA_CONFIG.Mysql.Port = DBPort
+ global.GVA_CONFIG.Mysql.Dbname = DBName
+ global.GVA_CONFIG.Mysql.Username = DBUser
+ global.GVA_CONFIG.Mysql.Password = DBPasswd
+ }
+ log.Printf("mysql dsn:%v", global.GVA_CONFIG.Mysql.Dsn())
+
+ grpcPort := os.Getenv("GRPC_PORT")
+ if grpcPort != "" {
+ global.GVA_CONFIG.System.GrpcPort = grpcPort
+ }
+
+ apsGrpc := os.Getenv("APS_GRPC")
+ if apsGrpc != "" {
+ global.GVA_CONFIG.System.GrpcUrl = apsGrpc
+ }
+
+ wmsGrpc := os.Getenv("WMS_GRPC")
+ if wmsGrpc != "" {
+ global.GVA_CONFIG.System.GrpcWmsUrl = wmsGrpc
+ }
+
+ adminGrpc := os.Getenv("ADMIN_GRPC")
+ if adminGrpc != "" {
+ global.GVA_CONFIG.System.GrpcAdminUrl = adminGrpc
+ }
+ log.Printf(" System: %+v", global.GVA_CONFIG.System)
+}
--
Gitblit v1.8.0