From db20e5efed0762ad61cffd222e7a883e5eba7104 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Tue, 14 Mar 2023 19:27:56 +0800 Subject: [PATCH 1/2] FIX: fix third-party login Change-Id: Ib4699ecec1a6c72a9bc4967751d07b75f6b52d3a Signed-off-by: Stone Li --- src/slic3r/GUI/HttpServer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/HttpServer.cpp b/src/slic3r/GUI/HttpServer.cpp index 1c2c27f1dd..44b6ffa4ea 100644 --- a/src/slic3r/GUI/HttpServer.cpp +++ b/src/slic3r/GUI/HttpServer.cpp @@ -48,8 +48,8 @@ std::string http_headers::get_response() std::string user_avatar; try { json user_j = json::parse(http_body); - if (user_j.contains("uid")) - user_id = std::to_string(user_j["uid"].get()); + if (user_j.contains("uidStr")) + user_id = user_j["uidStr"].get(); if (user_j.contains("name")) user_name = user_j["name"].get(); if (user_j.contains("avatar")) From d54bb63460bb05b28a9cfe1984765c21d8f0601c Mon Sep 17 00:00:00 2001 From: gerrit Date: Tue, 14 Mar 2023 20:00:57 +0800 Subject: [PATCH 2/2] ci: update build version to 01.05.00.61 Change-Id: I828de8c355151260da339acc75793f1d10f63ccf --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 399ebeda92..1dc25db428 100644 --- a/version.inc +++ b/version.inc @@ -11,4 +11,4 @@ if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "1") endif() -set(SLIC3R_VERSION "01.05.00.60") \ No newline at end of file +set(SLIC3R_VERSION "01.05.00.61")