fix: some api bug

app/order/api/etc/order-api.yaml

@@ -8,11 +8,25 @@ Prometheus:
   Path: /metrics
 
 # k8s://juwan/<service name>: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:
-  Target: k8s://juwan/order-rpc-svc:8080
+  Endpoints:
+    - order-rpc:8080
 
 PlayerRpcConf:
-  Target: k8s://juwan/player-rpc-svc:8080
+  Endpoints:
+    - player-rpc:8080
 
 ShopRpcConf:
-  Target: k8s://juwan/shop-rpc-svc:8080
+  Endpoints:
+    - shop-rpc:8080

app/order/api/order.go

@@ -6,6 +6,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"juwan-backend/common/middlewares"
 
 	"juwan-backend/app/order/api/internal/config"
 	"juwan-backend/app/order/api/internal/handler"
@@ -24,6 +25,8 @@ func main() {
 	conf.MustLoad(*configFile, &c)
 
 	server := rest.MustNewServer(c.RestConf)
+	server.Use(middlewares.NewRequestMiddleware().Handle)
+	server.Use(middlewares.NewHeaderExtractorMiddleware().Handle)
 	defer server.Stop()
 
 	ctx := svc.NewServiceContext(c)

app/order/rpc/etc/pb.yaml

@@ -14,25 +14,41 @@ Prometheus:
 
 # Target: k8s://juwan/<service name>.<namespace>: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:
-  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"
-  Slaves: "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

app/order/rpc/internal/svc/serviceContext.go

@@ -1,20 +1,22 @@
 package svc
 
 import (
+	stdsql "database/sql"
 	"fmt"
 	"strings"
 	"time"
 
+	"ariga.io/entcache"
+	"entgo.io/ent/dialect"
+	"entgo.io/ent/dialect/sql"
+	_ "github.com/jackc/pgx/v5/stdlib"
+	"github.com/zeromicro/go-zero/core/logx"
 	"juwan-backend/app/order/rpc/internal/config"
 	"juwan-backend/app/order/rpc/internal/models"
 	"juwan-backend/app/snowflake/rpc/snowflake"
 	"juwan-backend/common/redisx"
 	"juwan-backend/common/snowflakex"
 	"juwan-backend/pkg/adapter"
-
-	"ariga.io/entcache"
-	"entgo.io/ent/dialect/sql"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type ServiceContext struct {
@@ -25,14 +27,16 @@ type ServiceContext struct {
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
-	RWConn, err := sql.Open("pgx", c.DB.Master)
+	rawRW, err := stdsql.Open("pgx", c.DB.Master)
 	if err != nil {
 		panic(err)
 	}
-	ROConn, err := sql.Open("pgx", c.DB.Slaves)
+	rawRO, err := stdsql.Open("pgx", c.DB.Slaves)
 	if err != nil {
 		panic(err)
 	}
+	RWConn := sql.OpenDB(dialect.Postgres, rawRW)
+	ROConn := sql.OpenDB(dialect.Postgres, rawRO)
 
 	redisCluster, err := redisx.ConnectMasterSlaveCluster(c.CacheConf, 5*time.Second)
 	if redisCluster == nil || err != nil {

app/order/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) {