refactor: 启用 conf.UseEnv 并将 etc 配置统一为 env 占位

app/shop/api/etc/shop-api.yaml

@@ -7,17 +7,13 @@ Prometheus:
   Port: 4001
   Path: /metrics
 
-# k8s://juwan/<service name>:8080
-
-# ===== PROC CONFIG =====
-#ShopRpcConf:
-#    Target: k8s://juwan/shop-rpc-svc.juwan:8080
-
-
-# ===== DEV CONFIG ====
 ShopRpcConf:
   Endpoints:
-    - shop-rpc:8080
+    - "${SHOP_RPC_TARGET}"
+
 PlayerRpcConf:
   Endpoints:
-    - player-rpc:8080
+    - "${PLAYER_RPC_TARGET}"
+
+Log:
+  Level: debug

app/shop/api/shop.go

@@ -22,7 +22,7 @@ func main() {
 	flag.Parse()
 
 	var c config.Config
-	conf.MustLoad(*configFile, &c)
+	conf.MustLoad(*configFile, &c, conf.UseEnv())
 
 	server := rest.MustNewServer(c.RestConf)
 	server.Use(middlewares.NewHeaderExtractorMiddleware().Handle)

app/shop/rpc/etc/pb.yaml

@@ -6,53 +6,22 @@ Prometheus:
   Port: 4001
   Path: /metrics
 
-# tcd:
-#   Hosts:
-#   - 127.0.0.1:2379
-#   Key: pb.rpc
-
-# ===== PROC Config =====
-#SnowflakeRpcConf:
-#  Target: k8s://juwan/snowflake-svc:8080
-#UsersRpcConf:
-#  Target: k8s://juwan/user-rpc-svc:8080
-
-#DB:
-#  Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@{DB_HOST_RW}.juwan:${DB_PORT}/${DB_NAME}?sslmode=disable"
-#  Slaves: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@{BD_HOST_RO}.juwan:${DB_PORT}/${DB_NAME}?sslmode=disable"
-#
-#
-#CacheConf:
-#  - Host: "${REDIS_M_HOST}"
-#    Type: node
-#    Pass: "${REDIS_PASSWORD}"
-#    User: "default"
-#  - Host: "${REDIS_S_HOST}"
-#    Type: node
-#    Pass: "${REDIS_PASSWORD}"
-#    User: "default"
-
-# ===== DEV Config =====
 SnowflakeRpcConf:
   Endpoints:
-    - snowflake:8080
+    - "${SNOWFLAKE_RPC_TARGET}"
+
 UsersRpcConf:
   Endpoints:
-    - user-rpc:8080
+    - "${USER_RPC_TARGET}"
 
 DB:
-  Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@postgres:${DB_PORT}/${DB_NAME}?sslmode=disable"
-  Slaves: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@postgres:${DB_PORT}/${DB_NAME}?sslmode=disable"
+  Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=disable"
+  Slaves: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@${DB_HOST_RO}:${DB_PORT}/${DB_NAME}?sslmode=disable"
 
 CacheConf:
   - Host: "${REDIS_HOST}:${REDIS_PORT}"
     Type: node
+    Pass: "${REDIS_PASSWORD}"
 
 Log:
-  Level: info
-
-
-# Target: k8s://juwan/<service name>.<namespace>:8080
-#DB:
-#  Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-rw.juwan:${DB_PORT}/${DB_NAME}?sslmode=disable"
-#  Slaves: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-ro.juwan:${DB_PORT}/${DB_NAME}?sslmode=disable"
+  Level: debug