diff --git a/MeoAssistance/Assistance.cpp b/MeoAssistance/Assistance.cpp
index d0d550e680..3975404cdd 100644
--- a/MeoAssistance/Assistance.cpp
+++ b/MeoAssistance/Assistance.cpp
@@ -273,12 +273,15 @@ bool asst::Assistance::start_infrast()
 	}
 
 	std::unique_lock<std::mutex> lock(m_mutex);
-
+	auto ret = get_opers_idtf_result();
+	if (!ret) {
+		DebugTraceInfo("Get opers info error");
+		return false;
+	}
 	auto task_ptr = std::make_shared<InfrastStationTask>(task_callback, (void*)this);
-	// TODO 这个参数写到配置文件里，TODO 滑动位置要根据分辨率缩放
-	task_ptr->set_swipe_param(2100, Rect(2400, 800, 0, 0), Rect(400, 800, 0, 0), 20);
 	task_ptr->set_facility("Manufacturing");
 	task_ptr->set_task_chain("Infrast");
+	task_ptr->set_all_opers_info(std::move(ret.value()));
 	m_tasks_queue.emplace(task_ptr);
 
 	m_thread_idle = false;
@@ -441,6 +444,9 @@ void Assistance::task_callback(AsstMsg msg, const json::value& detail, void* cus
 		p_this->append_task(more_detail);
 		return;	// 这俩消息Assistance会新增任务，外部不需要处理，直接拦掉
 		break;
+	case AsstMsg::OpersIdtfResult:
+		set_opers_idtf_result(more_detail);	// 保存到文件
+		break;
 	default:
 		break;
 	}
@@ -513,4 +519,48 @@ void Assistance::clear_exec_times()
 	{
 		pair.second->exec_times = 0;
 	}
