✨ 经纬度更新

internal/api/v1/cptask_req.go

@@ -67,3 +67,8 @@ type PauseTaskReq struct {
 	g.Meta `path:"/task/pause/{id}" method:"post" tags:"CpTask" summary:"暂停任务"`
 	Id     int64 `json:"id"`
 }
+
+type FindLocationReq struct {
+	g.Meta  `path:"/task/location" method:"get" tags:"CpTask" summary:"查找地址"`
+	Address string `json:"address"`
+}

internal/application/cookiejar/jar.go

@@ -43,6 +43,11 @@ func (p *PersistCookieJar) SetCookies(u *url.URL, cookies []*http.Cookie) {
 			p.hostMap[host] = make(cookieMap)
 		}
 
+		// 检查并删除全局 cookie 中同名的 cookie
+		if globalCookies, exists := p.hostMap[""]; exists {
+			delete(globalCookies, cookie.Name)
+		}
+
 		// 查找是否存在相同 name, path 和 domain 的 cookie
 		existingCookies := p.hostMap[host][cookie.Name]
 		found := false
@@ -68,17 +73,21 @@ func (p *PersistCookieJar) Cookies(u *url.URL) []*http.Cookie {
 	defer p.RUnlock()
 
 	host := u.Host
-	if cookiesList, exists := p.hostMap[host]; exists {
-		result := make([]*http.Cookie, 0, len(cookiesList))
-		requestPath := u.Path
-		if requestPath == "" {
-			requestPath = "/"
-		}
+	requestPath := u.Path
+	if requestPath == "" {
+		requestPath = "/"
+	}
 
-		for _, cookies := range cookiesList {
+	result := make([]*http.Cookie, 0)
+	addedNames := make(map[string]bool)
+
+	// 先添加匹配 host 的 cookie
+	if cookiesList, exists := p.hostMap[host]; exists {
+		for cookieName, cookies := range cookiesList {
 			// 如果只有一个 cookie，直接返回
 			if len(cookies) == 1 {
 				result = append(result, cookies[0])
+				addedNames[cookieName] = true
 				continue
 			}
 
@@ -104,11 +113,50 @@ func (p *PersistCookieJar) Cookies(u *url.URL) []*http.Cookie {
 			// 如果找到匹配的，添加到结果中
 			if bestMatch != nil {
 				result = append(result, bestMatch)
+				addedNames[cookieName] = true
 			}
 		}
-		return result
 	}
-	return nil
+
+	// 再添加没有 host 的全局 cookie（避免重复）
+	if globalCookies, exists := p.hostMap[""]; exists {
+		for cookieName, cookies := range globalCookies {
+			// 如果该名称的 cookie 已经从 host 中添加了，跳过
+			if addedNames[cookieName] {
+				continue
+			}
+
+			// 如果只有一个 cookie，直接返回
+			if len(cookies) == 1 {
+				result = append(result, cookies[0])
+				continue
+			}
+
+			// 有多个同名 cookie，选择最匹配的
+			var bestMatch *http.Cookie
+			bestMatchLen := -1
+
+			for _, cookie := range cookies {
+				cookiePath := cookie.Path
+				if cookiePath == "" {
+					cookiePath = "/"
+				}
+
+				if pathMatch(requestPath, cookiePath) {
+					if len(cookiePath) > bestMatchLen {
+						bestMatch = cookie
+						bestMatchLen = len(cookiePath)
+					}
+				}
+			}
+
+			if bestMatch != nil {
+				result = append(result, bestMatch)
+			}
+		}
+	}
+
+	return result
 }
 
 // pathMatch 检查请求路径是否匹配 cookie 的 path
@@ -275,3 +323,30 @@ func (p *PersistCookieJar) DeserializeReader(reader io.Reader) {
 
 	p.hostMap = hostMap
 }
+
+// RemoveCookieInfo 将所有 host 的 cookie 移除 host 信息，存储为全局 cookie
+func (p *PersistCookieJar) RemoveCookieInfo() {
+	p.Lock()
+	defer p.Unlock()
+
+	// 确保全局 cookie map 存在
+	if _, exists := p.hostMap[""]; !exists {
+		p.hostMap[""] = make(cookieMap)
+	}
+
+	// 将所有 host 的 cookie 移动到全局
+	for host, hostCookies := range p.hostMap {
+		// 跳过全局 cookie 本身
+		if host == "" {
+			continue
+		}
+
+		// 将该 host 的所有 cookie 移动到全局
+		for cookieName, cookies := range hostCookies {
+			p.hostMap[""][cookieName] = cookies
+		}
+
+		// 删除该 host 的 cookie
+		delete(p.hostMap, host)
+	}
+}

internal/application/cpdaily/login/cas.go

@@ -450,6 +450,11 @@ func submitCasKickOut(ctx context.Context, requestUrl string, doc *goquery.Docum
 }
 
 func getCasValidLoginUrl(info *school.SchoolDetailInfo) string {
+	// 特殊学校单独处理
+	// 甘肃农业大学
+	if info.Id == "gsau" {
+		return info.IdsUrl
+	}
 	if strings.Contains(info.AmpUrl, "campusphere") || strings.Contains(info.AmpUrl, "wec-portal-mobile") {
 		return info.AmpUrl
 	} else if strings.Contains(info.AmpUrl2, "campusphere") || strings.Contains(info.AmpUrl2, "wec-portal-mobile") {

internal/application/cpdaily/login/common.go

@@ -14,6 +14,11 @@ import (
 )
 
 func ActivateSession(ctx context.Context, host string, client *resty.Client) {
+	// 处理cookie，干掉path
+	jar := client.CookieJar()
+	realJar := jar.(*cookiejar.PersistCookieJar)
+	realJar.RemoveCookieInfo()
+	client.SetCookieJar(realJar)
 	client.SetRedirectPolicy(resty.FlexibleRedirectPolicy(20))
 
 	host = strings.TrimSuffix(host, "/")

internal/application/cpdaily/map_info/map.go

@@ -0,0 +1,78 @@
+package map_info
+
+import (
+	"context"
+	"fmt"
+	"likedream-goframe/internal/application/httpclient"
+	"likedream-goframe/internal/common/errors"
+	"likedream-goframe/internal/utils"
+	"regexp"
+	"time"
+
+	"github.com/bytedance/sonic"
+	"github.com/samber/oops"
+)
+
+func SearchAddressLongitudeAndLatitude(ctx context.Context, address string) []MapPoi {
+	client := httpclient.Cpdaily.Clone(ctx).SetDoNotParseResponse(false)
+	// 首先访问获取ak
+	response, err := client.R().Get("https://lbsyun.baidu.com/jsdemo/demo/webgl0_5.htm")
+	utils.OkOrPanic(err, func(err error) error {
+		return oops.WithContext(ctx).With("url", "https://lbsyun.baidu.com/jsdemo/demo/webgl0_5.htm").In("SearchAddressLongitudeAndLatitude.GetAk").Wrap(err)
+	})
+	ak := ParseAkString(response.String())
+	timestamp := fmt.Sprintf("%d", time.Now().UnixMilli())
+	mapResponse, err := client.R().
+		SetQueryParams(map[string]string{
+			"qt":         "placesug",
+			"query":      address,
+			"callback":   "BMapGL._rd._cbk25241",
+			"region":     "131",
+			"city_limit": "false",
+			"t":          timestamp,
+			"from":       "jsapi",
+			"ak":         ak,
+			"v":          "gl",
+			"timeStamp":  timestamp,
+		}).
+		SetHeaders(map[string]string{
+			"Accept":          "*/*",
+			"Accept-Language": "zh-CN,zh;q=0.9",
+			"Connection":      "keep-alive",
+			"Referer":         "https://lbsyun.baidu.com/",
+			"User-Agent":      "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36",
+		}).
+		Get("https://api.map.baidu.com/")
+	utils.OkOrPanic(err, func(err error) error {
+		return oops.WithContext(ctx).With("address", address).In("SearchAddressLongitudeAndLatitude.QueryMap").Wrap(err)
+	})
+
+	// 从JSONP响应中提取JSON数据
+	str := ParseJsonpToJson(mapResponse.String())
+	var jsonData MapJSONData
+	sonic.Unmarshal([]byte(str), &jsonData)
+	return jsonData.Result.PoiList
+}
+
+// 正则提取ak // <script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=E4805d16520de693a3fe707cdc962045"></script>
+func ParseAkString(data string) string {
+	reg := regexp.MustCompile(`ak=([^"]+)`)
+	matches := reg.FindStringSubmatch(data)
+	if len(matches) < 2 {
+		utils.OkOrPanic(errors.NewBusinessError(500, "获取ak出错"))
+	}
+	return matches[1]
+}
+
+// 从JSONP响应中提取JSON数据
+// 输入: /**/BMapGL._rd._cbk25241 && BMapGL._rd._cbk25241({...})
+// 输出: {...}
+func ParseJsonpToJson(jsonpData string) string {
+	// 匹配 callback(json) 格式，提取括号中的内容
+	reg := regexp.MustCompile(`\((\{.*\})\)`)
+	matches := reg.FindStringSubmatch(jsonpData)
+	if len(matches) < 2 {
+		utils.OkOrPanic(errors.NewBusinessError(500, "解析JSONP数据出错"))
+	}
+	return matches[1]
+}

internal/application/cpdaily/map_info/map_test.go

@@ -0,0 +1,14 @@
+package map_info
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/gogf/gf/v2/os/gctx"
+)
+
+func TestMapSearch(t *testing.T) {
+	res := SearchAddressLongitudeAndLatitude(gctx.New(), "河北石油职业技术大学c座")
+	marshal, _ := json.Marshal(res)
+	t.Log(string(marshal))
+}

internal/application/cpdaily/map_info/model.go

@@ -0,0 +1,29 @@
+package map_info
+
+type MapJSONData struct {
+	Status  int       `json:"status"`
+	Message string    `json:"message"`
+	Result  MapResult `json:"result"`
+}
+type MapLocation struct {
+	Lat float64 `json:"lat"`
+	Lng float64 `json:"lng"`
+}
+type MapPoi struct {
+	Name     string        `json:"name"`
+	Location MapLocation   `json:"location"`
+	UID      string        `json:"uid"`
+	Province string        `json:"province"`
+	City     string        `json:"city"`
+	District string        `json:"district"`
+	Business string        `json:"business"`
+	Cityid   string        `json:"cityid"`
+	Tag      string        `json:"tag"`
+	Address  string        `json:"address"`
+	Children []interface{} `json:"children"`
+	Adcode   string        `json:"adcode"`
+}
+type MapResult struct {
+	Q       string   `json:"q"`
+	PoiList []MapPoi `json:"poi_list"`
+}

internal/application/cpdaily/task/formtype/form_item.go

@@ -15,4 +15,5 @@ type CpTaskFormItem struct {
 	Sort       uint                   `json:"sort,omitempty"`
 	CacheKey   string                 `json:"cacheKey,omitempty"`
 	Show       bool                   `json:"show,omitempty"`
+	Tip        string                 `json:"tip,omitempty"`
 }

internal/application/cpdaily/task/formtype/item_type.go

@@ -8,4 +8,5 @@ const (
 	ItemTypeMulti
 	ItemTypeImage
 	ItemTypeAddress
+	ItemTypeLatAndLon
 )

internal/application/cpdaily/task/sign.go

@@ -359,19 +359,27 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 	var list []*formtype.CpTaskFormItem
 
 	// 经纬度
+	//dto := &formtype.CpTaskFormItem{
+	//	Title:    "经度",
+	//	ColName:  "lon",
+	//	Type:     formtype.ItemTypeInput,
+	//	Required: true,
+	//}
+	//list = append(list, dto)
+	//
+	//dto = &formtype.CpTaskFormItem{
+	//	Title:    "纬度",
+	//	ColName:  "lat",
+	//	Type:     formtype.ItemTypeInput,
+	//	Required: true,
+	//}
+	//list = append(list, dto)
 	dto := &formtype.CpTaskFormItem{
-		Title:    "经度",
-		ColName:  "lon",
-		Type:     formtype.ItemTypeInput,
-		Required: true,
-	}
-	list = append(list, dto)
-
-	dto = &formtype.CpTaskFormItem{
-		Title:    "纬度",
-		ColName:  "lat",
-		Type:     formtype.ItemTypeInput,
+		Title:    "经纬度",
+		ColName:  "latAndLon",
+		Type:     formtype.ItemTypeLatAndLon,
 		Required: true,
+		Tip:      "您可以通过地址搜索签到经纬度，如果觉得不够准确可以自行修改",
 	}
 	list = append(list, dto)
 
@@ -380,6 +388,7 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 		ColName:  "address",
 		Type:     formtype.ItemTypeInput,
 		Required: true,
+		Tip:      "这个就是指签到完毕后查看时最底部那个最详细的地址信息哦",
 	}
 	list = append(list, dto)
 
@@ -389,6 +398,7 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 			ColName:  "signImg",
 			Type:     formtype.ItemTypeImage,
 			Required: true,
+			Tip:      "您可以上传多张图片，会顺序轮换更新的哦~",
 		}
 		list = append(list, dto)
 	}
@@ -410,6 +420,7 @@ func (c *CpdailyAutoSignTask) ParseFormJson(ctx context.Context, rawJson map[str
 				IsOtherItems: false,
 			},
 		},
+		Tip: "一般在学校就是选否，如果在外实习、请假之类的才选是",
 	}
 	list = append(list, dto)
 

internal/application/cpdaily/task/sleepcheck.go

@@ -435,19 +435,27 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 	var list []*formtype.CpTaskFormItem
 
 	// 经纬度
+	//dto := &formtype.CpTaskFormItem{
+	//	Title:    "经度",
+	//	ColName:  "lon",
+	//	Type:     formtype.ItemTypeInput,
+	//	Required: true,
+	//}
+	//list = append(list, dto)
+	//
+	//dto = &formtype.CpTaskFormItem{
+	//	Title:    "纬度",
+	//	ColName:  "lat",
+	//	Type:     formtype.ItemTypeInput,
+	//	Required: true,
+	//}
+	//list = append(list, dto)
 	dto := &formtype.CpTaskFormItem{
-		Title:    "经度",
-		ColName:  "lon",
-		Type:     formtype.ItemTypeInput,
-		Required: true,
-	}
-	list = append(list, dto)
-
-	dto = &formtype.CpTaskFormItem{
-		Title:    "纬度",
-		ColName:  "lat",
-		Type:     formtype.ItemTypeInput,
+		Title:    "经纬度",
+		ColName:  "latAndLon",
+		Type:     formtype.ItemTypeLatAndLon,
 		Required: true,
+		Tip:      "您可以通过地址搜索签到经纬度，如果觉得不够准确可以自行修改",
 	}
 	list = append(list, dto)
 	dto = &formtype.CpTaskFormItem{
@@ -455,6 +463,7 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 		ColName:  "address",
 		Type:     formtype.ItemTypeInput,
 		Required: true,
+		Tip:      "这个就是指签到完毕后查看时最底部那个最详细的地址信息哦",
 	}
 	list = append(list, dto)
 
@@ -464,6 +473,7 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 			ColName:  "signImg",
 			Type:     formtype.ItemTypeImage,
 			Required: true,
+			Tip:      "您可以上传多张图片，会顺序轮换更新的哦~",
 		}
 		list = append(list, dto)
 
