脚本下载接口修改

api/v1/task/upload_file.go

@@ -1,13 +1,12 @@
 package task
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 	"log-server/global"
 	"log-server/model/common/response"
-	taskReq "log-server/model/task/request"
 	taskRes "log-server/model/task/response"
-	"log-server/utils"
 	"strconv"
 )
 
@@ -36,14 +35,12 @@ func (b *UploadFileApi) UploadFile(c *gin.Context) {
 }
 
 func (b *UploadFileApi) DownloadFile(c *gin.Context) {
-	var info taskReq.DownloadRequest
-	_ = c.ShouldBindJSON(&info)
-	if err := utils.Verify(info, utils.DownloadFileVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
+	gameIdStr := c.Query("gameId")
+	md5String := c.Query("md5String")
 
-	downloadFile, err := uploadFileService.DownloadFile(info.GameId, info.Md5String)
+	fmt.Println(gameIdStr)
+	gameId, _ := strconv.Atoi(gameIdStr)
+	downloadFile, err := uploadFileService.DownloadFile(gameId, md5String)
 	if err != nil {
 		global.GVA_LOG.Error("查询失败!", zap.Error(err))
 		response.FailWithMessage("查询失败", c)

initialize/timer.go

@@ -39,131 +39,131 @@ func Timer() {
 		}
 	}
 
-	// 定时更新前一天的统计数据
-	_, err := global.GVA_Timer.AddTaskByFunc("StatisticsLog", "2 8 5 * * * ", serviceStatisticsLog.CreateStatisticsLog)
-	if err != nil {
-		fmt.Println("add taskCode timer error:", err)
-	}
-
-	//定时同步电脑相关的统计数据
-	_, err = global.GVA_Timer.AddTaskByFunc("CreateComputerStatisticsData", "40 9,19,29,39,49,59 7-23 * * * ", serviceStatisticsLog.CreateComputerStatisticsData)
-	if err != nil {
-		fmt.Println("add CreateComputerStatisticsData timer error:", err)
-	}
-	// 同步游戏相关的统计数据
-	_, err = global.GVA_Timer.AddTaskByFunc("TodayCreateStatisticsGameInfoLog", "2 8,18,28,38,48,58 6-23 * * * ", serviceStatisticsLog.TodayCreateStatisticsGameInfoLog)
-	if err != nil {
-		fmt.Println("add TodayCreateStatisticsGameInfoLog timer error:", err)
-	}
-	// 同步任务统计数据
-	_, err = global.GVA_Timer.AddTaskByFunc("TaskStatisticsDataCache", "20 0/3 6-23 * * * ", serviceStatisticsLog.TaskStatisticsDataCache)
-	if err != nil {
-		fmt.Println("add TaskStatisticsDataCache timer error:", err)
-	}
-	// 重试失败数据
-	_, err = global.GVA_Timer.AddTaskByFunc("createFailLog", "2 5,15,25,35,45,55 6-23 * * * ", ServiceLogList.CreateFailLog)
-	if err != nil {
-		fmt.Println("everyDayResetStatisticsCache timer error:", err)
-	}
-	// 定时检查电脑上报
-	_, err = global.GVA_Timer.AddTaskByFunc("RegularCheckPc", "2 57 8-23 * * * ", serviceStatisticsLog.RegularCheckPc)
-	if err != nil {
-		fmt.Println("RegularCheckPc timer error:", err)
-	}
-	// 新建日志表
-	_, err = global.GVA_Timer.AddTaskByFunc("RegularCreateLogingTable", "2 1 19 20 * * ", ServiceLogList.RegularCreateLogingTable)
-	if err != nil {
-		fmt.Println("add RegularCreateLogingTable timer error:", err)
-	}
-	// 定时删缓存
-	_, err = global.GVA_Timer.AddTaskByFunc("RegularDelCheckData", "2 33 11 * * *", serviceStatisticsLog.RegularDelCheckData)
-	if err != nil {
-		fmt.Println("add RegularDelCheckData timer error:", err)
-	}
-	//定时添加任务
-	_, err = global.GVA_Timer.AddTaskByFunc("EveryDaySyncTaskData", "30 22 21 * * *", syncData.EveryDaySyncTaskData)
-	if err != nil {
-		fmt.Println("add EveryDaySyncTaskData timer error:", err)
-	}
-	//同步任务数据
-	_, err = global.GVA_Timer.AddTaskByFunc("SyncTaskData", "2 0/3 1-23 * * *", syncData.SyncTaskData)
-	if err != nil {
-		fmt.Println("add SyncTaskData timer error:", err)
-	}
-	// 数优任务统计
-	_, err = global.GVA_Timer.AddTaskByFunc("DayTargetDataStatistics", "40 2 5 * * *", syncData.DayTargetDataStatistics)
-	if err != nil {
-		fmt.Println("add DayTargetDataStatistics timer error:", err)
-	}
-
-	//// 定时检查是否有电脑到期，修改租机状态@every 1s
-	//_, err = global.GVA_Timer.AddTaskByFunc("CheckIsExpire", "0 0/5 * * * *", serviceRentComputer.CheckIsExpire)
+	//// 定时更新前一天的统计数据
+	//_, err := global.GVA_Timer.AddTaskByFunc("StatisticsLog", "2 8 5 * * * ", serviceStatisticsLog.CreateStatisticsLog)
 	//if err != nil {
-	//	fmt.Println("add CheckIsExpire timer error:", err)
+	//	fmt.Println("add taskCode timer error:", err)
 	//}
-	//// 定时生成租机每日台账@every 1s
-	//_, err = global.GVA_Timer.AddTaskByFunc("CreateRentComputerLedger", "0 30 23 * * *", serviceRentComputer.CreateRentComputerLedger)
+	//
+	////定时同步电脑相关的统计数据
+	//_, err = global.GVA_Timer.AddTaskByFunc("CreateComputerStatisticsData", "40 9,19,29,39,49,59 7-23 * * * ", serviceStatisticsLog.CreateComputerStatisticsData)
 	//if err != nil {
-	//	fmt.Println("add CreateRentComputerLedger timer error:", err)
+	//	fmt.Println("add CreateComputerStatisticsData timer error:", err)
 	//}
-
-	//定时获取扫码平台余额,每小时执行一次
+	//// 同步游戏相关的统计数据
+	//_, err = global.GVA_Timer.AddTaskByFunc("TodayCreateStatisticsGameInfoLog", "2 8,18,28,38,48,58 6-23 * * * ", serviceStatisticsLog.TodayCreateStatisticsGameInfoLog)
+	//if err != nil {
+	//	fmt.Println("add TodayCreateStatisticsGameInfoLog timer error:", err)
+	//}
+	//// 同步任务统计数据
+	//_, err = global.GVA_Timer.AddTaskByFunc("TaskStatisticsDataCache", "20 0/3 6-23 * * * ", serviceStatisticsLog.TaskStatisticsDataCache)
+	//if err != nil {
+	//	fmt.Println("add TaskStatisticsDataCache timer error:", err)
+	//}
+	//// 重试失败数据
+	//_, err = global.GVA_Timer.AddTaskByFunc("createFailLog", "2 5,15,25,35,45,55 6-23 * * * ", ServiceLogList.CreateFailLog)
+	//if err != nil {
+	//	fmt.Println("everyDayResetStatisticsCache timer error:", err)
+	//}
+	//// 定时检查电脑上报
+	//_, err = global.GVA_Timer.AddTaskByFunc("RegularCheckPc", "2 57 8-23 * * * ", serviceStatisticsLog.RegularCheckPc)
+	//if err != nil {
+	//	fmt.Println("RegularCheckPc timer error:", err)
+	//}
+	//// 新建日志表
+	//_, err = global.GVA_Timer.AddTaskByFunc("RegularCreateLogingTable", "2 1 19 20 * * ", ServiceLogList.RegularCreateLogingTable)
+	//if err != nil {
+	//	fmt.Println("add RegularCreateLogingTable timer error:", err)
+	//}
+	//// 定时删缓存
+	//_, err = global.GVA_Timer.AddTaskByFunc("RegularDelCheckData", "2 33 11 * * *", serviceStatisticsLog.RegularDelCheckData)
+	//if err != nil {
+	//	fmt.Println("add RegularDelCheckData timer error:", err)
+	//}
+	////定时添加任务
+	//_, err = global.GVA_Timer.AddTaskByFunc("EveryDaySyncTaskData", "30 22 21 * * *", syncData.EveryDaySyncTaskData)
+	//if err != nil {
+	//	fmt.Println("add EveryDaySyncTaskData timer error:", err)
+	//}
+	////同步任务数据
+	//_, err = global.GVA_Timer.AddTaskByFunc("SyncTaskData", "2 0/3 1-23 * * *", syncData.SyncTaskData)
+	//if err != nil {
+	//	fmt.Println("add SyncTaskData timer error:", err)
+	//}
+	//// 数优任务统计
+	//_, err = global.GVA_Timer.AddTaskByFunc("DayTargetDataStatistics", "40 2 5 * * *", syncData.DayTargetDataStatistics)
+	//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 {
+	////	fmt.Println("add CheckIsExpire timer error:", err)
+	////}
+	////// 定时生成租机每日台账@every 1s
+	////_, err = global.GVA_Timer.AddTaskByFunc("CreateRentComputerLedger", "0 30 23 * * *", serviceRentComputer.CreateRentComputerLedger)
+	////if err != nil {
+	////	fmt.Println("add CreateRentComputerLedger timer error:", err)
+	////}
+	//
+	////定时获取扫码平台余额,每小时执行一次
+	////_, err = global.GVA_Timer.AddTaskByFunc("SyncGetWeChatScannerBalance", "0 58 * * * *", serviceWeChatScannerApi.SyncGetWeChatScannerBalance)
 	//_, err = global.GVA_Timer.AddTaskByFunc("SyncGetWeChatScannerBalance", "0 58 * * * *", serviceWeChatScannerApi.SyncGetWeChatScannerBalance)
-	_, err = global.GVA_Timer.AddTaskByFunc("SyncGetWeChatScannerBalance", "0 58 * * * *", serviceWeChatScannerApi.SyncGetWeChatScannerBalance)
-	if err != nil {
-		fmt.Println("add SyncGetWeChatScannerBalance timer error:", err)
-	}
-	//定时更新异常率
-	_, err = global.GVA_Timer.AddTaskByFunc("SyncAbnormalRateByBatch", "0 1,31 * * * *", serviceDataAbnormalRate.SyncAbnormalRateByBatch)
-	if err != nil {
-		fmt.Println("add SyncAbnormalRateByBatch timer error:", err)
-	}
-
-	//定时更新当日微信扫码订单列表
-	_, err = global.GVA_Timer.AddTaskByFunc("SyncTodayWeChatScannerDetailed", "0 3,33 * * * *", serviceWeChatScannerDetailed.SyncTodayWeChatScannerDetailed)
-	if err != nil {
-		fmt.Println("add SyncTodayWeChatScannerDetailed timer error:", err)
-	}
-
-	//0点更新昨日微信扫码订单列表
-	_, err = global.GVA_Timer.AddTaskByFunc("SyncYesterdayWeChatScannerDetailed", "1 1 0 * * *", serviceWeChatScannerDetailed.SyncYesterdayWeChatScannerDetailed)
-	if err != nil {
-		fmt.Println("add SyncYesterdayWeChatScannerDetailed timer error:", err)
-	}
-
-	//半小时同步一次机房设备信息，播报是否有异常
-	_, err = global.GVA_Timer.AddTaskByFunc("SyncJfDevicesMessage", "0 0,30 * * * *", robotService.SyncJfDevicesMessage)
-	if err != nil {
-		fmt.Println("add SyncJfDevicesMessage timer error:", err)
-	}
-
-	// 活跃定时推送消息
-	_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "20 29,59 8-21 * * *", syncData.TaskMsgSend)
-	if err != nil {
-		fmt.Println("add TaskMsgSend timer error:", err)
-	}
-
-	// 活跃定时推送消息
-	_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "20 0/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)
-	if err != nil {
-		fmt.Println("add TaskFreeMsgSend timer error:", err)
-	}
-
-	// 付费定时推送消息
-	_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "40 0/5 22-23 * * *", syncData.TaskFreeMsgSend)
-	if err != nil {
-		fmt.Println("add TaskFreeMsgSend timer error:", err)
-	}
-
-	// 23起检测任务完成情况
-	_, err = global.GVA_Timer.AddTaskByFunc("CheckTaskCompletedInfo", "10 0/4 23 * * *", syncData.CheckTaskCompletedInfo)
-	if err != nil {
-		fmt.Println("add CheckTaskCompletedInfo timer error:", err)
-	}
+	//if err != nil {
+	//	fmt.Println("add SyncGetWeChatScannerBalance timer error:", err)
+	//}
+	////定时更新异常率
+	//_, err = global.GVA_Timer.AddTaskByFunc("SyncAbnormalRateByBatch", "0 1,31 * * * *", serviceDataAbnormalRate.SyncAbnormalRateByBatch)
+	//if err != nil {
+	//	fmt.Println("add SyncAbnormalRateByBatch timer error:", err)
+	//}
+	//
+	////定时更新当日微信扫码订单列表
+	//_, err = global.GVA_Timer.AddTaskByFunc("SyncTodayWeChatScannerDetailed", "0 3,33 * * * *", serviceWeChatScannerDetailed.SyncTodayWeChatScannerDetailed)
+	//if err != nil {
+	//	fmt.Println("add SyncTodayWeChatScannerDetailed timer error:", err)
+	//}
+	//
+	////0点更新昨日微信扫码订单列表
+	//_, err = global.GVA_Timer.AddTaskByFunc("SyncYesterdayWeChatScannerDetailed", "1 1 0 * * *", serviceWeChatScannerDetailed.SyncYesterdayWeChatScannerDetailed)
+	//if err != nil {
+	//	fmt.Println("add SyncYesterdayWeChatScannerDetailed timer error:", err)
+	//}
+	//
+	////半小时同步一次机房设备信息，播报是否有异常
+	//_, err = global.GVA_Timer.AddTaskByFunc("SyncJfDevicesMessage", "0 0,30 * * * *", robotService.SyncJfDevicesMessage)
+	//if err != nil {
+	//	fmt.Println("add SyncJfDevicesMessage timer error:", err)
+	//}
+	//
+	//// 活跃定时推送消息
+	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "20 29,59 8-21 * * *", syncData.TaskMsgSend)
+	//if err != nil {
+	//	fmt.Println("add TaskMsgSend timer error:", err)
+	//}
+	//
+	//// 活跃定时推送消息
+	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "20 0/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)
+	//if err != nil {
+	//	fmt.Println("add TaskFreeMsgSend timer error:", err)
+	//}
+	//
+	//// 付费定时推送消息
+	//_, err = global.GVA_Timer.AddTaskByFunc("TaskMsgSend", "40 0/5 22-23 * * *", syncData.TaskFreeMsgSend)
+	//if err != nil {
+	//	fmt.Println("add TaskFreeMsgSend timer error:", err)
+	//}
+	//
+	//// 23起检测任务完成情况
+	//_, err = global.GVA_Timer.AddTaskByFunc("CheckTaskCompletedInfo", "10 0/4 23 * * *", syncData.CheckTaskCompletedInfo)
+	//if err != nil {
+	//	fmt.Println("add CheckTaskCompletedInfo timer error:", err)
+	//}
 }

