Merge pull request #13 from NpoolPlatform/feat/auto-increment-id

Feat/auto increment

api/api.go

@@ -34,5 +34,20 @@ func RegisterGateway(mux *runtime.ServeMux, endpoint string, opts []grpc.DialOpt
 	if err := ledger.RegisterMiddlewareHandlerFromEndpoint(context.Background(), mux, endpoint, opts); err != nil {
 		return err
 	}
+	if err := ledger1.RegisterGateway(mux, endpoint, opts); err != nil {
+		return err
+	}
+	if err := statement.RegisterGateway(mux, endpoint, opts); err != nil {
+		return err
+	}
+	if err := profit.RegisterGateway(mux, endpoint, opts); err != nil {
+		return err
+	}
+	if err := withdraw.RegisterGateway(mux, endpoint, opts); err != nil {
+		return err
+	}
+	if err := goodstatement.RegisterGateway(mux, endpoint, opts); err != nil {
+		return err
+	}
 	return nil
 }

api/good/ledger/statement/api.go

@@ -1,7 +1,10 @@
 package statement
 
 import (
+	"context"
+
 	goodstatement "github.com/NpoolPlatform/message/npool/ledger/mw/v2/good/ledger/statement"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 
 	"google.golang.org/grpc"
 )
@@ -13,3 +16,7 @@ type Server struct {
 func Register(server grpc.ServiceRegistrar) {
 	goodstatement.RegisterMiddlewareServer(server, &Server{})
 }
+
+func RegisterGateway(mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) error {
+	return goodstatement.RegisterMiddlewareHandlerFromEndpoint(context.Background(), mux, endpoint, opts)
+}

api/good/ledger/statement/create.go

@@ -26,7 +26,7 @@ func (s *Server) CreateGoodStatement(ctx context.Context, in *npool.CreateGoodSt
 
 	handler, err := goodstatement1.NewHandler(
 		ctx,
-		goodstatement1.WithID(req.ID, false),
+		goodstatement1.WithEntID(req.EntID, false),
 		goodstatement1.WithGoodID(req.GoodID, true),
 		goodstatement1.WithCoinTypeID(req.CoinTypeID, true),
 		goodstatement1.WithTotalAmount(req.TotalAmount, true),

api/good/ledger/statement/delete.go

@@ -23,12 +23,13 @@ func (s *Server) DeleteGoodStatement(ctx context.Context, in *npool.DeleteGoodSt
 			"DeleteGoodStatement",
 			"In", in,
 		)
-		return &npool.DeleteGoodStatementResponse{}, status.Error(codes.InvalidArgument, "invalid info")
+		return &npool.DeleteGoodStatementResponse{}, status.Error(codes.Aborted, "invalid info")
 	}
 
 	handler, err := statement1.NewHandler(
 		ctx,
-		goodstatement1.WithID(req.ID, true),
+		goodstatement1.WithID(req.ID, false),
+		goodstatement1.WithEntID(req.EntID, false),
 	)
 	if err != nil {
 		logger.Sugar().Errorw(

api/ledger/api.go

@@ -1,6 +1,8 @@
 package ledger
 
 import (
+	"context"
+
 	"github.com/NpoolPlatform/message/npool/ledger/mw/v2/ledger"
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
@@ -16,5 +18,5 @@ func Register(server grpc.ServiceRegistrar) {
 }
 
 func RegisterGateway(mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) error {
-	return nil
+	return ledger.RegisterMiddlewareHandlerFromEndpoint(context.Background(), mux, endpoint, opts)
 }

api/ledger/profit/api.go

@@ -1,7 +1,10 @@
 package profit
 
 import (
+	"context"
+
 	"github.com/NpoolPlatform/message/npool/ledger/mw/v2/ledger/profit"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 
 	"google.golang.org/grpc"
 )
@@ -13,3 +16,7 @@ type Server struct {
 func Register(server grpc.ServiceRegistrar) {
 	profit.RegisterMiddlewareServer(server, &Server{})
 }
+
+func RegisterGateway(mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) error {
+	return profit.RegisterMiddlewareHandlerFromEndpoint(context.Background(), mux, endpoint, opts)
+}

api/ledger/profit/query.go

@@ -48,7 +48,7 @@ func (s *Server) GetProfits(ctx context.Context, in *npool.GetProfitsRequest) (
 func (s *Server) GetProfit(ctx context.Context, in *npool.GetProfitRequest) (*npool.GetProfitResponse, error) {
 	handler, err := profit1.NewHandler(
 		ctx,
-		profit1.WithID(&in.ID, true),
+		profit1.WithEntID(&in.EntID, true),
 	)
 	if err != nil {
 		logger.Sugar().Errorw(

api/ledger/query.go

@@ -48,7 +48,7 @@ func (s *Server) GetLedgers(ctx context.Context, in *npool.GetLedgersRequest) (
 func (s *Server) GetLedger(ctx context.Context, in *npool.GetLedgerRequest) (*npool.GetLedgerResponse, error) {
 	handler, err := ledger1.NewHandler(
 		ctx,
-		ledger1.WithID(&in.ID, true),
+		ledger1.WithEntID(&in.EntID, true),
 	)
 	if err != nil {
 		logger.Sugar().Errorw(

api/ledger/statement/api.go

@@ -1,7 +1,10 @@
 package statement
 
 import (
+	"context"
+
 	"github.com/NpoolPlatform/message/npool/ledger/mw/v2/ledger/statement"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 
 	"google.golang.org/grpc"
 )
@@ -13,3 +16,6 @@ type Server struct {
 func Register(server grpc.ServiceRegistrar) {
 	statement.RegisterMiddlewareServer(server, &Server{})
 }
+func RegisterGateway(mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) error {
+	return statement.RegisterMiddlewareHandlerFromEndpoint(context.Background(), mux, endpoint, opts)
+}

api/ledger/statement/create.go

@@ -22,7 +22,7 @@ func (s *Server) CreateStatement(ctx context.Context, in *npool.CreateStatementR
 	}
 	handler, err := statement1.NewHandler(
 		ctx,
-		statement1.WithID(req.ID, false),
+		statement1.WithEntID(req.EntID, false),
 		statement1.WithAppID(req.AppID, true),
 		statement1.WithUserID(req.UserID, true),
 		statement1.WithCoinTypeID(req.CoinTypeID, true),

api/ledger/statement/delete.go

@@ -22,7 +22,8 @@ func (s *Server) DeleteStatement(ctx context.Context, in *npool.DeleteStatementR
 	}
 	handler, err := statement1.NewHandler(
 		ctx,
-		statement1.WithID(req.ID, true),
+		statement1.WithID(req.ID, false),
+		statement1.WithEntID(req.EntID, false),
 		statement1.WithRollback(req.Rollback, false),
 	)
 	if err != nil {

api/ledger/statement/query.go

@@ -13,7 +13,7 @@ import (
 func (s *Server) GetStatement(ctx context.Context, in *npool.GetStatementRequest) (*npool.GetStatementResponse, error) {
 	handler, err := statement1.NewHandler(
 		ctx,
-		statement1.WithID(&in.ID, true),
+		statement1.WithEntID(&in.EntID, true),
 	)
 	if err != nil {
 		logger.Sugar().Errorw(

api/withdraw/api.go

@@ -1,8 +1,10 @@
 package withdraw
 
 import (
-	"github.com/NpoolPlatform/message/npool/ledger/mw/v2/withdraw"
+	"context"
 
+	"github.com/NpoolPlatform/message/npool/ledger/mw/v2/withdraw"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"google.golang.org/grpc"
 )
 
@@ -13,3 +15,7 @@ type Server struct {
 func Register(server grpc.ServiceRegistrar) {
 	withdraw.RegisterMiddlewareServer(server, &Server{})
 }
+
+func RegisterGateway(mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) error {
+	return withdraw.RegisterMiddlewareHandlerFromEndpoint(context.Background(), mux, endpoint, opts)
+}

api/withdraw/create.go

@@ -1,3 +1,4 @@
+//nolint
 package withdraw
 
 import (
@@ -17,17 +18,16 @@ func (s *Server) CreateWithdraw(ctx context.Context, in *npool.CreateWithdrawReq
 			"CreateWithdraw",
 			"In", in,
 		)
-		return &npool.CreateWithdrawResponse{}, status.Error(codes.InvalidArgument, "invalid info")
+		return &npool.CreateWithdrawResponse{}, status.Error(codes.Aborted, "invalid info")
 	}
 	handler, err := withdraw1.NewHandler(
 		ctx,
-		withdraw1.WithID(req.ID, false),
+		withdraw1.WithEntID(req.EntID, false),
 		withdraw1.WithAppID(req.AppID, true),
 		withdraw1.WithUserID(req.UserID, true),
 		withdraw1.WithCoinTypeID(req.CoinTypeID, true),
 		withdraw1.WithAccountID(req.AccountID, true),
 		withdraw1.WithAmount(req.Amount, true),
-		withdraw1.WithPlatformTransactionID(req.PlatformTransactionID, false),
 		withdraw1.WithAddress(req.Address, true),
 	)
 	if err != nil {

api/withdraw/delete.go

@@ -21,7 +21,8 @@ func (s *Server) DeleteWithdraw(ctx context.Context, in *npool.DeleteWithdrawReq
 	}
 	handler, err := withdraw1.NewHandler(
 		ctx,
-		withdraw1.WithID(req.ID, true),
+		withdraw1.WithID(req.ID, false),
+		withdraw1.WithEntID(req.EntID, false),
 	)
 	if err != nil {
 		logger.Sugar().Errorw(

api/withdraw/query.go

@@ -48,7 +48,7 @@ func (s *Server) GetWithdraws(ctx context.Context, in *npool.GetWithdrawsRequest
 func (s *Server) GetWithdraw(ctx context.Context, in *npool.GetWithdrawRequest) (*npool.GetWithdrawResponse, error) {
 	handler, err := withdraw1.NewHandler(
 		ctx,
-		withdraw1.WithID(&in.ID, true),
+		withdraw1.WithEntID(&in.EntID, true),
 	)
 	if err != nil {
 		logger.Sugar().Errorw(

api/withdraw/update.go

@@ -1,3 +1,4 @@
+//nolint
 package withdraw
 
 import (

cmd/ledger-middleware/k8s/03-strip-prefix.yaml

@@ -6,4 +6,4 @@ metadata:
 spec:
   stripPrefix:
     prefixes:
-      - /api/ledger-middleware
+      - /api/ledgermw

cmd/ledger-middleware/k8s/05-traefik-ingress.yaml

@@ -0,0 +1,131 @@
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: ledger-middleware-traefik-app-ingress
+  namespace: kube-system
+  annotations:
+    k8s.kuboard.cn/displayName: ledger-middleware-traefik-app
+    k8s.kuboard.cn/workload: ledger-middleware-traefik-app
+    kubernetes.io/ingress.class: "traefik-internet"
+    traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
+    traefik.ingress.kubernetes.io/router.middlewares:
+      kube-system-strip-ledger-middleware-prefix@kubernetescrd,
+      kube-system-common-headers@kubernetescrd,
+      kube-system-headers-appid-to-body@kubernetescrd,
+      kube-system-headers-userid-to-body@kubernetescrd,
+      kube-system-headers-app-login-token-to-body@kubernetescrd,
+      kube-system-app-user-role-rbac-auth@kubernetescrd
+
+spec:
+  rules:
+    - host: api.npool.top
+      http: &http_rules
+        paths:
+          - path: /api/ledgermw/v1/ledgerstatement_CreateStatement
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledgerstatement_CreateStatements
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledgerstatement_DeleteStatements
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledgerstatement_DeleteStatement
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledgerstatement_GetStatement
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledgerstatement_GetStatements
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledgerstatement_ExistStatementConds
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/profit_GetProfit
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/profit_GetProfits
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledger_GetLedger
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledger_GetLedgers
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledger_LockBalance
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledger_UnlockBalance
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/ledger_SettleBalance
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/goodstatement_CreateGoodStatement
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/goodstatement_CreateGoodStatements
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/goodstatement_DeleteGoodStatement
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/goodstatement_DeleteGoodStatements
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/goodstatement_GetGoodStatements
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/goodstatement_ExistGoodStatementConds
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/withdraw_CreateWithdraw
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/withdraw_UpdateWithdraw
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/withdraw_GetWithdraw
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/withdraw_GetWithdraws
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+          - path: /api/ledgermw/v1/withdraw_DeleteWithdraw
+            backend:
+              serviceName: ledger-middleware
+              servicePort: 50420
+    - host: api.procyon.vip
+      http: *http_rules
+    - host: api.xpool.top
+      http: *http_rules
+    - host: api.ohhash.com
+      http: *http_rules
+    - host: api.development.npool.top
+      http: *http_rules

cmd/ledger-middleware/k8s/kustomization.yaml

@@ -3,3 +3,4 @@ resources:
   - 02-ledger-middleware.yaml
   - 03-strip-prefix.yaml
   - 04-service-monitor.yaml
+  - 05-traefik-ingress.yaml

cmd/ledger-middleware/run.go

@@ -8,6 +8,7 @@ import (
 	"github.com/NpoolPlatform/go-service-framework/pkg/logger"
 	"github.com/NpoolPlatform/ledger-middleware/api"
 	"github.com/NpoolPlatform/ledger-middleware/pkg/db"
+	"github.com/NpoolPlatform/ledger-middleware/pkg/migrator"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	cli "github.com/urfave/cli/v2"
 	"google.golang.org/grpc"
@@ -29,6 +30,9 @@ var runCmd = &cli.Command{
 }
 
 func run(ctx context.Context) error {
+	if err := migrator.Migrate(ctx); err != nil {
+		return err
+	}
 	if err := db.Init(); err != nil {
 		return err
 	}