From 429a1df32a2d84f013c797d2abd5d5be447c5af0 Mon Sep 17 00:00:00 2001 From: zetaloop Date: Sun, 3 May 2026 07:14:28 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=90=AF=E7=94=A8=20conf.UseEnv=20?= =?UTF-8?q?=E5=B9=B6=E5=B0=86=20etc=20=E9=85=8D=E7=BD=AE=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=B8=BA=20env=20=E5=8D=A0=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chat/api/chat.go | 2 +- app/chat/api/etc/chat-api.yaml | 14 ++++---- app/community/api/community.go | 2 +- app/community/api/etc/community-api.yaml | 15 ++++---- app/community/rpc/etc/pb.yaml | 26 +++----------- app/dispute/api/dispute.go | 2 +- app/dispute/api/etc/dispute-api.yaml | 12 ++++--- app/dispute/rpc/etc/pb.yaml | 8 ++--- app/email/api/etc/email-api.yaml | 16 +++------ app/email/mq/etc/email.yaml | 14 ++------ app/game/api/etc/game-api.yaml | 9 ++--- app/game/api/game.go | 2 +- app/game/rpc/etc/pb.yaml | 30 +++------------- app/notification/api/etc/notifi-api.yaml | 6 ++-- app/notification/api/notifi.go | 2 +- app/notification/rpc/etc/pb.yaml | 8 ++--- app/objectstory/api/etc/file-api.yaml | 16 ++------- app/objectstory/api/objectstory.go | 2 +- app/objectstory/rpc/etc/file.yaml | 33 +++-------------- app/objectstory/rpc/pb.go | 2 +- app/order/api/etc/order-api.yaml | 21 ++++------- app/order/api/order.go | 2 +- app/order/rpc/etc/pb.yaml | 41 +++------------------ app/player/api/etc/player-api.yaml | 14 ++++---- app/player/api/player.go | 2 +- app/player/rpc/etc/pb.yaml | 33 +++-------------- app/review/api/etc/review-api.yaml | 12 ++++--- app/review/api/review.go | 2 +- app/review/rpc/etc/pb.yaml | 8 ++--- app/search/api/etc/search-api.yaml | 6 ++-- app/search/api/search.go | 2 +- app/search/rpc/etc/pb.yaml | 8 ++--- app/shop/api/etc/shop-api.yaml | 16 ++++----- app/shop/api/shop.go | 2 +- app/shop/rpc/etc/pb.yaml | 45 ++++-------------------- app/snowflake/rpc/pb.go | 2 +- app/user_verifications/rpc/etc/pb.yaml | 38 ++++++-------------- app/users/api/etc/users-api.yaml | 14 +++----- app/users/api/users.go | 2 +- app/users/rpc/etc/pb.yaml | 35 +++--------------- app/wallet/api/etc/wallet-api.yaml | 13 ++----- app/wallet/api/wallet.go | 2 +- app/wallet/rpc/etc/pb.yaml | 42 +++------------------- deploy/dev/.env | 32 +++++++++++++++-- deploy/dev/docker-compose.yml | 1 + 45 files changed, 181 insertions(+), 435 deletions(-) diff --git a/app/chat/api/chat.go b/app/chat/api/chat.go index 7c4de6c..dedef5f 100644 --- a/app/chat/api/chat.go +++ b/app/chat/api/chat.go @@ -20,7 +20,7 @@ func main() { flag.Parse() var c config.Config - conf.MustLoad(*configFile, &c) + conf.MustLoad(*configFile, &c, conf.UseEnv()) svcCtx := svc.NewServiceContext(c) handler := chathandler.NewHandler(svcCtx) diff --git a/app/chat/api/etc/chat-api.yaml b/app/chat/api/etc/chat-api.yaml index 776e844..84244af 100644 --- a/app/chat/api/etc/chat-api.yaml +++ b/app/chat/api/etc/chat-api.yaml @@ -17,10 +17,8 @@ Hybrid: Wt: Addr: :8443 Path: /wt/chat - CertFile: /etc/certs/tls.crt - KeyFile: /etc/certs/tls.key - Auth: - Enabled: true + CertFile: "${CHAT_WT_CERT_FILE}" + KeyFile: "${CHAT_WT_KEY_FILE}" Auth: Enabled: true FallbackStrategy: auto @@ -31,18 +29,18 @@ Hybrid: WsHeaderName: x-auth-user-id WtTokenSource: cookie WtTokenName: JToken - WtJWTSecret: MGUyMWE3ZDhjMTQ5ZDg1MWViOWU0MGM3OTE2NWVkYTBlOTE5ZWRkZDU1YjYzOGJjOWRiNzM0NTc4NDIyMjlkZQ + WtJWTSecret: "${JWT_SECRET_KEY}" Stateless: PollInterval: 100ms BatchSize: 100 Mongo: - URI: mongodb://mongo:27017 - Database: juwan_chat + URI: "${MONGO_URI}" + Database: "${MONGO_DATABASE}" Redis: - Addr: redis:6379 + Addr: "${REDIS_HOST}:${REDIS_PORT}" Log: Level: info diff --git a/app/community/api/community.go b/app/community/api/community.go index 96f2e2d..8b9a3c0 100644 --- a/app/community/api/community.go +++ b/app/community/api/community.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) diff --git a/app/community/api/etc/community-api.yaml b/app/community/api/etc/community-api.yaml index bc8ebfa..3610149 100644 --- a/app/community/api/etc/community-api.yaml +++ b/app/community/api/etc/community-api.yaml @@ -7,16 +7,13 @@ Prometheus: Port: 4001 Path: /metrics -# ===== PROC CONFIG ===== -#CommunityRpcConf: -# Target: k8s://juwan/community-rpc-svc.juwan:8080 -#UsercenterRpcConf: -# Target: k8s://juwan/users-rpc-svc.juwan:8080 - -# ===== DEV CONFIG ===== CommunityRpcConf: Endpoints: - - community-rpc:8080 + - "${COMMUNITY_RPC_TARGET}" + UsercenterRpcConf: Endpoints: - - user-rpc:8080 + - "${USER_RPC_TARGET}" + +Log: + Level: debug diff --git a/app/community/rpc/etc/pb.yaml b/app/community/rpc/etc/pb.yaml index 86cff59..17e61e0 100644 --- a/app/community/rpc/etc/pb.yaml +++ b/app/community/rpc/etc/pb.yaml @@ -6,36 +6,18 @@ Prometheus: Port: 4001 Path: /metrics -# ===== PROC CONF ===== -#SnowflakeRpcConf: -# Target: k8s://juwan/snowflake-svc:8080 -# -#DB: -# Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-rw.juwan:${DB_PORT}/${DB_NAME}?sslmode=disable" -# Slave: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-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 CONF ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_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: debug diff --git a/app/dispute/api/dispute.go b/app/dispute/api/dispute.go index bc735fb..413b05f 100644 --- a/app/dispute/api/dispute.go +++ b/app/dispute/api/dispute.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) diff --git a/app/dispute/api/etc/dispute-api.yaml b/app/dispute/api/etc/dispute-api.yaml index a1c4893..4d864f0 100644 --- a/app/dispute/api/etc/dispute-api.yaml +++ b/app/dispute/api/etc/dispute-api.yaml @@ -7,13 +7,17 @@ Prometheus: Port: 4001 Path: /metrics -# ===== DEV CONFIG ===== DisputeRpcConf: Endpoints: - - dispute-rpc:8080 + - "${DISPUTE_RPC_TARGET}" + OrderRpcConf: Endpoints: - - order-rpc:8080 + - "${ORDER_RPC_TARGET}" + PlayerRpcConf: Endpoints: - - player-rpc:8080 + - "${PLAYER_RPC_TARGET}" + +Log: + Level: debug diff --git a/app/dispute/rpc/etc/pb.yaml b/app/dispute/rpc/etc/pb.yaml index 0bbfacb..17e61e0 100644 --- a/app/dispute/rpc/etc/pb.yaml +++ b/app/dispute/rpc/etc/pb.yaml @@ -6,18 +6,18 @@ Prometheus: Port: 4001 Path: /metrics -# ===== DEV CONF ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_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: debug diff --git a/app/email/api/etc/email-api.yaml b/app/email/api/etc/email-api.yaml index 2b837ff..0e1516f 100644 --- a/app/email/api/etc/email-api.yaml +++ b/app/email/api/etc/email-api.yaml @@ -7,21 +7,10 @@ Prometheus: Port: 4001 Path: /metrics -# ===== PROC CONFIG ===== -#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 ===== CacheConf: - Host: "${REDIS_HOST}:${REDIS_PORT}" Type: node + Pass: "${REDIS_PASSWORD}" Kmq: Name: email-api @@ -29,3 +18,6 @@ Kmq: - "${KAFKA_BROKER}" Group: "email-api-group" Topic: "email-task" + +Log: + Level: debug diff --git a/app/email/mq/etc/email.yaml b/app/email/mq/etc/email.yaml index 7950963..04c61ca 100644 --- a/app/email/mq/etc/email.yaml +++ b/app/email/mq/etc/email.yaml @@ -30,15 +30,5 @@ Mail: InsecureSkipVerify: false ReplyTo: "${EMAIL_REPLY_TO}" -# Mail: -# Enabled: true -# Host: "smtp.163.com" -# Port: 465 -# Username: "churong2646@163.com" -# Password: "GTv6C6qNbv5urAiD" -# FromAddress: "churong2646@163.com" -# FromName: "聚玩" -# UseSSL: true -# UseStartTLS: false -# InsecureSkipVerify: false -# ReplyTo: "" +Log: + Level: debug diff --git a/app/game/api/etc/game-api.yaml b/app/game/api/etc/game-api.yaml index 664eed9..5cdc9ef 100644 --- a/app/game/api/etc/game-api.yaml +++ b/app/game/api/etc/game-api.yaml @@ -7,14 +7,9 @@ Prometheus: Port: 4001 Path: /metrics -# ===== PROC CONF ===== -#GameRpcConf: -# Target: k8s://juwan/game-rpc-svc:8080 - -# ===== DEV CONF ===== GameRpcConf: Endpoints: - - game-rpc:8080 + - "${GAME_RPC_TARGET}" Log: - Level: debug \ No newline at end of file + Level: debug diff --git a/app/game/api/game.go b/app/game/api/game.go index ef1535a..216f314 100644 --- a/app/game/api/game.go +++ b/app/game/api/game.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.NewRequestMiddleware().Handle) diff --git a/app/game/rpc/etc/pb.yaml b/app/game/rpc/etc/pb.yaml index 9300327..17e61e0 100644 --- a/app/game/rpc/etc/pb.yaml +++ b/app/game/rpc/etc/pb.yaml @@ -6,40 +6,18 @@ Prometheus: Port: 4001 Path: /metrics -# ===== PROC CONF ===== -#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" -# -# -#SnowflakeRpcConf: -# Target: k8s://juwan/snowflake-svc:8080 -# -#CacheConf: -# - Host: "${REDIS_M_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# - Host: "${REDIS_S_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# -#Log: -# Level: info - -# ===== DEV CONF ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_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: debug diff --git a/app/notification/api/etc/notifi-api.yaml b/app/notification/api/etc/notifi-api.yaml index c405fdf..fb1e33a 100644 --- a/app/notification/api/etc/notifi-api.yaml +++ b/app/notification/api/etc/notifi-api.yaml @@ -7,7 +7,9 @@ Prometheus: Port: 4001 Path: /metrics -# ===== DEV CONFIG ===== NotificationRpcConf: Endpoints: - - notification-rpc:8080 + - "${NOTIFICATION_RPC_TARGET}" + +Log: + Level: debug diff --git a/app/notification/api/notifi.go b/app/notification/api/notifi.go index 7608bad..5eea0f4 100644 --- a/app/notification/api/notifi.go +++ b/app/notification/api/notifi.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) diff --git a/app/notification/rpc/etc/pb.yaml b/app/notification/rpc/etc/pb.yaml index 0bbfacb..17e61e0 100644 --- a/app/notification/rpc/etc/pb.yaml +++ b/app/notification/rpc/etc/pb.yaml @@ -6,18 +6,18 @@ Prometheus: Port: 4001 Path: /metrics -# ===== DEV CONF ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_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: debug diff --git a/app/objectstory/api/etc/file-api.yaml b/app/objectstory/api/etc/file-api.yaml index 0697f0f..72fe817 100644 --- a/app/objectstory/api/etc/file-api.yaml +++ b/app/objectstory/api/etc/file-api.yaml @@ -7,21 +7,9 @@ Prometheus: Port: 4001 Path: /metrics - -# ===== PROC CONF ===== -#FileRpcConf: -# Target: k8s://juwan/objectstory-rpc-svc:8080 -# -#Log: -# Level: info - -# ===== DEV CONF ===== FileRpcConf: Endpoints: - - objectstory-rpc:8080 + - "${OBJECTSTORY_RPC_TARGET}" Log: - Level: debug - -# k8s://juwan/:8080 - + Level: debug diff --git a/app/objectstory/api/objectstory.go b/app/objectstory/api/objectstory.go index 23c8e71..127f50e 100644 --- a/app/objectstory/api/objectstory.go +++ b/app/objectstory/api/objectstory.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.NewRequestMiddleware().Handle) diff --git a/app/objectstory/rpc/etc/file.yaml b/app/objectstory/rpc/etc/file.yaml index a09c59e..d1306d0 100644 --- a/app/objectstory/rpc/etc/file.yaml +++ b/app/objectstory/rpc/etc/file.yaml @@ -6,36 +6,13 @@ Prometheus: Port: 4001 Path: /metrics -# Target: k8s://juwan/.:8080 -#S3Conf: -# Endpoint: "${S3_ENDPOINT}" -# AccessKey: "${S3_ACCESS_KEY}" -# SecretKey: "${S3_SECRET_KEY}" -# Bucket: "${S3_BUCKET_NAME}" -# Region: "${S3_REGION}" - S3Conf: - Endpoint: "https://cn-nb1.rains3.com" - AccessKey: "mfgGnaAcUDP2zYAi" - SecretKey: "ZfKkbhUvsAchiKlxzIXrDHrSyskyRj" - Bucket: "juwan-dev-image-zj" - Region: auto + Endpoint: "${S3_ENDPOINT}" + AccessKey: "${S3_ACCESS_KEY}" + SecretKey: "${S3_SECRET_KEY}" + Bucket: "${S3_BUCKET_NAME}" + Region: "${S3_REGION}" UsePathStyle: true Log: Level: debug - -#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" -# -#CacheConf: -# - Host: "${REDIS_M_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# - Host: "${REDIS_S_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# diff --git a/app/objectstory/rpc/pb.go b/app/objectstory/rpc/pb.go index e45e019..edf92e3 100644 --- a/app/objectstory/rpc/pb.go +++ b/app/objectstory/rpc/pb.go @@ -22,7 +22,7 @@ func main() { flag.Parse() var c config.Config - conf.MustLoad(*configFile, &c) + conf.MustLoad(*configFile, &c, conf.UseEnv()) ctx := svc.NewServiceContext(c) s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) { diff --git a/app/order/api/etc/order-api.yaml b/app/order/api/etc/order-api.yaml index 87f541e..08ba81e 100644 --- a/app/order/api/etc/order-api.yaml +++ b/app/order/api/etc/order-api.yaml @@ -7,26 +7,17 @@ Prometheus: Port: 4001 Path: /metrics -# k8s://juwan/:8080 -# ===== PROC CONF ===== -#OrderRpcConf: -# Target: k8s://juwan/order-rpc-svc:8080 -# -#PlayerRpcConf: -# Target: k8s://juwan/player-rpc-svc:8080 -# -#ShopRpcConf: -# Target: k8s://juwan/shop-rpc-svc:8080 - -# ===== DEV CONF ==== OrderRpcConf: Endpoints: - - order-rpc:8080 + - "${ORDER_RPC_TARGET}" PlayerRpcConf: Endpoints: - - player-rpc:8080 + - "${PLAYER_RPC_TARGET}" ShopRpcConf: Endpoints: - - shop-rpc:8080 + - "${SHOP_RPC_TARGET}" + +Log: + Level: debug diff --git a/app/order/api/order.go b/app/order/api/order.go index 7588fb8..7b1f468 100644 --- a/app/order/api/order.go +++ b/app/order/api/order.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.NewRequestMiddleware().Handle) diff --git a/app/order/rpc/etc/pb.yaml b/app/order/rpc/etc/pb.yaml index 661205c..17e61e0 100644 --- a/app/order/rpc/etc/pb.yaml +++ b/app/order/rpc/etc/pb.yaml @@ -1,54 +1,23 @@ Name: pb.rpc ListenOn: 0.0.0.0:8080 - Prometheus: Host: 0.0.0.0 Port: 4001 Path: /metrics -# tcd: -# Hosts: -# - 127.0.0.1:2379 -# Key: pb.rpc - -# Target: k8s://juwan/.:8080 - -# ==== PROC CONF ==== -#SnowflakeRpcConf: -# Target: k8s://juwan/snowflake-svc: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" -# -# -#CacheConf: -# - Host: "${REDIS_M_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# - Host: "${REDIS_S_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# -#Log: -# Level: info - -# ==== DEV CONF ==== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_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: debug \ No newline at end of file + Level: debug diff --git a/app/player/api/etc/player-api.yaml b/app/player/api/etc/player-api.yaml index 1c5f270..e88ede8 100644 --- a/app/player/api/etc/player-api.yaml +++ b/app/player/api/etc/player-api.yaml @@ -7,15 +7,13 @@ Prometheus: Port: 4001 Path: /metrics -# k8s://juwan/:8080 -# ===== PROC CONF ===== -#PlayerRpcConf: -# Target: k8s://juwan/player-rpc-svc:8080 - -# ===== DEV CONF ==== PlayerRpcConf: Endpoints: - - player-rpc:8080 + - "${PLAYER_RPC_TARGET}" + UsercenterRpcConf: Endpoints: - - user-rpc:8080 + - "${USER_RPC_TARGET}" + +Log: + Level: debug diff --git a/app/player/api/player.go b/app/player/api/player.go index b3f1740..8bfd9e2 100644 --- a/app/player/api/player.go +++ b/app/player/api/player.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) diff --git a/app/player/rpc/etc/pb.yaml b/app/player/rpc/etc/pb.yaml index a73865e..17e61e0 100644 --- a/app/player/rpc/etc/pb.yaml +++ b/app/player/rpc/etc/pb.yaml @@ -1,48 +1,23 @@ Name: pb.rpc ListenOn: 0.0.0.0:8080 - Prometheus: Host: 0.0.0.0 Port: 4001 Path: /metrics - - - -# ===== PROC CONF ===== -#SnowflakeRpcConf: -# Target: k8s://juwan/snowflake-svc: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" -# -#CacheConf: -# - Host: "${REDIS_M_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# - Host: "${REDIS_S_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# -#Log: -# Level: info - -# ===== DEV CONF ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_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: debug diff --git a/app/review/api/etc/review-api.yaml b/app/review/api/etc/review-api.yaml index bc1437c..98d2053 100644 --- a/app/review/api/etc/review-api.yaml +++ b/app/review/api/etc/review-api.yaml @@ -7,13 +7,17 @@ Prometheus: Port: 4001 Path: /metrics -# ===== DEV CONFIG ===== ReviewRpcConf: Endpoints: - - review-rpc:8080 + - "${REVIEW_RPC_TARGET}" + OrderRpcConf: Endpoints: - - order-rpc:8080 + - "${ORDER_RPC_TARGET}" + PlayerRpcConf: Endpoints: - - player-rpc:8080 + - "${PLAYER_RPC_TARGET}" + +Log: + Level: debug diff --git a/app/review/api/review.go b/app/review/api/review.go index cea80e9..176e5cd 100644 --- a/app/review/api/review.go +++ b/app/review/api/review.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) diff --git a/app/review/rpc/etc/pb.yaml b/app/review/rpc/etc/pb.yaml index 0bbfacb..17e61e0 100644 --- a/app/review/rpc/etc/pb.yaml +++ b/app/review/rpc/etc/pb.yaml @@ -6,18 +6,18 @@ Prometheus: Port: 4001 Path: /metrics -# ===== DEV CONF ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_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: debug diff --git a/app/search/api/etc/search-api.yaml b/app/search/api/etc/search-api.yaml index 00b12fb..5b9a837 100644 --- a/app/search/api/etc/search-api.yaml +++ b/app/search/api/etc/search-api.yaml @@ -7,7 +7,9 @@ Prometheus: Port: 4001 Path: /metrics -# ===== DEV CONFIG ===== SearchRpcConf: Endpoints: - - search-rpc:8080 + - "${SEARCH_RPC_TARGET}" + +Log: + Level: debug diff --git a/app/search/api/search.go b/app/search/api/search.go index 8cce7f6..a34d826 100644 --- a/app/search/api/search.go +++ b/app/search/api/search.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) diff --git a/app/search/rpc/etc/pb.yaml b/app/search/rpc/etc/pb.yaml index 0bbfacb..17e61e0 100644 --- a/app/search/rpc/etc/pb.yaml +++ b/app/search/rpc/etc/pb.yaml @@ -6,18 +6,18 @@ Prometheus: Port: 4001 Path: /metrics -# ===== DEV CONF ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_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: debug diff --git a/app/shop/api/etc/shop-api.yaml b/app/shop/api/etc/shop-api.yaml index fabc5b1..9b8b4c3 100644 --- a/app/shop/api/etc/shop-api.yaml +++ b/app/shop/api/etc/shop-api.yaml @@ -7,17 +7,13 @@ Prometheus: Port: 4001 Path: /metrics -# k8s://juwan/: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 diff --git a/app/shop/api/shop.go b/app/shop/api/shop.go index 02812c6..617e96b 100644 --- a/app/shop/api/shop.go +++ b/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) diff --git a/app/shop/rpc/etc/pb.yaml b/app/shop/rpc/etc/pb.yaml index b41c6a1..3e51c92 100644 --- a/app/shop/rpc/etc/pb.yaml +++ b/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/.: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 diff --git a/app/snowflake/rpc/pb.go b/app/snowflake/rpc/pb.go index b7952b2..b77bfcd 100644 --- a/app/snowflake/rpc/pb.go +++ b/app/snowflake/rpc/pb.go @@ -22,7 +22,7 @@ func main() { flag.Parse() var c config.Config - conf.MustLoad(*configFile, &c) + conf.MustLoad(*configFile, &c, conf.UseEnv()) ctx := svc.NewServiceContext(c) s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) { diff --git a/app/user_verifications/rpc/etc/pb.yaml b/app/user_verifications/rpc/etc/pb.yaml index ce65f5e..6d2683f 100644 --- a/app/user_verifications/rpc/etc/pb.yaml +++ b/app/user_verifications/rpc/etc/pb.yaml @@ -1,45 +1,27 @@ Name: pb.rpc ListenOn: 0.0.0.0:8080 +Prometheus: + Host: 0.0.0.0 + Port: 4001 + Path: /metrics -# ===== PROC Config ===== -#SnowflakeRpcConf: -# Target: k8s://juwan/snowflake-svc.juwan:8080 -#UserRpcConf: -# Target: k8s://juwan/user-rpc-svc.juwan:8080 -# -#DB: -# Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-rw.juwan:${DB_PORT}/${DB_NAME}?sslmode=disable" -# Slave: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-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" -# -#Log: -# Level: info - -# ===== DEV Config ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_RPC_TARGET}" + UserRpcConf: Endpoints: - - user-rpc:8080 + - "${USER_RPC_TARGET}" DB: - Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@postgres:${DB_PORT}/${DB_NAME}?sslmode=disable" - Slave: "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" + Slave: "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: debug diff --git a/app/users/api/etc/users-api.yaml b/app/users/api/etc/users-api.yaml index 8d01408..c26320d 100644 --- a/app/users/api/etc/users-api.yaml +++ b/app/users/api/etc/users-api.yaml @@ -7,19 +7,13 @@ Prometheus: Port: 4001 Path: /metrics -# ===== PROC CONFIG ===== -#UsercenterRpcConf: -# Target: k8s://juwan/user-rpc-svc:8080 -#UserVerificationRpc: -# Target: k8s://juwan/user_verifications-svc:8080 - -# ===== DEV CONFIG ==== UserVerificationRpc: Endpoints: - - user-verifications-rpc:8080 + - "${USER_VERIFICATIONS_RPC_TARGET}" + UsercenterRpcConf: Endpoints: - - user-rpc:8080 + - "${USER_RPC_TARGET}" Log: - Level: debug \ No newline at end of file + Level: debug diff --git a/app/users/api/users.go b/app/users/api/users.go index 59cc36a..bd2d029 100644 --- a/app/users/api/users.go +++ b/app/users/api/users.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) diff --git a/app/users/rpc/etc/pb.yaml b/app/users/rpc/etc/pb.yaml index 2b074a3..3118749 100644 --- a/app/users/rpc/etc/pb.yaml +++ b/app/users/rpc/etc/pb.yaml @@ -6,46 +6,21 @@ Prometheus: Port: 4001 Path: /metrics -DataSource: "${DB_URI}?sslmode=disable" - - -# ===== PROC CONFIG ===== -#SnowflakeRpcConf: -# Target: k8s://juwan/snowflake-svc:8080 -# -#DB: -# Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-rw.juwan:${DB_PORT}/${DB_NAME}?sslmode=disable" -# Slave: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-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" -# -#Jwt: -# SecretKey: "${JWT_SECRET_KEY}" -# Issuer: "juwan-user-rpc" - -# ===== DEV CONFIG ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_RPC_TARGET}" DB: - Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@postgres:${DB_PORT}/${DB_NAME}?sslmode=disable" - Slave: "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" + Slave: "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}" Jwt: - SecretKey: "MGUyMWE3ZDhjMTQ5ZDg1MWViOWU0MGM3OTE2NWVkYTBlOTE5ZWRkZDU1YjYzOGJjOWRiNzM0NTc4NDIyMjlkZQ" + SecretKey: "${JWT_SECRET_KEY}" Issuer: "juwan-user-rpc" Log: diff --git a/app/wallet/api/etc/wallet-api.yaml b/app/wallet/api/etc/wallet-api.yaml index fb9fb3b..c681384 100644 --- a/app/wallet/api/etc/wallet-api.yaml +++ b/app/wallet/api/etc/wallet-api.yaml @@ -7,16 +7,9 @@ Prometheus: Port: 4001 Path: /metrics -# ===== PROC CONF ===== -#WalletRpcConf: -# Target: k8s://juwan/wallet-rpc:8080 - - - -# ===== DEV CONF ===== WalletRpcConf: Endpoints: - - wallet-rpc:8080 - -# k8s://juwan/:8080 + - "${WALLET_RPC_TARGET}" +Log: + Level: debug diff --git a/app/wallet/api/wallet.go b/app/wallet/api/wallet.go index d23f4b9..101548d 100644 --- a/app/wallet/api/wallet.go +++ b/app/wallet/api/wallet.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.NewRequestMiddleware().Handle) diff --git a/app/wallet/rpc/etc/pb.yaml b/app/wallet/rpc/etc/pb.yaml index 3d6bf89..17e61e0 100644 --- a/app/wallet/rpc/etc/pb.yaml +++ b/app/wallet/rpc/etc/pb.yaml @@ -1,55 +1,23 @@ Name: pb.rpc ListenOn: 0.0.0.0:8080 - Prometheus: Host: 0.0.0.0 Port: 4001 Path: /metrics -# tcd: -# Hosts: -# - 127.0.0.1:2379 -# Key: pb.rpc - -# Target: k8s://juwan/.:8080 - - -# ===== PROC CONF ===== -#SnowflakeRpcConf: -# Target: k8s://juwan/snowflake-svc: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" -# -# -#CacheConf: -# - Host: "${REDIS_M_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# - Host: "${REDIS_S_HOST}" -# Type: node -# Pass: "${REDIS_PASSWORD}" -# User: "default" -# -#Log: -# Level: info - -# ===== DEV CONFIG ===== SnowflakeRpcConf: Endpoints: - - snowflake:8080 + - "${SNOWFLAKE_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: debug \ No newline at end of file + Level: debug diff --git a/deploy/dev/.env b/deploy/dev/.env index 0cea1cf..f594536 100644 --- a/deploy/dev/.env +++ b/deploy/dev/.env @@ -3,18 +3,44 @@ PD_USERNAME=postgres DB_PASSWORD=123456 DB_PORT=5432 DB_NAME=app -DB_URI=postgresql://postgres:123456@postgres:5432/app +DB_HOST=postgres +DB_HOST_RO=postgres # Redis REDIS_HOST=redis REDIS_PORT=6379 REDIS_PASSWORD= -REDIS_M_HOST=redis:6379 -REDIS_S_HOST=redis:6379 + +# Mongo (chat) +MONGO_URI=mongodb://mongo:27017 +MONGO_DATABASE=juwan_chat # Kafka KAFKA_BROKER=kafka:9092 +# JWT +JWT_SECRET_KEY=MGUyMWE3ZDhjMTQ5ZDg1MWViOWU0MGM3OTE2NWVkYTBlOTE5ZWRkZDU1YjYzOGJjOWRiNzM0NTc4NDIyMjlkZQ + +# RPC targets (compose DNS) +SNOWFLAKE_RPC_TARGET=snowflake:8080 +USER_RPC_TARGET=user-rpc:8080 +USER_VERIFICATIONS_RPC_TARGET=user-verifications-rpc:8080 +PLAYER_RPC_TARGET=player-rpc:8080 +GAME_RPC_TARGET=game-rpc:8080 +SHOP_RPC_TARGET=shop-rpc:8080 +ORDER_RPC_TARGET=order-rpc:8080 +WALLET_RPC_TARGET=wallet-rpc:8080 +COMMUNITY_RPC_TARGET=community-rpc:8080 +REVIEW_RPC_TARGET=review-rpc:8080 +DISPUTE_RPC_TARGET=dispute-rpc:8080 +NOTIFICATION_RPC_TARGET=notification-rpc:8080 +SEARCH_RPC_TARGET=search-rpc:8080 +OBJECTSTORY_RPC_TARGET=objectstory-rpc:8080 + +# Chat WebTransport TLS (dev self-signed; chat service reads OptionalValue with empty fallback) +CHAT_WT_CERT_FILE=/etc/certs/tls.crt +CHAT_WT_KEY_FILE=/etc/certs/tls.key + # Email (placeholder) EMAIL_SMTP_HOST=smtp.example.com EMAIL_SMTP_PORT=465 diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml index bf136a3..e4f54ae 100644 --- a/deploy/dev/docker-compose.yml +++ b/deploy/dev/docker-compose.yml @@ -451,6 +451,7 @@ services: image: juwan/chat-api:dev container_name: juwan-chat-api restart: unless-stopped + env_file: .env ports: - "18810:8888" - "18889:8889"