modify

controllers/monitor.go

@@ -54,15 +54,26 @@ func (server *MonitorController) NodeManagersByPage() {
 	err := json.Unmarshal(body, &appRequest) //解析body中数据
 	logs.Debug("appRequest", appRequest, string(body))
 
+	if appRequest.Page > 0 {
+		appRequest.Page = appRequest.Page - 1
+	}
+
 	if appRequest.Size == 0 {
 		appRequest.Size = 10
 	}
-	data, err := registry.NodeManagersByPage(int(appRequest.Size), int(appRequest.Page))
+	data, total, err := registry.NodeManagersByPage(int(appRequest.Size), int(appRequest.Page))
 	if err != nil {
 		server.respond(models.BusinessFailed, err.Error())
 		return
 	}
-	server.respond(http.StatusOK, "", data)
+	responseData := struct {
+		Total int64       `json:"total"`
+		Data  interface{} `json:"data,omitempty"`
+	}{
+		Total: int64(total),
+		Data:  data,
+	}
+	server.respond(http.StatusOK, "", responseData)
 }
 
 func (server *MonitorController) GatewaysByPage() {
@@ -71,15 +82,26 @@ func (server *MonitorController) GatewaysByPage() {
 	err := json.Unmarshal(body, &appRequest) //解析body中数据
 	logs.Debug("appRequest", appRequest, string(body))
 
+	if appRequest.Page > 0 {
+		appRequest.Page = appRequest.Page - 1
+	}
+
 	if appRequest.Size == 0 {
 		appRequest.Size = 10
 	}
-	data, err := registry.GatewaysByPage(int(appRequest.Size), int(appRequest.Page))
+	data, total, err := registry.GatewaysByPage(int(appRequest.Size), int(appRequest.Page))
 	if err != nil {
 		server.respond(models.BusinessFailed, err.Error())
 		return
 	}
-	server.respond(http.StatusOK, "", data)
+	responseData := struct {
+		Total int64       `json:"total"`
+		Data  interface{} `json:"data,omitempty"`
+	}{
+		Total: int64(total),
+		Data:  data,
+	}
+	server.respond(http.StatusOK, "", responseData)
 }
 
 func (server *MonitorController) WorkersByPage() {
@@ -88,15 +110,26 @@ func (server *MonitorController) WorkersByPage() {
 	err := json.Unmarshal(body, &appRequest) //解析body中数据
 	logs.Debug("appRequest", appRequest, string(body))
 
+	if appRequest.Page > 0 {
+		appRequest.Page = appRequest.Page - 1
+	}
+
 	if appRequest.Size == 0 {
 		appRequest.Size = 10
 	}
-	data, err := registry.WorkersByPage(int(appRequest.Size), int(appRequest.Page))
+	data, total, err := registry.WorkersByPage(int(appRequest.Size), int(appRequest.Page))
 	if err != nil {
 		server.respond(models.BusinessFailed, err.Error())
 		return
 	}
-	server.respond(http.StatusOK, "", data)
+	responseData := struct {
+		Total int64       `json:"total"`
+		Data  interface{} `json:"data,omitempty"`
+	}{
+		Total: int64(total),
+		Data:  data,
+	}
+	server.respond(http.StatusOK, "", responseData)
 }
 
 func (server *MonitorController) SchedulesByPage() {
@@ -105,13 +138,23 @@ func (server *MonitorController) SchedulesByPage() {
 	err := json.Unmarshal(body, &appRequest) //解析body中数据
 	logs.Debug("appRequest", appRequest, string(body))
 
+	if appRequest.Page > 0 {
+		appRequest.Page = appRequest.Page - 1
+	}
 	if appRequest.Size == 0 {
 		appRequest.Size = 10
 	}
-	data, err := registry.SchedulesByPage(int(appRequest.Size), int(appRequest.Page))
+	data, total, err := registry.SchedulesByPage(int(appRequest.Size), int(appRequest.Page))
 	if err != nil {
 		server.respond(models.BusinessFailed, err.Error())
 		return
 	}
-	server.respond(http.StatusOK, "", data)
+	responseData := struct {
+		Total int64       `json:"total"`
+		Data  interface{} `json:"data,omitempty"`
+	}{
+		Total: int64(total),
+		Data:  data,
+	}
+	server.respond(http.StatusOK, "", responseData)
 }

controllers/user.go

@@ -98,9 +98,14 @@ func (server *UserController) Login() {
 
 	checkUser := &models.User{Mail: user.Mail}
 	err = mysql.GetMysqlInstace().Ormer.Read(checkUser, "mail")
-	if err != nil {
+	stats := mysql.Ping()
+	if stats != nil {
+		server.respond(models.CreateUserFailed, stats.Error())
+		return
+	}
+	if err != nil && stats == nil {
 		checkUser, err = regisgerUser(user)
-		if err != nil {
+		if checkUser == nil {
 			server.respond(models.CreateUserFailed, err.Error())
 			return
 		}
@@ -187,11 +192,11 @@ func (server *UserController) UserInfo() {
 func regisgerUser(user models.User) (*models.User, error) {
 	var err error
 	qs := mysql.GetMysqlInstace().Ormer.QueryTable("user")
-	usernameQs := qs.Filter("username", user.Username)
+	usernameQs := qs.Filter("mail", user.Mail)
 	var count int64
 	count, err = usernameQs.Count()
 	if count > 0 {
-		return nil, errors.New("用户名已存在")
+		return nil, errors.New("用户已存在")
 	}
 	//if len(user.CustomId) > 0 {
 	//	customIdQs := qs.Filter("custom_id", user.CustomId)

libs/mysql/mysql.go

@@ -65,3 +65,11 @@ func init() {
 	orm.SetMaxIdleConns("default", 10)
 	orm.SetMaxOpenConns("default", 100)
 }
+
+func Ping() error {
+	db, err := orm.GetDB("default")
+	if err != nil {
+		return err
+	}
+	return db.Ping()
+}

libs/registry/registry.go

@@ -43,19 +43,19 @@ func Schedules() ([]string, error) {
 	return querier.Select(common.SERVICE_SCHEDULER).List()
 }
 
-func NodeManagersByPage(pageSize int, pageNum int) ([]string, error) {
+func NodeManagersByPage(pageSize int, pageNum int) ([]string, int, error) {
 	return querier.Select(common.SERVICE_NODE_MANAGER).ListByPage(pageSize, pageNum)
 }
 
-func GatewaysByPage(pageSize int, pageNum int) ([]string, error) {
+func GatewaysByPage(pageSize int, pageNum int) ([]string, int, error) {
 	return querier.Select(common.SERVICE_API_GATEWAY).ListByPage(pageSize, pageNum)
 }
 
-func WorkersByPage(pageSize int, pageNum int) ([]string, error) {
+func WorkersByPage(pageSize int, pageNum int) ([]string, int, error) {
 	return querier.Select(common.SERVICE_WORKER).ListByPage(pageSize, pageNum)
 }
 
-func SchedulesByPage(pageSize int, pageNum int) ([]string, error) {
+func SchedulesByPage(pageSize int, pageNum int) ([]string, int, error) {
 	return querier.Select(common.SERVICE_SCHEDULER).ListByPage(pageSize, pageNum)
 }