完成授权凭证隔离

pkg/api/credential.go

@@ -58,7 +58,17 @@ func CredentialPagingEndpoint(c echo.Context) error {
 	pageSize, _ := strconv.Atoi(c.QueryParam("pageSize"))
 	name := c.QueryParam("name")
 
-	items, total, _ := model.FindPageCredential(pageIndex, pageSize, name)
+	var (
+		total int64
+		items []model.CredentialVo
+	)
+
+	account, _ := GetCurrentAccount(c)
+	if account.Role == model.RoleUser {
+		items, total, _ = model.FindPageCredential(pageIndex, pageSize, name, account.ID)
+	} else {
+		items, total, _ = model.FindPageCredential(pageIndex, pageSize, name, "")
+	}
 
 	return Success(c, H{
 		"total": total,

pkg/model/credential.go

@@ -27,20 +27,34 @@ func (r *Credential) TableName() string {
 	return "credentials"
 }
 
+type CredentialVo struct {
+	ID          string         `json:"id"`
+	Name        string         `json:"name"`
+	Type        string         `json:"type"`
+	Username    string         `json:"username"`
+	Created     utils.JsonTime `json:"created"`
+	Creator     string         `json:"creator"`
+	CreatorName string         `json:"creatorName"`
+}
+
 func FindAllCredential() (o []Credential, err error) {
 	err = global.DB.Find(&o).Error
 	return
 }
 
-func FindPageCredential(pageIndex, pageSize int, name string) (o []Credential, total int64, err error) {
+func FindPageCredential(pageIndex, pageSize int, name, creator string) (o []CredentialVo, total int64, err error) {
 	db := global.DB
+	db = db.Table("credentials").Select("credentials.id,credentials.name,credentials.type,credentials.username,credentials.creator,credentials.created,users.nickname as creator_name").Joins("left join users on credentials.creator = users.id")
 	if len(name) > 0 {
-		db = db.Where("name like ?", "%"+name+"%")
+		db = db.Where("credentials.name like ?", "%"+name+"%")
+	}
+	if len(creator) > 0 {
+		db = db.Where("credentials.creator = ?", creator)
 	}
 
-	err = db.Order("created desc").Find(&o).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Count(&total).Error
+	err = db.Order("credentials.created desc").Find(&o).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Count(&total).Error
 	if o == nil {
-		o = make([]Credential, 0)
+		o = make([]CredentialVo, 0)
 	}
 	return
 }

pkg/model/user.go

@@ -6,6 +6,11 @@ import (
 	"reflect"
 )
 
+const (
+	RoleUser  = "user"
+	RoleAdmin = "admin"
+)
+
 type User struct {
 	ID         string         `gorm:"primary_key" json:"id"`
 	Username   string         `json:"username"`
@@ -60,6 +65,11 @@ func FindUserById(id string) (o User, err error) {
 	return
 }
 
+func FindUserByIdIn(ids []string) (o []User, err error) {
+	err = global.DB.Where("id in ?", ids).First(&o).Error
+	return
+}
+
 func FindUserByUsername(username string) (o User, err error) {
 	err = global.DB.Where("username = ?", username).First(&o).Error
 	return