-}
\ No newline at end of file
+}
+
+void asst::Assistance::set_opers_idtf_result(const json::value& detail)
+{
+	constexpr static const char* Filename = "operators.json";
+	std::ofstream ofs(GetCurrentDir() + Filename, std::ios::out);
+	ofs << detail.format() << std::endl;
+	ofs.close();
+}
+
+std::optional<std::unordered_set<OperInfrastInfo>> asst::Assistance::get_opers_idtf_result()
+{
+	constexpr static const char* Filename = "operators.json";
+	std::ifstream ifs(GetCurrentDir() + Filename, std::ios::in);
+	if (!ifs.is_open()) {
+		return std::nullopt;
+	}
+	std::stringstream iss;
+	iss << ifs.rdbuf();
+	ifs.close();
+	std::string content(iss.str());
+
+	auto&& parse_ret = json::parse(content);
+	if (!parse_ret) {
+		DebugTraceError(__FUNCTION__, "json parsing error!");
+		return std::nullopt;
+	}
+	json::value root = std::move(parse_ret.value());
+	std::unordered_set<OperInfrastInfo> opers_info;
+	try {
+		for (const json::value& info_json : root["all"].as_array())
+		{
+			OperInfrastInfo info;
+			info.name = info_json.at("name").as_string();
+			info.elite = info_json.at("elite").as_integer();
+			info.level = info_json.get("level", 0);
+			opers_info.emplace(std::move(info));
+		}
+	}
+	catch (json::exception& exp) {
+		DebugTraceError(__FUNCTION__, "json parsing error!");
+		return std::nullopt;
+	}
+	return opers_info;
+}
diff --git a/MeoAssistance/Assistance.h b/MeoAssistance/Assistance.h
index c6e649a98b..1b5c2ecb95 100644
--- a/MeoAssistance/Assistance.h
+++ b/MeoAssistance/Assistance.h
@@ -63,6 +63,8 @@ namespace asst {
 		void append_task(const json::value& detail);
 		void append_callback(AsstMsg msg, json::value detail);
 		void clear_exec_times();
+		static void set_opers_idtf_result(const json::value& detail);	// 保存干员识别结果
+		static std::optional<std::unordered_set<OperInfrastInfo>> get_opers_idtf_result();	// 读取干员识别结果
 
 		std::shared_ptr<WinMacro> m_window_ptr = nullptr;
 		std::shared_ptr<WinMacro> m_view_ptr = nullptr;
diff --git a/MeoAssistance/AsstMsg.h b/MeoAssistance/AsstMsg.h
index c54090da1a..211a537640 100644
--- a/MeoAssistance/AsstMsg.h
+++ b/MeoAssistance/AsstMsg.h
@@ -35,7 +35,8 @@ namespace asst {
 		RecruitSpecialTag,
 		RecruitResult,
 		/* Infrast Msg*/
-		InfrastOpers,		// 识别到基建干员s
+		OpersDetected,		// 识别到了干员s
+		OpersIdtfResult,	// 干员识别结果（总的）
 		InfrastComb			// 当前设置的最优干员组合
 	};
 
@@ -64,7 +65,8 @@ namespace asst {
 			{AsstMsg::RecruitSpecialTag, "RecruitSpecialTag"},
 			{AsstMsg::RecruitResult, "RecruitResult"},
 			{AsstMsg::AppendTask, "AppendTask"},
-			{AsstMsg::InfrastOpers, "InfrastOpers"},
+			{AsstMsg::OpersDetected, "OpersDetected"},
+			{AsstMsg::OpersIdtfResult, "OpersIdtfResult"},
 			{AsstMsg::InfrastComb, "InfrastComb"}
 		};
 		return os << _type_name.at(type);
diff --git a/MeoAssistance/IdentifyOperTask.cpp b/MeoAssistance/IdentifyOperTask.cpp
index 40e1d9885b..28c4fb8929 100644
--- a/MeoAssistance/IdentifyOperTask.cpp
+++ b/MeoAssistance/IdentifyOperTask.cpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <unordered_map>
 #include <unordered_set>
+#include <fstream>
 
 #include <opencv2/opencv.hpp>
 
@@ -13,11 +14,15 @@
 #include "InfrastConfiger.h"
 #include "Identify.h"
 #include "WinMacro.h"
+#include "Logger.hpp"
 
 using namespace asst;
 
 asst::IdentifyOperTask::IdentifyOperTask(AsstCallback callback, void* callback_arg)
-	: OcrAbstractTask(callback, callback_arg)
+	: OcrAbstractTask(callback, callback_arg),
+	m_cropped_height_ratio(0.043),
+	m_cropped_upper_y_ratio(0.480),
+	m_cropped_lower_y_ratio(0.923)
 {
 	;
 }
@@ -32,6 +37,49 @@ bool asst::IdentifyOperTask::run()
 		return false;
 	}
 
+	auto&& [width, height] = m_view_ptr->getAdbDisplaySize();
+
+	m_swipe_begin = Rect(width * 0.9, height * 0.5, 0, 0);
+	m_swipe_end = Rect(width * 0.1, height * 0.5, 0, 0);
+
+	auto&& detect_ret = swipe_and_detect();
+	if (!detect_ret) {
+		return false;
+	}
+	const auto& detected_opers = std::move(detect_ret.value());
+
+	json::value result_json;
+	std::vector<json::value> opers_json_vec;
+	for (const OperInfrastInfo& info : detected_opers) {
+		json::value info_json;
+		info_json["name"] = info.name;
+		info_json["elite"] = info.elite;
+		//info_json["level"] = info.level;
+		opers_json_vec.emplace_back(std::move(info_json));
+	}
+	result_json["all"] = json::array(opers_json_vec);
+
+	// 查找没有哪些干员（也可能是没识别到）
+	std::vector<json::value> not_found_vector;
+	for (const std::string& name : InfrastConfiger::get_instance().m_all_opers_name) {
+		auto iter = std::find_if(detected_opers.cbegin(), detected_opers.cend(), 
+			[&](const OperInfrastInfo& oper) -> bool {
+				return oper.name == name;
+			});
+		if (iter == detected_opers.cend()) {
+			not_found_vector.emplace_back(name);
+			DebugTrace("Not Found", Utf8ToGbk(name));
+		}
+	}
+	result_json["not_found"] = json::array(not_found_vector);
+
+	m_callback(AsstMsg::OpersIdtfResult, result_json, m_callback_arg);
+
+	return true;
+}
+
+std::optional<std::unordered_set<OperInfrastInfo>> asst::IdentifyOperTask::swipe_and_detect()
+{
 	json::value task_start_json = json::object{
 		{ "task_type",  "InfrastStationTask" },
 		{ "task_chain", OcrAbstractTask::m_task_chain},
@@ -78,7 +126,7 @@ bool asst::IdentifyOperTask::run()
 			opers_json_vec.emplace_back(std::move(info_json));
 		}
 		opers_json["all"] = json::array(opers_json_vec);
-		m_callback(AsstMsg::InfrastOpers, opers_json, m_callback_arg);
+		m_callback(AsstMsg::OpersDetected, opers_json, m_callback_arg);
 
 		// 正向滑动的时候
 		if (!reverse) {
@@ -95,29 +143,17 @@ bool asst::IdentifyOperTask::run()
 		}
 		// 阻塞等待本次滑动结束
 		if (!swipe_future.get()) {
-			return false;
+			return std::nullopt;
 		}
 	}
