From abdd3f60615ad04efd3f84ee11e0341d42e27358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E4=BF=8A=E6=88=90?= Date: Sun, 8 Oct 2023 15:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=BB=BF=E5=9F=8E=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 36 +++----------------------- app/admin/apis/usermanage/user.go | 2 +- app/admin/models/game_card.go | 6 ++--- app/admin/models/greentown_sms.go | 2 +- app/admin/models/greentown_sms_test.go | 2 +- app/admin/models/share_card.go | 7 ++--- app/admin/models/user.go | 10 +++---- 7 files changed, 19 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index fd0cdfd..7aaf856 100644 --- a/README.md +++ b/README.md @@ -3,35 +3,7 @@ #### 介绍 管理后台 -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) +#### 本地运行 +``` +go run main.go server config=config/settings.yml +``` \ No newline at end of file diff --git a/app/admin/apis/usermanage/user.go b/app/admin/apis/usermanage/user.go index 38fc051..032ae7c 100644 --- a/app/admin/apis/usermanage/user.go +++ b/app/admin/apis/usermanage/user.go @@ -749,7 +749,7 @@ func GroupSendMessage(c *gin.Context) { fmt.Println("tels:", tels) fmt.Println("Message:", groupMessageTemplate.Message) //groupMessageTemplate.Message = "【go2switch】温馨提示:您的会员即将过期,请在过期之前将卡归还到门店,如有问题联系客服" - err = models.SmsSend(tels, groupMessageTemplate.Message) + err = models.GtSendMessage(strings.Split(tels, ","), groupMessageTemplate.Message) if err != nil { logger.Errorf("SmsSend err:", err) app.Error(c, http.StatusInternalServerError, err, "群发消息错误") diff --git a/app/admin/models/game_card.go b/app/admin/models/game_card.go index d04d6d1..e5593aa 100644 --- a/app/admin/models/game_card.go +++ b/app/admin/models/game_card.go @@ -1466,7 +1466,7 @@ func MemberExpirationReminderDay(days int64) { continue } //fmt.Println("content:", content) - err = SmsSend(users[i].Tel, content) + err = GtSendMessage([]string{users[i].Tel}, content) if err != nil { logger.Error("err:", err) } @@ -1483,7 +1483,7 @@ func ExpireMemberSMSSend() { func ExpireMemberSMSSendDay(day uint32, nowTime time.Time) { smsSend := &ExpireMemberSmsSend{ - Message: fmt.Sprintf("【go2switch】您的租卡会员已过期%d天，卡带未归还产生滞纳金%d元，请及时续费会员或归还卡带，以避免对您造成不必要的损失。", day, day*2), + Message: fmt.Sprintf("【迪为】您的租卡会员已过期%d天，卡带未归还产生滞纳金%d元，请及时续费会员或归还卡带，以避免对您造成不必要的损失。", day, day*2), SendTime: nowTime, Tel: "", Status: 1, @@ -1514,7 +1514,7 @@ func ExpireMemberSMSSendDay(day uint32, nowTime time.Time) { logger.Error("err:", err) continue } - err = SmsSend(users[i].Tel, smsSend.Message) + err = GtSendMessage([]string{users[i].Tel}, smsSend.Message) if err != nil { smsSend.Status = 2 logger.Error("err:", err) diff --git a/app/admin/models/greentown_sms.go b/app/admin/models/greentown_sms.go index 636995a..4a4510b 100644 --- a/app/admin/models/greentown_sms.go +++ b/app/admin/models/greentown_sms.go @@ -49,7 +49,7 @@ type GtSendMessageResp struct { SmsCount int `json:"smsCount"` } -func GtSendMessage(phoneList []int, content string) error { +func GtSendMessage(phoneList []string, content string) error { params := make(map[string]interface{}, 0) nowTime := time.Now() fmt.Println("nowTime.UnixMicro", nowTime.UnixMilli()) diff --git a/app/admin/models/greentown_sms_test.go b/app/admin/models/greentown_sms_test.go index 57779af..fc150cf 100644 --- a/app/admin/models/greentown_sms_test.go +++ b/app/admin/models/greentown_sms_test.go @@ -18,5 +18,5 @@ func TestCreateInviteMemberReport(t *testing.T) { } func TestGtSendMessage(t *testing.T) { - GtSendMessage([]int{int(17080320980)}, "【迪为】绿城短信推送测试,测试") + GtSendMessage([]string{"17080320980"}, "【迪为】绿城短信推送测试,测试") } diff --git a/app/admin/models/share_card.go b/app/admin/models/share_card.go index 14f4578..23357fb 100644 --- a/app/admin/models/share_card.go +++ b/app/admin/models/share_card.go @@ -9,8 +9,9 @@ import ( "time" ) -//go:generate goqueryset -in share_card.go // gen:qs +// +//go:generate goqueryset -in share_card.go type UserShareCardBill struct { Model Uid uint32 `json:"uid" gorm:"index"` @@ -2302,7 +2303,7 @@ func TakeExpressStatePush(pushReq *ExpressStatePushReq) { if userInfo.Tel == "" { return } - err = SmsSend(userInfo.Tel, "【go2switch】温馨提示：您的收回卡已签收，请及时检查卡带确认功能正常，如有问题，请于签收后48小时内通过小程序发起异常反馈。") + err = GtSendMessage([]string{userInfo.Tel}, "【迪为】温馨提示：您的收回卡已签收，请及时检查卡带确认功能正常，如有问题，请于签收后48小时内通过小程序发起异常反馈。") if err != nil { logger.Errorf("SmsSend err:", err) return @@ -2343,7 +2344,7 @@ func TakeExpressStatePush(pushReq *ExpressStatePushReq) { if userInfo.Tel == "" { return } - err = SmsSend(userInfo.Tel, "【go2switch】温馨提示：您的借卡已签收，请及时检查卡带确认功能正常，如有问题，请于签收后48小时内通过小程序发起异常反馈。") + err = GtSendMessage([]string{userInfo.Tel}, "【迪为】温馨提示：您的借卡已签收，请及时检查卡带确认功能正常，如有问题，请于签收后48小时内通过小程序发起异常反馈。") if err != nil { logger.Errorf("SmsSend err:", err) return diff --git a/app/admin/models/user.go b/app/admin/models/user.go index d91d9a3..47c1ba3 100644 --- a/app/admin/models/user.go +++ b/app/admin/models/user.go @@ -1998,18 +1998,18 @@ func SendMessageMemberRenewal() { return } - tels := "" + tels := make([]string, 0) uids := make([]uint32, 0, len(users)) for i, _ := range users { if users[i].Tel != "" { - tels += users[i].Tel + "," + tels = append(tels, users[i].Tel) fmt.Println("user:", users[i].Uid, users[i].Tel) uids = append(uids, users[i].Uid) } } - if tels != "" { - message := "【go2switch】提醒：您的租卡会员时长仅剩余一个月，现在续费最高立减200元！赶快进入小程序领取优惠吧~" - err = SmsSend(tels[:len(tels)-1], message) + if len(tels) > 0 { + message := "【迪为】提醒：您的租卡会员时长仅剩余一个月，现在续费最高立减200元！赶快进入小程序领取优惠吧~" + err = GtSendMessage(tels, message) if err != nil { logger.Errorf("SmsSend err:", err) return