更新

http/server.go

@@ -42,6 +42,7 @@ func (s *Server) Start() error {
 		mux.HandleFunc("/api/stats", s.handleStats)
 		mux.HandleFunc("/api/shield", s.handleShield)
 		mux.HandleFunc("/api/shield/hosts", s.handleShieldHosts)
+		mux.HandleFunc("/api/shield/blacklists", s.handleShieldBlacklists)
 		mux.HandleFunc("/api/query", s.handleQuery)
 		mux.HandleFunc("/api/status", s.handleStatus)
 		mux.HandleFunc("/api/config", s.handleConfig)
@@ -194,14 +195,21 @@ func (s *Server) handleHourlyStats(w http.ResponseWriter, r *http.Request) {
 func (s *Server) handleShield(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 
-	// 处理hosts管理子路由
-	if strings.HasPrefix(r.URL.Path, "/api/shield/hosts") {
-		s.handleShieldHosts(w, r)
-		return
+	// 返回屏蔽规则的基本配置信息
+	switch r.Method {
+	case http.MethodGet:
+		shieldInfo := map[string]interface{}{
+			"updateInterval": s.globalConfig.Shield.UpdateInterval,
+			"blockMethod":    s.globalConfig.Shield.BlockMethod,
+			"blacklistCount": len(s.globalConfig.Shield.Blacklists),
+		}
+		json.NewEncoder(w).Encode(shieldInfo)
+	default:
+		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
 	}
 
 	// 处理远程黑名单管理子路由
-	if strings.HasPrefix(r.URL.Path, "/api/shield/blacklists") {
+	if strings.HasPrefix(r.URL.Path, "/shield/blacklists") {
 		s.handleShieldBlacklists(w, r)
 		return
 	}
@@ -268,21 +276,26 @@ func (s *Server) handleShieldBlacklists(w http.ResponseWriter, r *http.Request)
 	// 处理更新单个黑名单
 	if strings.Contains(r.URL.Path, "/update") {
 		if r.Method == http.MethodPost {
-			// 提取黑名单ID
+			// 提取黑名单URL或Name
 			parts := strings.Split(r.URL.Path, "/")
-			var id string
+			var targetURLOrName string
 			for i, part := range parts {
 				if part == "blacklists" && i+1 < len(parts) && parts[i+1] != "update" {
-					id = parts[i+1]
+					targetURLOrName = parts[i+1]
 					break
 				}
 			}
 
+			if targetURLOrName == "" {
+				http.Error(w, "黑名单标识不能为空", http.StatusBadRequest)
+				return
+			}
+
 			// 获取黑名单列表
 			blacklists := s.shieldManager.GetBlacklists()
 			var targetIndex = -1
 			for i, list := range blacklists {
-				if list.URL == id || list.Name == id {
+				if list.URL == targetURLOrName || list.Name == targetURLOrName {
 					targetIndex = i
 					break
 				}
@@ -293,18 +306,13 @@ func (s *Server) handleShieldBlacklists(w http.ResponseWriter, r *http.Request)
 				return
 			}
 
-			// 尝试更新该黑名单
-			if err := s.shieldManager.fetchRemoteRules(blacklists[targetIndex].URL); err != nil {
-				// 更新失败，但不返回错误，而是更新状态
-				blacklists[targetIndex].LastUpdateTime = time.Now().Format(time.RFC3339)
-			} else {
-				// 更新成功
-				blacklists[targetIndex].LastUpdateTime = time.Now().Format(time.RFC3339)
-				// 重新加载规则
-				s.shieldManager.LoadRules()
-			}
-
+			// 更新时间戳
+			blacklists[targetIndex].LastUpdateTime = time.Now().Format(time.RFC3339)
+			// 保存更新后的黑名单列表
 			s.shieldManager.UpdateBlacklist(blacklists)
+			// 重新加载规则以获取最新的远程规则
+			s.shieldManager.LoadRules()
+
 			json.NewEncoder(w).Encode(map[string]string{"status": "success"})
 			return
 		}
@@ -372,8 +380,7 @@ func (s *Server) handleShieldBlacklists(w http.ResponseWriter, r *http.Request)
 		blacklists = append(blacklists, newEntry)
 		s.shieldManager.UpdateBlacklist(blacklists)
 
-		// 尝试获取规则
-		s.shieldManager.fetchRemoteRules(req.URL)
+		// 重新加载规则以获取新添加的远程规则
 		s.shieldManager.LoadRules()
 
 		json.NewEncoder(w).Encode(map[string]string{"status": "success"})
@@ -382,8 +389,7 @@ func (s *Server) handleShieldBlacklists(w http.ResponseWriter, r *http.Request)
 		// 更新所有远程黑名单
 		blacklists := s.shieldManager.GetBlacklists()
 		for i := range blacklists {
-			// 尝试更新每个黑名单
-			s.shieldManager.fetchRemoteRules(blacklists[i].URL)
+			// 更新每个黑名单的时间戳
 			blacklists[i].LastUpdateTime = time.Now().Format(time.RFC3339)
 		}