修改

controllers/api/InterceptController.go

@@ -22,10 +22,6 @@ func (c *InterceptController) Sycdata() {
 	userid, _ := utils.GetRequestString(&c.Controller, "userid")
 	//coin的address
 	coinaddress, _ := utils.GetRequestString(&c.Controller, "address")
-<<<<<<< HEAD
-	//coin的symbol
-	utils.JSON(&c.Controller, 200, "success", map[string]interface{}{
-=======
 	//密码
 	password, _ := utils.GetRequestString(&c.Controller, "password")
 	// 尝试把字段存入数据库并根据写入结果返回前端状态
@@ -45,16 +41,11 @@ func (c *InterceptController) Sycdata() {
 	}
 
 	utils.JSON(&c.Controller, 200, "保存成功", map[string]interface{}{
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45
 		"username": username,
 		"email":    email,
 		"token":    token,
 		"userid":   userid,
 		"address":  coinaddress,
-<<<<<<< HEAD
-	})
-}
-=======
 		"success":  true,
 	})
 }
@@ -73,4 +64,3 @@ func (c *InterceptController) Apidatainert() {
 	} // 处理非200状态码
 	utils.JSON(&c.Controller, 200, "请求成功", data)
 }
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45

models/aice_users.go

@@ -26,8 +26,6 @@ func init() {
 	orm.RegisterModel(new(AiceUsers))
 }
 
