|
|
@@ -569,6 +569,7 @@ static void *web_thread(void *arg)
|
|
|
return NULL;
|
|
|
}
|
|
|
//get user info message
|
|
|
+#if 0
|
|
|
INIT_LIST_HEAD(&_g_User_list.list);
|
|
|
|
|
|
//get current db user infoinfomation
|
|
|
@@ -576,7 +577,7 @@ static void *web_thread(void *arg)
|
|
|
{
|
|
|
printf("get user db failed");
|
|
|
}
|
|
|
-
|
|
|
+#endif
|
|
|
webSetCallback();
|
|
|
printf("_____mgHandle.cnt: %d, rootdir: %s\n", mh->cnt, mh->rootDir);
|
|
|
#if (CHIP_TYPE == CHIP_T113s)
|
|
|
@@ -669,6 +670,7 @@ static void loginFunc(void* conn)
|
|
|
// 查询用户信息
|
|
|
UserInfo User_list;
|
|
|
INIT_LIST_HEAD(&User_list.list);
|
|
|
+#if 0
|
|
|
UserInfo *_UserInfoTemp;
|
|
|
list_for_each_entry(_UserInfoTemp, &_g_User_list.list, list)
|
|
|
{
|
|
|
@@ -825,6 +827,7 @@ static void loginFunc(void* conn)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
// UserInfo *_UserInfoTemp = (UserInfo *)malloc(sizeof(UserInfo));
|
|
|
// if(_UserInfoTemp)
|
|
|
@@ -890,22 +893,22 @@ static void loginFunc(void* conn)
|
|
|
|
|
|
// }else
|
|
|
// {
|
|
|
- // if (0 == dev_get_user_info(__globalDeviceManage.db, &User_list))
|
|
|
- // {
|
|
|
- // UserInfo *_UserInfoTemp = NULL;
|
|
|
- // list_for_each_entry(_UserInfoTemp, &User_list.list, list)
|
|
|
- // {
|
|
|
- // if (_UserInfoTemp == NULL)
|
|
|
- // break;
|
|
|
+ if (0 == dev_get_user_info(__globalDeviceManage.db, &User_list))
|
|
|
+ {
|
|
|
+ UserInfo *_UserInfoTemp = NULL;
|
|
|
+ list_for_each_entry(_UserInfoTemp, &User_list.list, list)
|
|
|
+ {
|
|
|
+ if (_UserInfoTemp == NULL)
|
|
|
+ break;
|
|
|
|
|
|
- // if (strcmp(_UserInfoTemp->userName,_newUserLogin->user_name)==0 && strcmp(_UserInfoTemp->userPW,_newUserLogin->user_password)==0)
|
|
|
- // {
|
|
|
- // LoginFlag=true;
|
|
|
- // _GlobalUserInfoNew = *_UserInfoTemp;
|
|
|
- // break;
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
+ if (strcmp(_UserInfoTemp->userName,_newUserLogin->user_name)==0 && strcmp(_UserInfoTemp->userPW,_newUserLogin->user_password)==0)
|
|
|
+ {
|
|
|
+ LoginFlag=true;
|
|
|
+ _GlobalUserInfoNew = *_UserInfoTemp;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
// }
|
|
|
// UserInfo *_UserInfoTemp = NULL;
|
|
|
@@ -1014,26 +1017,29 @@ static void getUserRouters(void* conn)
|
|
|
char *rx_Head_buf = (char*)hm->head.buf;
|
|
|
|
|
|
// 查询用户信息
|
|
|
- // UserInfo User_list;
|
|
|
- // INIT_LIST_HEAD(&User_list.list);
|
|
|
+ UserInfo User_list;
|
|
|
+ INIT_LIST_HEAD(&User_list.list);
|
|
|
// 查询角色信息
|
|
|
- // RoleInfo Role_list;
|
|
|
- // INIT_LIST_HEAD(&Role_list.list);
|
|
|
+ RoleInfo Role_list;
|
|
|
+ INIT_LIST_HEAD(&Role_list.list);
|
|
|
|
|
|
g_token = json_to_Token_info(rx_Head_buf);
|
|
|
- char *nName = getUserNamebyToken(g_token);
|
|
|
+
|
|
|
// 根据token获取用户及用户权限
|
|
|
int nRoleID=3;
|
|
|
+#if 0
|
|
|
UserInfo *_UserInfoTemp= NULL;
|
|
|
list_for_each_entry(_UserInfoTemp, &_g_User_list.list, list)
|
|
|
{
|
|
|
- if (strcmp(nName,_UserInfoTemp->userName)==0)
|
|
|
+ char *nName = getUserNamebyToken(g_token);
|
|
|
+ if (_UserInfoTemp && nName && strcmp(nName,_UserInfoTemp->userName)==0)
|
|
|
{
|
|
|
nRoleID = _UserInfoTemp->roleID;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-/*
|
|
|
+#endif
|
|
|
+
|
|
|
if (0 == dev_get_user_info(__globalDeviceManage.db, &User_list) )
|
|
|
{
|
|
|
char *nName = getUserNamebyToken(g_token);
|
|
|
@@ -1042,7 +1048,7 @@ static void getUserRouters(void* conn)
|
|
|
nRoleID = GetRoleIDByUserName(nName,&User_list);
|
|
|
}
|
|
|
}
|
|
|
-*/
|
|
|
+
|
|
|
SetMenuAuthority(nRoleID);
|
|
|
|
|
|
|