Skip to content

Commit bb33c31

Browse files
songzhibin97songzhibin97
committed
Merge remote-tracking branch 'upstream/gva_gormv2_dev' into gva_gormv2_dev
2 parents b9b4bc6 + 6e6b488 commit bb33c31

File tree

23 files changed

+1739
-950
lines changed

23 files changed

+1739
-950
lines changed

‎server/api/v1/autocode/autocodeExample.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) UpdateAutoCodeExample(c *gin.Conte
7878
// @Security ApiKeyAuth
7979
// @accept application/json
8080
// @Produce application/json
81-
// @Param data body autocode.AutoCodeExample true "用id查询AutoCodeExample"
81+
// @Param data query autocode.AutoCodeExample true "用id查询AutoCodeExample"
8282
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
8383
// @Router /autoCodeExample/findAutoCodeExample [get]
8484
func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context) {
@@ -101,7 +101,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context
101101
// @Security ApiKeyAuth
102102
// @accept application/json
103103
// @Produce application/json
104-
// @Param data body autocodeReq.AutoCodeExampleSearch true "页码, 每页大小, 搜索条件"
104+
// @Param data query autocodeReq.AutoCodeExampleSearch true "页码, 每页大小, 搜索条件"
105105
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
106106
// @Router /autoCodeExample/getAutoCodeExampleList [get]
107107
func (autoCodeExampleApi *AutoCodeExampleApi) GetAutoCodeExampleList(c *gin.Context) {

‎server/api/v1/example/exa_customer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (e *CustomerApi) UpdateExaCustomer(c *gin.Context) {
9494
// @Security ApiKeyAuth
9595
// @accept application/json
9696
// @Produce application/json
97-
// @Param data body example.ExaCustomer true "客户ID"
97+
// @Param data query example.ExaCustomer true "客户ID"
9898
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
9999
// @Router /customer/customer [get]
100100
func (e *CustomerApi) GetExaCustomer(c *gin.Context) {
@@ -118,7 +118,7 @@ func (e *CustomerApi) GetExaCustomer(c *gin.Context) {
118118
// @Security ApiKeyAuth
119119
// @accept application/json
120120
// @Produce application/json
121-
// @Param data body request.PageInfo true "页码, 每页大小"
121+
// @Param data query request.PageInfo true "页码, 每页大小"
122122
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
123123
// @Router /customer/customerList [get]
124124
func (e *CustomerApi) GetExaCustomerList(c *gin.Context) {

‎server/api/v1/system/sys_captcha.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
// 当开启多服务器部署时，替换下面的配置，使用redis共享存储验证码
13-
// var store = captcha.NewDefaultRedisStore()
13+
//var store = captcha.NewDefaultRedisStore()
1414
var store = base64Captcha.DefaultMemStore
1515

1616
type BaseApi struct {
@@ -27,6 +27,7 @@ func (b *BaseApi) Captcha(c *gin.Context) {
2727
// 字符,公式,验证码配置
2828
// 生成默认数字的driver
2929
driver := base64Captcha.NewDriverDigit(global.GVA_CONFIG.Captcha.ImgHeight, global.GVA_CONFIG.Captcha.ImgWidth, global.GVA_CONFIG.Captcha.KeyLong, 0.7, 80)
30+
//cp := base64Captcha.NewCaptcha(driver, store.UseWithCtx(c)) // v8下使用redis
3031
cp := base64Captcha.NewCaptcha(driver, store)
3132
if id, b64s, err := cp.Generate(); err != nil {
3233
global.GVA_LOG.Error("验证码获取失败!", zap.Any("err", err))

‎server/api/v1/system/sys_dictionary.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (s *DictionaryApi) UpdateSysDictionary(c *gin.Context) {
7575
// @Security ApiKeyAuth
7676
// @accept application/json
7777
// @Produce application/json
78-
// @Param data body system.SysDictionary true "ID或字典英名"
78+
// @Param data query system.SysDictionary true "ID或字典英名"
7979
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
8080
// @Router /sysDictionary/findSysDictionary [get]
8181
func (s *DictionaryApi) FindSysDictionary(c *gin.Context) {
@@ -94,7 +94,7 @@ func (s *DictionaryApi) FindSysDictionary(c *gin.Context) {
9494
// @Security ApiKeyAuth
9595
// @accept application/json
9696
// @Produce application/json
97-
// @Param data body request.SysDictionarySearch true "页码, 每页大小, 搜索条件"
97+
// @Param data query request.SysDictionarySearch true "页码, 每页大小, 搜索条件"
9898
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
9999
// @Router /sysDictionary/getSysDictionaryList [get]
100100
func (s *DictionaryApi) GetSysDictionaryList(c *gin.Context) {

‎server/api/v1/system/sys_dictionary_detail.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (s *DictionaryDetailApi) UpdateSysDictionaryDetail(c *gin.Context) {
7575
// @Security ApiKeyAuth
7676
// @accept application/json
7777
// @Produce application/json
78-
// @Param data body system.SysDictionaryDetail true "用id查询SysDictionaryDetail"
78+
// @Param data query system.SysDictionaryDetail true "用id查询SysDictionaryDetail"
7979
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
8080
// @Router /sysDictionaryDetail/findSysDictionaryDetail [get]
8181
func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) {
@@ -98,7 +98,7 @@ func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) {
9898
// @Security ApiKeyAuth
9999
// @accept application/json
100100
// @Produce application/json
101-
// @Param data body request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件"
101+
// @Param data query request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件"
102102
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
103103
// @Router /sysDictionaryDetail/getSysDictionaryDetailList [get]
104104
func (s *DictionaryDetailApi) GetSysDictionaryDetailList(c *gin.Context) {

‎server/api/v1/system/sys_menu.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (a *AuthorityMenuApi) AddMenuAuthority(c *gin.Context) {
8181
// @Produce application/json
8282
// @Param data body request.GetAuthorityId true "角色ID"
8383
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
84-
// @Router /menu/GetMenuAuthority [post]
84+
// @Router /menu/getMenuAuthority [post]
8585
func (a *AuthorityMenuApi) GetMenuAuthority(c *gin.Context) {
8686
var param request.GetAuthorityId
8787
_ = c.ShouldBindJSON(&param)

‎server/api/v1/system/sys_operation_record.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (s *OperationRecordApi) DeleteSysOperationRecordByIds(c *gin.Context) {
7676
// @Security ApiKeyAuth
7777
// @accept application/json
7878
// @Produce application/json
79-
// @Param data body system.SysOperationRecord true "Id"
79+
// @Param data query system.SysOperationRecord true "Id"
8080
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
8181
// @Router /sysOperationRecord/findSysOperationRecord [get]
8282
func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) {
@@ -99,7 +99,7 @@ func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) {
9999
// @Security ApiKeyAuth
100100
// @accept application/json
101101
// @Produce application/json
102-
// @Param data body request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件"
102+
// @Param data query request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件"
103103
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
104104
// @Router /sysOperationRecord/getSysOperationRecordList [get]
105105
func (s *OperationRecordApi) GetSysOperationRecordList(c *gin.Context) {

‎server/api/v1/system/sys_user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (b *BaseApi) Register(c *gin.Context) {
143143
// @Produce application/json
144144
// @Param data body systemReq.ChangePasswordStruct true "用户名, 原密码, 新密码"
145145
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
146-
// @Router /user/changePassword [put]
146+
// @Router /user/changePassword [post]
147147
func (b *BaseApi) ChangePassword(c *gin.Context) {
148148
var user systemReq.ChangePasswordStruct
149149
_ = c.ShouldBindJSON(&user)

‎server/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,4 @@ Timer:
132132
{ tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" },
133133
#{ tableName: "log2" , compareField: "created_at", interval: "2160h" }
134134
]
135+

‎server/config/oss.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type AliyunOSS struct {
2020
AccessKeySecret string `mapstructure:"access-key-secret" json:"accessKeySecret" yaml:"access-key-secret"`
2121
BucketName string `mapstructure:"bucket-name" json:"bucketName" yaml:"bucket-name"`
2222
BucketUrl string `mapstructure:"bucket-url" json:"bucketUrl" yaml:"bucket-url"`
23-
BasePath string `mapstructure:"base-path" json:"basePath" yaml:"base-path"`
23+
BasePath string `mapstructure:"base-path" json:"basePath" yaml:"base-path"`
2424
}
2525
type TencentCOS struct {
2626
Bucket string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`

0 commit comments

Comments
 (0)