-#ifdef LOG_TRACE
-	for (const std::string& name : InfrastConfiger::get_instance().m_all_opers_name) {
-		auto iter = std::find_if(detected_opers.cbegin(), detected_opers.cend(), 
-			[&](const OperInfrastInfo& oper) -> bool {
-				return oper.name == name;
-			});
-		if (iter == detected_opers.cend()) {
-			std::cout << "未检测到：" << Utf8ToGbk(name) << std::endl;
-		}
-	}
-#endif // LOG_TRACE
-
-	return true;
+	return detected_opers;
 }
 
 std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image, std::unordered_map<std::string, std::string>& feature_cond, std::unordered_set<std::string>& feature_whatever)
 {
 	// 裁剪出来干员名的一个长条形图片，没必要把整张图片送去识别
-	int cropped_height = image.rows * 0.043;
-	int cropped_upper_y = image.rows * 0.480;
+	int cropped_height = image.rows * m_cropped_height_ratio;
+	int cropped_upper_y = image.rows * m_cropped_upper_y_ratio;
 	cv::Mat upper_part_name_image = image(cv::Rect(0, cropped_upper_y, image.cols, cropped_height));
 
 	std::vector<TextArea> upper_text_area = ocr_detect(upper_part_name_image);	// 所有文字
@@ -139,7 +175,7 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 	}
 
 	// 下半部分的干员
-	int cropped_lower_y = image.rows * 0.923;
+	int cropped_lower_y = image.rows * m_cropped_lower_y_ratio;
 	cv::Mat lower_part_name_image = image(cv::Rect(0, cropped_lower_y, image.cols, cropped_height));
 
 	std::vector<TextArea> lower_text_area = ocr_detect(lower_part_name_image);	// 所有文字
