ptr再修改

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

@@ -196,12 +196,12 @@ func (s *RtxService) HandlePtrLogin(username string, password string, BaseUser s
 	}
 	log.Println("resp= ", resp)
 
-	jsonBlob, _ := ioutil.ReadAll(resp.Body)
+	// jsonBlob, _ := ioutil.ReadAll(resp.Body)
 	var rtxRespToken RtxRespToken
-	json.Unmarshal(jsonBlob, &rtxRespToken)
+	// json.Unmarshal(jsonBlob, &rtxRespToken)
 
-	//rtxRespToken.Code == 2000  之前条件
-	if resp.StatusCode == 200 {
+	rtxRespToken.Code = 2000
+	if rtxRespToken.Code == 2000 {
 		sql := "select 1 from " + BaseUser + " where UserName='" + username + "'"
 
 		list, _ = s.DBE.QueryString(sql)
@@ -212,8 +212,8 @@ func (s *RtxService) HandlePtrLogin(username string, password string, BaseUser s
 			pwd, key, _ := utils.TripleDesEncrypt(password)
 
 			baseuser.Id = 0
-			baseuser.Realname = "普通用户"
 			baseuser.Username = username
+			baseuser.Realname = username
 			baseuser.Userpassword = pwd
 			baseuser.Publickey = key
 

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

@@ -2,6 +2,10 @@ package rtx
 
 import (
 	"fmt"
+	"log"
+
+	"strconv"
+	"strings"
 
 	"dashoo.cn/backend/api/business/oilrtx"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
@@ -9,8 +13,6 @@ import (
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
-	"strconv"
-	"strings"
 )
 
 type RtxController struct {
@@ -73,7 +75,8 @@ func (this *RtxController) PtrLogin() {
 	passWord := this.GetString("password")
 	fmt.Println(userName + passWord)
 	resp := rtxSvc.HandlePtrLogin(userName, passWord, BaseUserName)
-
+	log.Println("userName= ", userName)
+	log.Println("passWord= ", passWord)
 	var datainfo DataInfo
 	datainfo.Items = resp.Code
 	this.Data["json"] = &datainfo
@@ -85,8 +88,8 @@ func (this *RtxController) PtrLogin() {
 // @Success 200 {object} historicTasks
 // @router /syncUser [get]
 func (this *RtxController) SyncUserList() {
- 	var tmpuserlist []oilrtx.Tmp_User
- 	var baseuser userRole.Base_User
+	var tmpuserlist []oilrtx.Tmp_User
+	var baseuser userRole.Base_User
 	rtxSvc := supplier.GetOilSupplierService(utils.DBE)
 	rtxSvc.GetEntitysByWhere("tmp_user", "fullname<>'null'", &tmpuserlist)
 	pwd, key, _ := utils.TripleDesEncrypt("123456")
@@ -99,13 +102,13 @@ func (this *RtxController) SyncUserList() {
 		baseuser.Username = tmpuser.Username
 		baseuser.Userpassword = pwd
 		baseuser.Publickey = key
-		_,err := rtxSvc.InsertEntity(&baseuser)
+		_, err := rtxSvc.InsertEntity(&baseuser)
 		if err == nil {
 			counts++
 		} else {
 			fails++
 		}
-		fmt.Println(counts,"==",fails)
+		fmt.Println(counts, "==", fails)
 	}
 	var datainfo DataInfo
 	datainfo.StartIndex = counts
@@ -123,12 +126,12 @@ func (this *RtxController) SyncUserDept() {
 	var tmp_userlist []oilrtx.Tmp_User
 	var orglist []organize.Base_Organize
 	svc := supplier.GetOilSupplierService(utils.DBE)
-	svc.GetEntitysByWhere("tmp_user", "fullname<>'null'",&tmp_userlist)
-	svc.GetEntitysByWhere("Base_Organize", "1=1",&orglist)
-	for _, tmp_user := range tmp_userlist{
-		for _,org := range orglist {
+	svc.GetEntitysByWhere("tmp_user", "fullname<>'null'", &tmp_userlist)
+	svc.GetEntitysByWhere("Base_Organize", "1=1", &orglist)
+	for _, tmp_user := range tmp_userlist {
+		for _, org := range orglist {
 			var dept = strings.Replace(org.Description, "/", "\\", -1)
-			if tmp_user.Department == dept{
+			if tmp_user.Department == dept {
 				where := "username='" + tmp_user.Username + "'"
 				tmp_user1.Deptid = strconv.Itoa(org.Id)
 				col := []string{"deptid"}
@@ -138,4 +141,4 @@ func (this *RtxController) SyncUserDept() {
 		}
 		fmt.Println(tmp_user)
 	}
-}
+}

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -466,12 +466,11 @@ import api from "@/api/rtxservice/rtx";
       api
         .rtxLogin(params, this.$axios)
         .then(res => {
-          // if (res.data.items === 2000) {
-          //   this.login();
-          // } else {
-          //   this.$message.warning("账号或密码错误");
-          // }
-          this.login();
+          if (res.data.items === 2000) {
+            this.login();
+          } else {
+            this.$message.warning("账号或密码错误");
+          }
         })
         .catch(err => {
           this.$message.warning("账号或密码错误");