优化系统用户登录校验

internal/db/models/user_dao.go

@@ -63,6 +63,19 @@ func (this *UserDAO) FindEnabledUser(id int64) (*User, error) {
 	return result.(*User), err
 }
 
+// 查找用户基本信息
+func (this *UserDAO) FindEnabledBasicUser(id int64) (*User, error) {
+	result, err := this.Query().
+		Pk(id).
+		Attr("state", UserStateEnabled).
+		Result("id", "fullname", "username").
+		Find()
+	if result == nil {
+		return nil, err
+	}
+	return result.(*User), err
+}
+
 // 获取管理员名称
 func (this *UserDAO) FindUserFullname(userId int64) (string, error) {
 	return this.Query().

internal/rpc/services/service_admin.go

@@ -251,9 +251,10 @@ func (this *AdminService) FindAllAdminModules(ctx context.Context, req *pb.FindA
 		}
 
 		list := &pb.AdminModuleList{
-			AdminId: int64(admin.Id),
+			AdminId:  int64(admin.Id),
-			IsSuper: admin.IsSuper == 1,
+			IsSuper:  admin.IsSuper == 1,
-			Modules: pbModules,
+			Fullname: admin.Fullname,
+			Modules:  pbModules,
 		}
 		result = append(result, list)
 	}

internal/rpc/services/service_server.go

@@ -430,6 +430,19 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
 			}
 		}
 
+		// 用户
+		user, err := models.SharedUserDAO.FindEnabledBasicUser(int64(server.UserId))
+		if err != nil {
+			return nil, err
+		}
+		var pbUser *pb.User = nil
+		if user != nil {
+			pbUser = &pb.User{
+				Id:       int64(user.Id),
+				Fullname: user.Fullname,
+			}
+		}
+
 		result = append(result, &pb.Server{
 			Id:              int64(server.Id),
 			IsOn:            server.IsOn == 1,
@@ -453,6 +466,7 @@ func (this *ServerService) ListEnabledServersMatch(ctx context.Context, req *pb.
 				Name: clusterName,
 			},
 			Groups: pbGroups,
+			User:   pbUser,
 		})
 	}