Skip to content

Commit 9052979

Browse files
author
pixel
committed
Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev
2 parents aaa53d9 + 6fb241a commit 9052979

File tree

17 files changed

+34
-25
lines changed

17 files changed

+34
-25
lines changed

‎server/docs/docs.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
22
// This file was generated by swaggo/swag at
3-
// 2021-04-30 13:57:23.4731221 +0800 CST m=+1.258292701
3+
// 2021-05-11 17:25:23.4731221 +0800 CST m=+1.258292701
44

55
package docs
66

@@ -3396,6 +3396,7 @@ var doc = `{
33963396
}
33973397
},
33983398
"createdAt": {
3399+
"description": "创建时间",
33993400
"type": "string"
34003401
},
34013402
"dataAuthorityId": {
@@ -3422,6 +3423,7 @@ var doc = `{
34223423
"type": "string"
34233424
},
34243425
"updatedAt": {
3426+
"description": "更新时间",
34253427
"type": "string"
34263428
}
34273429
}
@@ -3696,7 +3698,7 @@ var doc = `{
36963698
"type": "integer"
36973699
},
36983700
"nickName": {
3699-
"description": "用户昵称\"",
3701+
"description": "用户昵称",
37003702
"type": "string"
37013703
},
37023704
"updatedAt": {
@@ -4105,6 +4107,7 @@ var doc = `{
41054107
"$ref": "#/definitions/model.SysAuthority"
41064108
},
41074109
"oldAuthorityId": {
4110+
"description": "旧角色ID",
41084111
"type": "string"
41094112
}
41104113
}

‎server/docs/swagger.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3379,6 +3379,7 @@
33793379
}
33803380
},
33813381
"createdAt": {
3382+
"description": "创建时间",
33823383
"type": "string"
33833384
},
33843385
"dataAuthorityId": {
@@ -3405,6 +3406,7 @@
34053406
"type": "string"
34063407
},
34073408
"updatedAt": {
3409+
"description": "更新时间",
34083410
"type": "string"
34093411
}
34103412
}
@@ -3679,7 +3681,7 @@
36793681
"type": "integer"
36803682
},
36813683
"nickName": {
3682-
"description": "用户昵称\"",
3684+
"description": "用户昵称",
36833685
"type": "string"
36843686
},
36853687
"updatedAt": {
@@ -4088,6 +4090,7 @@
40884090
"$ref": "#/definitions/model.SysAuthority"
40894091
},
40904092
"oldAuthorityId": {
4093+
"description": "旧角色ID",
40914094
"type": "string"
40924095
}
40934096
}

‎server/docs/swagger.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ definitions:
445445
$ref: '#/definitions/model.SysAuthority'
446446
type: array
447447
createdAt:
448+
description: 创建时间
448449
type: string
449450
dataAuthorityId:
450451
items:
@@ -463,6 +464,7 @@ definitions:
463464
description: 父角色ID
464465
type: string
465466
updatedAt:
467+
description: 更新时间
466468
type: string
467469
type: object
468470
model.SysBaseMenu:
@@ -661,7 +663,7 @@ definitions:
661663
description: 主键ID
662664
type: integer
663665
nickName:
664-
description: 用户昵称"
666+
description: 用户昵称
665667
type: string
666668
updatedAt:
667669
description: 更新时间
@@ -952,6 +954,7 @@ definitions:
952954
authority:
953955
$ref: '#/definitions/model.SysAuthority'
954956
oldAuthorityId:
957+
description: 旧角色ID
955958
type: string
956959
type: object
957960
info:

‎server/model/request/common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ type PageInfo struct {
88

99
// Find by id structure
1010
type GetById struct {
11-
ID float64 `json:"id" form:"id"`
11+
ID float64 `json:"id" form:"id"` // 主键ID
1212
}
1313

1414
type IdsReq struct {

‎server/model/response/sys_authority.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ type SysAuthorityResponse struct {
88

99
type SysAuthorityCopyResponse struct {
1010
Authority model.SysAuthority `json:"authority"`
11-
OldAuthorityId string `json:"oldAuthorityId"`
11+
OldAuthorityId string `json:"oldAuthorityId"` // 旧角色ID
1212
}

‎server/model/sys_authority.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import (
55
)
66

77
type SysAuthority struct {
8-
CreatedAt time.Time
9-
UpdatedAt time.Time
8+
CreatedAt time.Time // 创建时间
9+
UpdatedAt time.Time // 更新时间
1010
DeletedAt *time.Time `sql:"index"`
1111
AuthorityId string `json:"authorityId" gorm:"not null;unique;primary_key;comment:角色ID;size:90"` // 角色ID
12-
AuthorityName string `json:"authorityName" gorm:"comment:角色名"` // 角色名
13-
ParentId string `json:"parentId" gorm:"comment:父角色ID"` // 父角色ID
12+
AuthorityName string `json:"authorityName" gorm:"comment:角色名"` // 角色名
13+
ParentId string `json:"parentId" gorm:"comment:父角色ID"` // 父角色ID
1414
DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id"`
1515
Children []SysAuthority `json:"children" gorm:"-"`
1616
SysBaseMenus []SysBaseMenu `json:"menus" gorm:"many2many:sys_authority_menus;"`

‎server/model/sys_user.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type SysUser struct {
1010
UUID uuid.UUID `json:"uuid" gorm:"comment:用户UUID"` // 用户UUID
1111
Username string `json:"userName" gorm:"comment:用户登录名"` // 用户登录名
1212
Password string `json:"-" gorm:"comment:用户登录密码"` // 用户登录密码
13-
NickName string `json:"nickName" gorm:"default:系统用户;comment:用户昵称"` // 用户昵称"
13+
NickName string `json:"nickName" gorm:"default:系统用户;comment:用户昵称"` // 用户昵称
1414
HeaderImg string `json:"headerImg" gorm:"default:http://qmplusimg.henrongyi.top/head.png;comment:用户头像"` // 用户头像
1515
Authority SysAuthority `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
1616
AuthorityId string `json:"authorityId" gorm:"default:888;comment:用户角色ID"` // 用户角色ID

‎server/resource/template/web/table.vue.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ export default {
228228
type: 'success',
229229
message: '删除成功'
230230
})
231-
if (this.tableData.length == ids.length) {
231+
if (this.tableData.length == ids.length && this.page > 1) {
232232
this.page--;
233233
}
234234
this.deleteVisible = false
@@ -272,7 +272,7 @@ export default {
272272
type: "success",
273273
message: "删除成功"
274274
});
275-
if (this.tableData.length == 1) {
275+
if (this.tableData.length == 1 && this.page > 1 ) {
276276
this.page--;
277277
}
278278
this.getTableData();

‎web/src/components/customPic/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default {
3333
},
3434
data(){
3535
return{
36-
path: path,
36+
path: path + '/',
3737
}
3838
},
3939
computed:{
@@ -72,4 +72,4 @@ export default {
7272
height: 80px;
7373
position: relative;
7474
}
75-
</style>
75+
</style>

‎web/src/view/example/customer/customer.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export default {
125125
type: "success",
126126
message: ""
127127
});
128-
if (this.tableData.length == 1) {
128+
if (this.tableData.length == 1 && this.page > 1 ) {
129129
this.page--;
130130
}
131131
this.getTableData();

0 commit comments

Comments
 (0)