From: hcj <1224667075@qq.com> Date: Fri, 18 Jul 2025 03:45:03 +0000 (+0800) Subject: 修改ai 鉴权服务 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=47ab24b39fd9b7e4ac9f44a80d8c6270843aec4e;p=mirrors%2FFD230.git 修改ai 鉴权服务 --- diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ai_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ai_server.cpp index 1b55258f5..033eae4df 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ai_server.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ai_server.cpp @@ -1458,11 +1458,11 @@ bool dinit_ai_task(void) } // -void pre_AI_init(void) +bool pre_AI_init(void) { if(read_dev_token(NULL)==false) { - aut_login(); + return aut_login(); } } diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.h b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.h index 8a3769395..8f2c5e53c 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.h +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.h @@ -28,7 +28,7 @@ typedef enum AI_TYPE_KIMI,//KIMI }G_AI_TYPE; -void pre_AI_init(void); +bool pre_AI_init(void); //////////////////////////////////////////////////////////////////////// diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.cpp index a0dc5257b..15043bdf6 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.cpp @@ -449,13 +449,15 @@ bool aut_active(void)//设备激活 // 输出JSON printf("JSON output: %s\n", json_string); extern uint32_t put_data_by_get_file(char *data,uint16_t data_len); - cJSON_free(json_string); + if(200==put_data_by_get_file(json_string,strlen(json_string))) { + cJSON_free(json_string); return true; } else { + cJSON_free(json_string); return false; } @@ -469,6 +471,7 @@ bool aut_active(void)//设备激活 extern bool read_dev_pass(char *data_pass); extern uint32_t post_data_by_get_file(char *data,uint16_t data_len); +bool read_dev_token(char *data_token); uint32_t aut_login_time=0; @@ -491,6 +494,10 @@ bool aut_login(void)//登录 printf( "aut_active fail\n"); return false; } + else + { + read_dev_pass(dev_pass); + } } @@ -556,16 +563,26 @@ bool aut_login(void)//登录 int ret= post_data_by_get_file(json_string,strlen(json_string)); - cJSON_free(json_string); + - if(ret==200) + if(ret==200 ) { + cJSON_free(json_string); aut_login_time=timestamp; - - return true; + if(read_dev_token(NULL)) + { + return true; + } + else + { + aut_login_time=0; + return false; + } + } else { + cJSON_free(json_string); return false; } } @@ -639,13 +656,17 @@ bool read_dev_pass(char *data_pass) printf("dev_pass malloc error!!!!!!!!!!!"); } + + if(strlen(password_str)>=0) { memcpy(data_pass,dev_pass,dev_pass_len); free(dev_pass); + cJSON_Delete(data); return true; } - + free(dev_pass); + cJSON_Delete(data); return false; } @@ -698,16 +719,30 @@ bool read_dev_token(char *data_token) if (data) { cJSON* token = cJSON_GetObjectItem(data, "token"); - if (token && cJSON_IsString(token)) { + if (token && cJSON_IsString(token)) + { token_str= token->valuestring; } + else + { + cJSON_Delete(data); + return false; + } } + else + { + cJSON_Delete(data); + return false; + } + if(strlen(token_str)>=0 && data_token!=NULL ) { memcpy(data_token,token_str,strlen(token_str)); + cJSON_Delete(data); return true; } + cJSON_Delete(data); return true; }