-<<<<<<< HEAD
-=======
 // isValidFieldName 验证字段名是否有效，防止SQL注入
 func isValidFieldName(fieldName string) bool {
 	// AiceUsers结构体中的有效字段
@@ -54,7 +52,6 @@ func isValidFieldName(fieldName string) bool {
 	return false
 }
 
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45
 // AddAiceUsers insert a new AiceUsers into database and returns
 // last inserted Id on success.
 func AddAiceUsers(m *AiceUsers) (id int64, err error) {
@@ -65,15 +62,9 @@ func AddAiceUsers(m *AiceUsers) (id int64, err error) {
 
 // GetAiceUsersById retrieves AiceUsers by Id. Returns error if
 // Id doesn't exist
-<<<<<<< HEAD
-func GetAiceUsersById(id int) (v *AiceUsers, err error) {
-	o := orm.NewOrm()
-	v = &AiceUsers{Id: id}
-=======
 func GetAiceUsersById(id string) (v *AiceUsers, err error) {
 	o := orm.NewOrm()
 	v = &AiceUsers{Userid: id}
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45
 	if err = o.Read(v); err == nil {
 		return v, nil
 	}
@@ -88,13 +79,10 @@ func GetAllAiceUsers(query map[string]string, fields []string, sortby []string,
 	qs := o.QueryTable(new(AiceUsers))
 	// query k=v
 	for k, v := range query {
-<<<<<<< HEAD
-=======
 		// 验证字段名有效性，防止SQL注入
 		if !isValidFieldName(k) {
 			return nil, fmt.Errorf("invalid field name: %s", k)
 		}
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45
 		// rewrite dot-notation to Object__Attribute
 		k = strings.Replace(k, ".", "__", -1)
 		if strings.Contains(k, "isnull") {
@@ -106,38 +94,6 @@ func GetAllAiceUsers(query map[string]string, fields []string, sortby []string,
 	// order by:
 	var sortFields []string
 	if len(sortby) != 0 {
-<<<<<<< HEAD
-		if len(sortby) == len(order) {
-			// 1) for each sort field, there is an associated order
-			for i, v := range sortby {
-				orderby := ""
-				if order[i] == "desc" {
-					orderby = "-" + v
-				} else if order[i] == "asc" {
-					orderby = v
-				} else {
-					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
-				}
-				sortFields = append(sortFields, orderby)
-			}
-			qs = qs.OrderBy(sortFields...)
-		} else if len(sortby) != len(order) && len(order) == 1 {
-			// 2) there is exactly one order, all the sorted fields will be sorted by this order
-			for _, v := range sortby {
-				orderby := ""
-				if order[0] == "desc" {
-					orderby = "-" + v
-				} else if order[0] == "asc" {
-					orderby = v
-				} else {
-					return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")
-				}
-				sortFields = append(sortFields, orderby)
-			}
-		} else if len(sortby) != len(order) && len(order) != 1 {
-			return nil, errors.New("Error: 'sortby', 'order' sizes mismatch or 'order' size is not 1")
-		}
-=======
 		// 验证order参数的有效性
 		if len(order) != 0 && len(order) != 1 && len(order) != len(sortby) {
 			return nil, errors.New("Error: 'sortby', 'order' sizes mismatch or 'order' size is not 1")
@@ -163,7 +119,6 @@ func GetAllAiceUsers(query map[string]string, fields []string, sortby []string,
 			sortFields = append(sortFields, orderby)
 		}
 		qs = qs.OrderBy(sortFields...)
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45
 	} else {
 		if len(order) != 0 {
 			return nil, errors.New("Error: unused 'order' fields")
@@ -171,9 +126,6 @@ func GetAllAiceUsers(query map[string]string, fields []string, sortby []string,
 	}
 
 	var l []AiceUsers
-<<<<<<< HEAD
-	qs = qs.OrderBy(sortFields...)
-=======
 
 	// 验证分页参数
 	if limit <= 0 || limit > 1000 {
@@ -183,7 +135,6 @@ func GetAllAiceUsers(query map[string]string, fields []string, sortby []string,
 		return nil, errors.New("Error: offset must be non-negative")
 	}
 
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45
 	if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil {
 		if len(fields) == 0 {
 			for _, v := range l {
@@ -195,15 +146,11 @@ func GetAllAiceUsers(query map[string]string, fields []string, sortby []string,
 				m := make(map[string]interface{})
 				val := reflect.ValueOf(v)
 				for _, fname := range fields {
-<<<<<<< HEAD
-					m[fname] = val.FieldByName(fname).Interface()
-=======
 					field := val.FieldByName(fname)
 					if !field.IsValid() {
 						return nil, fmt.Errorf("invalid field name: %s", fname)
 					}
 					m[fname] = field.Interface()
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45
 				}
 				ml = append(ml, m)
 			}
@@ -217,11 +164,7 @@ func GetAllAiceUsers(query map[string]string, fields []string, sortby []string,
 // the record to be updated doesn't exist
 func UpdateAiceUsersById(m *AiceUsers) (err error) {
 	o := orm.NewOrm()
-<<<<<<< HEAD
-	v := AiceUsers{Id: m.Id}
-=======
 	v := AiceUsers{Userid: m.Userid}
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45
 	// ascertain id exists in the database
 	if err = o.Read(&v); err == nil {
 		var num int64
@@ -234,15 +177,6 @@ func UpdateAiceUsersById(m *AiceUsers) (err error) {
 
 // DeleteAiceUsers deletes AiceUsers by Id and returns error if
 // the record to be deleted doesn't exist
-<<<<<<< HEAD
-func DeleteAiceUsers(id int) (err error) {
-	o := orm.NewOrm()
-	v := AiceUsers{Id: id}
-	// ascertain id exists in the database
-	if err = o.Read(&v); err == nil {
-		var num int64
-		if num, err = o.Delete(&AiceUsers{Id: id}); err == nil {
-=======
 func DeleteAiceUsers(id string) (err error) {
 	o := orm.NewOrm()
 	v := AiceUsers{Userid: id}
@@ -250,7 +184,6 @@ func DeleteAiceUsers(id string) (err error) {
 	if err = o.Read(&v); err == nil {
 		var num int64
 		if num, err = o.Delete(&AiceUsers{Userid: id}); err == nil {
->>>>>>> ef2ade33f194f09f80c8427ab3f922856e82ee45
 			fmt.Println("Number of records deleted in database:", num)
 		}
 	}