GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-21 04:23:15 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: use old slicer_uuid for client_id

Browse Source 
Change-Id: I6c45e83213d613fc28eef04115f9cfb19dea703e
Jira: none
This commit is contained in:
chunmao.guo 2024-03-05 13:37:28 +08:00 committed by Lane.Wei
parent e7ffe31cb3
commit 5ed48bbb08
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libslic3r/AppConfig.cpp
View File

@ -343,13 +343,6 @@ void AppConfig::set_defaults()
set_str("print", "timelapse", "1"); set_str("print", "timelapse", "1");
} }
if (get("client_id").empty()) {
boost::uuids::uuid uuid = boost::uuids::random_generator()();
auto client_id = boost::uuids::to_string(uuid);
boost::algorithm::replace_all(client_id, "-", "");
set("client_id", client_id);
}
// Remove legacy window positions/sizes // Remove legacy window positions/sizes
erase("app", "main_frame_maximized"); erase("app", "main_frame_maximized");
erase("app", "main_frame_pos"); erase("app", "main_frame_pos");

8
src/slic3r/GUI/MediaFilePanel.cpp
View File

@ -211,8 +211,6 @@ MediaFilePanel::~MediaFilePanel()
SetMachineObject(nullptr); SetMachineObject(nullptr);
} }
wxString hide_id_middle_string(wxString const &str, size_t offset = 0, size_t length = -1);
void MediaFilePanel::SetMachineObject(MachineObject* obj) void MediaFilePanel::SetMachineObject(MachineObject* obj)
{ {
std::string machine = obj ? obj->dev_id : ""; std::string machine = obj ? obj->dev_id : "";
@ -476,7 +474,7 @@ void MediaFilePanel::fetchUrl(boost::weak_ptr<PrinterFileSystem> wfs)
url += "&device=" + m_machine; url += "&device=" + m_machine;
url += "&net_ver=" + agent_version; url += "&net_ver=" + agent_version;
url += "&dev_ver=" + m_dev_ver; url += "&dev_ver=" + m_dev_ver;
url += "&cli_id=" + wxGetApp().app_config->get("client_id"); url += "&cli_id=" + wxGetApp().app_config->get("slicer_uuid");
url += "&cli_ver=" + std::string(SLIC3R_VERSION); url += "&cli_ver=" + std::string(SLIC3R_VERSION);
fs->SetUrl(url); fs->SetUrl(url);
return; return;
@ -503,10 +501,10 @@ void MediaFilePanel::fetchUrl(boost::weak_ptr<PrinterFileSystem> wfs)
url += "&device=" + m; url += "&device=" + m;
url += "&net_ver=" + v; url += "&net_ver=" + v;
url += "&dev_ver=" + dv; url += "&dev_ver=" + dv;
url += "&cli_id=" + wxGetApp().app_config->get("client_id"); url += "&cli_id=" + wxGetApp().app_config->get("slicer_uuid");
url += "&cli_ver=" + std::string(SLIC3R_VERSION); url += "&cli_ver=" + std::string(SLIC3R_VERSION);
} }
BOOST_LOG_TRIVIAL(info) << "MediaFilePanel::fetchUrl: camera_url: " << hide_id_middle_string(hide_passwd(url, {"authkey=", "passwd="}), 9, 20); BOOST_LOG_TRIVIAL(info) << "MediaFilePanel::fetchUrl: camera_url: " << hide_passwd(url, {"?uid=", "authkey=", "passwd="});
CallAfter([=] { CallAfter([=] {
boost::shared_ptr fs(wfs.lock()); boost::shared_ptr fs(wfs.lock());
if (!fs || fs != m_image_grid->GetFileSystem()) return; if (!fs || fs != m_image_grid->GetFileSystem()) return;

6
src/slic3r/GUI/MediaPlayCtrl.cpp
View File

@ -282,7 +282,7 @@ void MediaPlayCtrl::Play()
url += "&device=" + m_machine; url += "&device=" + m_machine;
url += "&net_ver=" + agent_version; url += "&net_ver=" + agent_version;
url += "&dev_ver=" + m_dev_ver; url += "&dev_ver=" + m_dev_ver;
url += "&cli_id=" + wxGetApp().app_config->get("client_id"); url += "&cli_id=" + wxGetApp().app_config->get("slicer_uuid");
url += "&cli_ver=" + std::string(SLIC3R_VERSION); url += "&cli_ver=" + std::string(SLIC3R_VERSION);
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: " << hide_passwd(hide_id_middle_string(url, url.find(m_lan_ip), m_lan_ip.length()), {m_lan_passwd}); BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: " << hide_passwd(hide_id_middle_string(url, url.find(m_lan_ip), m_lan_ip.length()), {m_lan_passwd});
m_url = url; m_url = url;
@ -325,7 +325,7 @@ void MediaPlayCtrl::Play()
url += "&device=" + into_u8(m); url += "&device=" + into_u8(m);
url += "&net_ver=" + v; url += "&net_ver=" + v;
url += "&dev_ver=" + dv; url += "&dev_ver=" + dv;
url += "&cli_id=" + wxGetApp().app_config->get("client_id"); url += "&cli_id=" + wxGetApp().app_config->get("slicer_uuid");
url += "&cli_ver=" + std::string(SLIC3R_VERSION); url += "&cli_ver=" + std::string(SLIC3R_VERSION);
} }
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: " << hide_id_middle_string(hide_passwd(url, {"authkey=", "passwd="}), 9, 20) << "tutk_state: " << m_tutk_state; BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: " << hide_id_middle_string(hide_passwd(url, {"authkey=", "passwd="}), 9, 20) << "tutk_state: " << m_tutk_state;
@ -558,7 +558,7 @@ void MediaPlayCtrl::ToggleStream()
url += "&device=" + m; url += "&device=" + m;
url += "&net_ver=" + v; url += "&net_ver=" + v;
url += "&dev_ver=" + dv; url += "&dev_ver=" + dv;
url += "&cli_id=" + wxGetApp().app_config->get("client_id"); url += "&cli_id=" + wxGetApp().app_config->get("slicer_uuid");
url += "&cli_ver=" + std::string(SLIC3R_VERSION); url += "&cli_ver=" + std::string(SLIC3R_VERSION);
} }
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::ToggleStream: " << hide_id_middle_string(hide_passwd(url, {"authkey=", "passwd="}), 9, 20); BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::ToggleStream: " << hide_id_middle_string(hide_passwd(url, {"authkey=", "passwd="}), 9, 20);