From 9358e5ec2d2b65fec4ef9a1be7d1a1e1e2cf9d2d Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 10 八月 2020 16:31:34 +0800
Subject: [PATCH] new push schedule
---
service/userService.go | 102 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 82 insertions(+), 20 deletions(-)
diff --git a/service/userService.go b/service/userService.go
index 5bd2303..2caaeaf 100644
--- a/service/userService.go
+++ b/service/userService.go
@@ -1,22 +1,22 @@
package service
import (
- "car-service/cache"
"car-service/extend/util"
"car-service/models"
"car-service/vo"
"errors"
"fmt"
"github.com/aliyun/alibaba-cloud-sdk-go/services/dysmsapi"
- "github.com/gomodule/redigo/redis"
"github.com/satori/go.uuid"
+ "sync"
+ "time"
)
type UserService struct {
}
-func (sv *UserService) Login(phoneNum, code string) (bool,*vo.UserInfo,error) {
+func (sv *UserService) Login(phoneNum, code, cid string) (bool,*vo.UserInfo,error) {
if verifyCode(phoneNum, code) {
carSv := NewCarService()
@@ -46,10 +46,22 @@
IsDelete: false,
}
if _, e := u.Insert();e ==nil {
+ var plateNos = make([]string, 0)
+ hikVehicles := carSv.GetVehicleListByPerson(u.Id)
+
+ if hikVehicles != nil {
+ for _,up := range hikVehicles {
+ plateNos = append(plateNos, up.PlateNo)
+ }
+ }
+ //瀹㈡埛绔痗id缁戝畾鍒悕
+ if cid != "" {
+ go BindAlias(cid, phoneNum)
+ }
return true, &vo.UserInfo{
UserId: u.Id,
PhoneNum: phoneNum,
- PlateNos: []string{},
+ PlateNos: plateNos,
}, nil
} else {
fmt.Println("u.Insert err:", e)
@@ -63,6 +75,10 @@
for _,up := range hikVehicles {
plateNos = append(plateNos, up.PlateNo)
}
+ }
+ //瀹㈡埛绔痗id缁戝畾鍒悕
+ if cid != "" {
+ go BindAlias(cid, phoneNum)
}
return true, &vo.UserInfo{
UserId: tmpUser.Id,
@@ -93,6 +109,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
+ }
+ }
+ }
+ if !found {
+ return errors.New("鎵嬫満鍙蜂笉瀛樺湪锛岃鑱旂郴鍋滆溅鍦虹鐞嗗憳")
+ }
+ }
+
regionId := "cn-hangzhou"
accessKeyId := "LTAIkHFaStA1JKk5"
AccessSecret := "oE7LhSqBWWUBzV0B7l1G9aVmgHPddM"
@@ -127,26 +163,52 @@
return false
}
+type CodCache struct {
+ phoneNum string
+ cod string
+ ex time.Time
+}
+var codMap = make(map[string]CodCache)
+var codLock sync.RWMutex
func add2Cache(phoneNum string, code string) {
//鍐欏埌redis缂撳瓨涓�
- c := cache.Get()
- defer c.Close()
-
- reply, err := c.Do("SET", phoneNum, code, "EX", 5 * 60)//瓒呮椂浜斿垎閽�
- if err != nil {
- fmt.Println("鍐欏叆redis澶辫触")
- } else {
- fmt.Println("鍐欏叆redis鎴愬姛,reply:", reply)
+ //c := cache.Get()
+ //defer c.Close()
+ //
+ //reply, err := c.Do("SET", phoneNum, code, "EX", 5 * 60)//瓒呮椂浜斿垎閽�
+ //if err != nil {
+ // fmt.Println("鍐欏叆redis澶辫触")
+ //} else {
+ // fmt.Println("鍐欏叆redis鎴愬姛,reply:", reply)
+ //}
+ codLock.Lock()
+ defer codLock.Unlock()
+ expireTime := time.Now().Add(time.Minute * 5)
+ codMap[phoneNum] = CodCache{
+ phoneNum:phoneNum,
+ cod: code,
+ ex:expireTime,
}
}
func existCode(phoneNum string) (bool,string) {
- c := cache.Get()
- defer c.Close()
-
- r, err := redis.String(c.Do("GET", phoneNum))
- if err != nil {
- fmt.Println("existCode err:", err)
- return false,""
+ //c := cache.Get()
+ //defer c.Close()
+ //
+ //r, err := redis.String(c.Do("GET", phoneNum))
+ //if err != nil {
+ // fmt.Println("existCode err:", err)
+ // return false,""
+ //}
+ //return true,r
+ codLock.Lock()
+ defer codLock.Unlock()
+ if cache,exist := codMap[phoneNum];exist {
+ if cache.ex.Before(time.Now()) {//宸茶繃鏈�
+ return false, ""
+ } else {
+ return true, cache.cod
+ }
+ } else {
+ return false, ""
}
- return true,r
}
\ No newline at end of file
--
Gitblit v1.8.0