添加beego作为对外服务

main.go

@@ -2,11 +2,17 @@ package main
 
 import (
 	"github.com/usual2970/util/tel"
+	"fmt"
+	//"github.com/usual2970/util/request"
 )
 
 func main() {
 
-	tel := tel.NewTel("18257140570", "15000210629")
-
-	tel.Dial()
+	tel := tel.NewTel("15000000000", "15000000000")
+	//var resp request.Resp
+	resp,err:=tel.Dial()
+	if err!=nil{
+		fmt.Println(err)
+	}
+	fmt.Println(resp)
 }

request/client.go

@@ -10,6 +10,7 @@ import (
 	"github.com/usual2970/util/time"
 	"crypto/sha256"
 	"encoding/base64"
+	"io/ioutil"
 
 )
 
@@ -19,6 +20,11 @@ type Client struct {
 	httpClient *http.Client
 }
 
+
+type Resp struct {
+	Code,Description,Sessionid string
+}
+
 func (clt *Client) AppKey() string {
 	return clt.appKey
 }
@@ -37,9 +43,8 @@ func NewClient(appKey,appSecret string, httpClient *http.Client) *Client {
 	}
 }
 
-func (clt *Client) Post(url string,params interface{}) (resp interface{},err error){
+func (clt *Client) Post(url string,params interface{}) (resp Resp,err error){
 	pBytes,err:=ffjson.Marshal(params)
-	fmt.Println(string(pBytes))
 	if err!=nil{
 		return 
 	}
@@ -50,23 +55,23 @@ func (clt *Client) Post(url string,params interface{}) (resp interface{},err err
 		return 
 	}
 
-	ctime:=time.NowCm()
+	ctime:=time.NowCmUtc()
 	nonce:=string(random.RandomCreateBytes(64))
 
 	pwDigest:=clt.PwDigest(ctime,nonce)
 
-	
-	req.Header.Add("Authorization","WSSE realm=\"SDP\", profile=\"UsernameToken\", type=\"AppKey\"")
-	req.Header.Add("X-WSSE",
-		fmt.Sprintf(`UsernameToken Username="%s", PasswordDigest="%s", Nonce="%s", Created="%s"`,
+	headers:=http.Header{
+		"Authorization":[]string{"WSSE realm=\"SDP\", profile=\"UsernameToken\", type=\"AppKey\""},
+		"X-WSSE":[]string{fmt.Sprintf(`UsernameToken Username="%s", PasswordDigest="%s", Nonce="%s", Created="%s"`,
 					clt.AppKey(),
 					pwDigest,
 					nonce,
 					ctime,
-		))
-	req.Header.Add("Content-Type","application/json; charset=UTF-8")
-
+				)},
+		"Content-Type":[]string{"application/json; charset=UTF-8"},
+	}
 
+	req.Header=headers
 
 	response,err:=clt.httpClient.Do(req)
 	if err!=nil{
@@ -74,7 +79,21 @@ func (clt *Client) Post(url string,params interface{}) (resp interface{},err err
 		return 
 	}
 	defer response.Body.Close()
-	fmt.Println(response)
+
+	rsBody,err:=ioutil.ReadAll(response.Body)
+	if err!=nil {
+		fmt.Println(err)
+		return 
+	}
+
+
+	
+	err=ffjson.Unmarshal(rsBody,&resp)
+	if err!=nil{
+		fmt.Println(err)
+		return
+	}
+	fmt.Println(resp)
 	return 
 }
 

service/conf/app.conf

+appname = service
+httpport = 8080
+runmode = dev

service/controllers/default.go

+package controllers
+
+import (
+	"github.com/astaxie/beego"
+)
+
+type MainController struct {
+	beego.Controller
+}
+
+func (c *MainController) Get() {
+	c.Data["Website"] = "beego.me"
+	c.Data["Email"] = "astaxie@gmail.com"
+	c.TplName = "index.tpl"
+}

service/main.go

+package main
+
+import (
+	_ "github.com/usual2970/util/service/routers"
+	"github.com/astaxie/beego"
+)
+
+func main() {
+	beego.Run()
+}
+

service/routers/router.go

+package routers
+
+import (
+	"github.com/usual2970/util/service/controllers"
+	"github.com/astaxie/beego"
+)
+
+func init() {
+    beego.Router("/", &controllers.MainController{})
+}

service/tests/default_test.go

+package test
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"runtime"
+	"path/filepath"
+	_ "github.com/usual2970/util/service/routers"
+
+	"github.com/astaxie/beego"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func init() {
+	_, file, _, _ := runtime.Caller(1)
+	apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".." + string(filepath.Separator))))
+	beego.TestBeegoInit(apppath)
+}
+
+
+// TestMain is a sample to run an endpoint test
+func TestMain(t *testing.T) {
+	r, _ := http.NewRequest("GET", "/", nil)
+	w := httptest.NewRecorder()
+	beego.BeeApp.Handlers.ServeHTTP(w, r)
+
+	beego.Trace("testing", "TestMain", "Code[%d]\n%s", w.Code, w.Body.String())
+
+	Convey("Subject: Test Station Endpoint\n", t, func() {
+	        Convey("Status Code Should Be 200", func() {
+	                So(w.Code, ShouldEqual, 200)
+	        })
+	        Convey("The Result Should Not Be Empty", func() {
+	                So(w.Body.Len(), ShouldBeGreaterThan, 0)
+	        })
+	})
+}
+

tel/tel.go

@@ -3,6 +3,7 @@ package tel
 
 import(
 	"github.com/usual2970/util/request"
+	"fmt"
 
 )
 
@@ -35,7 +36,7 @@ func NewTel(from, to string) *Tel {
 	}
 }
 
-func (t *Tel) Dial() (v interface{},err error) {
+func (t *Tel) Dial() (resp request.Resp,err error) {
 	tlsClient,err:=request.NewTLSHttpClientSingle(CerPath)
 	if err!=nil{
 		return 
@@ -43,7 +44,9 @@ func (t *Tel) Dial() (v interface{},err error) {
 
 	client:=request.NewClient(AppKey,AppSecret,tlsClient)
 	
-	client.Post(DialUrl,t.Params)
+	if resp,err=client.Post(DialUrl,t.Params);err!=nil{
+		fmt.Println(err)
+	}
 	return
 }
 

time/time.go

@@ -7,3 +7,8 @@ import (
 func NowCm() string{
 	return time.Now().Format("2006-01-02T15:04:05Z")
 }
+
+
+func NowCmUtc() string{
+	return time.Now().UTC().Format("2006-01-02T15:04:05Z")
+}
\ No newline at end of file