Skip to content

Commit 84bde23

Browse files
piupuerpiupuer
committed
bug fix
1 parent 3c9aec7 commit 84bde23

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+66
-73
lines changed

‎api/v1/sys_api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
// 获取接口列表
1414
func GetApis(c *gin.Context) {
1515
// 绑定参数
16-
var req request.ApiListRequestStruct
16+
var req request.ApiRequestStruct
1717
err := c.ShouldBind(&req)
1818
if err != nil {
1919
response.FailWithMsg("参数绑定失败, 请检查数据类型")

‎api/v1/sys_leave.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// 获取请假列表
1515
func GetLeaves(c *gin.Context) {
1616
// 绑定参数
17-
var req request.LeaveListRequestStruct
17+
var req request.LeaveRequestStruct
1818
err := c.ShouldBind(&req)
1919
if err != nil {
2020
response.FailWithMsg("参数绑定失败, 请检查数据类型")
@@ -46,7 +46,7 @@ func GetLeaves(c *gin.Context) {
4646
// 获取请假列表
4747
func GetLeaveApprovalLogs(c *gin.Context) {
4848
// 绑定参数
49-
var req request.LeaveListRequestStruct
49+
var req request.LeaveRequestStruct
5050
err := c.ShouldBind(&req)
5151
if err != nil {
5252
response.FailWithMsg("参数绑定失败, 请检查数据类型")

‎api/v1/sys_machine.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// 获取机器列表
1515
func GetMachines(c *gin.Context) {
1616
// 绑定参数
17-
var req request.MachineListRequestStruct
17+
var req request.MachineRequestStruct
1818
err := c.ShouldBind(&req)
1919
if err != nil {
2020
response.FailWithMsg("参数绑定失败, 请检查数据类型")

‎api/v1/sys_message.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
// 获取全部消息
1212
func GetAllMessages(c *gin.Context) {
1313
// 绑定参数
14-
var req request.MessageListRequestStruct
14+
var req request.MessageRequestStruct
1515
err := c.ShouldBind(&req)
1616
if err != nil {
1717
response.FailWithMsg("参数绑定失败, 请检查数据类型")

‎api/v1/sys_operation_log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// 获取操作日志列表
1515
func GetOperationLogs(c *gin.Context) {
1616
// 绑定参数
17-
var req request.OperationLogListRequestStruct
17+
var req request.OperationLogRequestStruct
1818
err := c.ShouldBind(&req)
1919
if err != nil {
2020
response.FailWithMsg("参数绑定失败, 请检查数据类型")

‎api/v1/sys_role.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
// 获取角色列表
1616
func GetRoles(c *gin.Context) {
1717
// 绑定参数
18-
var req request.RoleListRequestStruct
18+
var req request.RoleRequestStruct
1919
err := c.ShouldBind(&req)
2020
if err != nil {
2121
response.FailWithMsg("参数绑定失败, 请检查数据类型")

‎api/v1/sys_user.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var (
2020
userInfoCache = cache.New(24*time.Hour, 48*time.Hour)
2121
userByIdCache = cache.New(24*time.Hour, 48*time.Hour)
2222
)
23+
2324
// 获取当前用户信息
2425
func GetUserInfo(c *gin.Context) {
2526
user := GetCurrentUser(c)
@@ -45,7 +46,7 @@ func GetUserInfo(c *gin.Context) {
4546
// 获取用户列表
4647
func GetUsers(c *gin.Context) {
4748
// 绑定参数
48-
var req request.UserListRequestStruct
49+
var req request.UserRequestStruct
4950
err := c.ShouldBind(&req)
5051
if err != nil {
5152
response.FailWithMsg("参数绑定失败, 请检查数据类型")

‎api/v1/sys_workflow.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
// 获取全部审批日志(目前有1: 请假)
1616
func GetWorkflowApprovings(c *gin.Context) {
1717
// 绑定参数
18-
var req request.WorkflowApprovingListRequestStruct
18+
var req request.WorkflowApprovingRequestStruct
1919
err := c.ShouldBind(&req)
2020
if err != nil {
2121
response.FailWithMsg("参数绑定失败, 请检查数据类型")
@@ -71,7 +71,7 @@ func GetWorkflowApprovings(c *gin.Context) {
7171
// 获取工作流列表
7272
func GetWorkflows(c *gin.Context) {
7373
// 绑定参数
74-
var req request.WorkflowListRequestStruct
74+
var req request.WorkflowRequestStruct
7575
err := c.ShouldBind(&req)
7676
if err != nil {
7777
response.FailWithMsg("参数绑定失败, 请检查数据类型")
@@ -100,7 +100,7 @@ func GetWorkflows(c *gin.Context) {
100100
// 获取工作流列表
101101
func GetWorkflowLines(c *gin.Context) {
102102
// 绑定参数
103-
var req request.WorkflowLineListRequestStruct
103+
var req request.WorkflowLineRequestStruct
104104
err := c.ShouldBind(&req)
105105
if err != nil {
106106
response.FailWithMsg("参数绑定失败, 请检查数据类型")

‎conf/config.prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ system:
55

66
mysql:
77
database: gin_web_prod
8-
8+
99
logs:
1010
level: 0
1111

‎main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"gin-web/initialize"
77
"gin-web/pkg/global"
88
"net/http"
9-
// 加入pprof性能分析
9+
// 加入pprof性能分析
1010
_ "net/http/pprof"
1111
"os"
1212
"os/signal"
@@ -37,7 +37,7 @@ func main() {
3737

3838
// 初始化casbin策略管理器
3939
initialize.CasbinEnforcer()
40-
40+
4141
// 初始校验器
4242
initialize.Validate()
4343

@@ -51,7 +51,7 @@ func main() {
5151

5252
// 初始化定时任务
5353
initialize.Cron()
54-
54+
5555
// 初始化对象存储
5656
initialize.Oss()
5757

@@ -71,7 +71,7 @@ func main() {
7171
global.Log.Error("listen pprof error: ", err)
7272
}
7373
}()
74-
74+
7575
// Initializing the server in a goroutine so that
7676
// it won't block the graceful shutdown handling below
7777
go func() {

‎middleware/operation_log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func getApiDesc(c *gin.Context, method, path string) string {
186186
} else {
187187
// 获取当前接口
188188
s := cache_service.New(c)
189-
apis, err := s.GetApis(&request.ApiListRequestStruct{
189+
apis, err := s.GetApis(&request.ApiRequestStruct{
190190
PageInfo: response.PageInfo{
191191
NoPagination: true,
192192
},

‎models/soft_delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (t *DeletedAt) UnmarshalJSON(data []byte) (err error) {
2525
*t = DeletedAt{Time: time.Time{}}
2626
return
2727
}
28-
28+
2929
// 设置str
3030
t.SetString(str)
3131
return

‎pkg/cache_service/sys_api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
)
1212

1313
// 获取所有接口
14-
func (s *RedisService) GetApis(req *request.ApiListRequestStruct) ([]models.SysApi, error) {
14+
func (s *RedisService) GetApis(req *request.ApiRequestStruct) ([]models.SysApi, error) {
1515
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
1616
// 不使用redis
1717
return s.mysql.GetApis(req)

‎pkg/cache_service/sys_api_test.go

+2-11
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,10 @@ import (
1010
func TestRedisService_GetApis(t *testing.T) {
1111
tests.InitTestEnv()
1212
s := New(nil)
13-
req1 := &request.ApiListRequestStruct{}
13+
req1 := &request.ApiRequestStruct{}
1414
fmt.Println(s.GetApis(req1))
15-
req2 := &request.ApiListRequestStruct{
15+
req2 := &request.ApiRequestStruct{
1616
Method: "GET",
1717
}
1818
fmt.Println(s.GetApis(req2))
1919
}
20-
21-
func TestRedisService_GetAllApiGroupByCategoryByRoleId(t *testing.T) {
22-
tests.InitTestEnv()
23-
s := New(nil)
24-
fmt.Println(s.GetAllApiGroupByCategoryByRoleId(1))
25-
fmt.Println(s.GetAllApiGroupByCategoryByRoleId(2))
26-
fmt.Println(s.GetAllApiGroupByCategoryByRoleId(3))
27-
fmt.Println(s.GetAllApiGroupByCategoryByRoleId(1000))
28-
}

‎pkg/cache_service/sys_leave.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
// 获取所有请假(当前用户)
11-
func (s *RedisService) GetLeaves(req *request.LeaveListRequestStruct) ([]models.SysLeave, error) {
11+
func (s *RedisService) GetLeaves(req *request.LeaveRequestStruct) ([]models.SysLeave, error) {
1212
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
1313
// 不使用redis
1414
return s.mysql.GetLeaves(req)

‎pkg/cache_service/sys_machine.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
)
99

10-
func (s *RedisService) GetMachines(req *request.MachineListRequestStruct) ([]models.SysMachine, error) {
10+
func (s *RedisService) GetMachines(req *request.MachineRequestStruct) ([]models.SysMachine, error) {
1111
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
1212
// 不使用redis
1313
return s.mysql.GetMachines(req)

‎pkg/cache_service/sys_message.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
// 查询指定用户未删除的消息
13-
func (s *RedisService) GetUnDeleteMessages(req *request.MessageListRequestStruct) ([]response.MessageListResponseStruct, error) {
13+
func (s *RedisService) GetUnDeleteMessages(req *request.MessageRequestStruct) ([]response.MessageListResponseStruct, error) {
1414
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
1515
// 不使用redis
1616
return s.mysql.GetUnDeleteMessages(req)

‎pkg/cache_service/sys_operation_log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
// 获取所有操作日志
12-
func (s *RedisService) GetOperationLogs(req *request.OperationLogListRequestStruct) ([]models.SysOperationLog, error) {
12+
func (s *RedisService) GetOperationLogs(req *request.OperationLogRequestStruct) ([]models.SysOperationLog, error) {
1313
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
1414
// 不使用redis
1515
return s.mysql.GetOperationLogs(req)

‎pkg/cache_service/sys_role.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (s *RedisService) GetRoleIdsBySort(currentRoleSort uint) ([]uint, error) {
2626
}
2727

2828
// 获取所有角色
29-
func (s *RedisService) GetRoles(req *request.RoleListRequestStruct) ([]models.SysRole, error) {
29+
func (s *RedisService) GetRoles(req *request.RoleRequestStruct) ([]models.SysRole, error) {
3030
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
3131
// 不使用redis
3232
return s.mysql.GetRoles(req)

‎pkg/cache_service/sys_user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func (s *RedisService) LoginCheck(user *models.SysUser) (*models.SysUser, error)
2929
return &u, err
3030
}
3131

32-
func (s *RedisService) GetUsers(req *request.UserListRequestStruct) ([]models.SysUser, error) {
32+
func (s *RedisService) GetUsers(req *request.UserRequestStruct) ([]models.SysUser, error) {
3333
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
3434
// 不使用redis
3535
return s.mysql.GetUsers(req)

‎pkg/cache_service/sys_workflow.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func (s *RedisService) GetWorkflowByTargetCategory(targetCategory uint) (models.
1818
}
1919

2020
// 获取所有工作流
21-
func (s *RedisService) GetWorkflows(req *request.WorkflowListRequestStruct) ([]models.SysWorkflow, error) {
21+
func (s *RedisService) GetWorkflows(req *request.WorkflowRequestStruct) ([]models.SysWorkflow, error) {
2222
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
2323
// 不使用redis
2424
return s.mysql.GetWorkflows(req)
@@ -53,7 +53,7 @@ func (s *RedisService) GetWorkflows(req *request.WorkflowListRequestStruct) ([]m
5353
}
5454

5555
// 获取所有流水线
56-
func (s *RedisService) GetWorkflowLines(req *request.WorkflowLineListRequestStruct) ([]models.SysWorkflowLine, error) {
56+
func (s *RedisService) GetWorkflowLines(req *request.WorkflowLineRequestStruct) ([]models.SysWorkflowLine, error) {
5757
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
5858
// 不使用redis
5959
return s.mysql.GetWorkflowLines(req)
@@ -89,7 +89,7 @@ func (s *RedisService) GetWorkflowLogs(flowId uint, targetId uint) ([]models.Sys
8989
}
9090

9191
// 查询待审批目标列表(指定用户)
92-
func (s *RedisService) GetWorkflowApprovings(req *request.WorkflowApprovingListRequestStruct) ([]models.SysWorkflowLog, error) {
92+
func (s *RedisService) GetWorkflowApprovings(req *request.WorkflowApprovingRequestStruct) ([]models.SysWorkflowLog, error) {
9393
if !global.Conf.System.UseRedis || !global.Conf.System.UseRedisService {
9494
// 不使用redis
9595
return s.mysql.GetWorkflowApprovings(req)

‎pkg/global/constant.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package global
22

33
const (
44
// 本地时间格式
5-
MsecLocalTimeFormat = "2006-01-02 15:04:05.000"
6-
SecLocalTimeFormat = "2006-01-02 15:04:05"
7-
DateLocalTimeFormat = "2006-01-02"
5+
MsecLocalTimeFormat = "2006-01-02 15:04:05.000"
6+
SecLocalTimeFormat = "2006-01-02 15:04:05"
7+
DateLocalTimeFormat = "2006-01-02"
88
MonthLocalTimeFormat = "2006-01"
99
)

‎pkg/request/sys_api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
// 获取接口列表结构体
8-
type ApiListRequestStruct struct {
8+
type ApiRequestStruct struct {
99
Method string `json:"method" form:"method"`
1010
Path string `json:"path" form:"path"`
1111
Category string `json:"category" form:"category"`
@@ -41,5 +41,5 @@ type UpdateApiRequestStruct struct {
4141
Desc *string `json:"desc"`
4242
Title *string `json:"title"`
4343
Creator *string `json:"creator"`
44-
RoleIds []uint `json:"roleIds"`
44+
RoleIds []uint `json:"roleIds"`
4545
}

‎pkg/request/sys_leave.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
)
77

88
// 获取请假列表结构体
9-
type LeaveListRequestStruct struct {
9+
type LeaveRequestStruct struct {
1010
UserId uint `json:"-"`
1111
Status *uint `json:"status" form:"status"`
1212
ApprovalOpinion string `json:"approvalOpinion" form:"approvalOpinion"`

‎pkg/request/sys_machine.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package request
33
import "gin-web/pkg/response"
44

55
// 获取机器列表结构体
6-
type MachineListRequestStruct struct {
6+
type MachineRequestStruct struct {
77
Id uint `json:"id" form:"id"`
88
Host string `json:"host" form:"host"`
99
SshPort int `json:"sshPort" form:"sshPort"`

‎pkg/request/sys_menu.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package request
33
import "gin-web/pkg/response"
44

55
// 获取菜单列表结构体
6-
type MenuListRequestStruct struct {
6+
type MenuRequestStruct struct {
77
Name string `json:"name" form:"name"`
88
Title string `json:"title" form:"title"`
99
Path string `json:"path" form:"path"`

‎pkg/request/sys_message.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
// 获取消息列表结构体
8-
type MessageListRequestStruct struct {
8+
type MessageRequestStruct struct {
99
ToUserId uint `json:"toUserId"`
1010
Title string `json:"title" form:"title"`
1111
Content string `json:"content" form:"content"`

‎pkg/request/sys_operation_log.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
)
77

88
// 获取操作日志列表结构体
9-
type OperationLogListRequestStruct struct {
9+
type OperationLogRequestStruct struct {
1010
Method string `json:"method" form:"method"`
1111
Path string `json:"path" form:"path"`
1212
Username string `json:"username" form:"username"`
@@ -16,7 +16,7 @@ type OperationLogListRequestStruct struct {
1616
}
1717

1818
// 翻译需要校验的字段名称
19-
func (s OperationLogListRequestStruct) FieldTrans() map[string]string {
19+
func (s OperationLogRequestStruct) FieldTrans() map[string]string {
2020
m := make(map[string]string, 0)
2121
m["Status"] = "响应状态码"
2222
return m

‎pkg/request/sys_role.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
)
66

77
// 获取角色列表结构体
8-
type RoleListRequestStruct struct {
8+
type RoleRequestStruct struct {
99
Name string `json:"name" form:"name"`
1010
Keyword string `json:"keyword" form:"keyword"`
1111
CurrentRoleSort uint `json:"currentRoleSort"`

‎pkg/request/sys_upload.go

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const (
1212
// 上传分片文件临时目录
1313
ChunkTmpPath = "chunks"
1414
)
15+
1516
// 文件分片信息结构体
1617
type FilePartInfo struct {
1718
// 当前文件大小(post传输时值非空)

‎pkg/request/sys_user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type ChangePwdRequestStruct struct {
1818
}
1919

2020
// 获取用户列表结构体
21-
type UserListRequestStruct struct {
21+
type UserRequestStruct struct {
2222
CurrentRole models.SysRole `json:"currentRole"`
2323
Username string `json:"username" form:"username"`
2424
Mobile string `json:"mobile" form:"mobile"`

0 commit comments

Comments
 (0)