initialize/timer.go

@@ -23,6 +23,7 @@ var serviceDataAbnormalRate = new(dataStatistics.ServiceDataAbnormalRate)
 var serviceWeChatScannerDetailed = new(dataStatistics.ServiceWeChatScannerDetailed)
 var serviceDownLoadUrl = new(fileManager.ServiceDownLoadUrl)
 var robotService = new(system.RobotService)
+var ServiceRegularTask = new(task.ServiceRegularTask)
 
 func Timer() {
 	if global.GVA_CONFIG.Timer.Start {
@@ -97,7 +98,7 @@ func Timer() {
 	//if err != nil {
 	//	fmt.Println("add DayTargetDataStatistics timer error:", err)
 	//}
-
+	//
 	//// 定时检查是否有电脑到期，修改租机状态@every 1s
 	//_, err = global.GVA_Timer.AddTaskByFunc("CheckIsExpire", "0 0/5 * * * *", serviceRentComputer.CheckIsExpire)
 	//if err != nil {
@@ -145,31 +146,31 @@ func Timer() {
 	}
 	//
 	//// 活跃定时推送消息
-	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "20 29,59 8-21 * * *", syncData.TaskMsgSend)
+	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "20 2/32 8-21 * * *", syncData.TaskMsgSend)
 	//if err != nil {
 	//	fmt.Println("add TaskMsgSend timer error:", err)
 	//}
 	//
 	//// 活跃定时推送消息
-	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "40 0/10 22-23 * * *", syncData.TaskMsgSend)
+	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "30 1/10 22-23 * * *", syncData.TaskMsgSend)
 	//if err != nil {
 	//	fmt.Println("add TaskMsgSend timer error:", err)
 	//}
 	//
 	//// 付费定时推送消息
-	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "40 15,30,45,59 8-21 * * *", syncData.TaskFreeMsgSend)
+	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "45 2/15 8-21 * * *", syncData.TaskFreeMsgSend)
 	//if err != nil {
 	//	fmt.Println("add TaskFreeMsgSend timer error:", err)
 	//}
 	//
 	//// 付费定时推送消息
-	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "50 0/5 22-23 * * *", syncData.TaskFreeMsgSend)
+	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "50 1/5 22-23 * * *", syncData.TaskFreeMsgSend)
 	//if err != nil {
 	//	fmt.Println("add TaskFreeMsgSend timer error:", err)
 	//}
 	//
 	//// 23起检测任务完成情况
-	//_, err = global.GVA_Timer.AddTaskByFunc("CheckTaskCompletedInfo", "57 0/4 23 * * *", syncData.CheckTaskCompletedInfo)
+	//_, err = global.GVA_Timer.AddTaskByFunc("CheckTaskCompletedInfo", "57 5/4 23 * * *", syncData.CheckTaskCompletedInfo)
 	//if err != nil {
 	//	fmt.Println("add CheckTaskCompletedInfo timer error:", err)
 	//}
@@ -179,4 +180,22 @@ func Timer() {
 	//if err != nil {
 	//	fmt.Println("add UpdateGameVersion timer error:", err)
 	//}
+	//
+	////定时更新在线电脑缓存
+	//_, err = global.GVA_Timer.AddTaskByFunc("OnlinePcCodeUpdateCache", "14 7 8-20 * * *", ServiceRegularTask.OnlinePcCodeUpdateCache)
+	//if err != nil {
+	//	fmt.Println("add OnlinePcCodeUpdateCache timer error:", err)
+	//}
+	//
+	//// 定时同步arpu值
+	//_, err = global.GVA_Timer.AddTaskByFunc("SyncArpu", "50 36 7,12,23 * * *", syncData.SyncArpu)
+	//if err != nil {
+	//	fmt.Println("add SyncArpu timer error:", err)
+	//}
+	//
+	//// 提醒修改腾讯目标
+	//_, err = global.GVA_Timer.AddTaskByFunc("RemindSendOne", "11 2 18,22 * * *", syncData.RemindSendOne)
+	//if err != nil {
+	//	fmt.Println("add RemindSendOne timer error:", err)
+	//}
 }

model/typeManage/gameChannel.go

@@ -1,5 +1,10 @@
 package typeManage
 
