Skip to content

Commit dc20ef6

Browse files
ssongliussongliu
committed
Merge branch 'master' of github.com:KubeOperator/KubePi
2 parents e8475ee + 9b35e72 commit dc20ef6

File tree

5 files changed

+3387
-2889
lines changed

5 files changed

+3387
-2889
lines changed

‎internal/service/v1/cluster/cluster.go

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -75,49 +75,43 @@ func (c *cluster) List(options common.DBOptions) ([]v1Cluster.Cluster, error) {
7575
func (c *cluster) Search(num, size int, conditions common.Conditions, options common.DBOptions) ([]v1Cluster.Cluster, int, error) {
7676
db := c.GetDB(options)
7777

78-
query := db.Select()
79-
80-
query = func() storm2.Query {
81-
var ms []q.Matcher
82-
83-
for k := range conditions {
84-
if k == "quick" {
85-
ms = append(ms, storm.Like("Name", conditions[k].Value))
86-
} else if k == "labels" {
87-
switch conditions[k].Operator {
88-
case "like":
89-
ms = append(ms, storm.ArrayValueLike("Labels", conditions[k].Value))
90-
case "not like":
91-
ms = append(ms, q.Not(storm.ArrayValueLike("Labels", conditions[k].Value)))
92-
case "eq":
93-
ms = append(ms, storm.ArrayValueEq("Labels", conditions[k].Value))
94-
case "ne":
95-
ms = append(ms, q.Not(storm.ArrayValueEq("Labels", conditions[k].Value)))
96-
}
97-
} else {
98-
field := lang.FirstToUpper(conditions[k].Field)
99-
switch conditions[k].Operator {
100-
case "eq":
101-
ms = append(ms, q.Eq(field, conditions[k].Value))
102-
case "ne":
103-
ms = append(ms, q.Not(q.Eq(field, conditions[k].Value)))
104-
case "like":
105-
ms = append(ms, storm.Like(field, conditions[k].Value))
106-
case "not like":
107-
ms = append(ms, q.Not(storm.Like(field, conditions[k].Value)))
108-
}
78+
var ms []q.Matcher
79+
for k := range conditions {
80+
if k == "quick" {
81+
ms = append(ms, storm.Like("Name", conditions[k].Value))
82+
} else if k == "labels" {
83+
switch conditions[k].Operator {
84+
case "like":
85+
ms = append(ms, storm.ArrayValueLike("Labels", conditions[k].Value))
86+
case "not like":
87+
ms = append(ms, q.Not(storm.ArrayValueLike("Labels", conditions[k].Value)))
88+
case "eq":
89+
ms = append(ms, storm.ArrayValueEq("Labels", conditions[k].Value))
90+
case "ne":
91+
ms = append(ms, q.Not(storm.ArrayValueEq("Labels", conditions[k].Value)))
10992
}
110-
}
111-
if len(conditions) > 0 {
112-
return db.Select(q.And(ms...)).Limit(size).Skip((num - 1) * size).OrderBy("CreateAt").Reverse()
11393
} else {
114-
return db.Select().Limit(size).Skip((num - 1) * size).OrderBy("CreateAt").Reverse()
94+
field := lang.FirstToUpper(conditions[k].Field)
95+
switch conditions[k].Operator {
96+
case "eq":
97+
ms = append(ms, q.Eq(field, conditions[k].Value))
98+
case "ne":
99+
ms = append(ms, q.Not(q.Eq(field, conditions[k].Value)))
100+
case "like":
101+
ms = append(ms, storm.Like(field, conditions[k].Value))
102+
case "not like":
103+
ms = append(ms, q.Not(storm.Like(field, conditions[k].Value)))
104+
}
115105
}
116-
}()
106+
}
107+
query := db.Select(ms...).OrderBy("CreateAt").Reverse()
117108
count, err := query.Count(&v1Cluster.Cluster{})
118109
if err != nil {
119110
return nil, 0, err
120111
}
112+
if size != 0 {
113+
query.Limit(size).Skip((num - 1) * size)
114+
}
121115
clusters := make([]v1Cluster.Cluster, 0)
122116
if err := query.Find(&clusters); err != nil {
123117
return clusters, 0, err

‎internal/service/v1/role/role.go

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"github.com/KubeOperator/kubepi/internal/service/v1/common"
77
costomStorm "github.com/KubeOperator/kubepi/pkg/storm"
88
"github.com/KubeOperator/kubepi/pkg/util/lang"
9-
"github.com/asdine/storm/v3"
109
"github.com/asdine/storm/v3/q"
1110
"github.com/google/uuid"
1211
"time"
@@ -109,42 +108,34 @@ func (s *service) Delete(name string, options common.DBOptions) error {
109108

110109
func (s *service) Search(num, size int, conditions common.Conditions, options common.DBOptions) ([]v1Role.Role, int, error) {
111110
db := s.GetDB(options)
112-
query := func() storm.Query {
113-
var ms []q.Matcher
114-
115-
for k := range conditions {
116-
if conditions[k].Field == "quick" {
117-
ms = append(ms, costomStorm.Like("Name", conditions[k].Value))
118-
} else {
119-
filed := lang.FirstToUpper(conditions[k].Field)
120-
value := lang.ParseValueType(conditions[k].Value)
121-
122-
switch conditions[k].Operator {
123-
case "eq":
124-
ms = append(ms, q.Eq(filed, value))
125-
case "ne":
126-
ms = append(ms, q.Not(q.Eq(filed, value)))
127-
case "like":
128-
ms = append(ms, costomStorm.Like(filed, value.(string)))
129-
case "not like":
130-
ms = append(ms, q.Not(costomStorm.Like(filed, value.(string))))
131-
}
111+
var ms []q.Matcher
112+
for k := range conditions {
113+
if conditions[k].Field == "quick" {
114+
ms = append(ms, costomStorm.Like("Name", conditions[k].Value))
115+
} else {
116+
filed := lang.FirstToUpper(conditions[k].Field)
117+
value := lang.ParseValueType(conditions[k].Value)
118+
119+
switch conditions[k].Operator {
120+
case "eq":
121+
ms = append(ms, q.Eq(filed, value))
122+
case "ne":
123+
ms = append(ms, q.Not(q.Eq(filed, value)))
124+
case "like":
125+
ms = append(ms, costomStorm.Like(filed, value.(string)))
126+
case "not like":
127+
ms = append(ms, q.Not(costomStorm.Like(filed, value.(string))))
132128
}
133129
}
134-
if len(conditions) > 0 {
135-
return db.Select(ms...).OrderBy("CreateAt")
136-
}
137-
return db.Select().OrderBy("CreateAt")
138-
}()
139-
140-
if num != 0 && size != 0 {
141-
query.Limit(size).Skip((num - 1) * size)
142130
}
143-
131+
query := db.Select(ms...).OrderBy("CreateAt")
144132
count, err := query.Count(&v1Role.Role{})
145133
if err != nil {
146134
return nil, 0, err
147135
}
136+
if size != 0 {
137+
query.Limit(size).Skip((num - 1) * size)
138+
}
148139
roles := make([]v1Role.Role, 0)
149140
if err := query.Find(&roles); err != nil {
150141
return nil, 0, err

‎internal/service/v1/user/user.go

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/KubeOperator/kubepi/internal/service/v1/rolebinding"
99
costomStorm "github.com/KubeOperator/kubepi/pkg/storm"
1010
"github.com/KubeOperator/kubepi/pkg/util/lang"
11-
"github.com/asdine/storm/v3"
1211
"github.com/asdine/storm/v3/q"
1312
"github.com/google/uuid"
1413
"golang.org/x/crypto/bcrypt"
@@ -87,41 +86,37 @@ func (u *service) Update(name string, us *v1User.User, options common.DBOptions)
8786

8887
func (u *service) Search(num, size int, conditions common.Conditions, options common.DBOptions) ([]v1User.User, int, error) {
8988
db := u.GetDB(options)
90-
query := func() storm.Query {
91-
var ms []q.Matcher
92-
for k := range conditions {
93-
if conditions[k].Field == "quick" {
94-
ms = append(ms, q.Or(
95-
costomStorm.Like("Name", conditions[k].Value),
96-
costomStorm.Like("NickName", conditions[k].Value),
97-
costomStorm.Like("Email", conditions[k].Value),
98-
))
99-
} else {
100-
field := lang.FirstToUpper(conditions[k].Field)
101-
value := lang.ParseValueType(conditions[k].Value)
10289

103-
switch conditions[k].Operator {
104-
case "eq":
105-
ms = append(ms, q.Eq(field, value))
106-
case "ne":
107-
ms = append(ms, q.Not(q.Eq(field, value)))
108-
case "like":
109-
ms = append(ms, costomStorm.Like(field, value.(string)))
110-
case "not like":
111-
ms = append(ms, q.Not(costomStorm.Like(field, value.(string))))
112-
}
90+
var ms []q.Matcher
91+
for k := range conditions {
92+
if conditions[k].Field == "quick" {
93+
ms = append(ms, q.Or(
94+
costomStorm.Like("Name", conditions[k].Value),
95+
costomStorm.Like("NickName", conditions[k].Value),
96+
costomStorm.Like("Email", conditions[k].Value),
97+
))
98+
} else {
99+
field := lang.FirstToUpper(conditions[k].Field)
100+
value := lang.ParseValueType(conditions[k].Value)
101+
102+
switch conditions[k].Operator {
103+
case "eq":
104+
ms = append(ms, q.Eq(field, value))
105+
case "ne":
106+
ms = append(ms, q.Not(q.Eq(field, value)))
107+
case "like":
108+
ms = append(ms, costomStorm.Like(field, value.(string)))
109+
case "not like":
110+
ms = append(ms, q.Not(costomStorm.Like(field, value.(string))))
113111
}
114112
}
115-
if len(conditions) > 0 {
116-
return db.Select(ms...).OrderBy("CreateAt")
117-
}
118-
return db.Select().OrderBy("CreateAt")
119-
}()
113+
}
114+
query := db.Select(ms...).OrderBy("CreateAt").Reverse()
120115
count, err := query.Count(&v1User.User{})
121116
if err != nil {
122117
return nil, 0, err
123118
}
124-
if num != 0 && size != 0 {
119+
if size != 0 {
125120
query.Limit(size).Skip((num - 1) * size)
126121
}
127122
users := make([]v1User.User, 0)

‎web/dashboard/src/business/storage/pv/create/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export default {
213213
} else {
214214
data = this.transformYaml()
215215
}
216-
if (data.spec.nodeAffinity?.required?.nodeSelectorTerms?.length === 0) {
216+
if (!data.spec.nodeAffinity?.required?.nodeSelectorTerms?.length > 0) {
217217
delete data.spec.nodeAffinity
218218
}
219219
this.loading = true

0 commit comments

Comments
 (0)