Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump golang.org/x/crypto from 0.0.0-20210921155107-089bfa567519 to 0.1.0 #6

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
820acbc
configs dir
xushuhui Oct 14, 2021
755ab2b
register no auth
xushuhui Oct 14, 2021
6d9c28c
增加book接口
LiYuanits Oct 15, 2021
f2a1346
feat: get book
LiYuanits Oct 15, 2021
45478b5
fix:route, get book
LiYuanits Oct 15, 2021
bdd8981
fix: changeMyPassword, timemixin
xushuhui Oct 18, 2021
ea85503
feat: zap logger middleware
xushuhui Oct 18, 2021
97b4a41
remove: zap logger middleware
xushuhui Oct 18, 2021
5927844
chore:log
xushuhui Oct 20, 2021
28109d4
fix :sql
xushuhui Oct 20, 2021
0f8c63d
fix: create_time,update_time
LiYuanits Oct 20, 2021
89a8f9d
fear: page struct
xushuhui Oct 20, 2021
b78f8dd
feat(biz,data/log):log
LiYuanits Oct 21, 2021
2561e8b
feat(biz,data/log):log
LiYuanits Oct 21, 2021
41bf9e3
fix: page, request validate tag
xushuhui Oct 21, 2021
d476aa1
fix: changemypassword getmyinfomation
xushuhui Oct 21, 2021
1dfe4be
feat: move ent model to model dir
xushuhui Oct 21, 2021
d1b82b9
.gitignore
1768177868 Oct 21, 2021
b27569b
Merge branch 'master' of github.com:xushuhui/lin-cms-go
1768177868 Oct 21, 2021
387ee5d
Dockerfile
1768177868 Oct 21, 2021
eb13016
.dockerignore
1768177868 Oct 22, 2021
cb10233
feat:log
LiYuanits Oct 22, 2021
924b49b
Merge remote-tracking branch 'origin/master'
LiYuanits Oct 22, 2021
98e18bd
refactor: searchlogs
xushuhui Oct 22, 2021
23876f3
refactor:log
LiYuanits Oct 25, 2021
d409748
docs, model
xushuhui Oct 26, 2021
36774b7
feat:group
LiYuanits Nov 1, 2021
fb5a2ae
perf:CreateGroup
LiYuanits Nov 3, 2021
5716be4
refactor:error handle
xushuhui Nov 4, 2021
59e15a4
fix: dispatch permissions
xushuhui Nov 8, 2021
49b5396
fix: delete lin_group_permission struct
xushuhui Nov 8, 2021
43c2581
feat: get all lin_permission
xushuhui Nov 8, 2021
b9fbf4c
feat:group
LiYuanits Nov 8, 2021
d74a2b8
fix: delete group
xushuhui Nov 8, 2021
6d10490
feat : userlog middleware
xushuhui Nov 9, 2021
ee61343
refactor move core/utils
xushuhui Nov 11, 2021
7fe1e4f
middleware error
xushuhui Nov 11, 2021
bba5ff2
feat : permission
xushuhui Nov 15, 2021
94a0ace
feat: delete user
xushuhui Nov 15, 2021
66d3383
feat : updateUser,getUsers
xushuhui Nov 16, 2021
0cd4390
fix: permission
xushuhui Nov 16, 2021
d91925d
fix: permission
xushuhui Nov 16, 2021
3402472
refactor: error
xushuhui Nov 17, 2021
8d06c53
refactor: error wrap
xushuhui Nov 23, 2021
545203c
fix; doc
xushuhui Sep 20, 2022
4d71d19
chore(deps): bump golang.org/x/crypto
dependabot[bot] Mar 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: page, request validate tag
  • Loading branch information
