diff --git a/Makefile b/Makefile
index b49d262..d343a96 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ all: lint test build
 .PHONY: build
 # make build, Build the binary file
 build: wire
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags ${ldflags} -o bin/$(SERVICE_NAME) cmd/server/main.go cmd/server/wire_gen.go
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -race -ldflags ${ldflags} -o bin/$(SERVICE_NAME) cmd/server/main.go cmd/server/wire_gen.go
 #	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags ${ldflags} -o bin/$(SERVICE_NAME)-consumer cmd/consumer/main.go cmd/consumer/wire_gen.go
 
 .PHONY: run
@@ -75,7 +75,7 @@ lint:
 .PHONY: test
 # make test
 test: vet
-	@go test -short ${PKG_LIST}
+	@go test -race -short ${PKG_LIST}
 
 .PHONY: vet
 # make vet
diff --git a/api/user/v1/user.pb.go b/api/user/v1/user.pb.go
index 27d2336..8c8a1e1 100644
--- a/api/user/v1/user.pb.go
+++ b/api/user/v1/user.pb.go
@@ -6,6 +6,7 @@ package v1
 import (
 	fmt "fmt"
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
+	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	io "io"
@@ -1283,74 +1284,75 @@ func init() {
 func init() { proto.RegisterFile("api/user/v1/user.proto", fileDescriptor_68a8f9c10c733b91) }
 
 var fileDescriptor_68a8f9c10c733b91 = []byte{
-	// 1063 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x6f, 0xe3, 0x44,
-	0x14, 0x5f, 0x3b, 0x6d, 0x3e, 0x5e, 0x9a, 0x8f, 0x9d, 0xa6, 0xad, 0xd7, 0xb4, 0x55, 0x77, 0x7a,
-	0x09, 0x45, 0xad, 0xd5, 0x72, 0x62, 0x57, 0x1c, 0x5a, 0x28, 0x2b, 0x44, 0x36, 0x8b, 0xd2, 0x54,
-	0xc0, 0x5e, 0xc2, 0x24, 0x9e, 0x4d, 0xac, 0x4d, 0xec, 0x60, 0x4f, 0x52, 0x05, 0xc4, 0x85, 0xff,
-	0x00, 0xf1, 0x4f, 0x71, 0x44, 0xe2, 0x1f, 0x40, 0x15, 0x07, 0xc4, 0x89, 0x33, 0xe2, 0x80, 0xde,
-	0xf8, 0x6b, 0xea, 0x64, 0x91, 0x56, 0x02, 0x0e, 0x88, 0x4b, 0x3b, 0xf3, 0xde, 0xf3, 0xef, 0xf7,
-	0xfc, 0x3e, 0x1d, 0xd8, 0x66, 0x53, 0xc7, 0x9a, 0x05, 0xdc, 0xb7, 0xe6, 0xa7, 0xf2, 0xff, 0xc9,
-	0xd4, 0xf7, 0x84, 0x47, 0x0a, 0xf2, 0x3c, 0x3f, 0x35, 0x77, 0xe6, 0x6c, 0xec, 0xd8, 0x4c, 0x70,
-	0x2b, 0x3e, 0x84, 0x16, 0xe6, 0xee, 0xd0, 0xf3, 0x86, 0x63, 0x6e, 0x21, 0x00, 0x73, 0x5d, 0x4f,
-	0x30, 0xe1, 0x78, 0x6e, 0x10, 0x6a, 0xe9, 0x1f, 0x3a, 0xac, 0x5d, 0x07, 0xdc, 0x27, 0x55, 0xd0,
-	0x1d, 0xdb, 0xd0, 0x0e, 0xb4, 0x66, 0xae, 0xa3, 0x3b, 0x36, 0x31, 0xa1, 0x88, 0xd0, 0x2e, 0x9b,
-	0x70, 0x43, 0x3f, 0xd0, 0x9a, 0xa5, 0x4e, 0x72, 0x27, 0x0d, 0x58, 0xe7, 0x13, 0xe6, 0x8c, 0x8d,
-	0x9c, 0x54, 0x84, 0x17, 0x94, 0x4e, 0x47, 0x9e, 0xcb, 0x8d, 0xb5, 0x50, 0x2a, 0x2f, 0x84, 0x42,
-	0x65, 0xcc, 0x02, 0xd1, 0x1b, 0x7b, 0x43, 0xc7, 0xed, 0x31, 0x61, 0xac, 0x4b, 0x8a, 0x32, 0x0a,
-	0x5b, 0x28, 0x3b, 0x17, 0xe4, 0x2d, 0xc8, 0x07, 0x82, 0x89, 0x59, 0x60, 0xe4, 0x0f, 0xb4, 0x66,
-	0xf5, 0x6c, 0xf3, 0x24, 0x7a, 0xab, 0x93, 0x2b, 0x29, 0xee, 0x2e, 0xa6, 0xbc, 0x13, 0x99, 0xa0,
-	0x63, 0xae, 0x33, 0x78, 0x29, 0x1d, 0x2b, 0x84, 0x8e, 0xc5, 0x77, 0xb2, 0x0d, 0x79, 0x36, 0x67,
-	0x82, 0xf9, 0x46, 0x51, 0x6a, 0xa2, 0x1b, 0x12, 0x0c, 0xb9, 0x6b, 0x73, 0xdf, 0x28, 0x65, 0x08,
-	0x9e, 0x48, 0x71, 0x48, 0x10, 0x9a, 0x20, 0x41, 0xdf, 0xf1, 0xc5, 0xc8, 0x66, 0x0b, 0x03, 0x42,
-	0x82, 0xf8, 0x4e, 0xea, 0x90, 0xeb, 0x3b, 0x9e, 0x51, 0x96, 0x62, 0x3c, 0x92, 0x3d, 0x80, 0x81,
-	0xcf, 0x99, 0xe0, 0x36, 0xbe, 0xdc, 0x86, 0x7c, 0xb9, 0x52, 0x24, 0x39, 0x17, 0xa8, 0x9e, 0x4d,
-	0xed, 0x58, 0x5d, 0x09, 0xd5, 0x91, 0xe4, 0x5c, 0xd0, 0x2f, 0xa1, 0xd6, 0xe1, 0x43, 0x27, 0x10,
-	0xdc, 0xef, 0xf0, 0x2f, 0x66, 0x3c, 0x10, 0xe4, 0x50, 0x09, 0x3c, 0xa6, 0xa3, 0x74, 0x51, 0xf8,
-	0xfd, 0x62, 0xcd, 0xd7, 0xeb, 0x79, 0x25, 0x03, 0x7b, 0x71, 0x06, 0x74, 0xc5, 0xe2, 0x73, 0x2d,
-	0x4e, 0xc5, 0x21, 0x14, 0xa7, 0x2c, 0x08, 0x6e, 0x3c, 0xdf, 0x0e, 0x73, 0xa4, 0x60, 0xc4, 0x0a,
-	0xfa, 0x18, 0x2a, 0x29, 0xf7, 0x74, 0xbc, 0x78, 0x9d, 0x12, 0xa0, 0x37, 0xb0, 0x21, 0xb3, 0xf7,
-	0xaf, 0x7b, 0x6d, 0x03, 0x44, 0xc4, 0xab, 0x5c, 0x7e, 0x08, 0x1b, 0x6c, 0x30, 0xe0, 0x41, 0xd0,
-	0x13, 0xde, 0x4b, 0xee, 0x46, 0x6e, 0x97, 0x43, 0x59, 0x17, 0x45, 0xe4, 0x10, 0x2a, 0x3e, 0x7f,
-	0xe1, 0xf3, 0x60, 0x14, 0xd9, 0x84, 0x45, 0xbc, 0x11, 0x09, 0xa5, 0x11, 0xed, 0x42, 0xa5, 0xe5,
-	0x0d, 0xbd, 0x99, 0x88, 0xdf, 0x6f, 0x27, 0x25, 0x92, 0x5e, 0x51, 0xbd, 0xa9, 0x49, 0xc6, 0xa3,
-	0x55, 0x8c, 0xb1, 0xe3, 0x8d, 0x3b, 0xd4, 0xb4, 0x02, 0xe5, 0x18, 0x75, 0x3a, 0x5e, 0x50, 0x06,
-	0xf7, 0xdf, 0x93, 0x85, 0x82, 0x0d, 0x18, 0x13, 0x99, 0xd9, 0x40, 0xae, 0xea, 0x3b, 0x5d, 0xed,
-	0x3b, 0x33, 0x1b, 0x36, 0x25, 0x5a, 0x57, 0x50, 0x53, 0x29, 0x5e, 0x33, 0xcb, 0xab, 0x1b, 0x9d,
-	0xfe, 0xaa, 0xc3, 0xfd, 0x6b, 0x59, 0xc2, 0xaa, 0xe3, 0x3b, 0x20, 0x67, 0x51, 0x2f, 0x01, 0xcf,
-	0xe3, 0xf5, 0xc3, 0xbf, 0x6f, 0x92, 0x3c, 0x80, 0x62, 0x66, 0x88, 0x14, 0xc6, 0xff, 0x8d, 0x01,
-	0xf2, 0x57, 0x13, 0xe2, 0x17, 0x1d, 0x6a, 0x6a, 0xb0, 0x31, 0x85, 0xff, 0x87, 0xfa, 0x1f, 0x09,
-	0xf5, 0xb7, 0x1a, 0x6c, 0x85, 0xa1, 0xfe, 0x38, 0xea, 0x9f, 0xb8, 0xb6, 0xd3, 0x9e, 0x29, 0xc5,
-	0x3d, 0x93, 0xb4, 0x9c, 0x7e, 0xb7, 0xe5, 0x70, 0x04, 0xb9, 0xfc, 0xa6, 0x97, 0x69, 0xc9, 0xb2,
-	0xcb, 0x6f, 0x62, 0x54, 0xf2, 0x26, 0xd4, 0x07, 0x9e, 0xfb, 0xc2, 0xf1, 0x27, 0xa9, 0x59, 0x18,
-	0xff, 0x5a, 0x24, 0x8f, 0x4d, 0xe9, 0x16, 0x6c, 0x66, 0x5d, 0xc2, 0xd1, 0x71, 0x00, 0xd5, 0x27,
-	0x5c, 0xa8, 0xed, 0x97, 0x69, 0x6b, 0x7a, 0x0a, 0x1b, 0x89, 0x05, 0xd6, 0xcc, 0x43, 0x58, 0xc3,
-	0x38, 0x4a, 0x8b, 0xf2, 0x59, 0x25, 0x09, 0xaa, 0xb4, 0x90, 0x2a, 0xda, 0x84, 0xc6, 0x05, 0x13,
-	0x83, 0x51, 0xf4, 0x5c, 0x10, 0x43, 0xd7, 0x21, 0xe7, 0xd8, 0x81, 0xa1, 0x1d, 0xe4, 0x9a, 0xb9,
-	0x0e, 0x1e, 0xe9, 0x3b, 0x40, 0x32, 0x96, 0x48, 0x71, 0x08, 0xeb, 0x88, 0x13, 0x5a, 0x2e, 0x71,
-	0x84, 0xba, 0xa3, 0x63, 0x80, 0xb4, 0x50, 0x08, 0x40, 0xbe, 0xfd, 0xac, 0xf3, 0xf4, 0xbc, 0x55,
-	0xbf, 0x87, 0xe7, 0xf7, 0x2f, 0x5b, 0x97, 0xdd, 0xcb, 0xba, 0x46, 0x0a, 0x90, 0xbb, 0x60, 0x6e,
-	0x5d, 0x3f, 0xb2, 0x00, 0xd2, 0xb4, 0x93, 0x32, 0x14, 0xae, 0xdb, 0x1f, 0xb5, 0x9f, 0x7d, 0xd2,
-	0xae, 0xdf, 0x23, 0x45, 0x58, 0x7b, 0x7a, 0xde, 0x42, 0x6b, 0x80, 0xfc, 0x07, 0x97, 0xf2, 0xac,
-	0x9f, 0xfd, 0xb6, 0x0e, 0x65, 0xe4, 0xbb, 0xe2, 0xfe, 0xdc, 0x19, 0x70, 0xf2, 0x1c, 0x8a, 0xf1,
-	0x96, 0x23, 0x46, 0xe2, 0x51, 0x66, 0xe9, 0x9a, 0xdb, 0x2b, 0x34, 0x18, 0xe7, 0xdd, 0x6f, 0x7e,
-	0xfc, 0xf9, 0x3b, 0x7d, 0x9b, 0xde, 0xc7, 0xcf, 0x2e, 0x36, 0x13, 0x23, 0xcb, 0x8f, 0xf4, 0x8f,
-	0xb4, 0x23, 0xd2, 0x86, 0x75, 0xb9, 0x8b, 0xc8, 0x56, 0xf2, 0xb8, 0xba, 0x14, 0xcd, 0xcd, 0xac,
-	0x18, 0x21, 0x1f, 0x48, 0xc8, 0x4d, 0x5a, 0x4d, 0x20, 0x65, 0x6b, 0x21, 0x5e, 0x07, 0xf2, 0xe1,
-	0x7e, 0x20, 0xdb, 0xea, 0x93, 0xe9, 0x1a, 0x32, 0x1b, 0x4b, 0x72, 0x84, 0x34, 0x25, 0x64, 0x83,
-	0xd6, 0x54, 0x48, 0x6f, 0x26, 0x10, 0xf3, 0x33, 0x80, 0x74, 0x03, 0x10, 0x33, 0x79, 0x7e, 0x69,
-	0xf3, 0x98, 0xc6, 0x4a, 0x1d, 0xe2, 0x6f, 0x49, 0xfc, 0x1a, 0x85, 0xf8, 0xe3, 0x33, 0xb0, 0x10,
-	0xba, 0x0b, 0x85, 0xa8, 0x00, 0xc8, 0x8e, 0xd2, 0xa4, 0x6a, 0x59, 0x9a, 0x5b, 0xcb, 0x0a, 0x25,
-	0x08, 0xa4, 0x9a, 0x22, 0x7e, 0xe5, 0xd8, 0x5f, 0x23, 0xea, 0x10, 0x2a, 0x77, 0x6a, 0x8b, 0xec,
-	0x25, 0x10, 0xab, 0xaa, 0xd3, 0x7c, 0xe3, 0x55, 0x6a, 0x25, 0x32, 0xa4, 0x96, 0xf2, 0xf4, 0xd1,
-	0x0a, 0x89, 0x3e, 0x05, 0x48, 0x07, 0xab, 0x12, 0x99, 0xa5, 0xd5, 0xa6, 0x44, 0x26, 0x33, 0x89,
-	0x69, 0x43, 0xe2, 0x57, 0xcd, 0x52, 0x82, 0x8f, 0xc8, 0x13, 0xa8, 0xde, 0x6d, 0x5a, 0xb2, 0x9f,
-	0x41, 0xc8, 0x0c, 0x18, 0x73, 0xf7, 0x95, 0x7a, 0x64, 0xd9, 0x93, 0x2c, 0x3b, 0x94, 0xa4, 0x6f,
-	0x11, 0xcf, 0x8d, 0x47, 0xda, 0xd1, 0xc5, 0xbb, 0xdf, 0xdf, 0xee, 0x6b, 0x3f, 0xdc, 0xee, 0x6b,
-	0x3f, 0xdd, 0xee, 0x6b, 0xcf, 0xad, 0xa1, 0x23, 0x46, 0xb3, 0xfe, 0xc9, 0xc0, 0x9b, 0x58, 0x43,
-	0xef, 0x98, 0x33, 0xfc, 0xf8, 0x97, 0x7f, 0x8f, 0xc7, 0x6c, 0xe1, 0xcd, 0x84, 0xa5, 0xfc, 0x94,
-	0x78, 0x3c, 0x3f, 0xed, 0xe7, 0xe5, 0x2f, 0x81, 0xb7, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x2e,
-	0x85, 0xb8, 0xad, 0x63, 0x0c, 0x00, 0x00,
+	// 1075 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x4f, 0x24, 0x45,
+	0x14, 0xdf, 0xee, 0x81, 0xf9, 0x78, 0xc3, 0x7c, 0x50, 0x0c, 0xd0, 0xdb, 0x02, 0x61, 0x8b, 0xcb,
+	0x88, 0x81, 0x0e, 0x78, 0x72, 0x37, 0x1e, 0x40, 0x71, 0x63, 0x64, 0x59, 0x33, 0x40, 0xd4, 0xbd,
+	0x60, 0xcd, 0x74, 0xd1, 0xd3, 0xd9, 0xa1, 0x6b, 0xec, 0xae, 0x19, 0x82, 0xc6, 0x8b, 0xff, 0x81,
+	0xf1, 0x9f, 0xf2, 0x68, 0xe2, 0x3f, 0x60, 0x88, 0x07, 0xe3, 0xc9, 0xb3, 0xf1, 0x60, 0x5e, 0xf5,
+	0x57, 0xd1, 0xcc, 0x9a, 0x6c, 0xa2, 0x1e, 0x8c, 0x17, 0xa8, 0x7a, 0xef, 0xf5, 0xef, 0xf7, 0xfa,
+	0x7d, 0x4e, 0xc3, 0x0a, 0x1b, 0xfb, 0xce, 0x24, 0xe2, 0xa1, 0x33, 0xdd, 0x53, 0xff, 0x77, 0xc7,
+	0xa1, 0x90, 0x82, 0x54, 0xd4, 0x79, 0xba, 0x67, 0xaf, 0x4e, 0xd9, 0xc8, 0x77, 0x99, 0xe4, 0x4e,
+	0x7a, 0x88, 0x2d, 0xec, 0x35, 0x4f, 0x08, 0x6f, 0xc4, 0x1d, 0x04, 0x60, 0x41, 0x20, 0x24, 0x93,
+	0xbe, 0x08, 0xa2, 0x44, 0x6b, 0x79, 0xc2, 0x13, 0x8e, 0x3a, 0xf7, 0x27, 0x97, 0x0e, 0xde, 0x62,
+	0x0d, 0xfd, 0xc3, 0x84, 0xb9, 0xf3, 0x88, 0x87, 0xa4, 0x09, 0xa6, 0xef, 0x5a, 0xc6, 0xa6, 0xd1,
+	0x2d, 0xf5, 0x4c, 0xdf, 0x25, 0x36, 0x54, 0x91, 0x34, 0x60, 0x57, 0xdc, 0x32, 0x37, 0x8d, 0x6e,
+	0xad, 0x97, 0xdd, 0x49, 0x07, 0xe6, 0xf9, 0x15, 0xf3, 0x47, 0x56, 0x49, 0x29, 0xe2, 0x0b, 0x4a,
+	0xc7, 0x43, 0x11, 0x70, 0x6b, 0x2e, 0x96, 0xaa, 0x0b, 0xa1, 0xd0, 0x18, 0xb1, 0x48, 0x5e, 0x8c,
+	0x84, 0xe7, 0x07, 0x17, 0x4c, 0x5a, 0xf3, 0x8a, 0xa2, 0x8e, 0xc2, 0x63, 0x94, 0x1d, 0x48, 0xf2,
+	0x16, 0x94, 0x23, 0xc9, 0xe4, 0x24, 0xb2, 0xca, 0x9b, 0x46, 0xb7, 0xb9, 0xbf, 0xb4, 0x9b, 0xbc,
+	0xef, 0xee, 0xa9, 0x12, 0x9f, 0xdd, 0x8c, 0x79, 0x2f, 0x31, 0x41, 0xc7, 0x02, 0x7f, 0xf0, 0x52,
+	0x39, 0x56, 0x89, 0x1d, 0x4b, 0xef, 0x64, 0x05, 0xca, 0x6c, 0xca, 0x24, 0x0b, 0xad, 0xaa, 0xd2,
+	0x24, 0x37, 0x24, 0xf0, 0x78, 0xe0, 0xf2, 0xd0, 0xaa, 0x15, 0x08, 0x9e, 0x2a, 0x71, 0x4c, 0x10,
+	0x9b, 0x20, 0x41, 0xdf, 0x0f, 0xe5, 0xd0, 0x65, 0x37, 0x16, 0xc4, 0x04, 0xe9, 0x9d, 0xb4, 0xa1,
+	0xd4, 0xf7, 0x85, 0x55, 0x57, 0x62, 0x3c, 0x92, 0x75, 0x80, 0x41, 0xc8, 0x99, 0xe4, 0x2e, 0xbe,
+	0xdc, 0x82, 0x7a, 0xb9, 0x5a, 0x22, 0x39, 0x90, 0xa8, 0x9e, 0x8c, 0xdd, 0x54, 0xdd, 0x88, 0xd5,
+	0x89, 0xe4, 0x40, 0xd2, 0x2f, 0xa1, 0xd5, 0xe3, 0x9e, 0x1f, 0x49, 0x1e, 0xf6, 0xf8, 0x17, 0x13,
+	0x1e, 0x49, 0xb2, 0xa5, 0x05, 0x1e, 0xd3, 0x51, 0x3b, 0xac, 0xfc, 0x7e, 0x38, 0x17, 0x9a, 0xed,
+	0xb2, 0x96, 0x81, 0xf5, 0x34, 0x03, 0xa6, 0x66, 0xf1, 0xb9, 0x91, 0xa6, 0x62, 0x0b, 0xaa, 0x63,
+	0x16, 0x45, 0xd7, 0x22, 0x74, 0xe3, 0x1c, 0x69, 0x18, 0xa9, 0x82, 0x3e, 0x81, 0x46, 0xce, 0x3d,
+	0x1e, 0xdd, 0xbc, 0x4e, 0x09, 0xd0, 0x6b, 0x58, 0x50, 0xd9, 0xfb, 0xd7, 0xbd, 0x76, 0x01, 0x12,
+	0xe2, 0x59, 0x2e, 0x3f, 0x82, 0x05, 0x36, 0x18, 0xf0, 0x28, 0xba, 0x90, 0xe2, 0x25, 0x0f, 0x12,
+	0xb7, 0xeb, 0xb1, 0xec, 0x0c, 0x45, 0x64, 0x0b, 0x1a, 0x21, 0xbf, 0x0c, 0x79, 0x34, 0x4c, 0x6c,
+	0xe2, 0x22, 0x5e, 0x48, 0x84, 0xca, 0x88, 0x9e, 0x41, 0xe3, 0x58, 0x78, 0x62, 0x22, 0xd3, 0xf7,
+	0x5b, 0xcd, 0x89, 0x94, 0x57, 0xd4, 0xec, 0x1a, 0x8a, 0x71, 0x7b, 0x16, 0x63, 0xea, 0x78, 0xe7,
+	0x0e, 0x35, 0x6d, 0x40, 0x3d, 0x45, 0x1d, 0x8f, 0x6e, 0x28, 0x83, 0xc5, 0xf7, 0x54, 0xa1, 0x60,
+	0x03, 0xa6, 0x44, 0x76, 0x31, 0x90, 0xb3, 0xfa, 0xce, 0xd4, 0xfb, 0xce, 0x2e, 0x86, 0x4d, 0x8b,
+	0xd6, 0x29, 0xb4, 0x74, 0x8a, 0xd7, 0xcc, 0xf2, 0xec, 0x46, 0xa7, 0xbf, 0x9a, 0xb0, 0x78, 0xae,
+	0x4a, 0x58, 0x77, 0x7c, 0x15, 0xd4, 0x94, 0xba, 0xc8, 0xc0, 0xcb, 0x78, 0xfd, 0xf0, 0xef, 0x9b,
+	0x24, 0x0f, 0xa1, 0x5a, 0x18, 0x22, 0x95, 0xd1, 0x7f, 0x63, 0x80, 0xfc, 0xd5, 0x84, 0xf8, 0xc5,
+	0x84, 0x96, 0x1e, 0x6c, 0x4c, 0xe1, 0xff, 0xa1, 0xfe, 0x47, 0x42, 0xfd, 0xad, 0x01, 0xcb, 0x71,
+	0xa8, 0x3f, 0x4e, 0xfa, 0x27, 0xad, 0xed, 0xbc, 0x67, 0x6a, 0x69, 0xcf, 0x64, 0x2d, 0x67, 0xde,
+	0x6d, 0x39, 0x1c, 0x41, 0x01, 0xbf, 0xbe, 0x28, 0xb4, 0x64, 0x3d, 0xe0, 0xd7, 0x29, 0x2a, 0x79,
+	0x13, 0xda, 0x03, 0x11, 0x5c, 0xfa, 0xe1, 0x55, 0x6e, 0x16, 0xc7, 0xbf, 0x95, 0xc8, 0x53, 0x53,
+	0xba, 0x0c, 0x4b, 0x45, 0x97, 0x70, 0x74, 0x6c, 0x42, 0xf3, 0x29, 0x97, 0x7a, 0xfb, 0x15, 0xda,
+	0x9a, 0xee, 0xc1, 0x42, 0x66, 0x81, 0x35, 0xf3, 0x08, 0xe6, 0x30, 0x8e, 0xca, 0xa2, 0xbe, 0xdf,
+	0xc8, 0x82, 0xaa, 0x2c, 0x94, 0x8a, 0x76, 0xa1, 0x73, 0xc8, 0xe4, 0x60, 0x98, 0x3c, 0x17, 0xa5,
+	0xd0, 0x6d, 0x28, 0xf9, 0x6e, 0x64, 0x19, 0x9b, 0xa5, 0x6e, 0xa9, 0x87, 0x47, 0xfa, 0x0e, 0x90,
+	0x82, 0x25, 0x52, 0x6c, 0xc1, 0x3c, 0xe2, 0xc4, 0x96, 0xf7, 0x38, 0x62, 0xdd, 0xf6, 0x0e, 0x40,
+	0x5e, 0x28, 0x04, 0xa0, 0x7c, 0xf2, 0xbc, 0xf7, 0xec, 0xe0, 0xb8, 0xfd, 0x00, 0xcf, 0xef, 0x1f,
+	0x1d, 0x1f, 0x9d, 0x1d, 0xb5, 0x0d, 0x52, 0x81, 0xd2, 0x21, 0x0b, 0xda, 0xe6, 0xb6, 0x03, 0x90,
+	0xa7, 0x9d, 0xd4, 0xa1, 0x72, 0x7e, 0xf2, 0xd1, 0xc9, 0xf3, 0x4f, 0x4e, 0xda, 0x0f, 0x48, 0x15,
+	0xe6, 0x9e, 0x1d, 0x1c, 0xa3, 0x35, 0x40, 0xf9, 0x83, 0x23, 0x75, 0x36, 0xf7, 0x7f, 0x9b, 0x87,
+	0x3a, 0xf2, 0x9d, 0xf2, 0x70, 0xea, 0x0f, 0x38, 0x79, 0x01, 0xd5, 0x74, 0xcb, 0x11, 0x2b, 0xf3,
+	0xa8, 0xb0, 0x74, 0xed, 0x95, 0x19, 0x1a, 0x8c, 0xf3, 0xda, 0x37, 0x3f, 0xfe, 0xfc, 0x9d, 0xb9,
+	0x42, 0x17, 0xf1, 0x07, 0x19, 0x9b, 0xc8, 0xa1, 0x13, 0x26, 0xfa, 0xc7, 0xc6, 0x36, 0x39, 0x81,
+	0x79, 0xb5, 0x8b, 0xc8, 0x72, 0xf6, 0xb8, 0xbe, 0x14, 0xed, 0xa5, 0xa2, 0x18, 0x21, 0x1f, 0x2a,
+	0xc8, 0x25, 0xda, 0xcc, 0x20, 0x55, 0x6b, 0x21, 0x5e, 0x0f, 0xca, 0xf1, 0x7e, 0x20, 0x2b, 0xfa,
+	0x93, 0xf9, 0x1a, 0xb2, 0x3b, 0xf7, 0xe4, 0x08, 0x69, 0x2b, 0xc8, 0x0e, 0x6d, 0xe9, 0x90, 0x62,
+	0x22, 0x11, 0xf3, 0x33, 0x80, 0x7c, 0x03, 0x10, 0x3b, 0x7b, 0xfe, 0xde, 0xe6, 0xb1, 0xad, 0x99,
+	0x3a, 0xc4, 0x5f, 0x56, 0xf8, 0x2d, 0x0a, 0xe9, 0xcf, 0xd2, 0xc8, 0x41, 0xe8, 0x33, 0xa8, 0x24,
+	0x05, 0x40, 0x56, 0xb5, 0x26, 0xd5, 0xcb, 0xd2, 0x5e, 0xbe, 0xaf, 0xd0, 0x82, 0x40, 0x9a, 0x39,
+	0xe2, 0x57, 0xbe, 0xfb, 0x35, 0xa2, 0x7a, 0xd0, 0xb8, 0x53, 0x5b, 0x64, 0x3d, 0x83, 0x98, 0x55,
+	0x9d, 0xf6, 0x1b, 0xaf, 0x52, 0x6b, 0x91, 0x21, 0xad, 0x9c, 0xa7, 0x8f, 0x56, 0x48, 0xf4, 0x29,
+	0x40, 0x3e, 0x58, 0xb5, 0xc8, 0xdc, 0x5b, 0x6d, 0x5a, 0x64, 0x0a, 0x93, 0x98, 0x76, 0x14, 0x7e,
+	0xd3, 0xae, 0x65, 0xf8, 0x88, 0x7c, 0x05, 0xcd, 0xbb, 0x4d, 0x4b, 0x36, 0x0a, 0x08, 0x85, 0x01,
+	0x63, 0xaf, 0xbd, 0x52, 0x8f, 0x2c, 0xeb, 0x8a, 0x65, 0x95, 0x92, 0xfc, 0x2d, 0xd2, 0xb9, 0xf1,
+	0xd8, 0xd8, 0x3e, 0x7c, 0xf7, 0xfb, 0xdb, 0x0d, 0xe3, 0x87, 0xdb, 0x0d, 0xe3, 0xa7, 0xdb, 0x0d,
+	0xe3, 0x85, 0xe3, 0xf9, 0x72, 0x38, 0xe9, 0xef, 0x0e, 0xc4, 0x95, 0xe3, 0x89, 0x1d, 0xce, 0xf0,
+	0xb3, 0x40, 0xfd, 0xdd, 0x19, 0xb1, 0x1b, 0x31, 0x91, 0x8e, 0xf6, 0x91, 0xf1, 0x64, 0xba, 0xd7,
+	0x2f, 0xab, 0x2f, 0x81, 0xb7, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x73, 0x7d, 0x0e, 0xf1, 0x7d,
+	0x0c, 0x00, 0x00,
 }
 
 func (m *User) Marshal() (dAtA []byte, err error) {
diff --git a/api/user/v1/user.proto b/api/user/v1/user.proto
index 972c3a5..7683dbc 100644
--- a/api/user/v1/user.proto
+++ b/api/user/v1/user.proto
@@ -4,6 +4,7 @@ package user.v1;
 
 import "validate/validate.proto";
 import "google/api/annotations.proto";
+import "gogo/protobuf/gogo.proto";
 
 option go_package = "github.com/go-eagle/eagle-layout/api/user/v1;v1";
 
@@ -190,6 +191,7 @@ message GetUserReply {
 
 message BatchGetUsersRequest {
   repeated int64 ids = 1;
+  // int64 ids = 1 [(gogoproto.moretags) = 'form:"ids"'];
 }
 
 message BatchGetUsersReply {
diff --git a/api/user/v1/user_gin.pb.go b/api/user/v1/user_gin.pb.go
index dd22331..ea08a49 100644
--- a/api/user/v1/user_gin.pb.go
+++ b/api/user/v1/user_gin.pb.go
@@ -9,7 +9,7 @@ import (
 	gin "github.com/gin-gonic/gin"
 	app "github.com/go-eagle/eagle/pkg/app"
 	errcode "github.com/go-eagle/eagle/pkg/errcode"
-	"github.com/go-eagle/eagle/pkg/utils"
+	"github.com/spf13/cast"
 	metadata "google.golang.org/grpc/metadata"
 )
 
@@ -141,8 +141,7 @@ func (s *UserService) GetUser_0(ctx *gin.Context) {
 	}
 
 	// make sure the uri include :id
-	id, _ := utils.StringToInt64(ctx.Param("id"))
-	in.Id = id
+	in.Id = cast.ToInt64(ctx.Param("id"))
 
 	md := metadata.New(nil)
 	for k, v := range ctx.Request.Header {
diff --git a/cmd/gen/generate.go b/cmd/gen/generate.go
index c6dd95c..63dc162 100644
--- a/cmd/gen/generate.go
+++ b/cmd/gen/generate.go
@@ -47,10 +47,13 @@ func main() {
 	dal.Init()
 
 	g := gen.NewGenerator(gen.Config{
-		OutPath:      "./internal/dal/db/dao",                       // 生成的查询类代码的输出路径，默认./query, 这里改为dao
-		ModelPkgPath: "./internal/dal/db/model",                     // 默认情况下会跟随OutPath参数，在同目录下生成model目录
-		Mode:         gen.WithDefaultQuery | gen.WithQueryInterface, // generate mode
-		WithUnitTest: true,                                          // 为生成的查询类代码生成单元测试
+		OutPath:           "./internal/dal/db/dao",                       // 生成的查询类代码的输出路径，默认./query, 这里改为dao
+		ModelPkgPath:      "./internal/dal/db/model",                     // 默认情况下会跟随OutPath参数，在同目录下生成model目录
+		Mode:              gen.WithDefaultQuery | gen.WithQueryInterface, // generate mode
+		WithUnitTest:      true,                                          // 为生成的查询类代码生成单元测试
+		FieldNullable:     true,                                          // 对于数据库中nullable的数据，在生成代码中自动对应为指针类型
+		FieldWithIndexTag: true,                                          // 从数据库同步的表结构代码包含gorm的index tag
+		FieldWithTypeTag:  true,                                          // 同步的表结构代码包含gorm的type tag(数据库中对应数据类型)
 	})
 
 	g.UseDB(dal.DB) // reuse your gorm db
diff --git a/internal/dal/cache/user_cache.go b/internal/dal/cache/user_cache.go
index 7761dc0..6db3acf 100644
--- a/internal/dal/cache/user_cache.go
+++ b/internal/dal/cache/user_cache.go
@@ -70,7 +70,7 @@ func (c *userCache) GetUserCache(ctx context.Context, id int64) (data *model.Use
 	cacheKey := c.GetUserCacheKey(id)
 	err = c.cache.Get(ctx, cacheKey, &data)
 	if err != nil && !errors.Is(err, redis.Nil) {
-		log.WithContext(ctx).Warnf("get err from redis, err: %v", err)
+		log.WithContext(ctx).Warnf("[cache] GetUserCache err: %v", err)
 		return nil, err
 	}
 	return data, nil
diff --git a/internal/repository/README.md b/internal/repository/README.md
index 1c680f8..e4a2a88 100644
--- a/internal/repository/README.md
+++ b/internal/repository/README.md
@@ -19,4 +19,4 @@
             /    |    \
            /     |     \
         db   rpc   cache
-```
+```
\ No newline at end of file
diff --git a/internal/repository/user_repo.go b/internal/repository/user_repo.go
index da8e0a9..0b27bbd 100644
--- a/internal/repository/user_repo.go
+++ b/internal/repository/user_repo.go
@@ -6,10 +6,13 @@ import (
 	"context"
 	"time"
 
+	localCache "github.com/go-eagle/eagle/pkg/cache"
+	"github.com/go-eagle/eagle/pkg/encoding"
 	"github.com/pkg/errors"
 	"github.com/spf13/cast"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/trace"
+	"golang.org/x/sync/singleflight"
 	"gorm.io/gorm"
 
 	"github.com/go-eagle/eagle-layout/internal/dal"
@@ -32,17 +35,21 @@ type UserRepo interface {
 }
 
 type userRepo struct {
-	db     *dal.DBClient
-	tracer trace.Tracer
-	cache  cache.UserCache
+	db         *dal.DBClient
+	tracer     trace.Tracer
+	cache      cache.UserCache
+	localCache localCache.Cache
+	sg         singleflight.Group
 }
 
 // NewUser new a repository and return
 func NewUserRepo(db *dal.DBClient, cache cache.UserCache) UserRepo {
 	return &userRepo{
-		db:     db,
-		tracer: otel.Tracer("user"),
-		cache:  cache,
+		db:         db,
+		tracer:     otel.Tracer("user"),
+		cache:      cache,
+		localCache: localCache.NewMemoryCache("local:user:", encoding.JSONEncoding{}),
+		sg:         singleflight.Group{},
 	}
 }
 
@@ -69,32 +76,59 @@ func (r *userRepo) UpdateUser(ctx context.Context, id int64, data model.UserInfo
 
 // GetUser get a record
 func (r *userRepo) GetUser(ctx context.Context, id int64) (ret *model.UserInfoModel, err error) {
-	// read cache
-	item, err := r.cache.GetUserCache(ctx, id)
+	// get data from local cache
+	err = r.localCache.Get(ctx, cast.ToString(id), &ret)
 	if err != nil {
 		return nil, err
 	}
-	if item != nil {
-		return item, nil
+	if ret != nil && ret.ID > 0 {
+		return ret, nil
 	}
 
-	// read db
-	data, err := dao.UserInfoModel.WithContext(ctx).Where(dao.UserInfoModel.ID.Eq(id)).First()
+	// read redis cache
+	ret, err = r.cache.GetUserCache(ctx, id)
 	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			r.cache.SetCacheWithNotFound(ctx, id)
-		}
-		return
+		return nil, err
+	}
+	if ret != nil && ret.ID > 0 {
+		return ret, nil
 	}
 
-	// write cache
-	if data != nil && data.ID > 0 {
-		err = r.cache.SetUserCache(ctx, id, data, 5*time.Minute)
+	// get data from db
+	// 避免缓存击穿(瞬间有大量请求过来)
+	val, err, _ := r.sg.Do("sg:user:"+cast.ToString(id), func() (interface{}, error) {
+		// read db or rpc
+		data, err := dao.UserInfoModel.WithContext(ctx).Where(dao.UserInfoModel.ID.Eq(id)).First()
 		if err != nil {
-			return nil, err
+			// cache not found and set empty cache to avoid 缓存穿透
+			// Note: 如果缓存空数据太多，会大大降低缓存命中率，可以改为使用布隆过滤器
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				r.cache.SetCacheWithNotFound(ctx, id)
+			}
+			return nil, errors.Wrapf(err, "[repo] GetUser get User from db error, id: %d", id)
 		}
+
+		// write cache
+		if data != nil && data.ID > 0 {
+			// write redis
+			err = r.cache.SetUserCache(ctx, id, data, 5*time.Minute)
+			if err != nil {
+				return nil, errors.WithMessage(err, "[repo] GetUser SetUserCache error")
+			}
+
+			// write local cache
+			err = r.localCache.Set(ctx, cast.ToString(id), data, 2*time.Minute)
+			if err != nil {
+				return nil, errors.WithMessage(err, "[repo] GetUser localCache set error")
+			}
+		}
+		return data, nil
+	})
+	if err != nil {
+		return nil, err
 	}
-	return data, nil
+
+	return val.(*model.UserInfoModel), nil
 }
 
 // BatchGetUser batch get items