接口修改

.gitignore

@@ -7,3 +7,4 @@ bin
 *.log
 */bin
 .idea
+.db

server.go

@@ -38,7 +38,7 @@ func (a *App) ServerActionUserLogin(param map[string]interface{}) map[string]int
 	qu.Debug("param---", param)
 	User = &UserInfo{}
 	//User = map[string]interface{}{}
-	GetResult(User, param, "login")
+	getResult(User, param, "login")
 	qu.Debug("user:", *User)
 	if User.ID == "" {
 		return map[string]interface{}{
@@ -87,18 +87,9 @@ func (a *App) ServerActionCodeList(param map[string]interface{}) map[string]inte
 	var msg string
 	var err int
 	if User != nil {
-		v := reflect.ValueOf(User)
-		if v.Kind() == reflect.Ptr {
-			v = v.Elem()
-		}
-		t := v.Type()
-		for i := 0; i < v.NumField(); i++ {
-			field := t.Field(i).Tag.Get("json")
-			value := v.Field(i).Interface()
-			param[field] = value
-		}
+		formatUser(param)
 		qu.Debug("param---", param)
-		GetResult(data, param, "getcodes")
+		getResult(data, param, "getcodes")
 	} else {
 		msg = "用户登录异常，请重新登录！"
 		err = 1
@@ -117,8 +108,8 @@ func (a *App) ServerActionGetModifyUsers() map[string]interface{} {
 	var msg string
 	var err int
 	if User != nil && User.Auth > 1 { //禁止开发查询
-		GetResult(data, nil, "getmodifyusers")
-		if len(User.Ids) > 0 { //外包审核员或管理员只能查看外包开发人员信息
+		getResult(data, nil, "getmodifyusers")
+		if len(User.Ids) > 0 && User.Identity == 0 { //外包审核员或管理员只能查看外包开发人员信息
 			resultUsers := []map[string]interface{}{}
 			for _, user := range data.List {
 				userid := qu.ObjToString(user["_id"])
@@ -152,19 +143,8 @@ func (a *App) ServerActionClaimCodes() map[string]interface{} {
 	data := map[string]interface{}{}
 	if User.Auth == 0 {
 		param := map[string]interface{}{}
-		userByte, _ := json.Marshal(User)
-		json.Unmarshal(userByte, &param)
-		//v := reflect.ValueOf(User)
-		//if v.Kind() == reflect.Ptr {
-		//	v = v.Elem()
-		//}
-		//t := v.Type()
-		//for i := 0; i < v.NumField(); i++ {
-		//	field := t.Field(i).Tag.Get("json")
-		//	value := v.Field(i).Interface()
-		//	param[field] = value
-		//}
-		GetResult(data, param, "claimcode")
+		formatUser(param)
+		getResult(data, param, "claimcode")
 		if tmpMsg := data["msg"]; tmpMsg != nil {
 			msg = qu.ObjToString(tmpMsg)
 			err = 0
@@ -178,9 +158,49 @@ func (a *App) ServerActionClaimCodes() map[string]interface{} {
 }
 
 // ServerActionUpdateCode 爬虫更新
-func (a *App) ServerActionUpdateCode(param map[string]interface{}) map[string]interface{} {
+func (a *App) ServerActionUpdateCode(param []map[string]interface{}) map[string]interface{} {
+	qu.Debug("param---", param)
 	data := map[string]interface{}{}
-	GetResult(data, param, "updatecode")
+	//
+	//[
+	//	{
+	//		"query":{},
+	//		"set":{}
+	//	},
+	//	{}
+	//]
+
+	//var msg string
+	//var err int
+	//arr := [][]map[string]interface{}{}
+	//for _, tmp := range param {
+	//	query := tmp["query"]
+	//	set := tmp["set"]
+	//	if query == nil || set == nil {
+	//		msg = "更新条件错误！"
+	//		err = 1
+	//		break
+	//	}
+	//	update:=[]map[string]interface{}{
+	//		query,
+	//	}
+	//}
+	//
+	//getResult(data, param, "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,
+	//}
+	////1、更新css选择器
+	////2、更新爬虫状态
 	return map[string]interface{}{
 		"msg":  "",
 		"err":  0,
@@ -188,7 +208,8 @@ func (a *App) ServerActionUpdateCode(param map[string]interface{}) map[string]in
 	}
 }
 
-func formatUser(user map[string]interface{}) {
+// 格式化User对象
+func formatUser(tmp map[string]interface{}) {
 	v := reflect.ValueOf(User)
 	if v.Kind() == reflect.Ptr {
 		v = v.Elem()
@@ -197,11 +218,12 @@ func formatUser(user map[string]interface{}) {
 	for i := 0; i < v.NumField(); i++ {
 		field := t.Field(i).Tag.Get("json")
 		value := v.Field(i).Interface()
-		user[field] = value
+		tmp[field] = value
 	}
 }
 
-func GetResult(result interface{}, param map[string]interface{}, route string) {
+// 获取接口结果
+func getResult(result interface{}, param map[string]interface{}, route string) {
 	jsonData, err := json.Marshal(param)
 	if err != nil {
 		qu.Debug("Error marshaling request:", err)