From bae4af47f77a195a12a0437584d667465e826e12 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 17 八月 2020 16:09:28 +0800
Subject: [PATCH] add log
---
service/userService.go | 84 +++++++++++++++++++++++++++++------------
1 files changed, 59 insertions(+), 25 deletions(-)
diff --git a/service/userService.go b/service/userService.go
index 7e0bec4..a468dca 100644
--- a/service/userService.go
+++ b/service/userService.go
@@ -37,7 +37,7 @@
}
var tmpUser models.User
- err := tmpUser.SelectByPhoneNum(phoneNum)
+ err := tmpUser.SelectById(hikPersonId)
fmt.Println("login err:", err)
if err != nil { //鐢ㄦ埛涓嶅瓨鍦�,鍒欐柊澧�
u := models.User{
@@ -57,8 +57,25 @@
//瀹㈡埛绔痗id缁戝畾鍒悕
if cid != "" {
go func() {
- bindR, bindE := BindAlias(cid, phoneNum)
- fmt.Println("bind cid:",cid, "phoneNum:",phoneNum,"result:", bindR, "err:", bindE)
+ var uc models.UserClient
+ ucList := uc.GetByCid(cid)
+ if ucList != nil && len(ucList) >0 {
+ if len(ucList) >1 || ucList[0].PhoneNum != phoneNum {
+ unbindB, unE := UnbindAlias(cid)
+ fmt.Println("unbindB:", unbindB, "err:", unE)
+ }
+ }
+ if !uc.ExistByCid(phoneNum, cid) {
+ new := models.UserClient{
+ Id:uuid.NewV4().String(),
+ PhoneNum: phoneNum,
+ ClientId: cid,
+ BindTime: time.Now().Format("2006-01-02 15:04:05"),
+ }
+ new.Insert()
+ bindR, bindE := BindAlias(cid, phoneNum)
+ fmt.Println("bind cid:",cid, "phoneNum:",phoneNum,"result:", bindR, "err:", bindE)
+ }
}()
}
return true, &vo.UserInfo{
@@ -71,12 +88,11 @@
return false, nil, errors.New("娉ㄥ唽澶辫触")
}
} else { //鐢ㄦ埛宸插瓨鍦�
- if hikPersonId != tmpUser.Id {
- tmpUser.Id = hikPersonId
- tmpUser.SyncHikPersonId(tmpUser.PhoneNum, hikPersonId)
+ if phoneNum != tmpUser.PhoneNum {
+ tmpUser.UpdatePhoneNum(phoneNum, hikPersonId)
}
var plateNos = make([]string, 0)
- hikVehicles := carSv.GetVehicleListByPerson(tmpUser.Id)
+ hikVehicles := carSv.GetVehicleListByPerson(hikPersonId)
if hikVehicles != nil {
for _,up := range hikVehicles {
@@ -86,8 +102,25 @@
//瀹㈡埛绔痗id缁戝畾鍒悕
if cid != "" {
go func() {
- bindR, bindE := BindAlias(cid, phoneNum)
- fmt.Println("bind cid:",cid, "phoneNum:",phoneNum,"result:", bindR, "err:", bindE)
+ var uc models.UserClient
+ ucList := uc.GetByCid(cid)
+ if ucList != nil && len(ucList) >0 {
+ if len(ucList) >1 || ucList[0].PhoneNum != phoneNum {
+ unbindB, unE := UnbindAlias(cid)
+ fmt.Println("unbindB:", unbindB, "err:", unE)
+ }
+ }
+ if !uc.ExistByCid(phoneNum, cid) {
+ new := models.UserClient{
+ Id:uuid.NewV4().String(),
+ PhoneNum: phoneNum,
+ ClientId: cid,
+ BindTime: time.Now().Format("2006-01-02 15:04:05"),
+ }
+ new.Insert()
+ bindR, bindE := BindAlias(cid, phoneNum)
+ fmt.Println("bind cid:",cid, "phoneNum:",phoneNum,"result:", bindR, "err:", bindE)
+ }
}()
}
return true, &vo.UserInfo{
@@ -119,25 +152,26 @@
}
func NewVerifyCode(phoneNum string) error {
- var tmpUser models.User
- err := tmpUser.SelectByPhoneNum(phoneNum)
- if err != nil { //鐢ㄦ埛涓嶅瓨鍦�,娉ㄥ唽鑾峰彇楠岃瘉鐮侊紝姝ゆ墜鏈哄彿蹇呴』鍦ㄨ偛鑻辨捣搴峰钩鍙颁腑
- carSv := NewCarService()
- personList := carSv.GetHikPersonList()
- found := false
- if personList ==nil {
- return errors.New("鎵嬫満鍙蜂笉瀛樺湪锛岃鑱旂郴鍋滆溅鍦虹鐞嗗憳")
- } else {
- for _,p := range personList {
- if p.PhoneNo == phoneNum {
- found = true
- }
+ carSv := NewCarService()
+ personList := carSv.GetHikPersonList()
+ found := false
+ if personList ==nil {
+ return errors.New("鎵嬫満鍙蜂笉瀛樺湪锛岃鑱旂郴鍋滆溅鍦虹鐞嗗憳")
+ } else {
+ for _,p := range personList {
+ if p.PhoneNo == phoneNum {
+ found = true
}
}
- if !found {
- return errors.New("鎵嬫満鍙蜂笉瀛樺湪锛岃鑱旂郴鍋滆溅鍦虹鐞嗗憳")
- }
}
+ if !found {
+ return errors.New("鎵嬫満鍙蜂笉瀛樺湪锛岃鑱旂郴鍋滆溅鍦虹鐞嗗憳")
+ }
+ //var tmpUser models.User
+ //err := tmpUser.SelectByPhoneNum(phoneNum)
+ //if err != nil { //鐢ㄦ埛涓嶅瓨鍦�,娉ㄥ唽鑾峰彇楠岃瘉鐮侊紝姝ゆ墜鏈哄彿蹇呴』鍦ㄨ偛鑻辨捣搴峰钩鍙颁腑
+ //
+ //}
regionId := "cn-hangzhou"
accessKeyId := "LTAIkHFaStA1JKk5"
--
Gitblit v1.8.0