- 修复无法查看原生会话录屏的bug

- 优化列表显示的时间
- 优化获取开发环境的方式

pkg/api/asset.go

@@ -53,9 +53,10 @@ func AssetPagingEndpoint(c echo.Context) error {
 	owner := c.QueryParam("owner")
 	sharer := c.QueryParam("sharer")
 	userGroupId := c.QueryParam("userGroupId")
+	ip := c.QueryParam("ip")
 
 	account, _ := GetCurrentAccount(c)
-	items, total, err := model.FindPageAsset(pageIndex, pageSize, name, protocol, tags, account, owner, sharer, userGroupId)
+	items, total, err := model.FindPageAsset(pageIndex, pageSize, name, protocol, tags, account, owner, sharer, userGroupId, ip)
 	if err != nil {
 		return err
 	}

pkg/api/middleware.go

@@ -27,7 +27,7 @@ func ErrorHandler(next echo.HandlerFunc) echo.HandlerFunc {
 
 func Auth(next echo.HandlerFunc) echo.HandlerFunc {
 
-	urls := []string{"download", "recording", "login", "static", "favicon", "logo"}
+	urls := []string{"download", "recording", "login", "static", "favicon", "logo", "asciinema"}
 
 	return func(c echo.Context) error {
 		// 路由拦截 - 登录身份、资源权限判断等

pkg/api/overview.go

@@ -22,12 +22,12 @@ func OverviewCounterEndPoint(c echo.Context) error {
 		asset              int64
 	)
 	if model.TypeUser == account.Type {
-		countUser, _ = model.CountUser()
+		countUser, _ = model.CountOnlineUser()
 		countOnlineSession, _ = model.CountOnlineSession()
 		credential, _ = model.CountCredentialByUserId(account.ID)
 		asset, _ = model.CountAssetByUserId(account.ID)
 	} else {
-		countUser, _ = model.CountUser()
+		countUser, _ = model.CountOnlineUser()
 		countOnlineSession, _ = model.CountOnlineSession()
 		credential, _ = model.CountCredential()
 		asset, _ = model.CountAsset()

pkg/model/asset.go

@@ -63,8 +63,8 @@ func FindAssetByConditions(protocol string, account User) (o []Asset, err error)
 	return
 }
 
-func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string, account User, owner, sharer, userGroupId string) (o []AssetVo, total int64, err error) {
-	db := global.DB.Table("assets").Select("assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created, users.nickname as owner_name,COUNT(resource_sharers.user_id) as sharer_count").Joins("left join users on assets.owner = users.id").Joins("left join resource_sharers on assets.id = resource_sharers.resource_id").Group("assets.id")
+func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string, account User, owner, sharer, userGroupId, ip string) (o []AssetVo, total int64, err error) {
+	db := global.DB.Table("assets").Select("assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created,assets.tags, users.nickname as owner_name,COUNT(resource_sharers.user_id) as sharer_count").Joins("left join users on assets.owner = users.id").Joins("left join resource_sharers on assets.id = resource_sharers.resource_id").Group("assets.id")
 	dbCounter := global.DB.Table("assets").Select("DISTINCT assets.id").Joins("left join resource_sharers on assets.id = resource_sharers.resource_id").Group("assets.id")
 
 	if TypeUser == account.Type {
@@ -103,6 +103,11 @@ func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string, account
 		dbCounter = dbCounter.Where("assets.name like ?", "%"+name+"%")
 	}
 
+	if len(ip) > 0 {
+		db = db.Where("assets.ip like ?", "%"+ip+"%")
+		dbCounter = dbCounter.Where("assets.ip like ?", "%"+ip+"%")
+	}
+
 	if len(protocol) > 0 {
 		db = db.Where("assets.protocol = ?", protocol)
 		dbCounter = dbCounter.Where("assets.protocol = ?", protocol)

pkg/model/user.go

@@ -107,7 +107,7 @@ func DeleteUserById(id string) {
 	global.DB.Where("user_id = ?", id).Delete(&ResourceSharer{})
 }
 
-func CountUser() (total int64, err error) {
-	err = global.DB.Find(&User{}).Count(&total).Error
+func CountOnlineUser() (total int64, err error) {
+	err = global.DB.Where("online = ?", true).Find(&User{}).Count(&total).Error
 	return
 }