diff --git a/.gitignore b/.gitignore index 0a56a16..602c99c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ go.sum account/ gen_result/ -etc/service.yaml -client/ \ No newline at end of file +etc/permission.yaml +client/ +.DS_Store \ No newline at end of file diff --git a/Makefile b/Makefile index 30110df..1cad38c 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ fmt: # 格式優化 .PHONY: gen-rpc gen-rpc: # 建立 rpc code - goctl rpc protoc ./generate/protobuf/service.proto -m --style=$(GO_ZERO_STYLE) --go_out=./gen_result/pb --go-grpc_out=./gen_result/pb --zrpc_out=. + goctl rpc protoc ./generate/protobuf/permission.proto -m --style=$(GO_ZERO_STYLE) --go_out=./gen_result/pb --go-grpc_out=./gen_result/pb --zrpc_out=. go mod tidy @echo "Generate core-api files successfully" diff --git a/generate/protobuf/service.proto b/generate/protobuf/permission.proto similarity index 100% rename from generate/protobuf/service.proto rename to generate/protobuf/permission.proto diff --git a/go.mod b/go.mod index d1810d9..8c17682 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( code.30cm.net/digimon/library-go/validator v1.0.0 code.30cm.net/wanderland/library-go/errors v1.0.1 github.com/golang-jwt/jwt/v4 v4.5.0 + github.com/google/uuid v1.6.0 github.com/zeromicro/go-zero v1.7.0 go.uber.org/mock v0.4.0 google.golang.org/grpc v1.65.0 @@ -40,7 +41,6 @@ require ( github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/internal/repository/token.go b/internal/repository/token.go index 7925006..4912ccc 100644 --- a/internal/repository/token.go +++ b/internal/repository/token.go @@ -240,11 +240,20 @@ func (t *tokenRepository) setRelation(ctx context.Context, tx redis.Pipeliner, u if err := tx.SAdd(ctx, domain.UIDTokenRedisKey.With(uid).ToString(), tokenID).Err(); err != nil { return err } + // 設置 UID 鍵的過期時間 + if err := tx.Expire(ctx, domain.UIDTokenRedisKey.With(uid).ToString(), ttl).Err(); err != nil { + return err + } if err := tx.SAdd(ctx, domain.DeviceTokenRedisKey.With(deviceID).ToString(), tokenID).Err(); err != nil { return err } + // 設置 deviceID 鍵的過期時間 + if err := tx.Expire(ctx, domain.DeviceTokenRedisKey.With(deviceID).ToString(), ttl).Err(); err != nil { + return err + } + return nil } diff --git a/internal/server/tokenservice/token_service_server.go b/internal/server/tokenservice/token_service_server.go index 2620970..6f51205 100644 --- a/internal/server/tokenservice/token_service_server.go +++ b/internal/server/tokenservice/token_service_server.go @@ -1,5 +1,5 @@ // Code generated by goctl. DO NOT EDIT. -// Source: service.proto +// Source: permission.proto package server @@ -7,7 +7,7 @@ import ( "context" "app-cloudep-permission-server/gen_result/pb/permission" - tokenservicelogic "app-cloudep-permission-server/internal/logic/tokenservice" + "app-cloudep-permission-server/internal/logic/tokenservice" "app-cloudep-permission-server/internal/svc" ) diff --git a/service.go b/permission.go similarity index 92% rename from service.go rename to permission.go index 54b770a..465f2da 100644 --- a/service.go +++ b/permission.go @@ -16,7 +16,7 @@ import ( "google.golang.org/grpc/reflection" ) -var configFile = flag.String("f", "etc/service.yaml", "the config file") +var configFile = flag.String("f", "etc/permission.yaml", "the config file") func main() { flag.Parse()