From 0e297f564cb824b7e7aa75c7fa8e1a8c365e6076 Mon Sep 17 00:00:00 2001
From: Leufolium <Caeruscaemon@outlook.com>
Date: Thu, 29 Feb 2024 10:34:21 +0800
Subject: [PATCH] by Robin at 20240229; fix

---
 app/mix/dao/mongo.go           | 4 ++--
 app/mix/service/cronservice.go | 1 +
 app/mix/service/utilservice.go | 2 +-
 etc/mix/mix-prod.yaml          | 4 ++--
 etc/mix/mix-test.yaml          | 6 +++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/mix/dao/mongo.go b/app/mix/dao/mongo.go
index 70fdc228..f4d03d2e 100644
--- a/app/mix/dao/mongo.go
+++ b/app/mix/dao/mongo.go
@@ -2435,14 +2435,14 @@ func (m *Mongo) GetContactCustomerServiceList(ctx *gin.Context, req *contact_cus
 	filterInClause := []qmgo.M{}
 	if req.CtLowerBound != nil {
 		filterInClause = append(filterInClause, qmgo.M{
-			"start_time": qmgo.M{
+			"ct": qmgo.M{
 				"$gt": util.DerefInt64(req.CtLowerBound),
 			},
 		})
 	}
 	if req.CtUpperBound != nil {
 		filterInClause = append(filterInClause, qmgo.M{
-			"end_time": qmgo.M{
+			"ct": qmgo.M{
 				"$lte": util.DerefInt64(req.CtUpperBound),
 			},
 		})
diff --git a/app/mix/service/cronservice.go b/app/mix/service/cronservice.go
index 691cb46d..fcc24b6b 100644
--- a/app/mix/service/cronservice.go
+++ b/app/mix/service/cronservice.go
@@ -53,6 +53,7 @@ func (s *CronService) Init(c any) (err error) {
 	exec.RegTask("text_audit_batch", s.TextAuditBatch)
 	exec.RegTask("text_audit_batch_his", s.TextAuditBatchHis)
 	//exec.RegTask("clear_content_audit_batch_execution_logs", s.ClearContentAuditBatchExecutionLogs)
+	exec.RegTask("send_contact_customer_services_of_last_minute", s.SendContactCustomerServicesOfLastMinute)
 	exec.LogHandler(customLogHandle)
 	//注册任务handler
 
diff --git a/app/mix/service/utilservice.go b/app/mix/service/utilservice.go
index c2317b13..96fa66c3 100644
--- a/app/mix/service/utilservice.go
+++ b/app/mix/service/utilservice.go
@@ -591,7 +591,7 @@ func (s *Service) utilStringifyContactCustomerServices(ctx *gin.Context, contact
 	msgBuilder.WriteString("上分钟收到的联系客服消息:\n\n")
 
 	for i, contactCustomerService := range contactCustomerServices {
-		sessionId := util.DerefInt64(contactCustomerService.Id)
+		sessionId := util.DerefInt64(contactCustomerService.SessionId)
 		subMid := util.DerefInt64(sessionMap[sessionId].SubMid)
 		isRead := util.DerefInt64(contactCustomerService.IsRead)
 		message := util.DerefString(contactCustomerService.Message)
diff --git a/etc/mix/mix-prod.yaml b/etc/mix/mix-prod.yaml
index 49ba4e18..30234c03 100644
--- a/etc/mix/mix-prod.yaml
+++ b/etc/mix/mix-prod.yaml
@@ -120,5 +120,5 @@ xxl_job:
   log_path: "/app/ironfan/log/xxl_job/"
 
 ding_talk_robot:
-  access_token: ""
-  secret: ""
\ No newline at end of file
+  access_token: "65f11ade605568c34f33ff79ed4c20c1721bd6da18511d8e08a6ed9666c4b8b4"
+  secret: "SECcc49257b2681b6488ab4be8ee815c61027a7254e2be3239c229de38b22207b5b"
\ No newline at end of file
diff --git a/etc/mix/mix-test.yaml b/etc/mix/mix-test.yaml
index f10c520d..5efaa1bb 100644
--- a/etc/mix/mix-test.yaml
+++ b/etc/mix/mix-test.yaml
@@ -22,7 +22,7 @@ mix_mongo:
 mix_mysql:
   uri: "127.0.0.1:3306"
   username: "root"
-  password: "Wishpal@2023"
+  password: "Xbz@114514"
   timeout: 3
   read_timeout_s: 5
   write_timeout_s: 3
@@ -119,5 +119,5 @@ xxl_job:
   log_path: "/app/ironfan/log/xxl_job/"
 
 ding_talk_robot:
-  access_token: ""
-  secret: ""
\ No newline at end of file
+  access_token: "65f11ade605568c34f33ff79ed4c20c1721bd6da18511d8e08a6ed9666c4b8b4"
+  secret: "SECcc49257b2681b6488ab4be8ee815c61027a7254e2be3239c229de38b22207b5b"
\ No newline at end of file