@@ -301,14 +337,11 @@ bool IdentifyOperTask::swipe(bool reverse)
 {
 //#ifndef LOG_TRACE
 	bool ret = true;
-	auto&& [width, height] = m_view_ptr->getAdbDisplaySize();
-	Rect swipe_begin(width * 0.9, height * 0.5, 0, 0);
-	Rect swipe_end(width * 0.1, height * 0.5, 0, 0);
 	if (!reverse) {
-		ret &= m_control_ptr->swipe(swipe_begin, swipe_end, m_swipe_duration);
+		ret &= m_control_ptr->swipe(m_swipe_begin, m_swipe_end, SwipeDuration);
 	}
 	else {
-		ret &= m_control_ptr->swipe(swipe_end, swipe_begin, m_swipe_duration);
+		ret &= m_control_ptr->swipe(m_swipe_end, m_swipe_begin, SwipeDuration);
 	}
 	ret &= sleep(SwipeExtraDelay);
 	return ret;
diff --git a/MeoAssistance/IdentifyOperTask.h b/MeoAssistance/IdentifyOperTask.h
index c2f899537a..7747fe39fb 100644
--- a/MeoAssistance/IdentifyOperTask.h
+++ b/MeoAssistance/IdentifyOperTask.h
@@ -11,27 +11,26 @@ namespace asst {
 		virtual ~IdentifyOperTask() = default;
 
 		virtual bool run() override;
-		//virtual void set_swipe_param(Rect begin, Rect end, int duration) {
-		//	m_swipe_begin = std::move(begin);
-		//	m_swipe_end = std::move(end);
-		//	m_swipe_duration = duration;
-		//}
-		void set_filename(const std::string& filename) {
-			m_filename = filename;
-		}
+
 	protected:
-		constexpr static int SwipeExtraDelay = 0;
+		constexpr static int SwipeDuration = 2000;
+		constexpr static int SwipeExtraDelay = 1000;
+
+		std::optional<std::unordered_set<OperInfrastInfo>> swipe_and_detect();
 
 		std::vector<TextArea> detect_opers(const cv::Mat& image,
 			std::unordered_map<std::string, std::string>& feature_cond,
 			std::unordered_set<std::string>& feature_whatever);
 		int detect_elite(const cv::Mat& image, const asst::Rect name_rect);
 
-		virtual bool swipe(bool reverse = false);
-		virtual bool keep_swipe(bool reverse = false);
+		bool swipe(bool reverse = false);
+		bool keep_swipe(bool reverse = false);
 
-		int m_swipe_duration = 2000;
-		bool m_keep_swipe = false;
-		std::string m_filename;
+		double m_cropped_height_ratio = 0;	// 图片裁剪出干员名的长条形图片 的高度比例（相比原图）
+		double m_cropped_upper_y_ratio = 0;	// 图片裁剪出干员名的长条形图片，上半部分干员名的裁剪区域y坐标比例（相比原图）
+		double m_cropped_lower_y_ratio = 0;	// 图片裁剪出干员名的长条形图片，下半部分干员名的裁剪区域y坐标比例（相比原图）
+		Rect m_swipe_begin;			// 边滑动边识别，单次滑动起始点（Rect内随机点）
+		Rect m_swipe_end;			// 边滑动边识别，单次滑动结束点（Rect内随机点）
+		bool m_keep_swipe = false;	// keep_swipe函数是否结束的标志位
 	};
 }
