Commit ab37bba1 authored by 学习的菜鸟's avatar 学习的菜鸟

解决了验证bug,测试通过

parent 008422b4
No preview for this file type
...@@ -17,7 +17,8 @@ int gverify_count =12000;//判断是否有一分钟 ...@@ -17,7 +17,8 @@ int gverify_count =12000;//判断是否有一分钟
char only_id_middle[11]; char only_id_middle[11];
char secret_key[256];//存储上一次的topic char secret_key[1024];//存储上一次的topic
bool secret_key_index = TRUE;//用于判断是否对比topic bool secret_key_index = TRUE;//用于判断是否对比topic
int gverify_index =0;//判断是否验证成功 int gverify_index =0;//判断是否验证成功
...@@ -52,6 +53,8 @@ int send_jwtser(const char *token){ ...@@ -52,6 +53,8 @@ int send_jwtser(const char *token){
char *only_Id =generate_random_id(); char *only_Id =generate_random_id();
my_zlog_debug("%s",only_Id);
strcpy(only_id_middle,only_Id); strcpy(only_id_middle,only_Id);
cJSON_AddStringToObject(body, "data", token);//为0成功 cJSON_AddStringToObject(body, "data", token);//为0成功
...@@ -97,13 +100,12 @@ int receive_jwt(cJSON *body) { ...@@ -97,13 +100,12 @@ int receive_jwt(cJSON *body) {
pthread_mutex_unlock(&gverify_mutex); pthread_mutex_unlock(&gverify_mutex);
my_zlog_notice("topic不同,验证完成"); my_zlog_notice("topic不同,验证完成");
} }
} }else {
if(secret_key_index == TRUE) {
strcpy(secret_key,token); strcpy(secret_key,token);
secret_key_index = FALSE; secret_key_index = FALSE;
} }
unsigned long long token_time_s = strtoull(token_time, NULL, 10); unsigned long long token_time_s = strtoull(token_time, NULL, 10);
// 转换为秒级时间戳 // 转换为秒级时间戳
...@@ -122,10 +124,12 @@ int receive_jwt(cJSON *body) { ...@@ -122,10 +124,12 @@ int receive_jwt(cJSON *body) {
my_zlog_debug("在有效期内"); my_zlog_debug("在有效期内");
pthread_mutex_lock(&gverify_mutex); pthread_mutex_lock(&gverify_mutex);
gverify_count=0; gverify_count=0;
my_zlog_info("count: %s", gverify_count);
pthread_mutex_unlock(&gverify_mutex); pthread_mutex_unlock(&gverify_mutex);
my_zlog_debug("gverify_count=%d",gverify_count); my_zlog_debug("gverify_count=%d",gverify_count);
} }
}else { }else {
my_zlog_debug("不在有效期内");
gverify_index=1; gverify_index=1;
my_zlog_debug("gverify_index= %d ",gverify_index); my_zlog_debug("gverify_index= %d ",gverify_index);
} }
......
...@@ -174,15 +174,13 @@ int car0104_change(unsigned char *buf) { ...@@ -174,15 +174,13 @@ int car0104_change(unsigned char *buf) {
unsigned char val = buf[2]; unsigned char val = buf[2];
if(mode == 1 ) { if(mode == 1 ) {
//mode_lift_flont(val); car0104_flont(val);
car0104_flont(val+45);
}else if(mode == 2 ) { }else if(mode == 2 ) {
//mode_lift_back(val); car0104_back(val);
car0104_back(val+45);
}else if(mode == 3) { }else if(mode == 3) {
car0104_lift(val+15); car0104_lift(val+20);
}else if(mode == 4) { }else if(mode == 4) {
car0104_right(val+15); car0104_right(val+20);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment