rtx登录

src/dashoo.cn/backend/api/business/oilrtx/RtxService.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -179,32 +180,43 @@ func (s *RtxService) HandleSendMsg(username string, tomobile string, message str
 
 func (s *RtxService) HandlePtrLogin(username string, password string, BaseUser string) int {
 
-	client := &http.Client{}
-	var ptrUser PtrUser
+	//client := &http.Client{}
+	//var ptrUser PtrUser
+	//
+	//ptrUser.UserName = username
+	//ptrUser.PassWord = password
+	//
+	//reqJson, err := json.Marshal(ptrUser)
+	//params := string(reqJson)
+	//
+	//ptrUrl := utils.Cfg.MustValue("PtrUrl", "ptrUrl")
+	//
+	//req, err := http.NewRequest("post", ptrUrl, strings.NewReader(params))
+	//req.Header.Add("Content-Type", "application/json")
+	////req.Header.Add("X-Token", "HJpczmIJr9z26t9KcV0i1OsBE9RXFeuyhuN9MdV+Ts/FlUjCgDOxaaubo9DkF91t+X2MCxBqX6s=")
 
-	ptrUser.UserName = username
-	ptrUser.PassWord = password
+	//resp, err := client.Do(req)
 
-	reqJson, err := json.Marshal(ptrUser)
-	params := string(reqJson)
+	ptrUrl := utils.Cfg.MustValue("PtrUrl", "ptrUrl")
 
-	url := utils.Cfg.MustValue("PtrUrl", "ptrUrl")
-	req, err := http.NewRequest("post", url, strings.NewReader(params))
-	req.Header.Add("Content-Type", "application/json")
-	//req.Header.Add("X-Token", "HJpczmIJr9z26t9KcV0i1OsBE9RXFeuyhuN9MdV+Ts/FlUjCgDOxaaubo9DkF91t+X2MCxBqX6s=")
+	v := make(url.Values)
+	v.Add("UserName", username)
+	v.Add("PassWord", password)
+
+	resp, err := http.PostForm(ptrUrl, v)
 
-	resp, err := client.Do(req)
 	if err != nil {
 		log.Println("err= ", err)
 	}
 	log.Println("resp= ", resp)
 
 	jsonBlob, _ := ioutil.ReadAll(resp.Body)
-	var rtxRespToken RtxRespToken
-	json.Unmarshal(jsonBlob, &rtxRespToken)
+	log.Println("jsonBlob=", jsonBlob)
+	//var rtxRespToken RtxRespToken
+	//json.Unmarshal(jsonBlob, &rtxRespToken)
 
 	flag := 0
-	if rtxRespToken.Code == 2000 {
+	if string(jsonBlob[:]) == "2000" {
 		sql := " UserName='" + username + "'"
 		var baseUser1 userRole.Base_User
 		s.GetEntity(&baseUser1, sql)
@@ -238,7 +250,7 @@ func (s *RtxService) HandlePtrLogin(username string, password string, BaseUser s
 		}
 
 	} else {
-		log.Println("Code:" + string(rtxRespToken.Code) + ",Message:" + rtxRespToken.Message + ",Token:" + rtxRespToken.Token)
+		log.Println("Code:" + string(jsonBlob[:]))
 	}
 
 	return flag

src/dashoo.cn/backend/api/controllers/document/document.go

@@ -79,7 +79,7 @@ func (this *DocumentController) GetDocumentNameAndTimeLogin() {
 
 	svc := documentmanage.GetDocumentmanageService(utils.DBE)
 	var list []documentmanage.DocumentNameTimeInfo
-	tableName := "s5OVE" + DocumentInfoName
+	tableName := DocumentInfoName
 	list = svc.GetDocumentNameAndTimeLogin(tableName, colName, rangeType)
 
 	this.Data["json"] = &list