router/task/upload_file.go

@@ -14,7 +14,7 @@ func (e *UploadFileRouter) InitUploadFileRouter(Router *gin.RouterGroup) {
 	UploadFileApi := v1.ApiGroupApp.GroupTask.UploadFileApi
 	{
 		GameTaskRouter.POST("addFileUpdate", UploadFileApi.UploadFile)
-		GameTaskRouter.POST("DownloadFile", UploadFileApi.DownloadFile)
+		GameTaskRouter.GET("downloadFile", UploadFileApi.DownloadFile)
 
 	}
 }

service/task/upload_file.go

@@ -45,15 +45,16 @@ func (e *UploadFileService) UploadFileFunc(file *multipart.FileHeader) (string,
 	filepath := global.GVA_CONFIG.Local.Path + "/" + filename
 
 	f, openError := file.Open() // 读取文件
-	if openError != nil {
+	f1, openErr := file.Open()	//	读取文件生成MD5值
+	if openError != nil || openErr != nil {
 		global.GVA_LOG.Error("function file.Open() Filed", zap.Any("err", openError.Error()))
 		return "", "", "", errors.New("function file.Open() Filed, err:" + openError.Error())
 	}
 	defer f.Close() // 创建文件 defer 关闭
-
+	defer f1.Close()
 	//生成md5值
 	md5h := md5.New()
-	io.Copy(md5h, f)
+	io.Copy(md5h, f1)
 	md5String := hex.EncodeToString(md5h.Sum(nil))
 
 	//
@@ -111,7 +112,7 @@ func (e *UploadFileService) UploadFile(gameId int, header *multipart.FileHeader)
 //下载文件
 func (e *UploadFileService) DownloadFile(gameId int, md5String string) (info response.DownloadFile, err error) {
 	var file response.UploadFileResponse
-
+	var prefix string = "http://assist.qiming321.cn:8001/api/"
 	//数据库中无记录，即不需要更新
 	err = global.GVA_DB.Table("upload_file").Where("game_id = ?", gameId).Last(&file).Error
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -120,18 +121,19 @@ func (e *UploadFileService) DownloadFile(gameId int, md5String string) (info res
 			Md5String: "",
 			Flag: false,
 		}
-		return info, nil
+		return info, errors.New("无对应game_id")
 	}
 
 	if file.Md5String == md5String {
 		info = response.DownloadFile{
 			Url: "",
-			Md5String: md5String,
+			Md5String: "",
 			Flag: false,
 		}
 	} else {
+		fullUrl := prefix + file.Url
 		info = response.DownloadFile{
-			Url: file.Url,
+			Url: fullUrl,
 			Md5String: file.Md5String,
 			Flag: true,
 		}

utils/verify.go

@@ -29,5 +29,4 @@ var (
 	GameTaskVerify          = Rules{"TaskId": {NotEmpty()}, "TaskName": {NotEmpty()}, "User": {NotEmpty()}, "NewRetained": {NotEmpty()}, "GamePortId": {NotEmpty()}}
 	TaskIdVerify            = Rules{"TaskId": {NotEmpty()}}
 	UpdateTargetVerify      = Rules{"TaskId": {NotEmpty()}, "CreateDate": {NotEmpty()}}
-	DownloadFileVerify		= Rules{"GameId":  {NotEmpty()}, "Md5String": {NotEmpty()}}
 )