api/v1/log/loging.go

@@ -12,7 +12,10 @@ import (
 	"log-server/service/log"
 	loging2 "log-server/service/log/loging"
 	"log-server/utils"
+	"net/url"
 	"strconv"
+	"strings"
+	"time"
 )
 
 type ApiLoging struct {
@@ -681,3 +684,49 @@ func (e *ApiLoging) GetErrDeviceLog(c *gin.Context) {
 		}, "获取成功", c)
 	}
 }
+
+// @Tags loging
+// @Summary 获取无忧token
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce  application/json
+// @Param data body log2.DeviceLog true "设备异常数据接口"
+// @Success 200
+// @Router /loging/getWuYToken [Get]
+func (e *ApiLoging) GetWuYToken(c *gin.Context) {
+	type Data struct {
+		Token string `json:"token"`
+	}
+	var data Data
+	key := fmt.Sprintf("%s:wuYToken", time.Now().Format("2006-01-02"))
+	t, _ := global.GVA_REDIS.Get(c, key).Result()
+	if t != "" {
+		data.Token = t
+		response.OkWithDetailed(data, "获取成功", c)
+		return
+	}
+	header := map[string]string{"Content-Type": "application/x-www-form-urlencoded"}
+	var (
+		params = url.Values{}
+	)
+	params.Set("username", "18408246387")
+	params.Set("password", "der123456")
+	params.Set("source", "3")
+	params.Set("auth", "none")
+	requestData := params.Encode()
+	reqUrl := "https://user.wuyouip.com/Sign/_In"
+	reqs, err := utils.Request("POST", reqUrl, strings.NewReader(requestData), header, nil)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+		return
+	}
+	token := reqs.Cookies()[1].Value
+	if token != "" {
+		token = "token=" + token
+		global.GVA_REDIS.Set(c, key, token, time.Hour*15)
+	}
+	data.Token = token
+	response.OkWithDetailed(data, "获取成功", c)
+	return
+}

api/v1/task/game_task.go

@@ -536,6 +536,7 @@ func (e *GameTaskApi) TaskTargetExport(c *gin.Context) {
 func (e *GameTaskApi) TemporaryTask(c *gin.Context) {
 	var params request.GetTemporaryTaskRequest
 	_ = c.ShouldBindJSON(&params)
+	global.GVA_LOG.Warn(params.PcCode)
 	if params.PcCode == "" {
 		response.FailWithMessage("参数错误", c)
 		return

router/log/loging.go

@@ -33,5 +33,6 @@ func (e *LogingRouter) InitLogingRouter(Router *gin.RouterGroup) {
 		excelRouter.POST("getErrDeviceLog", logApi.GetErrDeviceLog)
 		excelRouter.POST("getDeviceIdErr", logApi.GetDeviceIdErr)
 		excelRouter.POST("deviceErrRateExcel", logApi.DeviceErrRateExcel)
+		excelRouter.GET("getWuYToken", logApi.GetWuYToken)
 	}
 }

service/task/game_task.go

@@ -1258,5 +1258,8 @@ func (apiService *GameTask) TemporaryTask(ctx context.Context, pcCode string) (t
 		return temporaryConf, errors.New("没有任务数据")
 	}
 	err = global.GVA_DB.Model(&task.CentralControlConf{}).Where("task_id", taskId).First(&temporaryConf).Error
+	if err == nil {
+		global.GVA_REDIS.Del(ctx, key)
+	}
 	return temporaryConf, err
 }

service/task/urgent_task_conf.go

@@ -77,23 +77,23 @@ func (s *UrgentTaskService) DeleteUrgentTaskByIds(ids []int) (err error) {
 func (s *UrgentTaskService) UpdateUrgentTask(task1 task.UrgentTaskConf) (err error) {
 	//查找此task_id是否存在，如果存在不更新，否则更新
 	var entity task.UrgentTaskConf
-	err = global.GVA_DB.Model(&task.UrgentTaskConf{}).Where("task_id = ? and id != ? and create_date = ?", task1.TaskId, task1.Id, task1.CreateDate).First(&entity).Error
-	if !errors.Is(err, gorm.ErrRecordNotFound) {
-		return errors.New("已存在此task_id的任务，更新失败")
+	err = global.GVA_DB.Model(&task.UrgentTaskConf{}).Where("task_id = ? and id = ? and create_date = ?", task1.TaskId, task1.Id, task1.CreateDate).First(&entity).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return errors.New("没有找到数据")
+	}
+	upPcCode := ""
+	if task1.PcCode != "" {
+		upPcCode = task1.PcCode
+		task1.PcCode = entity.PcCode + "," + task1.PcCode
 	}
 	err = global.GVA_DB.Model(&task.UrgentTaskConf{}).Where("id", task1.Id).Updates(&task1).Error
 	if err != nil {
 		return err
 	}
 	date := entity.CreateDate[:10]
-	if entity.PcCode != task1.PcCode {
-		codeSplit := strings.Split(entity.PcCode, ",")
+	if upPcCode != "" {
 		ctx := context.Background()
-		for _, code := range codeSplit {
-			key := fmt.Sprintf(cache.TemporaryTaskPcCode, date, code)
-			global.GVA_REDIS.Del(ctx, key)
-		}
-		upCodeSplit := strings.Split(task1.PcCode, ",")
+		upCodeSplit := strings.Split(upPcCode, ",")
 		for _, upCode := range upCodeSplit {
 			key := fmt.Sprintf(cache.TemporaryTaskPcCode, date, upCode)
 			global.GVA_REDIS.Set(ctx, key, task1.TaskId, time.Hour*6)

utils/requst_http.go

@@ -3,9 +3,11 @@ package utils
 import (
 	"encoding/json"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"strings"
+	"time"
 )
 
 func HttpGet(url string, params map[string]string) (result []byte, err error) {
@@ -161,3 +163,28 @@ func HttpDeleteReplyCode(url string, params interface{}) (result []byte, code in
 	result = body
 	return
 }
+
+func Request(method, urlPath string, reqBody io.Reader, header map[string]string, cookies []*http.Cookie) (resp *http.Response, err error) {
+	req, err := http.NewRequest(method, urlPath, reqBody)
+	if err != nil {
+		return
+	}
+	for k, v := range header {
+		req.Header.Set(k, v)
+	}
+	for _, v := range cookies {
+		req.AddCookie(v)
+	}
+	var (
+		client = http.Client{
+			Timeout: 15 * time.Second,
+			//Transport: &http.Transport{Proxy: http.ProxyURL(&url.URL{Host: "localhost:8888"})},
+		}
+	)
+	if resp, err = client.Do(req); err != nil {
+		return
+	}
+
+	defer resp.Body.Close()
+	return
+}