Skip to content

Commit b09e54c

Browse files
WangLeonardWangLeonard
committed
修复格式问题，重构嵌套层数过深的函数
1 parent 5e2687a commit b09e54c

38 files changed

+167
-172
lines changed

‎server/api/v1/exa_breakpoint_continue.go‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package v1
33
import (
44
"fmt"
55
"gin-vue-admin/global/response"
6-
_ "gin-vue-admin/model/response"
76
resp "gin-vue-admin/model/response"
87
"gin-vue-admin/service"
98
"gin-vue-admin/utils"
@@ -29,34 +28,34 @@ func BreakpointContinue(c *gin.Context) {
2928
_, FileHeader, err := c.Request.FormFile("file")
3029
if err != nil {
3130
response.FailWithMessage(err.Error(), c)
32-
} else {
33-
f, err := FileHeader.Open()
34-
if err != nil {
35-
response.FailWithMessage(err.Error(), c)
36-
} else {
37-
cen, _ := ioutil.ReadAll(f)
38-
defer f.Close()
39-
if flag := utils.CheckMd5(cen, chunkMd5); flag {
40-
err, file := service.FindOrCreateFile(fileMd5, fileName, chunkTotal)
41-
if err != nil {
42-
response.FailWithMessage(err.Error(), c)
43-
} else {
44-
err, pathc := utils.BreakPointContinue(cen, fileName, chunkNumber, chunkTotal, fileMd5)
45-
if err != nil {
46-
response.FailWithMessage(err.Error(), c)
47-
} else {
48-
err = service.CreateFileChunk(file.ID, pathc, chunkNumber)
49-
if err != nil {
50-
response.FailWithMessage(err.Error(), c)
51-
} else {
52-
response.OkWithMessage("切片创建成功", c)
53-
}
54-
}
55-
}
56-
} else {
57-
}
58-
}
31+
return
32+
}
33+
f, err := FileHeader.Open()
34+
if err != nil {
35+
response.FailWithMessage(err.Error(), c)
36+
return
37+
}
38+
defer f.Close()
39+
cen, _ := ioutil.ReadAll(f)
40+
if flag := utils.CheckMd5(cen, chunkMd5); !flag {
41+
return
42+
}
43+
err, file := service.FindOrCreateFile(fileMd5, fileName, chunkTotal)
44+
if err != nil {
45+
response.FailWithMessage(err.Error(), c)
46+
return
47+
}
48+
err, pathc := utils.BreakPointContinue(cen, fileName, chunkNumber, chunkTotal, fileMd5)
49+
if err != nil {
50+
response.FailWithMessage(err.Error(), c)
51+
return
52+
}
53+
54+
if err = service.CreateFileChunk(file.ID, pathc, chunkNumber); err != nil {
55+
response.FailWithMessage(err.Error(), c)
56+
return
5957
}
58+
response.OkWithMessage("切片创建成功", c)
6059
}
6160

6261
// @Tags ExaFileUploadAndDownload

‎server/api/v1/exa_file_upload_download.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ func UploadFile(c *gin.Context) {
2626
if err != nil {
2727
response.FailWithMessage(fmt.Sprintf("上传文件失败，%v", err), c)
2828
} else {
29-
//文件上传后拿到文件路径
29+
// 文件上传后拿到文件路径
3030
err, filePath, key := utils.Upload(header)
3131
if err != nil {
3232
response.FailWithMessage(fmt.Sprintf("接收返回值失败，%v", err), c)
3333
} else {
34-
//修改数据库后得到修改后的user并且返回供前端使用
34+
// 修改数据库后得到修改后的user并且返回供前端使用
3535
var file model.ExaFileUploadAndDownload
3636
file.Url = filePath
3737
file.Name = header.Filename

‎server/api/v1/sys_api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func DeleteApi(c *gin.Context) {
6868
}
6969
}
7070

71-
//条件搜索后端看此api
71+
// 条件搜索后端看此api
7272

7373
// @Tags SysApi
7474
// @Summary 分页获取API列表

‎server/api/v1/sys_authority.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func DeleteAuthority(c *gin.Context) {
9393
response.FailWithMessage(AuthorityIdVerifyErr.Error(), c)
9494
return
9595
}
96-
//删除角色之前需要判断是否有用户正在使用此角色
96+
// 删除角色之前需要判断是否有用户正在使用此角色
9797
err := service.DeleteAuthority(&a)
9898
if err != nil {
9999
response.FailWithMessage(fmt.Sprintf("删除失败，%v", err), c)
@@ -127,7 +127,7 @@ func UpdateAuthority(c *gin.Context) {
127127
if err != nil {
128128
response.FailWithMessage(fmt.Sprintf("更新失败，%v", err), c)
129129
} else {
130-
response.OkWithData(resp.SysAuthorityResponse{authority}, c)
130+
response.OkWithData(resp.SysAuthorityResponse{Authority: authority}, c)
131131
}
132132
}
133133

‎server/api/v1/sys_auto_code.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func CreateTemp(c *gin.Context) {
8080
response.FailWithMessage(fmt.Sprintf("创建失败，%v", err), c)
8181
os.Remove("./ginvueadmin.zip")
8282
} else {
83-
c.Writer.Header().Add("Content-Disposition", fmt.Sprintf("attachment; filename=%s", "ginvueadmin.zip")) //fmt.Sprintf("attachment; filename=%s", filename)对下载的文件重命名
83+
c.Writer.Header().Add("Content-Disposition", fmt.Sprintf("attachment; filename=%s", "ginvueadmin.zip")) // fmt.Sprintf("attachment; filename=%s", filename)对下载的文件重命名
8484
c.Writer.Header().Add("Content-Type", "application/json")
8585
c.Writer.Header().Add("success", "true")
8686
c.File("./ginvueadmin.zip")

‎server/api/v1/sys_system.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func SetSystemConfig(c *gin.Context) {
4242
}
4343
}
4444

45-
//本方法开发中 开发者windows系统 缺少linux系统所需的包 因此搁置
45+
// 本方法开发中 开发者windows系统 缺少linux系统所需的包 因此搁置
4646
// @Tags system
4747
// @Summary 设置配置文件内容
4848
// @Security ApiKeyAuth

‎server/api/v1/sys_user.go‎

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -80,69 +80,66 @@ func Login(c *gin.Context) {
8080

8181
}
8282

83-
//登录以后签发jwt
83+
// 登录以后签发jwt
8484
func tokenNext(c *gin.Context, user model.SysUser) {
8585
j := &middleware.JWT{
86-
[]byte(global.GVA_CONFIG.JWT.SigningKey), // 唯一签名
86+
SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey), // 唯一签名
8787
}
8888
clams := request.CustomClaims{
8989
UUID: user.UUID,
9090
ID: user.ID,
9191
NickName: user.NickName,
9292
AuthorityId: user.AuthorityId,
9393
StandardClaims: jwt.StandardClaims{
94-
NotBefore: int64(time.Now().Unix() - 1000), // 签名生效时间
95-
ExpiresAt: int64(time.Now().Unix() + 60*60*24*7), // 过期时间 一周
96-
Issuer: "qmPlus", //签名的发行者
94+
NotBefore: time.Now().Unix() - 1000, // 签名生效时间
95+
ExpiresAt: time.Now().Unix() + 60*60*24*7, // 过期时间 一周
96+
Issuer: "qmPlus", // 签名的发行者
9797
},
9898
}
9999
token, err := j.CreateToken(clams)
100100
if err != nil {
101101
response.FailWithMessage("获取token失败", c)
102+
return
103+
}
104+
if !global.GVA_CONFIG.System.UseMultipoint {
105+
response.OkWithData(resp.LoginResponse{
106+
User: user,
107+
Token: token,
108+
ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
109+
}, c)
110+
return
111+
}
112+
var loginJwt model.JwtBlacklist
113+
loginJwt.Jwt = token
114+
err, jwtStr := service.GetRedisJWT(user.Username)
115+
if err == redis.Nil {
116+
if err := service.SetRedisJWT(loginJwt, user.Username); err != nil {
117+
response.FailWithMessage("设置登录状态失败", c)
118+
return
119+
}
120+
response.OkWithData(resp.LoginResponse{
121+
User: user,
122+
Token: token,
123+
ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
124+
}, c)
125+
} else if err != nil {
126+
response.FailWithMessage(fmt.Sprintf("%v", err), c)
102127
} else {
103-
if global.GVA_CONFIG.System.UseMultipoint {
104-
var loginJwt model.JwtBlacklist
105-
loginJwt.Jwt = token
106-
err, jwtStr := service.GetRedisJWT(user.Username)
107-
if err == redis.Nil {
108-
err2 := service.SetRedisJWT(loginJwt, user.Username)
109-
if err2 != nil {
110-
response.FailWithMessage("设置登录状态失败", c)
111-
} else {
112-
response.OkWithData(resp.LoginResponse{
113-
User: user,
114-
Token: token,
115-
ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
116-
}, c)
117-
}
118-
} else if err != nil {
119-
response.FailWithMessage(fmt.Sprintf("%v", err), c)
120-
} else {
121-
var blackJWT model.JwtBlacklist
122-
blackJWT.Jwt = jwtStr
123-
err3 := service.JsonInBlacklist(blackJWT)
124-
if err3 != nil {
125-
response.FailWithMessage("jwt作废失败", c)
126-
} else {
127-
err2 := service.SetRedisJWT(loginJwt, user.Username)
128-
if err2 != nil {
129-
response.FailWithMessage("设置登录状态失败", c)
130-
} else {
131-
response.OkWithData(resp.LoginResponse{
132-
User: user,
133-
Token: token,
134-
ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
135-
}, c)
136-
}
137-
}
138-
}
139-
} else {
140-
response.OkWithData(resp.LoginResponse{
141-
User: user,
142-
Token: token,
143-
ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
144-
}, c)
128+
var blackJWT model.JwtBlacklist
129+
blackJWT.Jwt = jwtStr
130+
if err := service.JsonInBlacklist(blackJWT); err != nil {
131+
response.FailWithMessage("jwt作废失败", c)
132+
return
133+
}
134+
if err := service.SetRedisJWT(loginJwt, user.Username); err != nil {
135+
response.FailWithMessage("设置登录状态失败", c)
136+
return
145137
}
138+
response.OkWithData(resp.LoginResponse{
139+
User: user,
140+
Token: token,
141+
ExpiresAt: clams.StandardClaims.ExpiresAt * 1000,
142+
}, c)
146143
}
147144
}
148145

@@ -189,21 +186,21 @@ type UserHeaderImg struct {
189186
// @Router /user/uploadHeaderImg [post]
190187
func UploadHeaderImg(c *gin.Context) {
191188
claims, _ := c.Get("claims")
192-
//获取头像文件
189+
// 获取头像文件
193190
// 这里我们通过断言获取 claims内的所有内容
194191
waitUse := claims.(*request.CustomClaims)
195192
uuid := waitUse.UUID
196193
_, header, err := c.Request.FormFile("headerImg")
197-
//便于找到用户 以后从jwt中取
194+
// 便于找到用户 以后从jwt中取
198195
if err != nil {
199196
response.FailWithMessage(fmt.Sprintf("上传文件失败，%v", err), c)
200197
} else {
201-
//文件上传后拿到文件路径
198+
// 文件上传后拿到文件路径
202199
err, filePath, _ := utils.Upload(header)
203200
if err != nil {
204201
response.FailWithMessage(fmt.Sprintf("接收返回值失败，%v", err), c)
205202
} else {
206-
//修改数据库后得到修改后的user并且返回供前端使用
203+
// 修改数据库后得到修改后的user并且返回供前端使用
207204
err, user := service.UploadHeaderImg(uuid, filePath)
208205
if err != nil {
209206
response.FailWithMessage(fmt.Sprintf("修改数据库链接失败，%v", err), c)

‎server/initialize/db_table.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"gin-vue-admin/model"
66
)
77

8-
//注册数据库表专用
8+
// 注册数据库表专用
99
func DBTables() {
1010
db := global.GVA_DB
1111
db.AutoMigrate(model.SysUser{},

‎server/initialize/mysql.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88
)
99

10-
//初始化数据库并产生数据库全局变量
10+
// 初始化数据库并产生数据库全局变量
1111
func Mysql() {
1212
admin := global.GVA_CONFIG.Mysql
1313
if db, err := gorm.Open("mysql", admin.Username+":"+admin.Password+"@("+admin.Path+")/"+admin.Dbname+"?"+admin.Config); err != nil {

‎server/initialize/router.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"github.com/swaggo/gin-swagger/swaggerFiles"
1111
)
1212

13-
//初始化总路由
13+
// 初始化总路由
1414

1515
func Routers() *gin.Engine {
1616
var Router = gin.Default()
17-
//Router.Use(middleware.LoadTls()) // 打开就能玩https了
17+
// Router.Use(middleware.LoadTls()) // 打开就能玩https了
1818
global.GVA_LOG.Debug("use middleware logger")
1919
// 跨域
2020
Router.Use(middleware.Cors())

0 commit comments

Comments
 (0)