diff --git a/app/community/api/etc/community-api.yaml b/app/community/api/etc/community-api.yaml index e23d7f1..bc8ebfa 100644 --- a/app/community/api/etc/community-api.yaml +++ b/app/community/api/etc/community-api.yaml @@ -7,10 +7,16 @@ Prometheus: Port: 4001 Path: /metrics -# k8s://juwan/:8080 +# ===== PROC CONFIG ===== +#CommunityRpcConf: +# Target: k8s://juwan/community-rpc-svc.juwan:8080 +#UsercenterRpcConf: +# Target: k8s://juwan/users-rpc-svc.juwan:8080 +# ===== DEV CONFIG ===== CommunityRpcConf: - Target: k8s://juwan/community-rpc-svc.juwan:8080 - + Endpoints: + - community-rpc:8080 UsercenterRpcConf: - Target: k8s://juwan/users-rpc-svc.juwan:8080 + Endpoints: + - user-rpc:8080 diff --git a/app/community/rpc/etc/pb.yaml b/app/community/rpc/etc/pb.yaml index 3763106..86cff59 100644 --- a/app/community/rpc/etc/pb.yaml +++ b/app/community/rpc/etc/pb.yaml @@ -1,38 +1,41 @@ 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" +# 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: - Target: k8s://juwan/snowflake-svc:8080 - + Endpoints: + - snowflake: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" - + 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" CacheConf: - - Host: "${REDIS_M_HOST}" + - Host: "${REDIS_HOST}:${REDIS_PORT}" Type: node - Pass: "${REDIS_PASSWORD}" - User: "default" - - Host: "${REDIS_S_HOST}" - Type: node - Pass: "${REDIS_PASSWORD}" - User: "default" Log: - Level: info + Level: debug diff --git a/app/email/api/etc/email-api.yaml b/app/email/api/etc/email-api.yaml index b57ce1a..2b837ff 100644 --- a/app/email/api/etc/email-api.yaml +++ b/app/email/api/etc/email-api.yaml @@ -7,15 +7,21 @@ 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_M_HOST}" + - Host: "${REDIS_HOST}:${REDIS_PORT}" Type: node - Pass: "${REDIS_PASSWORD}" - User: "default" - - Host: "${REDIS_S_HOST}" - Type: node - Pass: "${REDIS_PASSWORD}" - User: "default" Kmq: Name: email-api diff --git a/app/shop/rpc/etc/pb.yaml b/app/shop/rpc/etc/pb.yaml index 706de36..b41c6a1 100644 --- a/app/shop/rpc/etc/pb.yaml +++ b/app/shop/rpc/etc/pb.yaml @@ -36,7 +36,6 @@ Prometheus: SnowflakeRpcConf: Endpoints: - snowflake:8080 - - UsersRpcConf: Endpoints: - user-rpc:8080