- 修复「修改接入网关失败」的问题

- 完成「[功能请求]审计的历史会话建议添加“已阅”的功能」close #194
- 增加一键删除登录日志和历史会话的功能

server/repository/access_gateway.go

@@ -75,11 +75,6 @@ func (r AccessGatewayRepository) FindById(id string) (o model.AccessGateway, err
 }
 
 func (r AccessGatewayRepository) FindAll() (o []model.AccessGateway, err error) {
-	t := model.AccessGateway{}
-	db := r.DB.Table(t.TableName())
-	err = db.Find(&o).Error
-	if o == nil {
-		o = make([]model.AccessGateway, 0)
-	}
+	err = r.DB.Find(&o).Error
 	return
 }

server/repository/access_security.go

@@ -15,9 +15,8 @@ func NewAccessSecurityRepository(db *gorm.DB) *AccessSecurityRepository {
 	return accessSecurityRepository
 }
 
-func (r AccessSecurityRepository) FindAllAccessSecurities() (o []model.AccessSecurity, err error) {
-	db := r.DB
-	err = db.Order("priority asc").Find(&o).Error
+func (r AccessSecurityRepository) FindAll() (o []model.AccessSecurity, err error) {
+	err = r.DB.Order("priority asc").Find(&o).Error
 	return
 }
 

server/repository/command.go

@@ -94,3 +94,8 @@ func (r CommandRepository) FindByUser(account model.User) (o []model.CommandForP
 	}
 	return
 }
+
+func (r CommandRepository) FindAll() (o []model.Command, err error) {
+	err = r.DB.Find(&o).Error
+	return
+}

server/repository/login_log.go

@@ -54,6 +54,11 @@ func (r LoginLogRepository) FindAliveLoginLogs() (o []model.LoginLog, err error)
 	return
 }
 
+func (r LoginLogRepository) FindAllLoginLogs() (o []model.LoginLog, err error) {
+	err = r.DB.Find(&o).Error
+	return
+}
+
 func (r LoginLogRepository) FindAliveLoginLogsByUsername(username string) (o []model.LoginLog, err error) {
 	err = r.DB.Where("state = '1' and logout_time is null and username = ?", username).Find(&o).Error
 	return

server/repository/resource_sharer.go

@@ -218,3 +218,8 @@ func (r *ResourceSharerRepository) Find(resourceId, resourceType, userId, userGr
 	err = db.Find(&resourceSharers).Error
 	return
 }
+
+func (r *ResourceSharerRepository) FindAll() (o []model.ResourceSharer, err error) {
+	err = r.DB.Find(&o).Error
+	return
+}

server/repository/session.go

@@ -23,14 +23,14 @@ func NewSessionRepository(db *gorm.DB) *SessionRepository {
 	return sessionRepository
 }
 
-func (r SessionRepository) Find(pageIndex, pageSize int, status, userId, clientIp, assetId, protocol string) (results []model.SessionForPage, total int64, err error) {
+func (r SessionRepository) Find(pageIndex, pageSize int, status, userId, clientIp, assetId, protocol, reviewed string) (results []model.SessionForPage, total int64, err error) {
 
 	db := r.DB
 	var params []interface{}
 
 	params = append(params, status)
 
-	itemSql := "SELECT s.id,s.mode, s.protocol,s.recording, s.connection_id, s.asset_id, s.creator, s.client_ip, s.width, s.height, s.ip, s.port, s.username, s.status, s.connected_time, s.disconnected_time,s.code, s.message, a.name AS asset_name, u.nickname AS creator_name FROM sessions s LEFT JOIN assets a ON s.asset_id = a.id LEFT JOIN users u ON s.creator = u.id WHERE s.STATUS = ? "
+	itemSql := "SELECT s.id,s.mode, s.protocol,s.recording, s.connection_id, s.asset_id, s.creator, s.client_ip, s.width, s.height, s.ip, s.port, s.username, s.status, s.connected_time, s.disconnected_time,s.code,s.reviewed, s.message, a.name AS asset_name, u.nickname AS creator_name FROM sessions s LEFT JOIN assets a ON s.asset_id = a.id LEFT JOIN users u ON s.creator = u.id WHERE s.STATUS = ? "
 	countSql := "select count(*) from sessions as s where s.status = ? "
 
 	if len(userId) > 0 {
@@ -57,6 +57,13 @@ func (r SessionRepository) Find(pageIndex, pageSize int, status, userId, clientI
 		params = append(params, protocol)
 	}
 
+	if reviewed != "" {
+		bReviewed := reviewed == "true"
+		itemSql += " and s.reviewed = ?"
+		countSql += " and s.reviewed = ?"
+		params = append(params, bReviewed)
+	}
+
 	params = append(params, (pageIndex-1)*pageSize, pageSize)
 	itemSql += " order by s.connected_time desc LIMIT ?, ?"
 
@@ -209,3 +216,13 @@ func (r SessionRepository) OverviewAccess(account model.User) (o []model.Session
 	}
 	return
 }
+
+func (r SessionRepository) UpdateReadByIds(reviewed bool, ids []string) error {
+	sql := "update sessions set reviewed = ? where id in ?"
+	return r.DB.Exec(sql, reviewed, ids).Error
+}
+
+func (r SessionRepository) FindAllUnReviewed() (o []model.Session, err error) {
+	err = r.DB.Where("reviewed = false or reviewed is null").Find(&o).Error
+	return
+}

server/repository/user.go

@@ -16,15 +16,13 @@ func NewUserRepository(db *gorm.DB) *UserRepository {
 	return userRepository
 }
 
-func (r UserRepository) FindAll() (o []model.User) {
-	if r.DB.Find(&o).Error != nil {
-		return nil
-	}
+func (r UserRepository) FindAll() (o []model.User, err error) {
+	err = r.DB.Find(&o).Error
 	return
 }
 
 func (r UserRepository) Find(pageIndex, pageSize int, username, nickname, mail, order, field string, account model.User) (o []model.UserForPage, total int64, err error) {
-	db := r.DB.Table("users").Select("users.id,users.username,users.nickname,users.mail,users.online,users.enabled,users.created,users.type, count(resource_sharers.user_id) as sharer_asset_count, users.totp_secret").Joins("left join resource_sharers on users.id = resource_sharers.user_id and resource_sharers.resource_type = 'asset'").Group("users.id")
+	db := r.DB.Table("users").Select("users.id,users.username,users.nickname,users.mail,users.online,users.created,users.type,users.status, count(resource_sharers.user_id) as sharer_asset_count, users.totp_secret").Joins("left join resource_sharers on users.id = resource_sharers.user_id and resource_sharers.resource_type = 'asset'").Group("users.id")
 	dbCounter := r.DB.Table("users")
 
 	if constant.TypeUser == account.Type {

server/repository/user_group.go

@@ -16,10 +16,8 @@ func NewUserGroupRepository(db *gorm.DB) *UserGroupRepository {
 	return userGroupRepository
 }
 
-func (r UserGroupRepository) FindAll() (o []model.UserGroup) {
-	if r.DB.Find(&o).Error != nil {
-		return nil
-	}
+func (r UserGroupRepository) FindAll() (o []model.UserGroup, err error) {
+	err = r.DB.Find(&o).Error
 	return
 }
 
@@ -141,3 +139,8 @@ func AddUserGroupMembers(tx *gorm.DB, userIds []string, userGroupId string) erro
 	}
 	return nil
 }
+
+func (r UserGroupRepository) FindAllUserGroupMembers() (o []model.UserGroupMember, err error) {
+	err = r.DB.Find(&o).Error
+	return
+}