@@ -486,6 +496,7 @@ func (c *CpdailySleepCheckTask) ParseFormJson(ctx context.Context, rawJson map[s
 				IsOtherItems: false,
 			},
 		},
+		Tip: "一般在学校就是选否，如果在外实习、请假之类的才选是",
 	}
 	list = append(list, dto)
 
@@ -514,6 +525,12 @@ func (c *CpdailySleepCheckTask) FillCustomForm(ctx context.Context, form map[str
 			lon = v.Content
 		case "address":
 			address = v.Content
+		case "latAndLon":
+			{
+				res := strings.Split(v.Content, ",")
+				lat, lon = res[0], res[1]
+			}
+
 		}
 	}
 

internal/controller/cpdaily/cptask_ctrlV1.go

@@ -3,6 +3,7 @@ package cpdaily
 import (
 	"context"
 	v1 "likedream-goframe/internal/api/v1"
+	"likedream-goframe/internal/application/cpdaily/map_info"
 	"likedream-goframe/internal/ent"
 	"likedream-goframe/internal/service"
 	"likedream-goframe/internal/utils"
@@ -11,6 +12,11 @@ import (
 type CpTaskCtrlV1 struct {
 }
 
+func (c CpTaskCtrlV1) FindLocation(ctx context.Context, req *v1.FindLocationReq) (res *utils.Response[any], err error) {
+	defer utils.Pass(&err)
+	return utils.SuccessWithData[any](map_info.SearchAddressLongitudeAndLatitude(ctx, req.Address)), nil
+}
+
 func (c CpTaskCtrlV1) List(ctx context.Context, req *v1.CpTaskListReq) (res *utils.Response[[]*ent.CpTask], err error) {
 	defer utils.Pass(&err)
 	return service.Global.CpTask.List(ctx, req), nil

internal/controller/cpdaily/i_cptask_ctrl.go

@@ -18,4 +18,5 @@ type ICpTaskCtrlV1 interface {
 	Delete(ctx context.Context, req *v1.DeleteTaskReq) (res *utils.Response[any], err error)
 	ExecuteNow(ctx context.Context, req *v1.ExecuteNowReq) (res *utils.Response[any], err error)
 	PauseTask(ctx context.Context, req *v1.PauseTaskReq) (res *utils.Response[any], err error)
+	FindLocation(ctx context.Context, req *v1.FindLocationReq) (res *utils.Response[any], err error)
 }

internal/framework/schedule/cpdaily_handler.go

@@ -12,7 +12,6 @@ import (
 	errors2 "likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/ent"
 	"likedream-goframe/internal/ent/cptask"
-	"likedream-goframe/internal/ent/cpuser"
 	"likedream-goframe/internal/framework/errors"
 	"likedream-goframe/internal/framework/logger"
 	"likedream-goframe/internal/framework/model/email"
@@ -23,7 +22,6 @@ import (
 	"time"
 
 	"github.com/bytedance/sonic"
-	"github.com/google/uuid"
 	"github.com/hibiken/asynq"
 	"github.com/samber/oops"
 	"go.uber.org/zap"
@@ -126,16 +124,18 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 	e = sonic.UnmarshalString(targetTask.FormData, &customFormItems)
 	utils.OkOrPanic(e, oops.WithContext(ctx).With("task_id", taskPayload.CpTaskID).In("CpdailyTask.ProcessTask").Wrap)
 
-	var deviceID string
-
-	switch targetTask.Edges.CpUser.MobileType {
-	case cpuser.MobileTypeRandom:
-		deviceID = uuid.NewString()
-	case cpuser.MobileTypeAuthorize:
-		deviceID = targetTask.Edges.CpUser.MobileCode
-	default:
-		utils.OkOrPanic(errors.NewBusinessErrorWithDetail(503, "不支持的设备类型", targetTask.Edges.CpUser.MobileType))
-	}
+	//var deviceID string
+	//
+	//switch targetTask.Edges.CpUser.MobileType {
+	//case cpuser.MobileTypeRandom:
+	//	deviceID = uuid.NewString()
+	//case cpuser.MobileTypeAuthorize:
+	//	deviceID = targetTask.Edges.CpUser.MobileCode
+	//default:
+	//	utils.OkOrPanic(errors.NewBusinessErrorWithDetail(503, "不支持的设备类型", targetTask.Edges.CpUser.MobileType))
+	//}
+	// 不管是否随机应该都从数据库取，因为就算是随机 数据库已经随机了一个设备id了
+	deviceID := targetTask.Edges.CpUser.MobileCode
 	// 固定获取图片id
 	imgId := GetNextImgId(customFormItems, targetTask.UsedImg)
 	submitForm := taskExecutor.FillCustomForm(ctx, cpdailyRealTask, customFormItems, deviceID, imgId)