修复一些错误，以在sk上运行

super1207 · Nov 12, 2023 · ad72529 · ad72529
1 parent 2ea42b3
commit ad72529
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/MiraiCQ/MiraiCQ/center/api.cpp b/src/MiraiCQ/MiraiCQ/center/api.cpp
@@ -62,6 +62,9 @@ static TER_TYPE normal_call(
 
 	MiraiNet::NetStruct json(new Json::Value);
 	fun1(json); // 用于构造要发给net的json
+	if (json->get("params", Json::nullValue).isNull()) {
+		(*json)["params"] = Json::objectValue;
+	}
 
 	MiraiNet::NetStruct ret_json = nullptr;
 	if (g_is_alone) 

diff --git a/src/MiraiCQ/MiraiCQ/mainprocess/mainprocess.cpp b/src/MiraiCQ/MiraiCQ/mainprocess/mainprocess.cpp
@@ -133,7 +133,7 @@ static void login_dlg_cb(Fl_Widget* o, void* p) {
 static bool login_dlg()
 {
 	LOGIN_INFO login_info;
-	Fl_Window win(300, 180, "MiraiCQ V2.4.2");
+	Fl_Window win(300, 180, "MiraiCQ V2.4.3");
 	win.begin();
 	login_info.ws_url = Config::get_instance()->get_ws_url();
 	login_info.access_token = Config::get_instance()->get_access_token();
@@ -450,7 +450,7 @@ static void ex_btn_cb(Fl_Widget* o, void* p)
 static void plus_dlg()
 {
 	//fl_register_images();
-	std::string str1 = StrTool::to_utf8("MiraiCQ插件管理V2.4.2 " + Config::get_instance()->get_name());
+	std::string str1 = StrTool::to_utf8("MiraiCQ插件管理V2.4.3 " + Config::get_instance()->get_name());
 	Fl_Double_Window win(508, 400, str1.c_str());
 	win.color(fl_rgb_color(0, 255, 255));
 	win.size_range(500, 400, 500, 400);

diff --git a/src/MiraiCQ/MiraiCQ/tool/StrTool.cpp b/src/MiraiCQ/MiraiCQ/tool/StrTool.cpp
@@ -141,6 +141,14 @@ int64_t StrTool::get_int64_from_json(const Json::Value& json, const std::string&
 	{
 		return json_value.asInt64();
 	}
+	else if (json_value.isString()) {
+		try {
+			return std::stoll(json_value.asString());
+		}
+		catch (const std::exception& e) {
+			return default_value;
+		}
+	}
 	return default_value;
 }