no message

controllers/yidong.go

@@ -25,22 +25,6 @@ func (this *BaseYidongController) GetToken() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	url := utils.YiDongZhengTongYunUrl + "oauth/token?grant_type=client_credentials&response_type=token&client_id=" + utils.YiDongZhengTongYunAppid + "&client_secret=" + utils.YiDongZhengTongYunSecret
-	method := "GET"
-
-	client := &http.Client{}
-	req, err := http.NewRequest(method, url, nil)
-
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	res, err := client.Do(req)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	defer res.Body.Close()
 
 	type Ydtoklen struct {
 		Success     string `json:"success"`
@@ -48,17 +32,36 @@ func (this *BaseYidongController) GetToken() {
 		AccessToken string `json:"access_token"`
 	}
 	var ydtoklen Ydtoklen
-	body, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	//fmt.Println(body)
-	err = json.Unmarshal(body, &ydtoklen)
-	if err != nil {
-		fmt.Println("Getres.PublicGetDate Err:", err.Error())
-	}
-	services.GetYiDongActivity()
+
+	//url := utils.YiDongZhengTongYunUrl + "oauth/token?grant_type=client_credentials&response_type=token&client_id=" + utils.YiDongZhengTongYunAppid + "&client_secret=" + utils.YiDongZhengTongYunSecret
+	//method := "GET"
+	//
+	//client := &http.Client{}
+	//req, err := http.NewRequest(method, url, nil)
+	//
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	//res, err := client.Do(req)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	//defer res.Body.Close()
+	//
+	//
+	//body, err := ioutil.ReadAll(res.Body)
+	//if err != nil {
+	//	fmt.Println(err)
+	//	return
+	//}
+	////fmt.Println(body)
+	//err = json.Unmarshal(body, &ydtoklen)
+	//if err != nil {
+	//	fmt.Println("Getres.PublicGetDate Err:", err.Error())
+	//}
+	//services.GetYiDongActivity()
 
 	//cacheKey := utils.YD_TOKEN
 	//utils.Rc.Put(cacheKey, ydtoklen.AccessToken, time.Second*7000)
@@ -194,11 +197,13 @@ func (this *BaseYidongController) UserList() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+
+	activityId := this.GetString("ActivityId")
 	cacheKey := utils.YD_TOKEN
 	Ydtoklen, _ := utils.Rc.RedisString(cacheKey)
 	url := "https://services-dev.valueonline.cn/interact/activityManageApi/getAttendPersonList?access_token=" + Ydtoklen
 	method := "POST"
-	payload := strings.NewReader(`{"activityId":"9395147645597532110"}`)
+	payload := strings.NewReader(`{"activityId":"` + activityId + `"}`)
 	client := &http.Client{}
 	req, err := http.NewRequest(method, url, payload)
 	if err != nil {

services/yidong.go

@@ -60,7 +60,6 @@ func GetActivityTypeIdWithYiDong(industrySwName string) (chartPermissionId int)
 		//研选
 	}
 	chartPermissionId = mapIndustrySwName[industrySwName]
-	fmt.Println(mapIndustrySwName)
 	return
 }
 
@@ -106,7 +105,6 @@ func GetActivityTypeNameWithYiDong(industrySwName string) (chartPermissionName s
 		//研选
 	}
 	chartPermissionName = mapIndustrySwName[industrySwName]
-	fmt.Println(mapIndustrySwName)
 	return
 }
 
