http服务只用写actionStruct

zhangqijia
1 parent 729bc257
Showing 5 changed files with 41 additions and 26 deletions Show diff stats
cmd/http.go
protos
src/actions/HttpAction.go -> src/actions/AccountAction.go
src/components/net/http.go
src/components/net/http_test.go
@@ -16,7 +16,7 @@ func main() {
 	signal.Notify(stopChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
 	web := net.NewHttpServer("v1")
-	web.BindHandler(&actions.HttpAction{HttpServer: web})
+	web.BindHandler(&actions.AccountAction{HttpServer: web})
 	go func() {
 		err <- web.Start()
 	}()
-Subproject commit 432c66d9981fa1f6423f3e5aa27543a98ce8895c
+Subproject commit a2411bbcfc631805718ef4d692a42ba0200e698c
@@ -2,7 +2,6 @@ package actions
 import (
 	"github.com/gin-gonic/gin"
-	"net/http"
 	"pro2d/conf"
 	"pro2d/protos/pb"
 	"pro2d/src/components/net"
@@ -10,53 +9,42 @@ import (
 	"pro2d/src/utils"
 )
-type HttpAction struct {
+type AccountAction struct {
 	HttpServer *net.HttpServer
 }
-
-func PubRsp(c *gin.Context, code int, data interface{}) {
-	c.JSON(http.StatusOK, gin.H{"code": code, "data": data})
-}
-
-func (h *HttpAction) Register(c *gin.Context) {
+func (h *AccountAction) Register(c *gin.Context) (int, interface{}){
 	var register pb.Register
 	if err := c.ShouldBindJSON(&register); err != nil {
-		PubRsp(c, -1, err.Error())
-		return
+		return -1, err.Error()
 	}
 	account := models.NewAccount(register.Phone)
 	if err := account.Load(); err == nil {
-		PubRsp(c, -2, "account exist: " + register.Phone)
-		return
+		return -2 , "account exist: " + register.Phone
 	}
 	account.Uid = conf.SnowFlack.NextValStr()
 	account.Password = utils.Md5V(register.Password)
 	if _, err := account.Create(); err != nil{
-		PubRsp(c, -3, "account register err: " + err.Error())
-		return
+		return -3, "account register err: " + err.Error()
 	}
 	account.Password = register.Password
-	PubRsp(c, 0, account.Account)
+	return 0, account.Account
 }
-func (h *HttpAction) Login(c *gin.Context) {
+func (h *AccountAction) Login(c *gin.Context) (int,interface{}) {
 	var login pb.Account
 	if err := c.ShouldBindJSON(&login); err != nil {
-		PubRsp(c, -1, err.Error())
-		return
+		return -1, err.Error()
 	}
 	account := models.NewAccount(login.Phone)
 	if err := account.Load(); err != nil {
-		PubRsp(c, -2, err.Error())
-		return
+		return -2, err.Error()
 	}
 	if utils.Md5V(login.Password) != account.Password {
-		PubRsp(c, -3, "password error")
-		return
+		return -3, "password error"
 	}
 	var gs []*pb.ServiceInfo
@@ -71,5 +59,5 @@ func (h *HttpAction) Login(c *gin.Context) {
 		Uid:         account.Uid,
 		GameService: gs,
 	}
-	PubRsp(c, 0, rsp)
+	return 0, rsp
 }
@@ -3,6 +3,7 @@ package net
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"net/http"
 	"pro2d/conf"
 	"pro2d/src/components/db"
 	"pro2d/src/components/etcd"
@@ -32,7 +33,11 @@ func NewHttpServer(version string, port ...string) *HttpServer {
 func  (h *HttpServer)HandlerFuncObj(tvl, obj reflect.Value) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		v := tvl.Call([]reflect.Value{obj, reflect.ValueOf(c)})
-		fmt.Printf("v : %v\n", v)
+		if len(v) != 2 {
+			c.JSON(http.StatusNotFound, gin.H{"code": -100, "data": ""})
+			return
+		}
+		c.JSON(http.StatusOK, gin.H{"code": v[0].Interface(), "data": v[1].Interface()})
 	}
 }
@@ -0,0 +1,22 @@
+package net
+
+import (
+	"github.com/gin-gonic/gin"
+	"testing"
+)
+
+type HttpAction struct {
+}
+
+func (h *HttpAction) PrintA(c *gin.Context) (int, interface{}) {
+	return 0, "I'm A"
+}
+func (h *HttpAction) PrintB(c *gin.Context) (int, interface{}) {
+	return 0, "I'm B"
+}
+
+func TestHttpServer_Start(t *testing.T) {
+	web := NewHttpServer("v1")
+	web.BindHandler(&HttpAction{})
+	web.Start()
+}
 \ No newline at end of file