Merge pull request #21 from larksuite/new_service

delete gin
larksuite · Apr 13, 2021 · 9cdc673 · 9cdc673
2 parents d3150b5 + 981d200
commit 9cdc673
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 146 deletions.
diff --git a/card/http/gin/handler.go b/card/http/gin/handler.go
diff --git a/event/http/gin/handler.go b/event/http/gin/handler.go
diff --git a/sample/card/gin.go b/sample/card/gin.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/larksuite/oapi-sdk-go/card"
-	cardginserver "github.com/larksuite/oapi-sdk-go/card/http/gin"
+	cardtttp "github.com/larksuite/oapi-sdk-go/card/http"
 	"github.com/larksuite/oapi-sdk-go/card/model"
 	"github.com/larksuite/oapi-sdk-go/core"
 	"github.com/larksuite/oapi-sdk-go/core/constants"
@@ -26,7 +26,9 @@ func main() {
 	})
 
 	g := gin.Default()
-	cardginserver.Register("/webhook/card", conf, g)
+	g.POST("/webhook/card", func(context *gin.Context) {
+		cardtttp.Handle(conf, context.Request, context.Writer)
+	})
 	err := g.Run(":8089")
 	if err != nil {
 		panic(err)

diff --git a/sample/card/gin2.go b/sample/card/gin2.go
diff --git a/sample/event/gin.go b/sample/event/gin.go
@@ -7,17 +7,17 @@ import (
 	"github.com/larksuite/oapi-sdk-go/core/constants"
 	"github.com/larksuite/oapi-sdk-go/core/tools"
 	"github.com/larksuite/oapi-sdk-go/event"
-	eventginserver "github.com/larksuite/oapi-sdk-go/event/http/gin"
+	eventhttp "github.com/larksuite/oapi-sdk-go/event/http"
 	"github.com/larksuite/oapi-sdk-go/sample/configs"
 	application "github.com/larksuite/oapi-sdk-go/service/application/v1"
 )
 
-func main() {
+// for redis store and logrus
+// var conf = configs.TestConfigWithLogrusAndRedisStore(constants.DomainFeiShu)
+// var conf = configs.TestConfig("https://open.feishu.cn")
+var conf = configs.TestConfig(constants.DomainFeiShu)
 
-	// for redis store and logrus
-	// var conf = configs.TestConfigWithLogrusAndRedisStore(constants.DomainFeiShu)
-	// var conf = configs.TestConfig("https://open.feishu.cn")
-	var conf = configs.TestConfig(constants.DomainFeiShu)
+func main() {
 
 	application.SetAppOpenEventHandler(conf, func(ctx *core.Context, appOpenEvent *application.AppOpenEvent) error {
 		fmt.Println(ctx.GetRequestID())
@@ -49,22 +49,15 @@ func main() {
 		return nil
 	})
 
-	application.SetAppUninstalledEventHandler(conf, func(ctx *core.Context, appUninstalledEvent *application.AppUninstalledEvent) error {
-		fmt.Println(ctx.GetRequestID())
-		fmt.Println(tools.Prettify(appUninstalledEvent))
-		return nil
-	})
-
-	application.SetOrderPaidEventHandler(conf, func(ctx *core.Context, orderPaidEvent *application.OrderPaidEvent) error {
-		fmt.Println(ctx.GetRequestID())
-		fmt.Println(tools.Prettify(orderPaidEvent))
-		return nil
-	})
-
 	g := gin.Default()
-	eventginserver.Register("/webhook/event", conf, g)
+
+	g.POST("/webhook/event", webhookEventHandle)
 	err := g.Run(":8089")
 	if err != nil {
 		panic(err)
 	}
 }
+
+func webhookEventHandle(context *gin.Context) {
+	eventhttp.Handle(conf, context.Request, context.Writer)
+}
diff --git a/sample/event/gin2.go b/sample/event/gin2.go