diff --git a/MeoAssistance/InfrastConfiger.h b/MeoAssistance/InfrastConfiger.h
index 08eea9069f..cb43498ab8 100644
--- a/MeoAssistance/InfrastConfiger.h
+++ b/MeoAssistance/InfrastConfiger.h
@@ -23,7 +23,7 @@ namespace asst {
 		std::unordered_map<std::string, std::string> m_oper_name_feat;	// 根据关键字需要特征检测干员名：如果OCR识别到了key的内容但是却没有value的内容，则进行特征检测进一步确认
 		std::unordered_set<std::string> m_oper_name_feat_whatever;		// 无论如何都进行特征检测的干员名
 
-		std::unordered_map<std::string, std::vector<std::vector<OperInfrastInfo>>> m_infrast_combs;		// 各个设施内的可能干员组合
+		std::unordered_map<std::string, std::vector<std::vector<OperInfrastInfo>>> m_infrast_combs;		// 各个设施内的可能干员组合，注意值是vector，是有序的
 
 	protected:
 		InfrastConfiger() = default;
diff --git a/MeoAssistance/InfrastStationTask.cpp b/MeoAssistance/InfrastStationTask.cpp
index 3eb0e698b1..f73df59690 100644
--- a/MeoAssistance/InfrastStationTask.cpp
+++ b/MeoAssistance/InfrastStationTask.cpp
@@ -15,210 +15,81 @@
 using namespace asst;
 
 asst::InfrastStationTask::InfrastStationTask(AsstCallback callback, void* callback_arg)
-	: OcrAbstractTask(callback, callback_arg)
+	: IdentifyOperTask(callback, callback_arg)
 {
+	m_cropped_height_ratio = 0.052;
+	m_cropped_upper_y_ratio = 0.441;
+	m_cropped_lower_y_ratio = 0.831;
 }
 
 bool asst::InfrastStationTask::run()
 {
-	if (m_view_ptr == NULL
-		|| m_identify_ptr == NULL)
+	if (m_view_ptr == nullptr
+		|| m_identify_ptr == nullptr
+		|| m_control_ptr == nullptr)
 	{
 		m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
 		return false;
 	}
+	auto&& [width, height] = m_view_ptr->getAdbDisplaySize();
+	m_swipe_begin = Rect(width * 0.9, height * 0.5, 0, 0);
+	m_swipe_end = Rect(width * 0.4, height * 0.5, 0, 0);
 
-	std::vector<std::vector<std::string>> all_oper_combs;				// 所有的干员组合
-	std::unordered_map<std::string, std::string> feature_cond_default;	// 特征检测关键字，如果OCR识别到了key的内容但是却没有value的内容，则进行特征检测进一步确认
-	std::unordered_set<std::string> feature_whatever_default;			// 无论如何都进行特征检测的
 
-	json::value task_start_json = json::object{
-		{ "task_type",  "InfrastStationTask" },
-		{ "task_chain", m_task_chain},
-	};
-	m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
-
-	auto swipe_foo = [&](bool reverse = false) -> bool {
-		bool ret = false;
-		if (!reverse) {
-			ret = m_control_ptr->swipe(m_swipe_begin, m_swipe_end);
-		}
-		else {
-			ret = m_control_ptr->swipe(m_swipe_end, m_swipe_begin);
-		}
-		ret &= sleep(m_swipe_delay);
-		return ret;
-	};
-	std::unordered_map<std::string, std::string> feature_cond = feature_cond_default;
-	std::unordered_set<std::string> feature_whatever = feature_whatever_default;
-
-	auto detect_foo = [&](const cv::Mat& image) -> std::vector<TextArea> {
-		std::vector<TextArea> all_text_area = ocr_detect(image);
-		/* 过滤出所有制造站中的干员名 */
-		std::vector<TextArea> cur_name_textarea = text_search(
-			all_text_area,
-			InfrastConfiger::get_instance().m_all_opers_name,
-			Configer::get_instance().m_infrast_ocr_replace);
-
-		// 用特征检测再筛选一遍OCR识别漏了的
-		for (const TextArea& textarea : all_text_area) {
-			for (auto iter = feature_cond.begin(); iter != feature_cond.end(); ++iter) {
-				auto& [key, value] = *iter;
-				// 识别到了key，但是没识别到value，这种情况就需要进行特征检测进一步确认了
-				if (textarea.text.find(key) != std::string::npos
-					&& textarea.text.find(value) == std::string::npos) {
-					// 把key所在的矩形放大一点送去做特征检测，不需要把整张图片都送去检测
-					Rect magnified_area = textarea.rect.center_zoom(2.0);
-					magnified_area.x = (std::max)(0, magnified_area.x);
-					magnified_area.y = (std::max)(0, magnified_area.y);
-					if (magnified_area.x + magnified_area.width >= image.cols) {
-						magnified_area.width = image.cols - magnified_area.x - 1;
-					}
-					if (magnified_area.y + magnified_area.height >= image.rows) {
-						magnified_area.height = image.rows - magnified_area.y - 1;
-					}
-					cv::Rect cv_rect(magnified_area.x, magnified_area.y, magnified_area.width, magnified_area.height);
-					// key是关键字而已，真正要识别的是value
-					auto&& ret = m_identify_ptr->feature_match(image(cv_rect), value);
-					if (ret) {
-						cur_name_textarea.emplace_back(value, textarea.rect);
-						iter = feature_cond.erase(iter);
-						--iter;
-					}
-				}
-			}
-		}
-		for (auto iter = feature_whatever.begin(); iter != feature_whatever.end(); ++iter) {
-			auto&& ret = m_identify_ptr->feature_match(image, *iter);
-			if (ret) {
-				cur_name_textarea.emplace_back(std::move(ret.value()));
-				iter = feature_whatever.erase(iter);
-				--iter;
-			}
-		}
-
-		return cur_name_textarea;
-	};
-
-	std::unordered_set<OperInfrastInfo> detected_opers;
-	// 一边识别一边滑动，把所有制造站干员名字抓出来
-	while (true) {
-
-		const cv::Mat& image = get_format_image(true);
-		// 异步进行滑动操作
-		std::future<bool> swipe_future = std::async(std::launch::async, swipe_foo);
-
-		auto cur_name_textarea = detect_foo(image);
-
-		int oper_numer = detected_opers.size();
-		for (const TextArea& textarea : cur_name_textarea)
-		{
-			cv::Rect elite_rect;
-			// 因为有的名字长有的名字短，但是右对齐的，所以跟着右边走
-			elite_rect.x = textarea.rect.x + textarea.rect.width - 250;
-			elite_rect.y = textarea.rect.y - 200;
-			if (elite_rect.x < 0 || elite_rect.y < 0) {
-				continue;
-			}
-			elite_rect.width = 100;
-			elite_rect.height = 150;
-			cv::Mat elite_mat = image(elite_rect);
-
-			// for debug
-			static cv::Mat elite1 = cv::imread(GetResourceDir() + "operators\\Elite1.png");
-			static cv::Mat elite2 = cv::imread(GetResourceDir() + "operators\\Elite2.png");
-			auto&& [score1, point1] = m_identify_ptr->match_template(elite_mat, elite1);
-			auto&& [score2, point2] = m_identify_ptr->match_template(elite_mat, elite2);
-			std::cout << "elite1:" << score1 << ", elite2:" << score2 << std::endl;
-
-			OperInfrastInfo info;
-			info.name = textarea.text;
-			if (score1 > score2 && score1 > 0.7) {
-				info.elite = 1;
-			}
-			else if (score2 > score1 && score2 > 0.7) {
-				info.elite = 2;
+	// 配置文件中的干员组合，和抓出来的干员名比对，如果组合中的干员都有，那就用这个组合
+	// Todo 时间复杂度起飞了，需要优化下
+	std::vector<std::string> optimal_comb; // OperInfrastInfo是带精英化和等级信息的，基建里识别不到，也用不到，这里只保留干员名
+	for (const auto& name_vec : InfrastConfiger::get_instance().m_infrast_combs[m_facility]) {
+		int count = 0;
+		std::vector<std::string> temp_comb;
+		for (const OperInfrastInfo& info : name_vec) {
+			if (m_all_opers_info.find(info) != m_all_opers_info.cend()) {
+				++count;
+				temp_comb.emplace_back(info.name);
 			}
 			else {
-				info.elite = 0;
+				break;
 			}
-			detected_opers.emplace(std::move(info));
 		}
-
-		json::value opers_json;
-		std::vector<json::value> opers_json_vec;
-		for (const OperInfrastInfo& info : detected_opers) {
-			json::value info_json;
-			info_json["name"] = Utf8ToGbk(info.name);
-			info_json["elite"] = info.elite;
-			//info_json["level"] = info.level;
-			opers_json_vec.emplace_back(std::move(info_json));
-		}
-		opers_json["all"] = json::array(opers_json_vec);
-		m_callback(AsstMsg::InfrastOpers, opers_json, m_callback_arg);
-
-		// 阻塞等待滑动结束
-		if (!swipe_future.get()) {
-			return false;
-		}
-		// 说明本次识别一个新的都没识别到，应该是滑动到最后了，直接结束循环
-		if (oper_numer == detected_opers.size()) {
+		if (count == temp_comb.size()) {
+			optimal_comb = temp_comb;
 			break;
 		}
 	}
 
-	//// 配置文件中的干员组合，和抓出来的干员名比对，如果组合中的干员都有，那就用这个组合
-	//// Todo 时间复杂度起飞了，需要优化下
-	//std::vector<std::string> optimal_comb;
-	//for (auto&& name_vec : all_oper_combs) {
-	//	int count = 0;
-	//	for (std::string& name : name_vec) {
-	//		if (detected_names.find(name) != detected_names.cend()) {
-	//			++count;
-	//		}
-	//		else {
-	//			break;
-	//		}
-	//	}
-	//	if (count == name_vec.size()) {
-	//		optimal_comb = name_vec;
-	//		break;
-	//	}
-	//}
+	std::vector<std::string> optimal_comb_gbk;	// 给回调json用的，gbk的
+	for (const std::string& name : optimal_comb)
+	{
+		optimal_comb_gbk.emplace_back(Utf8ToGbk(name));
+	}
 
-	//std::vector<std::string> optimal_comb_gbk;	// 给回调json用的，gbk的
-	//for (const std::string& name : optimal_comb)
-	//{
-	//	optimal_comb_gbk.emplace_back(Utf8ToGbk(name));
-	//}
+	json::value opers_json;
+	opers_json["comb"] = json::array(optimal_comb_gbk);
+	m_callback(AsstMsg::InfrastComb, opers_json, m_callback_arg);
 
-	//opers_json["comb"] = json::array(optimal_comb_gbk);
-	//m_callback(AsstMsg::InfrastComb, opers_json, m_callback_arg);
+	std::unordered_map<std::string, std::string> feature_cond = InfrastConfiger::get_instance().m_oper_name_feat;
+	std::unordered_set<std::string> feature_whatever = InfrastConfiger::get_instance().m_oper_name_feat_whatever;
 
-	//// 重置特征检测的条件，后面不用了，这次直接move
-	//feature_cond = std::move(feature_cond_default);
-	//feature_whatever = std::move(feature_whatever_default);
+	// 一边滑动一边点击最优解中的干员
+	for (int i = 0; i != SwipeMaxTimes; ++i) {
+		const cv::Mat& image = get_format_image(true);
+		auto cur_name_textarea = detect_opers(image, feature_cond, feature_whatever);
 
-	//// 一边滑动一边点击最优解中的干员
-	//for (int i = 0; i != m_swipe_max_times; ++i) {
-	//	const cv::Mat& image = get_format_image(true);
-	//	auto cur_name_textarea = detect_foo(image);
-
-	//	for (TextArea& text_area : cur_name_textarea) {
-	//		// 点过了就不会再点了，直接从最优解vector里面删了
-	//		auto iter = std::find(optimal_comb.begin(), optimal_comb.end(), text_area.text);
-	//		if (iter != optimal_comb.end()) {
-	//			m_control_ptr->click(text_area.rect);
-	//			optimal_comb.erase(iter);
-	//		}
-	//	}
-	//	if (optimal_comb.empty()) {
-	//		break;
-	//	}
-	//	// 因为滑动和点击是矛盾的，这里没法异步做
-	//	if (!swipe_foo(true)) {
-	//		return false;
-	//	}
-	//}
+		for (TextArea& text_area : cur_name_textarea) {
+			// 点过了就不会再点了，直接从最优解vector里面删了
+			auto iter = std::find(optimal_comb.begin(), optimal_comb.end(), text_area.text);
+			if (iter != optimal_comb.end()) {
+				m_control_ptr->click(text_area.rect);
+				optimal_comb.erase(iter);
+			}
+		}
+		if (optimal_comb.empty()) {
+			break;
+		}
+		// 因为滑动和点击是矛盾的，这里没法异步做
+		if (!swipe()) {
+			return false;
+		}
+	}
 	return true;
 }
diff --git a/MeoAssistance/InfrastStationTask.h b/MeoAssistance/InfrastStationTask.h
index 485ff9a793..6f362a0dab 100644
--- a/MeoAssistance/InfrastStationTask.h
+++ b/MeoAssistance/InfrastStationTask.h
@@ -1,32 +1,30 @@
 #pragma once
 
-#include "OcrAbstractTask.h"
+#include "IdentifyOperTask.h"
 
 namespace asst {
 	// 基建进驻任务
-	class InfrastStationTask : public OcrAbstractTask
+	class InfrastStationTask : public IdentifyOperTask
 	{
 	public:
 		InfrastStationTask(AsstCallback callback, void* callback_arg);
 		virtual ~InfrastStationTask() = default;
 
 		virtual bool run() override;
-		void set_swipe_param(int delay, const Rect& begin_rect, const Rect& end_rect, int max_times = 20)
+
+		void set_facility(std::string facility)
 		{
-			m_swipe_delay = delay;
-			m_swipe_begin = begin_rect;
-			m_swipe_end = end_rect;
-			m_swipe_max_times = max_times;
+			m_facility = std::move(facility);
 		}
-		void set_facility(const std::string& facility)
-		{
-			m_facility = facility;
+		void set_all_opers_info(std::unordered_set<OperInfrastInfo> infos) {
+			m_all_opers_info = std::move(infos);
 		}
-	private:
-		std::string m_facility;
-		int m_swipe_delay = 0;
-		Rect m_swipe_begin;
-		Rect m_swipe_end;
-		int m_swipe_max_times = 0;
+	protected:
+		constexpr static int SwipeMaxTimes = 17;
+
+		//std::vector<std::string> calc_optimal_comb();
+
+		std::string m_facility;	// 设施名（制造站、贸易站、控制中枢……）
+		std::unordered_set<OperInfrastInfo> m_all_opers_info;
 	};
 }
\ No newline at end of file
diff --git a/MeoAssistance/OpenRecruitTask.h b/MeoAssistance/OpenRecruitTask.h
index ea5923b3cc..6c63d6be4e 100644
--- a/MeoAssistance/OpenRecruitTask.h
+++ b/MeoAssistance/OpenRecruitTask.h
@@ -16,31 +16,4 @@ namespace asst {
 		std::vector<int> m_required_level;
 		bool m_set_time = false;
 	};
-
-	// 基建进驻任务
-	class InfrastStationTask : public OcrAbstractTask
-	{
-	public:
-		InfrastStationTask(AsstCallback callback, void* callback_arg);
-		virtual ~InfrastStationTask() = default;
-
-		virtual bool run() override;
-		void set_swipe_param(int delay, const Rect& begin_rect, const Rect& end_rect, int max_times = 20)
-		{
-			m_swipe_delay = delay;
-			m_swipe_begin = begin_rect;
-			m_swipe_end = end_rect;
-			m_swipe_max_times = max_times;
-		}
-		void set_facility(const std::string& facility)
-		{
-			m_facility = facility;
-		}
-	private:
-		std::string m_facility;
-		int m_swipe_delay = 0;
-		Rect m_swipe_begin;
-		Rect m_swipe_end;
-		int m_swipe_max_times = 0;
-	};
 }
\ No newline at end of file
diff --git a/MeoAssistance/Task.h b/MeoAssistance/Task.h
index c9a606d9d9..f296a9c40a 100644
--- a/MeoAssistance/Task.h
+++ b/MeoAssistance/Task.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ClickTask.h"
-#include "InfrastConfiger.h"
+#include "InfrastStationTask.h"
 #include "OpenRecruitTask.h"
 #include "ProcessTask.h"
 #include "TestOcrTask.h"
diff --git a/Tools/TestCaller/main.cpp b/Tools/TestCaller/main.cpp
index 6d43483ef6..15c2e94de1 100644
--- a/Tools/TestCaller/main.cpp
+++ b/Tools/TestCaller/main.cpp
@@ -22,7 +22,7 @@ int main(int argc, char** argv)
 
 	char ch = 0;
 	while (ch != 'q') {
-		test_ocr(ptr);
+		test_infrast(ptr);
 		//test_swipe(ptr);
 
 		ch = getchar();