xushuhui committed Oct 21, 2021
commit 41bf9e3ea2e28b2e04f4c413f4388d1adb60d19c
13 changes: 6 additions & 7 deletions api/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ func Upload(c *fiber.Ctx) error {
}
func GetLogs(c *fiber.Ctx) error {
var req request.GetLogs
if err := core.ParseRequest(c, &req); err != nil {
if err := core.ParseQuery(c, &req); err != nil {
return err
}

data, total, err := biz.GetLogs(c.Context(), req)
if err != nil {
return err
Expand All @@ -24,7 +25,7 @@ func GetLogs(c *fiber.Ctx) error {

func SearchLogs(c *fiber.Ctx) error {
var req request.SearchLogs
if err := core.ParseRequest(c, &req); err != nil {
if err := core.ParseQuery(c, &req); err != nil {
return err
}

Expand All @@ -36,11 +37,9 @@ func SearchLogs(c *fiber.Ctx) error {
return core.SetData(c, data)
}
func GetLogUsers(c *fiber.Ctx) error {
var req request.GetLogUsers
if err := core.ParseRequest(c, &req); err != nil {
return err
}
data, total, err := biz.GetLogUsers(c.Context(), req)
page := core.GetPage(c)
size := core.GetSize(c)
data, total, err := biz.GetLogUsers(c.Context(), page, size)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/biz/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ func GetLogs(ctx context.Context, req request.GetLogs) (res interface{}, total i
func SearchLogs(req request.SearchLogs) (res map[string]interface{}, err error) {
return
}
func GetLogUsers(ctx context.Context, req request.GetLogUsers) (res interface{}, total int, err error) {
paging := data.NewPaging(req.Page, req.Count)
func GetLogUsers(ctx context.Context, page, size int) (res interface{}, total int, err error) {
paging := data.NewPaging(page, size)
res, err = paging.GetLogUsers(ctx)
if err != nil {
return
Expand Down
7 changes: 2 additions & 5 deletions internal/data/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,12 @@ func (p *Paging) FindLogsByUsername(ctx context.Context, name string) (model []*
}

func (p *Paging) GetLogUsers(ctx context.Context) (model []string, err error) {
model, err = GetDB().LinLog.Query().Limit(p.Size).Offset(p.Offset).Select(linlog.FieldUsername).GroupBy("username").Strings(ctx)
model, err = GetDB().LinLog.Query().Limit(p.Size).Offset(p.Offset).GroupBy(linlog.FieldUsername).Strings(ctx)
return
}

func GetLogUsersTotal(ctx context.Context) (total int, err error) {
// TODO sql有问题
model, err := GetDB().LinLog.Query().Select(linlog.FieldUsername).GroupBy("username").Strings(ctx)
GetDB().LinLog.Query().GroupBy("username")
total = len(model)
total, err = GetDB().LinLog.Query().Select(linlog.FieldUsername).Count(ctx)
return
}

Expand Down
14 changes: 7 additions & 7 deletions internal/request/admin.go
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package request

type GetUsers struct {
GroupId int `json:"group_id" binding:"required"`
GroupId int `json:"group_id" validate:"required"`
Pages
}
type Pages struct {
Count int `json:"count" binding:"required" comment:"数量"`
Page int `json:"page" binding:"required" comment:"页码"`
Count int `json:"count" validate:"required" comment:"数量"`
Page int `json:"page" validate:"required" comment:"页码"`
}
type ChangeUserPassword struct {
Id int `json:"uid"`
NewPassword string `json:"new_password" binding:"required" comment:"新密码"`
ConfirmPassword string `json:"confirm_password" binding:"required,eqcsfield=NewPassword" comment:"确认密码"`
NewPassword string `json:"new_password" validate:"required" comment:"新密码"`
ConfirmPassword string `json:"confirm_password" validate:"required,eqcsfield=NewPassword" comment:"确认密码"`
}
type UpdateUser struct {
Id int `json:"id" binding:"required"`
GroupIds []int `json:"group_ids" binding:"required"`
Id int `json:"id" validate:"required"`
GroupIds []int `json:"group_ids" validate:"required"`
}
type CreateGroup struct {
Name string `json:"name"`
Expand Down
4 changes: 2 additions & 2 deletions internal/request/book.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ type CreateBook struct {
Image string `json:"image" validate:"required" comment:"书籍封面图"`
}
type GetBooks struct {
Size int `json:"size" binding:"required" comment:"数量"`
Page int `json:"page" binding:"required" comment:"页码"`
Size int `json:"size" validate:"required" comment:"数量"`
Page int `json:"page" validate:"required" comment:"页码"`
}
12 changes: 6 additions & 6 deletions internal/request/permission.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package request

type DispatchPermissions struct {
GroupId int `json:"group_id" binding:"required"`
PermissionIds []int `json:"permission_ids" binding:"required"`
GroupId int `json:"group_id" validate:"required"`
PermissionIds []int `json:"permission_ids" validate:"required"`
}
type DispatchPermission struct {
GroupId int `json:"group_id" binding:"required"`
PermissionId int `json:"permission_id" binding:"required"`
GroupId int `json:"group_id" validate:"required"`
PermissionId int `json:"permission_id" validate:"required"`
}

type RemovePermissions struct {
GroupId int `json:"group_id" binding:"required"`
PermissionIds []int `json:"permission_ids" binding:"required"`
GroupId int `json:"group_id" validate:"required"`
PermissionIds []int `json:"permission_ids" validate:"required"`
}
6 changes: 3 additions & 3 deletions internal/server/routes.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ func InitRoute(app *fiber.App) {
cms.Post("/file", api.Upload)
cms.Post("/user/login", api.Login)
cms.Post("/user/register", api.Register)
cms.Use(jwtware.New(jwtware.Config{
SigningKey: []byte("secret"),
}))
//cms.Use(jwtware.New(jwtware.Config{
// SigningKey: []byte("secret"),
//}))

v1.Use(jwtware.New(jwtware.Config{
SigningKey: []byte("secret"),
Expand Down
4 changes: 2 additions & 2 deletions pkg/core/page.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ func GetPage(c *fiber.Ctx) int {
}

func GetSize(c *fiber.Ctx) int {
pageSize, _ := utils.StringToInt(c.Query("size"))
pageSize, _ := utils.StringToInt(c.Query("count"))
if pageSize <= 0 {
return 20
return 10
}

return pageSize
Expand Down
10 changes: 10 additions & 0 deletions pkg/core/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ func ValidateRequest(obj interface{}) error {
}
return nil
}
func ParseQuery(c *fiber.Ctx, request interface{}) (err error) {
err = c.QueryParser(request)

if err != nil {
return err
}

err = ValidateRequest(request)
return
}
func ParseRequest(c *fiber.Ctx, request interface{}) (err error) {
err = c.BodyParser(request)

Expand Down