接口返回值结构调整

server.go

@@ -8,6 +8,7 @@ import (
 	qu "jygit.jydev.jianyu360.cn/data_processing/common_utils"
 	"net/http"
 	"reflect"
+	"time"
 )
 
 const HREF = "http://127.0.0.1:8091/%s"
@@ -23,13 +24,17 @@ type UserInfo struct {
 	Ids      []string `json:"ids"`
 }
 
-type ListInfo struct {
+type Result struct {
+	Msg  string `json:"msg"`
+	Err  int    `json:"err"`
+	Data Data   `json:"data"`
+}
+
+type Data struct {
 	List  []map[string]interface{} `json:"list"`
 	Total int                      `json:"total"`
 }
 
-type Result map[string]interface{}
-
 var (
 	//User map[string]interface{} //user对象
 	User *UserInfo //user对象
@@ -83,37 +88,34 @@ func (a *App) ServerActionUserLogout() map[string]interface{} {
 }
 
 // ServerActionCodeList 获取爬虫列表
-func (a *App) ServerActionCodeList(param map[string]interface{}) map[string]interface{} {
+func (a *App) ServerActionCodeList(param map[string]interface{}) Result {
 	qu.Debug("param---", param)
-	data := &ListInfo{}
-	var msg string
-	var err int
+	data := &Result{}
 	if User != nil {
 		formatUser(param)
 		qu.Debug("param---", param)
 		getResult(data, param, "getcodes")
 	} else {
-		msg = "用户登录异常，请重新登录！"
-		err = 1
-		qu.Debug(msg)
-	}
-	return map[string]interface{}{
-		"msg":  msg,
-		"err":  err,
-		"data": data,
-	}
+		data.Msg = "用户登录异常，请重新登录！"
+		data.Err = 1
+		qu.Debug(data.Msg)
+	}
+	return *data
+	//return map[string]interface{}{
+	//	"msg":  msg,
+	//	"err":  err,
+	//	"data": data,
+	//}
 }
 
 // ServerActionGetModifyUsers 获取爬虫开发人员列表
-func (a *App) ServerActionGetModifyUsers() map[string]interface{} {
-	data := &ListInfo{}
-	var msg string
-	var err int
+func (a *App) ServerActionGetModifyUsers() Result {
+	data := &Result{}
 	if User != nil && User.Auth > 1 { //禁止开发查询
 		getResult(data, nil, "getmodifyusers")
 		if len(User.Ids) > 0 && User.Identity == 0 { //外包审核员或管理员只能查看外包开发人员信息
 			resultUsers := []map[string]interface{}{}
-			for _, user := range data.List {
+			for _, user := range data.Data.List {
 				userid := qu.ObjToString(user["_id"])
 				for _, id := range User.Ids {
 					if userid == id {
@@ -122,92 +124,75 @@ func (a *App) ServerActionGetModifyUsers() map[string]interface{} {
 					}
 				}
 			}
-			data.List = resultUsers
-			data.Total = len(resultUsers)
+			data.Data.List = resultUsers
+			data.Data.Total = len(resultUsers)
 		}
 	} else {
-		msg = "查询开发列表失败"
-		err = 1
-		qu.Debug(msg)
-	}
-
-	return map[string]interface{}{
-		"msg":  msg,
-		"err":  err,
-		"data": data,
+		data.Msg = "查询开发列表失败"
+		data.Err = 1
 	}
+	return *data
 }
 
 // ServerActionClaimCodes 爬虫认领
-func (a *App) ServerActionClaimCodes() map[string]interface{} {
-	msg := "认领失败！"
-	err := 1
+func (a *App) ServerActionClaimCodes() Result {
 	data := &Result{}
 	if User.Auth == 1 {
 		param := map[string]interface{}{}
 		formatUser(param)
 		getResult(data, param, "claimcode")
-		if tmpMsg := (*data)["msg"]; tmpMsg != nil {
-			msg = qu.ObjToString(tmpMsg)
-			err = 0
-		}
-	}
-	return map[string]interface{}{
-		"msg":  msg,
-		"err":  err,
-		"data": nil,
+	} else {
+		data.Msg = "认领失败！"
+		data.Err = 1
 	}
+	return *data
 }
 
 // ServerActionUpdateCode 爬虫更新
 func (a *App) ServerActionUpdateCode(param []map[string]interface{}) map[string]interface{} {
 	qu.Debug("param---", param)
-	data := map[string]interface{}{}
-	//
-	//[
-	//	{
-	//		"query":{},
-	//		"set":{}
-	//	},
-	//	{}
-	//]
 
+	////[
+	////	[
+	////		{
+	////			"query":{},
+	////			"set":{}
+	////		},
+	////	],
+	////	[
+	////		{
+	////			"query":{},
+	////			"set":{}
+	////		},
+	////	],
+	////]
+	//data := &Result{}
 	//var msg string
 	//var err int
 	//arr := [][]map[string]interface{}{}
 	//for _, tmp := range param {
-	//	query := tmp["query"]
-	//	set := tmp["set"]
+	//	query, _ := tmp["query"].(map[string]interface{})
+	//	set, _ := tmp["set"].(map[string]interface{})
 	//	if query == nil || set == nil {
 	//		msg = "更新条件错误！"
 	//		err = 1
 	//		break
 	//	}
-	//	update:=[]map[string]interface{}{
+	//	update := []map[string]interface{}{
 	//		query,
+	//		set,
 	//	}
+	//	arr = append(arr, update)
 	//}
 	//
-	//getResult(data, param, "updatecode")
+	//getResult(data, arr, "updatecode")
 	//
-	//update := []map[string]interface{}{
-	//	{"code": ""},
-	//	{"$set": map[string]interface{}{
-	//		"state": 1,
-	//	}},
-	//}
-	//arr := [][]map[string]interface{}{}
-	//arr = append(arr, update)
-	//result := map[string]interface{}{
-	//	"update": arr,
+	//return map[string]interface{}{
+	//	"msg":  "",
+	//	"err":  0,
+	//	"data": data,
 	//}
-	////1、更新css选择器
-	////2、更新爬虫状态
-	return map[string]interface{}{
-		"msg":  "",
-		"err":  0,
-		"data": data,
-	}
+	return map[string]interface{}{}
 }
 
 // 格式化User对象
@@ -225,7 +210,7 @@ func formatUser(tmp map[string]interface{}) {
 }
 
 // 获取接口结果
-func getResult(result interface{}, param map[string]interface{}, route string) {
+func getResult(result, param interface{}, route string) {
 	jsonData, err := json.Marshal(param)
 	if err != nil {
 		qu.Debug("Error marshaling request:", err)
@@ -239,7 +224,9 @@ func getResult(result interface{}, param map[string]interface{}, route string) {
 	// 设置请求头
 	req.Header.Set("Content-Type", "application/json")
 	// 发送请求
-	client := &http.Client{}
+	client := &http.Client{
+		Timeout: 10 * time.Second,
+	}
 	resp, err := client.Do(req)
 	if err != nil {
 		qu.Debug("Error sending request:", err)