|
@@ -25,6 +25,7 @@ type HTMiniFacade struct {
|
|
|
type HTResponse struct {
|
|
|
Ret int
|
|
|
Msg string
|
|
|
+ Data string
|
|
|
ErrMsg string
|
|
|
ErrCode int
|
|
|
Success bool
|
|
@@ -54,8 +55,7 @@ func dealChartInfo(baseReq facade.BaseRequest) (request HTRequest, err error) {
|
|
|
}
|
|
|
return
|
|
|
}
|
|
|
-func parseResult(resp string) (err error) {
|
|
|
- var response HTResponse
|
|
|
+func parseResult(resp string) (response HTResponse, err error) {
|
|
|
err = json.Unmarshal([]byte(resp), &response)
|
|
|
if err != nil {
|
|
|
utils.FileLog.Error("收藏失败,解析应答失败:%v,应答结果:%s", err.Error(), resp)
|
|
@@ -77,7 +77,8 @@ func (ht *HTMiniFacade) Collect(req facade.BaseRequest) (err error) {
|
|
|
if err != nil {
|
|
|
utils.FileLog.Error("收藏失败,err:%v,resp:%v", err, resp)
|
|
|
}
|
|
|
- return parseResult(resp)
|
|
|
+ _, err = parseResult(resp)
|
|
|
+ return
|
|
|
}
|
|
|
func (ht *HTMiniFacade) UnCollect(req facade.BaseRequest) (err error) {
|
|
|
param, err := dealChartInfo(req)
|
|
@@ -90,20 +91,37 @@ func (ht *HTMiniFacade) UnCollect(req facade.BaseRequest) (err error) {
|
|
|
if err != nil {
|
|
|
utils.FileLog.Error("取消收藏失败,err:%v,resp:%v", err, resp)
|
|
|
}
|
|
|
- return parseResult(resp)
|
|
|
+ _, err = parseResult(resp)
|
|
|
+ return
|
|
|
+}
|
|
|
+
|
|
|
+type IsBookMarkd struct {
|
|
|
+ IsBookMarked bool
|
|
|
}
|
|
|
+
|
|
|
func (ht *HTMiniFacade) IsCollect(req facade.BaseRequest) bool {
|
|
|
param, err := dealChartInfo(req)
|
|
|
if err != nil {
|
|
|
utils.FileLog.Error("获取是否收藏失败,获取图表信息失败:%v", err.Error())
|
|
|
return false
|
|
|
}
|
|
|
- url := fmt.Sprintf("%s%s", utils.GetMiniUrl(target), unBookMarkUrl)
|
|
|
+ url := fmt.Sprintf("%s%s", utils.GetMiniUrl(target), checkBookMarkUrl)
|
|
|
resp, err := ht.Post(url, param, req.Auth)
|
|
|
if err != nil {
|
|
|
utils.FileLog.Error("获取是否收藏失败,err:%v,resp:%v", err, resp)
|
|
|
}
|
|
|
- return false
|
|
|
+ response, err := parseResult(resp)
|
|
|
+ if err != nil {
|
|
|
+ utils.FileLog.Error("获取是否收藏失败,解析应答失败:%v,应答结果:%s", err, resp)
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ var isBookMarkd IsBookMarkd
|
|
|
+ err = json.Unmarshal([]byte(response.Data), &isBookMarkd)
|
|
|
+ if err != nil {
|
|
|
+ utils.FileLog.Error("获取是否收藏失败,解析应答失败:%v,应答结果:%s", err, resp)
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ return isBookMarkd.IsBookMarked
|
|
|
}
|
|
|
func init() {
|
|
|
facade.RegisterMiniFacade(target, &HTMiniFacade{
|