diff --git a/internal/logic/admin/user/getFamilyDetailLogic.go b/internal/logic/admin/user/getFamilyDetailLogic.go index d4db6d4..b3ed335 100644 --- a/internal/logic/admin/user/getFamilyDetailLogic.go +++ b/internal/logic/admin/user/getFamilyDetailLogic.go @@ -82,7 +82,7 @@ func (l *GetFamilyDetailLogic) GetFamilyDetail(req *types.GetFamilyDetailRequest memberItem := types.FamilyMemberItem{ UserId: member.UserId, Identifier: identifier, - DeviceID: deviceNoMap[member.UserId], + DeviceNo : deviceNoMap[member.UserId], Role: member.Role, RoleName: mapFamilyRoleName(member.Role), Status: member.Status, diff --git a/internal/logic/admin/user/getUserDetailLogic.go b/internal/logic/admin/user/getUserDetailLogic.go index e3b186c..61d8b1e 100644 --- a/internal/logic/admin/user/getUserDetailLogic.go +++ b/internal/logic/admin/user/getUserDetailLogic.go @@ -37,7 +37,7 @@ func (l *GetUserDetailLogic) GetUserDetail(req *types.GetDetailRequest) (*types. tool.DeepCopy(&resp, userInfo) for i, d := range userInfo.UserDevices { if i < len(resp.UserDevices) { - resp.UserDevices[i].DeviceID = tool.DeviceIdToHash(d.Id) + resp.UserDevices[i].DeviceNo = tool.DeviceIdToHash(d.Id) } } if referCode := strings.TrimSpace(resp.ReferCode); referCode != "" { diff --git a/internal/logic/admin/user/getUserListLogic.go b/internal/logic/admin/user/getUserListLogic.go index ea1efd2..219ae70 100644 --- a/internal/logic/admin/user/getUserListLogic.go +++ b/internal/logic/admin/user/getUserListLogic.go @@ -166,7 +166,7 @@ func (l *GetUserListLogic) GetUserList(req *types.GetUserListRequest) (*types.Ge // 填充 DeviceID for i, d := range item.UserDevices { if i < len(u.UserDevices) { - u.UserDevices[i].DeviceID = tool.DeviceIdToHash(d.Id) + u.UserDevices[i].DeviceNo = tool.DeviceIdToHash(d.Id) } } diff --git a/internal/logic/admin/user/getUserSubscribeDevicesLogic.go b/internal/logic/admin/user/getUserSubscribeDevicesLogic.go index 679f5d2..007d61a 100644 --- a/internal/logic/admin/user/getUserSubscribeDevicesLogic.go +++ b/internal/logic/admin/user/getUserSubscribeDevicesLogic.go @@ -36,7 +36,7 @@ func (l *GetUserSubscribeDevicesLogic) GetUserSubscribeDevices(req *types.GetUse tool.DeepCopy(&userRespList, list) for i, d := range list { if i < len(userRespList) { - userRespList[i].DeviceID = tool.DeviceIdToHash(d.Id) + userRespList[i].DeviceNo = tool.DeviceIdToHash(d.Id) } } return &types.GetUserSubscribeDevicesResponse{ diff --git a/internal/logic/public/user/getDeviceListLogic.go b/internal/logic/public/user/getDeviceListLogic.go index a1da1fb..b1ea792 100644 --- a/internal/logic/public/user/getDeviceListLogic.go +++ b/internal/logic/public/user/getDeviceListLogic.go @@ -38,7 +38,7 @@ func (l *GetDeviceListLogic) GetDeviceList() (resp *types.GetDeviceListResponse, tool.DeepCopy(&userRespList, list) for i, d := range list { if i < len(userRespList) { - userRespList[i].DeviceID = tool.DeviceIdToHash(d.Id) + userRespList[i].DeviceNo = tool.DeviceIdToHash(d.Id) } } resp = &types.GetDeviceListResponse{ diff --git a/internal/logic/public/user/queryUserInfoLogic.go b/internal/logic/public/user/queryUserInfoLogic.go index 21afb39..7ddf548 100644 --- a/internal/logic/public/user/queryUserInfoLogic.go +++ b/internal/logic/public/user/queryUserInfoLogic.go @@ -47,7 +47,7 @@ func (l *QueryUserInfoLogic) QueryUserInfo() (resp *types.User, err error) { tool.DeepCopy(resp, u) for i, d := range u.UserDevices { if i < len(resp.UserDevices) { - resp.UserDevices[i].DeviceID = tool.DeviceIdToHash(d.Id) + resp.UserDevices[i].DeviceNo = tool.DeviceIdToHash(d.Id) } } // refer_code 为空时自动生成 diff --git a/internal/types/types.go b/internal/types/types.go index 8fe6a96..aa88d6e 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -682,7 +682,7 @@ type FamilyDetail struct { type FamilyMemberItem struct { UserId int64 `json:"user_id"` Identifier string `json:"identifier"` - DeviceID string `json:"device_id"` + DeviceNo string `json:"device_no"` Role uint8 `json:"role"` RoleName string `json:"role_name"` Status uint8 `json:"status"` @@ -2957,7 +2957,7 @@ type UserDevice struct { Id int64 `json:"id"` Ip string `json:"ip"` Identifier string `json:"identifier"` - DeviceID string `json:"device_id"` + DeviceNo string `json:"device_no"` UserAgent string `json:"user_agent"` Online bool `json:"online"` Enabled bool `json:"enabled"`