diff --git a/Test/SubNet1_Service1.go b/Test/SubNet1_Service1.go index 1e9940f..28ac645 100644 --- a/Test/SubNet1_Service1.go +++ b/Test/SubNet1_Service1.go @@ -23,11 +23,11 @@ func init() { //OnInit ... func (ws *SubNet1_Service1) OnInit() error { - - originhttp.Post(" / aaa/bb/ :user/:pass/", ws.HTTP_UserIntegralInfo) + originhttp.Post("", ws.HTTP_UserIntegralInfo) originhttp.Post(" /aaa/bbb", ws.Test) - originhttp.Get(" /aaa/bbb", ws.HTTP_UserIntegralInfo) + originhttp.Get("/Login/bbb", ws.HTTP_UserIntegralInfo) originhttp.SetStaticResource(originhttp.METHOD_GET, "/file/", "d:\\") + return nil } diff --git a/Test/main.go b/Test/main.go index 1222d99..13eb261 100644 --- a/Test/main.go +++ b/Test/main.go @@ -1,7 +1,6 @@ package main import ( - "github.com/duanhf2012/origin/cluster" "github.com/duanhf2012/origin/originnode" "github.com/duanhf2012/origin/sysservice/originhttp" diff --git a/Test/workspace.code-workspace b/Test/workspace.code-workspace index a58161d..cd39b81 100644 --- a/Test/workspace.code-workspace +++ b/Test/workspace.code-workspace @@ -4,7 +4,7 @@ "path": "." }, { - "path": "D:\\GOPATH\\src\\github.com\\duanhf2012\\origin" + "path": "D:\\GOPATH\\src\\github.com" } ], "settings": { diff --git a/sysservice/originhttp/httpserverervice.go b/sysservice/originhttp/httpserverervice.go index d4f152f..6f3a27c 100644 --- a/sysservice/originhttp/httpserverervice.go +++ b/sysservice/originhttp/httpserverervice.go @@ -115,25 +115,25 @@ func (slf *HttpRequest) Query(key string) (string, bool) { func Request(method HTTP_METHOD, url string, handle HttpHandle) error { fnpath := runtime.FuncForPC(reflect.ValueOf(handle).Pointer()).Name() - fmt.Print(fnpath) + sidx := strings.LastIndex(fnpath, "*") if sidx == -1 { - return errors.New(fmt.Sprintf("http post func path is error, %s", fnpath)) + return errors.New(fmt.Sprintf("http post func path is error, %s\n", fnpath)) } eidx := strings.LastIndex(fnpath, "-fm") if sidx == -1 { - return errors.New(fmt.Sprintf("http post func path is error, %s", fnpath)) + return errors.New(fmt.Sprintf("http post func path is error, %s\n", fnpath)) } callpath := fnpath[sidx+1 : eidx] ridx := strings.LastIndex(callpath, ")") if ridx == -1 { - return errors.New(fmt.Sprintf("http post func path is error, %s", fnpath)) + return errors.New(fmt.Sprintf("http post func path is error, %s\n", fnpath)) } hidx := strings.LastIndex(callpath, "HTTP_") if hidx == -1 { - return errors.New(fmt.Sprintf("http post func not contain HTTP_, %s", fnpath)) + return errors.New(fmt.Sprintf("http post func not contain HTTP_, %s\n", fnpath)) } callpath = strings.ReplaceAll(callpath, ")", "") @@ -224,7 +224,7 @@ func (slf *ServeHTTPRouterMux) ServeHTTP(w http.ResponseWriter, r *http.Request) timeFuncPass := time.Since(timeFuncStart) if bPrintRequestTime { - service.GetLogger().Printf(service.LEVER_INFO, "HttpServer Time : %s url : %s", timeFuncPass, strCallPath) + service.GetLogger().Printf(service.LEVER_INFO, "HttpServer Time : %s url : %s\n", timeFuncPass, strCallPath) } if err != nil { writeRespone(w, http.StatusBadRequest, fmt.Sprint(err))