Skip to content

Commit 7e1348c

Browse files
bypanghubypanghu
authored
Merge pull request #2 from flipped-aurora/master
拉取请求
2 parents aac76dc + 93b373d commit 7e1348c

File tree

26 files changed

+403
-10050
lines changed

26 files changed

+403
-10050
lines changed

‎server/api/v1/sys_initdb.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"gin-vue-admin/model/request"
66
"gin-vue-admin/model/response"
77
"gin-vue-admin/service"
8+
89
"go.uber.org/zap"
910

1011
"github.com/gin-gonic/gin"
@@ -18,8 +19,8 @@ import (
1819
// @Router /init/initdb [post]
1920
func InitDB(c *gin.Context) {
2021
if global.GVA_DB != nil {
21-
global.GVA_LOG.Error("非法访问!")
22-
response.FailWithMessage("非法访问", c)
22+
global.GVA_LOG.Error("已存在数据库配置!")
23+
response.FailWithMessage("已存在数据库配置", c)
2324
return
2425
}
2526
var dbInfo request.InitDB
@@ -30,7 +31,7 @@ func InitDB(c *gin.Context) {
3031
}
3132
if err := service.InitDB(dbInfo); err != nil {
3233
global.GVA_LOG.Error("自动创建数据库失败!", zap.Any("err", err))
33-
response.FailWithMessage("自动创建数据库失败，请查看后台日志", c)
34+
response.FailWithMessage("自动创建数据库失败，请查看后台日志，检查后在进行初始化", c)
3435
return
3536
}
3637
response.OkWithData("自动创建数据库成功", c)

‎server/api/v1/sys_user.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ import (
2323
// @Success 200 {string} string "{"success":true,"data":{},"msg":"登陆成功"}"
2424
// @Router /base/login [post]
2525
func Login(c *gin.Context) {
26-
var L request.Login
27-
_ = c.ShouldBindJSON(&L)
28-
if err := utils.Verify(L, utils.LoginVerify); err != nil {
26+
var l request.Login
27+
_ = c.ShouldBindJSON(&l)
28+
if err := utils.Verify(l, utils.LoginVerify); err != nil {
2929
response.FailWithMessage(err.Error(), c)
3030
return
3131
}
32-
if store.Verify(L.CaptchaId, L.Captcha, true) {
33-
U := &model.SysUser{Username: L.Username, Password: L.Password}
34-
if err, user := service.Login(U); err != nil {
32+
if store.Verify(l.CaptchaId, l.Captcha, true) {
33+
u := &model.SysUser{Username: l.Username, Password: l.Password}
34+
if err, user := service.Login(u); err != nil {
3535
global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Any("err", err))
3636
response.FailWithMessage("用户名不存在或者密码错误", c)
3737
} else {
@@ -112,13 +112,13 @@ func tokenNext(c *gin.Context, user model.SysUser) {
112112
// @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
113113
// @Router /user/register [post]
114114
func Register(c *gin.Context) {
115-
var R request.Register
116-
_ = c.ShouldBindJSON(&R)
117-
if err := utils.Verify(R, utils.RegisterVerify); err != nil {
115+
var r request.Register
116+
_ = c.ShouldBindJSON(&r)
117+
if err := utils.Verify(r, utils.RegisterVerify); err != nil {
118118
response.FailWithMessage(err.Error(), c)
119119
return
120120
}
121-
user := &model.SysUser{Username: R.Username, NickName: R.NickName, Password: R.Password, HeaderImg: R.HeaderImg, AuthorityId: R.AuthorityId}
121+
user := &model.SysUser{Username: r.Username, NickName: r.NickName, Password: r.Password, HeaderImg: r.HeaderImg, AuthorityId: r.AuthorityId}
122122
err, userReturn := service.Register(*user)
123123
if err != nil {
124124
global.GVA_LOG.Error("注册失败!", zap.Any("err", err))
@@ -142,8 +142,8 @@ func ChangePassword(c *gin.Context) {
142142
response.FailWithMessage(err.Error(), c)
143143
return
144144
}
145-
U := &model.SysUser{Username: user.Username, Password: user.Password}
146-
if err, _ := service.ChangePassword(U, user.NewPassword); err != nil {
145+
u := &model.SysUser{Username: user.Username, Password: user.Password}
146+
if err, _ := service.ChangePassword(u, user.NewPassword); err != nil {
147147
global.GVA_LOG.Error("修改失败!", zap.Any("err", err))
148148
response.FailWithMessage("修改失败，原密码与当前账户不符", c)
149149
} else {

‎server/config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ captcha:
5353
img-height: 80
5454

5555
# mysql connect configuration
56+
# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://www.gin-vue-admin.com/docs/first）
5657
mysql:
5758
path: ''
5859
config: ''

‎server/model/sys_auto_code.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ type AutoCodeStruct struct {
77
StructName string `json:"structName"` // Struct名称
88
TableName string `json:"tableName"` // 表名
99
PackageName string `json:"packageName"` // 文件名称
10+
HumpPackageName string `json:"humpPackageName"` // go文件名称
1011
Abbreviation string `json:"abbreviation"` // Struct简称
1112
Description string `json:"description"` // Struct中文名称
1213
AutoCreateApiToSql bool `json:"autoCreateApiToSql"` // 是否自动创建api

‎server/resource/template/server/model.go.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
type {{.StructName}} struct {
1010
global.GVA_MODEL {{- range .Fields}}
1111
{{- if eq .FieldType "bool" }}
12-
{{.FieldName}} *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}}{{- if .DataType -}};type:{{.DataType}}{{- if eq .FieldType "string" -}}{{- if .DataTypeLong -}}({{.DataTypeLong}}){{- end -}}{{- end -}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}{{- end -}}"`
12+
{{.FieldName}} *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}}{{- if .DataType -}};type:{{.DataType}}{{- end }}"`
1313
{{- else }}
14-
{{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}}{{- if .DataType -}};type:{{.DataType}}{{- if eq .FieldType "string" -}}{{- if .DataTypeLong -}}({{.DataTypeLong}}){{- end -}}{{- end -}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}{{- end -}}"`
14+
{{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}}{{- if .DataType -}};type:{{.DataType}}{{- if eq .FieldType "string" -}}{{- if .DataTypeLong -}}({{.DataTypeLong}}){{- end -}}{{- end -}};{{- if ne .FieldType "string" -}}{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}{{- end -}}{{- end -}}"`
1515
{{- end }} {{- end }}
1616
}
1717

‎server/resource/template/web/api.js.tpl‎

Lines changed: 41 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ import service from '@/utils/request'
99
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
1010
// @Router /{{.Abbreviation}}/create{{.StructName}} [post]
1111
export const create{{.StructName}} = (data) => {
12-
return service({
13-
url: "/{{.Abbreviation}}/create{{.StructName}}",
14-
method: 'post',
15-
data
16-
})
17-
}
18-
12+
return service({
13+
url: '/{{.Abbreviation}}/create{{.StructName}}',
14+
method: 'post',
15+
data
16+
})
17+
}
1918

2019
// @Tags {{.StructName}}
2120
// @Summary 删除{{.StructName}}
@@ -25,13 +24,13 @@ export const create{{.StructName}} = (data) => {
2524
// @Param data body model.{{.StructName}} true "删除{{.StructName}}"
2625
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
2726
// @Router /{{.Abbreviation}}/delete{{.StructName}} [delete]
28-
export const delete{{.StructName}} = (data) => {
29-
return service({
30-
url: "/{{.Abbreviation}}/delete{{.StructName}}",
31-
method: 'delete',
32-
data
33-
})
34-
}
27+
export const delete{{.StructName}} = (data) => {
28+
return service({
29+
url: '/{{.Abbreviation}}/delete{{.StructName}}',
30+
method: 'delete',
31+
data
32+
})
33+
}
3534

3635
// @Tags {{.StructName}}
3736
// @Summary 删除{{.StructName}}
@@ -41,13 +40,13 @@ export const create{{.StructName}} = (data) => {
4140
// @Param data body request.IdsReq true "批量删除{{.StructName}}"
4241
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
4342
// @Router /{{.Abbreviation}}/delete{{.StructName}} [delete]
44-
export const delete{{.StructName}}ByIds = (data) => {
45-
return service({
46-
url: "/{{.Abbreviation}}/delete{{.StructName}}ByIds",
47-
method: 'delete',
48-
data
49-
})
50-
}
43+
export const delete{{.StructName}}ByIds = (data) => {
44+
return service({
45+
url: '/{{.Abbreviation}}/delete{{.StructName}}ByIds',
46+
method: 'delete',
47+
data
48+
})
49+
}
5150

5251
// @Tags {{.StructName}}
5352
// @Summary 更新{{.StructName}}
@@ -57,14 +56,13 @@ export const create{{.StructName}} = (data) => {
5756
// @Param data body model.{{.StructName}} true "更新{{.StructName}}"
5857
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
5958
// @Router /{{.Abbreviation}}/update{{.StructName}} [put]
60-
export const update{{.StructName}} = (data) => {
61-
return service({
62-
url: "/{{.Abbreviation}}/update{{.StructName}}",
63-
method: 'put',
64-
data
65-
})
66-
}
67-
59+
export const update{{.StructName}} = (data) => {
60+
return service({
61+
url: '/{{.Abbreviation}}/update{{.StructName}}',
62+
method: 'put',
63+
data
64+
})
65+
}
6866

6967
// @Tags {{.StructName}}
7068
// @Summary 用id查询{{.StructName}}
@@ -74,14 +72,13 @@ export const create{{.StructName}} = (data) => {
7472
// @Param data body model.{{.StructName}} true "用id查询{{.StructName}}"
7573
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
7674
// @Router /{{.Abbreviation}}/find{{.StructName}} [get]
77-
export const find{{.StructName}} = (params) => {
78-
return service({
79-
url: "/{{.Abbreviation}}/find{{.StructName}}",
80-
method: 'get',
81-
params
82-
})
83-
}
84-
75+
export const find{{.StructName}} = (params) => {
76+
return service({
77+
url: '/{{.Abbreviation}}/find{{.StructName}}',
78+
method: 'get',
79+
params
80+
})
81+
}
8582

8683
// @Tags {{.StructName}}
8784
// @Summary 分页获取{{.StructName}}列表
@@ -91,10 +88,10 @@ export const create{{.StructName}} = (data) => {
9188
// @Param data body request.PageInfo true "分页获取{{.StructName}}列表"
9289
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
9390
// @Router /{{.Abbreviation}}/get{{.StructName}}List [get]
94-
export const get{{.StructName}}List = (params) => {
95-
return service({
96-
url: "/{{.Abbreviation}}/get{{.StructName}}List",
97-
method: 'get',
98-
params
99-
})
100-
}
91+
export const get{{.StructName}}List = (params) => {
92+
return service({
93+
url: '/{{.Abbreviation}}/get{{.StructName}}List',
94+
method: 'get',
95+
params
96+
})
97+
}

0 commit comments

Comments
 (0)