elasticsearch 移除

bin/main.go

@@ -285,47 +285,8 @@ func main() {
 			}
 			return list
 		}
-		// 拼接基本查询条件
-		var addCondition = func(conditions *strings.Builder, key, column string) {
-			if values := QueryConditions(key); len(values) > 0 {
-				if conditions.Len() > 0 {
-					conditions.WriteString(" AND")
-				} else {
-					conditions.WriteString(" WHERE")
-				}
-				conditions.WriteString(fmt.Sprintf(" %s IN (%s)", column, strings.Join(values, ",")))
-			}
-		}
+
 		var conditions strings.Builder
-		// 如果是查询 text, 直接从 Elasticsearch 返回结果
-		var text_ids []string
-		if text := QueryConditions("text"); len(text) > 0 {
-			text_ids := models.ElasticsearchSearch(strings.Join(text, " ")).GetIDList(0, 0, 0, 0)
-			if len(text_ids) > 0 {
-				conditions.WriteString(fmt.Sprintf(" WHERE id IN (%s)", strings.Trim(strings.Replace(fmt.Sprint(text_ids), " ", ",", -1), "[]")))
-			} else {
-				// 直接返回空列表
-				var images ListView
-				images.Page, images.PageSize = stringToInt(r.URL.Query().Get("page"), 1), stringToInt(r.URL.Query().Get("pageSize"), 20)
-				images.Total = 0
-				images.Next = false
-				images.List = make([]interface{}, 0)
-				data, _ := json.MarshalIndent(images, "", "  ")
-				w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-				w.Write(data)
-				return
-			}
-			if conditions.Len() > 1024 {
-				log.Println("查询条件过长")
-				http.Error(w, err.Error(), http.StatusBadRequest)
-				return
-			}
-		} else {
-			addCondition(&conditions, "authors", "author")
-			addCondition(&conditions, "tags", "tag")
-			addCondition(&conditions, "categories", "categorie")
-			addCondition(&conditions, "sets", "sets")
-		}
 
 		// 获取图片列表
 		var images ListView
@@ -393,19 +354,6 @@ func main() {
 			image_list = image_list_sorted
 		}
 
-		// 如果使用了图像文字检索, 需要按照图像文字检索的相似度重新排序 text_ids
-		if len(text_ids) > 0 {
-			var image_list_sorted []Image
-			for _, id := range text_ids {
-				for _, image := range image_list {
-					if id == strconv.Itoa(image.Id) {
-						image_list_sorted = append(image_list_sorted, image)
-					}
-				}
-			}
-			image_list = image_list_sorted
-		}
-
 		// 用户ID, 文章ID
 		var user_ids []int
 		var article_ids []int