Skip to content

Commit a9c9199

Browse files
author
奇淼（piexlmax
authored
规范化代码结构，提升系统使用便捷度。
规范化代码结构，提升系统使用便捷度。
2 parents f521e3f + a844335 commit a9c9199

File tree

132 files changed

+5211
-4901
lines changed

Some content is hidden

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

132 files changed

+5211
-4901
lines changed

‎.docker-compose/shell/server-handle.sh‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎dockerfile_server‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ ENV GOPROXY=https://goproxy.io,direct
55
WORKDIR /go/src/gin-vue-admin
66
COPY server/ ./
77

8-
RUN cat ./config.yaml
9-
COPY .docker-compose/shell/server-handle.sh .
10-
RUN ls -al
11-
RUN sh ./server-handle.sh
12-
RUN rm -f server-handle.sh
13-
RUN cat ./config.yaml
14-
158
RUN go env && go mod tidy && go build -o server .
169

1710
FROM alpine:latest
@@ -20,9 +13,9 @@ LABEL MAINTAINER="SliverHorn@[email protected]"
2013
WORKDIR /go/src/gin-vue-admin
2114

2215
COPY --from=0 /go/src/gin-vue-admin/server ./
23-
COPY --from=0 /go/src/gin-vue-admin/config.yaml ./
16+
COPY --from=0 /go/src/gin-vue-admin/config.docker.yaml ./
2417
COPY --from=0 /go/src/gin-vue-admin/resource ./resource
2518

2619
EXPOSE 8888
2720

28-
ENTRYPOINT ./server
21+
ENTRYPOINT ./server -c config.docker.yaml

‎server/api/v1/exa_customer.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package v1
22

