Merge pull request #14 from xh-polaris/feat/auth

增加了wechat-phone登录这个方式
xh-polaris · Jan 8, 2025 · c0db5c6 · c0db5c6
2 parents 796e7d1 + b8a0b29
commit c0db5c6
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 39 deletions.
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ build_and_run:
 wire:
 	wire ./provider
 update:
-	hz update $(IDL_OPTIONS) --mod $(MODULE_NAME) $(EXTRA_OPTIONS)
+	hz.exe update $(IDL_OPTIONS) --mod $(MODULE_NAME) $(EXTRA_OPTIONS)
 	@files=$$(find biz/application/dto -type f); \
 	for file in $$files; do \
   	  sed -i  -e 's/func init\(\).*//' $$file; \

diff --git a/biz/application/dto/basic/app.pb.go b/biz/application/dto/basic/app.pb.go
diff --git a/biz/application/dto/http/http.pb.go b/biz/application/dto/http/http.pb.go
diff --git a/biz/application/dto/platform/core_api/auth.pb.go b/biz/application/dto/platform/core_api/auth.pb.go
diff --git a/biz/application/dto/platform/core_api/core_api.pb.go b/biz/application/dto/platform/core_api/core_api.pb.go
diff --git a/biz/application/dto/platform/core_api/data.pb.go b/biz/application/dto/platform/core_api/data.pb.go
diff --git a/biz/application/service/auth.go b/biz/application/service/auth.go
@@ -51,6 +51,9 @@ func (s *AuthService) SignIn(ctx context.Context, req *core_api.SignInReq) (*cor
 		return nil, err
 	}
 	resp.UserId = rpcResp.GetUserId()
+	if rpcResp.Options != nil {
+		resp.Option = rpcResp.Options
+	}
 	return resp, nil
 }
 

diff --git a/go.mod b/go.mod
@@ -77,7 +77,7 @@ require (
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/xh-polaris/service-idl-gen-go v0.0.0-20241008070604-1ac5105f5c13
+	github.com/xh-polaris/service-idl-gen-go v0.0.0-20250108075223-4036ab37c8b4
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect

diff --git a/go.sum b/go.sum
@@ -397,6 +397,8 @@ github.com/xh-polaris/gopkg v0.0.0-20240424152329-9162fdb0eef9 h1:C77LIsAjkwP5B1
 github.com/xh-polaris/gopkg v0.0.0-20240424152329-9162fdb0eef9/go.mod h1:iuTX4c9raQCv45PeZ1s6Ixy1/CP37kSjOxHpkhiNQLc=
 github.com/xh-polaris/service-idl-gen-go v0.0.0-20241008070604-1ac5105f5c13 h1:JJn3mPPWBlJnMH3ukBuKCAXeK9Q/Kq6P63/ZlTOIG1I=
 github.com/xh-polaris/service-idl-gen-go v0.0.0-20241008070604-1ac5105f5c13/go.mod h1:3ixuadpEpTumm8RftVwtXYH8Zfmu6shi33Hh5GKC6cU=
+github.com/xh-polaris/service-idl-gen-go v0.0.0-20250108075223-4036ab37c8b4 h1:SQE9JSehJufW87A3374EW90w+E9EonWozha+YW/277Q=
+github.com/xh-polaris/service-idl-gen-go v0.0.0-20250108075223-4036ab37c8b4/go.mod h1:3ixuadpEpTumm8RftVwtXYH8Zfmu6shi33Hh5GKC6cU=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=