+import (
+	"errors"
+	"log-server/global"
+)
+
 type GameChannel struct {
 	Id              int64     `gorm:"column:id;type:bigint(20);primaryKey" json:"id"`
 	ChannelName     string    `gorm:"column:channel_name;type:varchar(255);not null" json:"channelName" binding:"required"`
@@ -9,3 +14,30 @@ type GameChannel struct {
 	CreateTime      LocalTime `gorm:"column:create_time;type:TIMESTAMP;" json:"createTime"`
 	UpdateTime      LocalTime `gorm:"column:update_time;type:TIMESTAMP;" json:"updateTime"`
 }
+
+func (m *GameChannel) GetGameChannelById(id int) (gameChannel GameChannel, err error) {
+	err = global.GVA_DB.Table("game_channel").Where("id = ?", id).Find(&gameChannel).Error
+	if err != nil {
+		return
+	}
+	if gameChannel.Id == 0 {
+		return gameChannel, errors.New("数据错误")
+	}
+	return
+}
+
+func (m *GameChannel) GetGameChannelData() (mps map[int64]GameChannel, err error) {
+	var gameChannel []GameChannel
+	err = global.GVA_DB.Table("game_channel").Find(&gameChannel).Error
+	if err != nil {
+		return
+	}
+	if len(gameChannel) == 0 {
+		return
+	}
+	var mp = map[int64]GameChannel{}
+	for _, pc := range gameChannel {
+		mp[pc.Id] = pc
+	}
+	return mp, err
+}

model/typeManage/loginType.go

@@ -1,5 +1,7 @@
 package typeManage
 
+import "log-server/global"
+
 type LoginType struct {
 	Id              int64     `gorm:"column:id;" json:"id"`
 	LoginName       string    `gorm:"column:login_name;" json:"login_name"`
@@ -9,3 +11,19 @@ type LoginType struct {
 	CreatedAt       LocalTime `gorm:"column:create_time;" json:"createdAt"`
 	UpdatedAt       LocalTime `gorm:"column:update_time;" json:"updatedAt"`
 }
+
+func (m *LoginType) GetLoginTypeData() (mps map[int64]LoginType, err error) {
+	var loginType []LoginType
+	err = global.GVA_DB.Table("login_type").Find(&loginType).Error
+	if err != nil {
+		return
+	}
+	if len(loginType) == 0 {
+		return
+	}
+	var mp = map[int64]LoginType{}
+	for _, pc := range loginType {
+		mp[pc.Id] = pc
+	}
+	return mp, err
+}

service/log/log_statistics.go

@@ -551,7 +551,7 @@ func (s *ServiceStatisticsLog) CreateComputerStatisticsData() {
 		return
 	}
 	var csReplys []*log.LogComputer
-	for code, r := range codeMps {
+	for code, _ := range codeMps {
 		// 不统计不在电脑列表里的
 		if _, ok := computerData[code]; !ok {
 			continue
@@ -572,6 +572,7 @@ func (s *ServiceStatisticsLog) CreateComputerStatisticsData() {
 		if err != nil {
 			continue
 		}
+		operator := computerData[code]
 		delete(computerData, code)
 		for gameId, num := range accountMps {
 			csReply := new(log.LogComputer)
@@ -579,7 +580,7 @@ func (s *ServiceStatisticsLog) CreateComputerStatisticsData() {
 			if _, ok := onlineComputerMpa[csReply.PcCode]; ok {
 				delete(onlineComputerMpa, csReply.PcCode)
 			}
-			csReply.Operator = r
+			csReply.Operator = operator
 			data, err := global.GVA_REDIS.HGet(ctx, key, gameId).Result()
 			if err != nil {
 				if err == redis.Nil {
@@ -1163,6 +1164,13 @@ func (s *ServiceStatisticsLog) RegularDelCheckData() {
 	s.LogicalLog.DelHashUuidKey(ctx, date)
 	s.LogicalLog.DelZSetKey(ctx, date)
 	s.LogicalLog.DelHashKey(ctx, date)
+	s.DelListKey(ctx, date)
+}
+
+// 删除list缓存数据
+func (s *ServiceStatisticsLog) DelListKey(ctx context.Context, date string) {
+	key := fmt.Sprintf(failCacheKey, date)
+	global.GVA_REDIS.Del(ctx, key)
 }
 
 // @author: [piexlmax](https://github.com/piexlmax)

service/task/game_task.go

@@ -13,6 +13,7 @@ import (
 	"log-server/model/task/control"
 	"log-server/model/task/request"
 	"log-server/model/task/response"
+	"log-server/model/typeManage"
 	"log-server/service/cache"
 	"log-server/utils"
 	"math"
@@ -55,8 +56,10 @@ var (
 )
 
 type GameTask struct {
-	cache  cache.Cache
-	common Common
+	cache       cache.Cache
+	common      Common
+	gameChannel typeManage.GameChannel
+	loginType   typeManage.LoginType
 }
 
 // 创建游戏任务
@@ -84,12 +87,16 @@ func (s *GameTask) CreateGameTask(requestData request.GameTaskRequest) (err erro
 	gameTask.PayTarget = requestData.PayTarget
 	gameTask.RetainedTarget = requestData.RetainedTarget
 	gameTask.PayPrice = requestData.PayPrice
+	gameTask.NewTargetH = requestData.NewTargetH
+	gameTask.RetainedTargetH = requestData.RetainedTargetH
 	//gameTask.CreateTime		= requestData.CreateTime
 	//gameTask.UpdateTime		= requestData.UpdateTime
 	//gameTask.Status			= requestData.Status
 	//gameTask.IsDel			= requestData.IsDel
 	//gameTask.DeleteTime		= requestData.DeleteTime
 	taskRequestData := s.CreateGameTaskRequestData(requestData)
+	body, _ := json.Marshal(taskRequestData)
+	global.GVA_LOG.Info(string(body))
 	err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
 		err = tx.Omit("create_time", "update_time", "status", "is_del", "delete_time", "control_task_id").Create(&gameTask).Error
 		if err != nil {
@@ -158,12 +165,13 @@ func (s *GameTask) CreateGameTargetCompleteModel(oldA task.GameTask, date time.T
 // 创建任务群控请求数据
 func (s *GameTask) CreateGameTaskRequestData(requestData request.GameTaskRequest) control.CreateGameTaskRequest {
 	gameTask := control.CreateGameTaskRequest{}
+	gchannel, _ := s.gameChannel.GetGameChannelById(requestData.GamePortId)
 	gameTask.GameId = requestData.TaskId
 	gameTask.GameName = requestData.TaskName
 	gameTask.Remark = requestData.User
 	gameTask.NewRetained = requestData.NewRetained
 	gameTask.Date = time.Now().Format("2006-01-02")
-	gameTask.GamePort = GamePort[requestData.GamePortId]
+	gameTask.GamePort = gchannel.ChannelName
 	gameTask.GameIdXmy = requestData.GameIdXmy
 	gameTask.NewTarget = requestData.NewTarget
 	gameTask.PayTarget = requestData.PayTarget
@@ -257,7 +265,7 @@ func (apiService *GameTask) GetGameTaskInfoList(api task.GameTask, info request.
 	global.GVA_DB.Table("account_type").Select("id", "type_name").Find(&option.AccountTypeOptions)
 	global.GVA_DB.Table("game_list").Select("id", "game_name").Find(&option.GameListOptions)
 	//fmt.Println(option)
-
+	accountMp, gamePortMp, loginTypeMp := apiService.TypeManageToMps(option)
 	if err != nil {
 		return apiList, option, total, err
 	} else {
@@ -293,9 +301,9 @@ func (apiService *GameTask) GetGameTaskInfoList(api task.GameTask, info request.
 			apiReply.Status = apiInfo.Status
 			apiReply.TaskId = apiInfo.TaskId
 			apiReply.TaskName = apiInfo.TaskName
-			apiReply.GamePort = GamePort[apiInfo.GamePortId]
-			apiReply.AccountType = AccountType[apiInfo.AccountType]
-			apiReply.LoginMethod = LoginMethod[apiInfo.LoginMethod]
+			apiReply.GamePort = gamePortMp[apiInfo.GamePortId].ChannelName
+			apiReply.AccountType = accountMp[apiInfo.AccountType].TypeName
+			apiReply.LoginMethod = loginTypeMp[apiInfo.LoginMethod].LoginName
 			apiReply.CreateTime = apiInfo.CreateTime.Format("2006-01-02 15:04:05")
 			apiReply.User = apiInfo.User
 			apiReply.Date = apiInfo.Date.Format("2006-01-02")
@@ -318,6 +326,22 @@ func (apiService *GameTask) GetGameTaskInfoList(api task.GameTask, info request.
 	return apisReply, option, total, err
 }
 
+func (apiService *GameTask) TypeManageToMps(Option task.Option) (map[int]task.AccountTypeOption, map[int]task.GamePortOption, map[int]task.LoginTypeOption) {
+	var accountMp = make(map[int]task.AccountTypeOption, len(Option.AccountTypeOptions))
+	for _, pc := range Option.AccountTypeOptions {
+		accountMp[pc.Id] = pc
+	}
+	var gamePortMp = make(map[int]task.GamePortOption, len(Option.GamePortOptions))
+	for _, gamePort := range Option.GamePortOptions {
+		gamePortMp[gamePort.Id] = gamePort
+	}
+	var loginTypeMp = make(map[int]task.LoginTypeOption, len(Option.LoginTypeOptions))
+	for _, loginType := range Option.LoginTypeOptions {
+		loginTypeMp[loginType.Id] = loginType
+	}
+	return accountMp, gamePortMp, loginTypeMp
+}
+
 //获取启用状态的任务
 func (apiService *GameTask) GetUsedGameTaskInfoList(api task.GameTask, info request.PageInfo, order string, desc bool) (list interface{}, options interface{}, total int64, err error) {
 	limit := info.PageSize
@@ -354,7 +378,7 @@ func (apiService *GameTask) GetUsedGameTaskInfoList(api task.GameTask, info requ
 	global.GVA_DB.Table("account_type").Select("id", "type_name").Find(&option.AccountTypeOptions)
 	global.GVA_DB.Table("game_list").Select("id", "game_name").Find(&option.GameListOptions)
 	//fmt.Println(option)
-
+	accountMp, gamePortMp, loginTypeMp := apiService.TypeManageToMps(option)
 	if err != nil {
 		return apiList, option, total, err
 	} else {
@@ -391,9 +415,9 @@ func (apiService *GameTask) GetUsedGameTaskInfoList(api task.GameTask, info requ
 			apiReply.TaskId = apiInfo.TaskId
 			apiReply.TaskName = apiInfo.TaskName
 			apiReply.AddFeeNotice = apiInfo.AddFeeNotice
-			apiReply.GamePort = GamePort[apiInfo.GamePortId]
-			apiReply.AccountType = AccountType[apiInfo.AccountType]
-			apiReply.LoginMethod = LoginMethod[apiInfo.LoginMethod]
+			apiReply.GamePort = gamePortMp[apiInfo.GamePortId].ChannelName
+			apiReply.AccountType = accountMp[apiInfo.AccountType].TypeName
+			apiReply.LoginMethod = loginTypeMp[apiInfo.LoginMethod].LoginName
 			apiReply.CreateTime = apiInfo.CreateTime.Format("2006-01-02 15:04:05")
 			apiReply.User = apiInfo.User
 			apiReply.Date = apiInfo.Date.Format("2006-01-02")
@@ -546,7 +570,7 @@ func (s *GameTask) UpdateGameTask(requestData request.GameTaskRequest) (err erro
 	gameTask.RetainedTargetH = requestData.RetainedTargetH
 	taskRequestData := s.CreateGameTaskRequestData(requestData)
 	err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
-		err = tx.Where("task_id = ?", requestData.TaskId).Omit("create_time", "update_time", "status", "is_del", "delete_time", "control_task_id", "date", "task_id").Updates(&gameTask).Error
+		err = tx.Where("task_id = ?", requestData.TaskId).Omit("create_time", "update_time", "status", "is_del", "delete_time", "control_task_id", "date", "task_id").Save(&gameTask).Error
 		if err != nil {
 			global.GVA_LOG.Error("更新任务数据失败: ", zap.Error(err))
 			return err
@@ -674,10 +698,11 @@ func (apiService *GameTask) GetGameTaskTargetInfoList(api request.GameTargetComp
 		}
 	}
 	if len(apiList) != 0 {
+		loginType, _ := apiService.loginType.GetLoginTypeData()
 		for i, api := range apiList {
 			date := strings.Split(api.CreateDate, "T")
 			loginMethod, _ := strconv.Atoi(api.LoginMethod)
-			apiList[i].LoginMethod = LoginMethod[loginMethod]
+			apiList[i].LoginMethod = loginType[int64(loginMethod)].LoginName
 			apiList[i].CreateDate = date[0]
 			apiList[i].NewComplete = api.NewComplete + api.HandNewComplete
 			apiList[i].RetainedComplete = api.RetainedComplete + api.HandRetainedComplete

service/task/sync_data.go

@@ -1433,8 +1433,9 @@ func (s *SyncData) SyncArpu() {
 }
 
 func (s *SyncData) RemindSendOne() {
-	url := "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=89460a48-e1a1-4181-86c0-533bad342628"
-	content := "请修改腾讯付费目标"
-	mobile := []string{"18874128185"}
+	//url := "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=89460a48-e1a1-4181-86c0-533bad342628"
+	url := global.GVA_CONFIG.SendUrl.SendUrlOne
+	content := "请查看腾讯游戏是否有付费目标"
+	mobile := []string{global.GVA_CONFIG.SendUrl.TxSendMobile}
 	s.common.RemindSend(url, content, mobile)
 }