From df6c72beffbb1d80e742f77f700589c37a6a56ac Mon Sep 17 00:00:00 2001 From: gerrit Date: Wed, 6 Mar 2024 10:48:26 +0800 Subject: [PATCH] ci: update network module based on commit 542ced8 Change-Id: I3ad5032cc56a99d1c3a687b2891d147b13af066d --- src/slic3r/Utils/bambu_networking.hpp | 29 +++++++++++---------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/slic3r/Utils/bambu_networking.hpp b/src/slic3r/Utils/bambu_networking.hpp index b91b4d382..cccb312d9 100644 --- a/src/slic3r/Utils/bambu_networking.hpp +++ b/src/slic3r/Utils/bambu_networking.hpp @@ -94,7 +94,8 @@ namespace BBL { #define BAMBU_NETWORK_LIBRARY "bambu_networking" #define BAMBU_NETWORK_AGENT_NAME "bambu_network_agent" -#define BAMBU_NETWORK_AGENT_VERSION "01.07.09.02" + +#define BAMBU_NETWORK_AGENT_VERSION "01.08.05.01" //iot preset type strings #define IOT_PRINTER_TYPE_STRING "printer" @@ -104,27 +105,13 @@ namespace BBL { #define IOT_JSON_KEY_VERSION "version" #define IOT_JSON_KEY_NAME "name" #define IOT_JSON_KEY_TYPE "type" -#define IOT_JSON_KEY_UPDATE_TIME "updated_time" +#define IOT_JSON_KEY_UPDATE_TIME "update_time" +#define IOT_JSON_KEY_UPDATED_TIME "updated_time" #define IOT_JSON_KEY_BASE_ID "base_id" #define IOT_JSON_KEY_SETTING_ID "setting_id" #define IOT_JSON_KEY_FILAMENT_ID "filament_id" #define IOT_JSON_KEY_USER_ID "user_id" -#define IOT_JSON_KEY_SIGN_DATE "sign_date" -#define IOT_JSON_KEY_CERT_START_DATE "cert_start_date" -#define IOT_JSON_KEY_CERT_END_DATE "cert_end_date" -#define IOT_JSON_KEY_CERT_ISSUE_NAME "issue_name" -#define IOT_JSON_KEY_CERT_SUBJECT_NAME "subject_name" -#define IOT_JSON_KEY_CERT_SERIAL_NUMBER "serial_number" -#define IOT_JSON_KEY_CERT_HASH_VALUE "hash_value" -#define IOT_JSON_KEY_CERT_VERIFY_RESULT "verify_result" - -#define EMBEDDED_ISSUER_NAME "GlobalSign GCC R45 EV CodeSigning CA 2020" -#define EMBEDDED_SUBJECT_NAME "Shenzhen Tuozhu Technology Co., Ltd." -#define EMBEDDED_SERIAL_NAME "0b209295a54b188466ad7478" -#define EMBEDDED_HASH_NAME "9690647085f910ffe2098129bc1229956a51e250" - - // user callbacks typedef std::function OnUserLoginFn; // printer callbacks @@ -234,6 +221,14 @@ struct PublishParams { std::string config_filename; }; +struct CertificateInformation { + std::string issuer; + std::string sub_name; + std::string start_date; + std::string end_date; + std::string serial_number; +}; + } #endif