From 7b820a98601ba59fd06eda83983f2fdc6fd47fd8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 12 八月 2020 09:58:07 +0800
Subject: [PATCH] fix night push time,and msg title
---
service/userService.go | 33 +++++++++++++++++----------------
controllers/car.go | 8 ++++----
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/controllers/car.go b/controllers/car.go
index 4248526..a22189f 100644
--- a/controllers/car.go
+++ b/controllers/car.go
@@ -42,7 +42,7 @@
if left <=lowerLimit && left != prePushLeft {
go func() {
message := fmt.Sprintf("%s 鍓╀綑杞︿綅锛�%d涓�", time.Now().Format("2006-01-02 15:04:05"), left)
- b, e := service.PushByAlias("鑲茶嫳鏅烘収鍋滆溅", message)
+ b, e := service.PushByAlias("鑲茶嫳涓鍋滆溅", message)
prePushLeft = left
@@ -53,7 +53,7 @@
}
//鍒ゆ柇褰撳墠鏄惁鍦�22:00-22:30涔嬮棿
now := time.Now()
- if now.Hour() == 21 && now.Minute()>=0 && now.Minute() <=29{
+ if now.Hour() == 22 && now.Minute()>=0 && now.Minute() <=30{
if now.Minute() == 0 {
if nightPushTimes ==0 {
go nightPush()
@@ -69,7 +69,7 @@
go nightPush()
nightPushTimes++
}
- } else if now.Minute() == 29 {
+ } else if now.Minute() == 30 {
if nightPushTimes == 3{
go nightPush()
nightPushTimes++
@@ -88,7 +88,7 @@
func nightPush(){
message := fmt.Sprintf("%s 璇峰敖蹇┒鍑哄仠杞﹀満", time.Now().Format("2006-01-02 15:04:05"))
- b, e := service.NightPush("鑲茶嫳鏅烘収鍋滆溅", message)
+ b, e := service.NightPush("鑲茶嫳涓鍋滆溅", message)
fmt.Println("b:", b,"e:",e, "message:", message)
diff --git a/service/userService.go b/service/userService.go
index 7e0bec4..0bd2356 100644
--- a/service/userService.go
+++ b/service/userService.go
@@ -119,25 +119,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