http模块修改完成

Author: c-wind

http/server/handler.go

@@ -64,9 +64,22 @@ func NameToPath(name string, depth int) string {
 	return string(buf[index:])
 }
 
-//AddInterface 自动注册接口
-//只要struct实现了Get(),Post(),Delete(),Put()接口就可以自动注册
-func AddInterface(obj interface{}, path string, isPrefix bool) error {
+//Register 只要struct实现了Get(),Post(),Delete(),Put()接口就可以自动注册
+func Register(obj interface{}) error {
+	return register(obj, "", false)
+}
+
+//RegisterPrefix 注册url前缀.
+func RegisterPrefix(obj interface{}, path string) error {
+	return register(obj, path, true)
+}
+
+//RegisterPath 注册url完全匹配.
+func RegisterPath(obj interface{}, path string) error {
+	return register(obj, path, true)
+}
+
+func register(obj interface{}, path string, isPrefix bool) error {
 	rt := reflect.TypeOf(obj)
 	if rt.Kind() != reflect.Ptr {
 		return fmt.Errorf("need ptr")
@@ -177,7 +190,7 @@ func (s *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	log.Debugf("%v %v %v %v", r.RemoteAddr, r.Method, r.URL, i.path)
+	log.Debugf("%v %v %v %v", r.RemoteAddr, r.Method, r.URL, i.source)
 
 	callback := reflect.New(i.source).MethodByName(r.Method).Interface().(func(http.ResponseWriter, *http.Request))
 	callback(w, nr)

main.go

@@ -21,7 +21,7 @@ func (i *index) GET(w http.ResponseWriter, req *http.Request) {
 }
 
 func testHTTPClient() {
-	url := "http://127.0.0.1:9000/index"
+	url := "http://127.0.0.1:9000/main/index/"
 	buf, _, err := client.New(time.Second).Get(url, nil, nil)
 	if err != nil {
 		panic(err.Error())
@@ -33,7 +33,7 @@ func main() {
 	addr := flag.String("h", ":9000", "api listen address")
 	flag.Parse()
 
-	server.AddInterface(&index{}, "/index", false)
+	server.Register(&index{})
 
 	go func() {
 		for i := 0; i < 5; i++ {

server/init.go

@@ -5,10 +5,10 @@ import (
 )
 
 func init() {
-	server.AddInterface(&staticServer{}, "/", true)
-	server.AddInterface(&debugServer{}, "/debug/", true)
+	server.RegisterPrefix(&staticServer{}, "/")
+	server.RegisterPrefix(&debugServer{}, "/debug/")
 
-	server.AddInterface(&testServer{}, "/test/", false)
+	server.RegisterPath(&testServer{}, "/test/")
 
-	server.AddInterface(&user{}, "", false)
+	server.Register(&user{})
 }