@@ -140,7 +138,7 @@ func GetYiDongToken() (token string, err error) {
 		defer res.Body.Close()
 
 		type Ydtoklen struct {
-			Success     string `json:"success"`
+			Success     bool   `json:"success"`
 			ExpiresIn   int    `json:"expires_in"`
 			AccessToken string `json:"access_token"`
 		}
@@ -150,6 +148,7 @@ func GetYiDongToken() (token string, err error) {
 			err = errReq
 			return
 		}
+		fmt.Println(string(body))
 		errReq = json.Unmarshal(body, &ydtoklen)
 		if errReq != nil {
 			err = errReq
@@ -213,9 +212,12 @@ func GetYiDongActivity() (err error) {
 		utils.FileLog.Info(string(err.Error()))
 	}
 	mapOldYiDong := make(map[string]string)
+	mapOldYiDongBody := make(map[string]string)
 	for _, v := range OldActYIdongList {
 		mapOldYiDong[v.YidongActivityId] = v.YidongActivityId
+		mapOldYiDongBody[v.YidongActivityId] = fmt.Sprint(v.ActivityName, v.Label, v.ChartPermissionId, v.ActivityTime, v.DistinguishedGuest)
 	}
+	fmt.Println(mapOldYiDongBody)
 	var itemsAdd []*models.CygxActivity
 	if len(ApifoxModal.Result) > 0 {
 		actList := ApifoxModal.Result
@@ -231,10 +233,9 @@ func GetYiDongActivity() (err error) {
 			item.ChartPermissionName = GetActivityTypeNameWithYiDong(v.IndustrySwName)
 			item.ChartPermissionNames = GetActivityTypeNameWithYiDong(v.IndustrySwName)
 			item.ActivityTime = v.Start
-			item.ActivityTimeText = v.Start
+			item.ActivityTimeText = GetActivityTextTime(v.Start)
 			item.YidongActivityUrl = v.URL
-			item.DistinguishedGuest = "嘉宾"
-
+			fmt.Println(item.ActivityTimeText)
 			detailYidng, err := GetYiDongActivityDetail(v.ID)
 			if err != nil {
 				return err
@@ -252,6 +253,25 @@ func GetYiDongActivity() (err error) {
 					fmt.Println(err)
 					utils.FileLog.Info(string(err.Error()))
 				}
+			} else {
+				//如果内容主体有做变更，就修改内容
+				if mapOldYiDongBody[v.ID] != fmt.Sprint(item.ActivityName, item.Label, item.ChartPermissionId, item.ActivityTime, item.DistinguishedGuest) {
+					updateParams := make(map[string]interface{})
+					updateParams["ActivityName"] = item.ActivityName
+					updateParams["Label"] = item.Label
+					updateParams["TemporaryLabel"] = item.TemporaryLabel
+					updateParams["ChartPermissionId"] = item.ChartPermissionId
+					updateParams["ChartPermissionName"] = item.ChartPermissionName
+					updateParams["ChartPermissionNames"] = item.ChartPermissionNames
+					updateParams["ActivityTime"] = item.ActivityTime
+					updateParams["ActivityTimeText"] = item.ActivityTimeText
+					updateParams["YidongActivityUrl"] = item.YidongActivityUrl
+					whereParam := map[string]interface{}{"chart_id": item.YidongActivityId}
+					err = models.UpdateByExpr(models.CygxChart{}, whereParam, updateParams)
+					if err != nil {
+						return err
+					}
+				}
 			}
 		}
 
@@ -355,3 +375,43 @@ func GetYiDongCreateUserInfo(user *models.WxUserItem) (userTgc string, err error
 	userTgc = ApifoxModal.Result.Tgc
 	return
 }
+
+//处理易董这边过来的时间格式
+func GetActivityTextTime(timeYidong string) (timeText string) {
+	strTime := "2022-08-18 12:34:00"
+	startTime := utils.StrTimeToTime(strTime)
+	week := utils.StrDateTimeToWeek(strTime)
+	timeStrYmd := startTime.Format(utils.FormatDate)
+	timeStrHmm := startTime.Format(utils.FormatTime)
+	timeYmd := utils.StrTimeToTime(timeStrYmd + " 12:00:00") //拼接当天中午12点的时间
+	var amOrPm string
+	if startTime.After(timeYmd) {
+		amOrPm = " PM"
+	} else {
+		amOrPm = " AM"
+	}
+	timeText = timeStrYmd + "（" + week + "）" + timeStrHmm + amOrPm
+	return
+}
+
+func init() {
+	GetYiDongActivity()
+	//var timeText string
+	//strTime := "2022-08-18 12:34:00"
+	//startTime := utils.StrTimeToTime(strTime)
+	//week := utils.StrDateTimeToWeek(strTime)
+	//timeStrYmd := startTime.Format(utils.FormatDate)
+	//timeStrHmm := startTime.Format(utils.FormatTime)
+	//timeYmd := utils.StrTimeToTime(timeStrYmd + " 12:00:00") //拼接当天中午12点的时间
+	//var amOrPm string
+	//if startTime.After(timeYmd) {
+	//	amOrPm = " PM"
+	//} else {
+	//	amOrPm = " AM"
+	//}
+	//timeText = timeStrYmd + "（" + week + "）" + timeStrHmm
+	//fmt.Println(week)
+	//fmt.Println(amOrPm)
+	//fmt.Println(strTime)
+	//fmt.Println(timeText)
+}

utils/common.go

@@ -706,3 +706,20 @@ func GetLocalIP() (ip string, err error) {
 	}
 	return
 }
+
+//字符串类型时间转周几
+func StrDateTimeToWeek(strTime string) string {
+	var WeekDayMap = map[string]string{
+		"Monday":    "周一",
+		"Tuesday":   "周二",
+		"Wednesday": "周三",
+		"Thursday":  "周四",
+		"Friday":    "周五",
+		"Saturday":  "周六",
+		"Sunday":    "周日",
+	}
+	var ctime = StrTimeToTime(strTime).Format("2006-01-02")
+	startday, _ := time.Parse("2006-01-02", ctime)
+	staweek_int := startday.Weekday().String()
+	return WeekDayMap[staweek_int]
+}

utils/config.go

@@ -228,7 +228,7 @@ func init() {
 // YiDongApiConfig 易董开放api配置
 func YiDongApiConfig() {
 	if RunMode == "release" {
-		YiDongZhengTongYunUrl = "https://services.easy-board.com.cn/"
+		YiDongZhengTongYunUrl = "https://services.valueonline.cn/"
 		YiDongZhengTongYunAppid = "ca86a257ebb46fce"
 		YiDongZhengTongYunSecret = "338db2b2ca86a257ebb46fced9003f53"
 		YiDongHuaWeiYunUrl = "https://achievement.valueonline.cn/"