33
import (
4-
"fmt"
54
"gin-vue-admin/global"
65
"gin-vue-admin/model"
76
"gin-vue-admin/model/request"
@@ -81,7 +80,7 @@ func UpdateExaCustomer(c *gin.Context) {
8180
}
8281
if err := service.UpdateExaCustomer(&customer); err != nil {
8382
global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
84-
response.FailWithMessage("更新失败!", c)
83+
response.FailWithMessage("更新失败", c)
8584
} else {
8685
response.OkWithMessage("更新成功", c)
8786
}
@@ -129,7 +128,7 @@ func GetExaCustomerList(c *gin.Context) {
129128
err, customerList, total := service.GetCustomerInfoList(getUserAuthorityId(c), pageInfo)
130129
if err != nil {
131130
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
132-
response.FailWithMessage(fmt.Sprintf("获取失败：%v", err), c)
131+
response.FailWithMessage("获取失败"+err.Error(), c)
133132
} else {
134133
response.OkWithDetailed(response.PageResult{
135134
List: customerList,

‎server/api/v1/exa_excel.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func ImportExcel(c *gin.Context) {
6565
func LoadExcel(c *gin.Context) {
6666
menus, err := service.ParseExcel2InfoList()
6767
if err != nil {
68-
global.GVA_LOG.Error("加载数据失败", zap.Any("err", err))
68+
global.GVA_LOG.Error("加载数据失败!", zap.Any("err", err))
6969
response.FailWithMessage("加载数据失败", c)
7070
return
7171
}
@@ -90,7 +90,7 @@ func DownloadTemplate(c *gin.Context) {
9090
filePath := global.GVA_CONFIG.Excel.Dir + fileName
9191
ok, err := utils.PathExists(filePath)
9292
if !ok || err != nil {
93-
global.GVA_LOG.Error("文件不存在", zap.Any("err", err))
93+
global.GVA_LOG.Error("文件不存在!", zap.Any("err", err))
9494
response.FailWithMessage("文件不存在", c)
9595
return
9696
}

‎server/api/v1/sys_auto_code.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ func CreateTemp(c *gin.Context) {
7373
c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
7474
_ = os.Remove("./ginvueadmin.zip")
7575
}
76-
7776
} else {
7877
c.Writer.Header().Add("Content-Disposition", fmt.Sprintf("attachment; filename=%s", "ginvueadmin.zip")) // fmt.Sprintf("attachment; filename=%s", filename)对下载的文件重命名
7978
c.Writer.Header().Add("Content-Type", "application/json")

‎server/api/v1/sys_captcha.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var store = base64Captcha.DefaultMemStore
1818
// @Success 200 {string} string "{"success":true,"data":{},"msg":"验证码获取成功"}"
1919
// @Router /base/captcha [post]
2020
func Captcha(c *gin.Context) {
21-
//字符,公式,验证码配置
21+
// 字符,公式,验证码配置
2222
// 生成默认数字的driver
2323
driver := base64Captcha.NewDriverDigit(global.GVA_CONFIG.Captcha.ImgHeight, global.GVA_CONFIG.Captcha.ImgWidth, global.GVA_CONFIG.Captcha.KeyLong, 0.7, 80)
2424
cp := base64Captcha.NewCaptcha(driver, store)

‎server/api/v1/sys_initdb.go‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ import (
1818
// @Router /init/initdb [post]
1919
func InitDB(c *gin.Context) {
2020
if global.GVA_DB != nil {
21-
global.GVA_LOG.Error("非法访问")
21+
global.GVA_LOG.Error("非法访问!")
2222
response.FailWithMessage("非法访问", c)
2323
return
2424
}
2525
var dbInfo request.InitDB
2626
if err := c.ShouldBindJSON(&dbInfo); err != nil {
27-
global.GVA_LOG.Error("参数校验不通过", zap.Any("err", err))
27+
global.GVA_LOG.Error("参数校验不通过!", zap.Any("err", err))
2828
response.FailWithMessage("参数校验不通过", c)
2929
return
3030
}
3131
if err := service.InitDB(dbInfo); err != nil {
32-
global.GVA_LOG.Error("自动创建数据库失败", zap.Any("err", err))
32+
global.GVA_LOG.Error("自动创建数据库失败!", zap.Any("err", err))
3333
response.FailWithMessage("自动创建数据库失败，请查看后台日志", c)
3434
return
3535
}
@@ -44,15 +44,11 @@ func InitDB(c *gin.Context) {
4444
func CheckDB(c *gin.Context) {
4545
if global.GVA_DB != nil {
4646
global.GVA_LOG.Info("数据库无需初始化")
47-
response.OkWithDetailed(gin.H{
48-
"needInit": false,
49-
}, "数据库无需初始化", c)
47+
response.OkWithDetailed(gin.H{"needInit": false}, "数据库无需初始化", c)
5048
return
5149
} else {
5250
global.GVA_LOG.Info("前往初始化数据库")
53-
response.OkWithDetailed(gin.H{
54-
"needInit": true,
55-
}, "前往初始化数据库", c)
51+
response.OkWithDetailed(gin.H{"needInit": true}, "前往初始化数据库", c)
5652
return
5753
}
5854
}

‎server/api/v1/sys_system.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@ func ReloadSystem(c *gin.Context) {
5555
if err != nil {
5656
global.GVA_LOG.Error("重启系统失败!", zap.Any("err", err))
5757
response.FailWithMessage("重启系统失败", c)
58-
return
58+
} else {
59+
response.OkWithMessage("重启系统成功", c)
5960
}
60-
response.OkWithMessage("重启系统成功", c)
61-
return
6261
}
6362

6463
// @Tags System
@@ -71,9 +70,7 @@ func GetServerInfo(c *gin.Context) {
7170
if server, err := service.GetServerInfo(); err != nil {
7271
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
7372
response.FailWithMessage("获取失败", c)
74-
return
7573
} else {
7674
response.OkWithDetailed(gin.H{"server": server}, "获取成功", c)
7775
}
78-
7976
}

‎server/api/v1/sys_user.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func Login(c *gin.Context) {
3232
if store.Verify(L.CaptchaId, L.Captcha, true) {
3333
U := &model.SysUser{Username: L.Username, Password: L.Password}
3434
if err, user := service.Login(U); err != nil {
35-
global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误", zap.Any("err", err))
35+
global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Any("err", err))
3636
response.FailWithMessage("用户名不存在或者密码错误", c)
3737
} else {
3838
tokenNext(c, *user)
@@ -60,7 +60,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
6060
}
6161
token, err := j.CreateToken(claims)
6262
if err != nil {
63-
global.GVA_LOG.Error("获取token失败", zap.Any("err", err))
63+
global.GVA_LOG.Error("获取token失败!", zap.Any("err", err))
6464
response.FailWithMessage("获取token失败", c)
6565
return
6666
}
@@ -74,7 +74,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
7474
}
7575
if err, jwtStr := service.GetRedisJWT(user.Username); err == redis.Nil {
7676
if err := service.SetRedisJWT(token, user.Username); err != nil {
77-
global.GVA_LOG.Error("设置登录状态失败", zap.Any("err", err))
77+
global.GVA_LOG.Error("设置登录状态失败!", zap.Any("err", err))
7878
response.FailWithMessage("设置登录状态失败", c)
7979
return
8080
}
@@ -84,7 +84,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
8484
ExpiresAt: claims.StandardClaims.ExpiresAt * 1000,
8585
}, "登录成功", c)
8686
} else if err != nil {
87-
global.GVA_LOG.Error("设置登录状态失败", zap.Any("err", err))
87+
global.GVA_LOG.Error("设置登录状态失败!", zap.Any("err", err))
8888
response.FailWithMessage("设置登录状态失败", c)
8989
} else {
9090
var blackJWT model.JwtBlacklist
@@ -121,7 +121,7 @@ func Register(c *gin.Context) {
121121
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 {
124-
global.GVA_LOG.Error("注册失败", zap.Any("err", err))
124+
global.GVA_LOG.Error("注册失败!", zap.Any("err", err))
125125
response.FailWithDetailed(response.SysUserResponse{User: userReturn}, "注册失败", c)
126126
} else {
127127
response.OkWithDetailed(response.SysUserResponse{User: userReturn}, "注册成功", c)
@@ -144,7 +144,7 @@ func ChangePassword(c *gin.Context) {
144144
}
145145
U := &model.SysUser{Username: user.Username, Password: user.Password}
146146
if err, _ := service.ChangePassword(U, user.NewPassword); err != nil {
147-
global.GVA_LOG.Error("修改失败", zap.Any("err", err))
147+
global.GVA_LOG.Error("修改失败!", zap.Any("err", err))
148148
response.FailWithMessage("修改失败，原密码与当前账户不符", c)
149149
} else {
150150
response.OkWithMessage("修改成功", c)
@@ -167,7 +167,7 @@ func GetUserList(c *gin.Context) {
167167
return
168168
}
169169
if err, list, total := service.GetUserInfoList(pageInfo); err != nil {
170-
global.GVA_LOG.Error("获取失败", zap.Any("err", err))
170+
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
171171
response.FailWithMessage("获取失败", c)
172172
} else {
173173
response.OkWithDetailed(response.PageResult{
@@ -195,7 +195,7 @@ func SetUserAuthority(c *gin.Context) {
195195
return
196196
}
197197
if err := service.SetUserAuthority(sua.UUID, sua.AuthorityId); err != nil {
198-
global.GVA_LOG.Error("修改失败", zap.Any("err", err))
198+
global.GVA_LOG.Error("修改失败!", zap.Any("err", err))
199199
response.FailWithMessage("修改失败", c)
200200
} else {
201201
response.OkWithMessage("修改成功", c)
@@ -246,7 +246,7 @@ func SetUserInfo(c *gin.Context) {
246246
return
247247
}
248248
if err, ReqUser := service.SetUserInfo(user); err != nil {
249-
global.GVA_LOG.Error("设置失败", zap.Any("err", err))
249+
global.GVA_LOG.Error("设置失败!", zap.Any("err", err))
250250
response.FailWithMessage("设置失败", c)
251251
} else {
252252
response.OkWithDetailed(gin.H{"userInfo": ReqUser}, "设置成功", c)
@@ -256,7 +256,7 @@ func SetUserInfo(c *gin.Context) {
256256
// 从Gin的Context中获取从jwt解析出来的用户ID
257257
func getUserID(c *gin.Context) uint {
258258
if claims, exists := c.Get("claims"); !exists {
259-
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户ID失败, 请检查路由是否使用jwt中间件")
259+
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户ID失败, 请检查路由是否使用jwt中间件!")
260260
return 0
261261
} else {
262262
waitUse := claims.(*request.CustomClaims)
@@ -267,7 +267,7 @@ func getUserID(c *gin.Context) uint {
267267
// 从Gin的Context中获取从jwt解析出来的用户UUID
268268
func getUserUuid(c *gin.Context) string {
269269
if claims, exists := c.Get("claims"); !exists {
270-
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件")
270+
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件!")
271271
return ""
272272
} else {
273273
waitUse := claims.(*request.CustomClaims)
@@ -278,7 +278,7 @@ func getUserUuid(c *gin.Context) string {
278278
// 从Gin的Context中获取从jwt解析出来的用户角色id
279279
func getUserAuthorityId(c *gin.Context) string {
280280
if claims, exists := c.Get("claims"); !exists {
281-
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件")
281+
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件!")
282282
return ""
283283
} else {
284284
waitUse := claims.(*request.CustomClaims)

0 commit comments

Comments
 (0)