Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FLIPPED-AURORA
gin-vue-admin
提交
fb4dba16
G
gin-vue-admin
项目概览
FLIPPED-AURORA
/
gin-vue-admin
大约 1 年 前同步成功
通知
332
Star
18154
Fork
5505
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gin-vue-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fb4dba16
编写于
11月 22, 2020
作者:
S
songzhibin97
1
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
pointChange
上级
95d49ab5
变更
31
隐藏空白更改
内联
并排
Showing
31 changed file
with
111 addition
and
114 deletion
+111
-114
server/api/v1/exa_customer.go
server/api/v1/exa_customer.go
+2
-2
server/api/v1/exa_file_upload_download.go
server/api/v1/exa_file_upload_download.go
+3
-3
server/api/v1/exa_simple_uploader.go
server/api/v1/exa_simple_uploader.go
+2
-2
server/api/v1/sys_api.go
server/api/v1/sys_api.go
+4
-4
server/api/v1/sys_authority.go
server/api/v1/sys_authority.go
+7
-7
server/api/v1/sys_auto_code.go
server/api/v1/sys_auto_code.go
+1
-1
server/api/v1/sys_dictionary.go
server/api/v1/sys_dictionary.go
+3
-3
server/api/v1/sys_dictionary_detail.go
server/api/v1/sys_dictionary_detail.go
+3
-3
server/api/v1/sys_jwt_blacklist.go
server/api/v1/sys_jwt_blacklist.go
+1
-1
server/api/v1/sys_menu.go
server/api/v1/sys_menu.go
+4
-4
server/api/v1/sys_operation_record.go
server/api/v1/sys_operation_record.go
+4
-4
server/api/v1/sys_system.go
server/api/v1/sys_system.go
+2
-2
server/api/v1/sys_user.go
server/api/v1/sys_user.go
+6
-6
server/api/v1/sys_work_flow.go
server/api/v1/sys_work_flow.go
+1
-1
server/middleware/jwt.go
server/middleware/jwt.go
+2
-2
server/middleware/operation.go
server/middleware/operation.go
+3
-3
server/service/exa_customer.go
server/service/exa_customer.go
+5
-5
server/service/exa_file_upload_download.go
server/service/exa_file_upload_download.go
+7
-7
server/service/exa_simple_uploader.go
server/service/exa_simple_uploader.go
+2
-2
server/service/jwt_black_list.go
server/service/jwt_black_list.go
+2
-2
server/service/sys_api.go
server/service/sys_api.go
+7
-7
server/service/sys_authority.go
server/service/sys_authority.go
+6
-6
server/service/sys_auto_code.go
server/service/sys_auto_code.go
+3
-4
server/service/sys_base_menu.go
server/service/sys_base_menu.go
+1
-1
server/service/sys_dictionary.go
server/service/sys_dictionary.go
+5
-5
server/service/sys_dictionary_detail.go
server/service/sys_dictionary_detail.go
+5
-5
server/service/sys_menu.go
server/service/sys_menu.go
+2
-2
server/service/sys_operation_record.go
server/service/sys_operation_record.go
+6
-6
server/service/sys_system.go
server/service/sys_system.go
+4
-5
server/service/sys_user.go
server/service/sys_user.go
+6
-7
server/service/sys_workflow.go
server/service/sys_workflow.go
+2
-2
未找到文件。
server/api/v1/exa_customer.go
浏览文件 @
fb4dba16
...
@@ -29,7 +29,7 @@ func CreateExaCustomer(c *gin.Context) {
...
@@ -29,7 +29,7 @@ func CreateExaCustomer(c *gin.Context) {
}
}
customer
.
SysUserID
=
getUserID
(
c
)
customer
.
SysUserID
=
getUserID
(
c
)
customer
.
SysUserAuthorityID
=
getUserAuthorityId
(
c
)
customer
.
SysUserAuthorityID
=
getUserAuthorityId
(
c
)
if
err
:=
service
.
CreateExaCustomer
(
customer
);
err
!=
nil
{
if
err
:=
service
.
CreateExaCustomer
(
&
customer
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"创建失败"
,
c
)
response
.
FailWithMessage
(
"创建失败"
,
c
)
}
else
{
}
else
{
...
@@ -52,7 +52,7 @@ func DeleteExaCustomer(c *gin.Context) {
...
@@ -52,7 +52,7 @@ func DeleteExaCustomer(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
:=
service
.
DeleteExaCustomer
(
customer
);
err
!=
nil
{
if
err
:=
service
.
DeleteExaCustomer
(
&
customer
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"删除失败"
,
c
)
response
.
FailWithMessage
(
"删除失败"
,
c
)
}
else
{
}
else
{
...
...
server/api/v1/exa_file_upload_download.go
浏览文件 @
fb4dba16
...
@@ -46,7 +46,7 @@ func UploadFile(c *gin.Context) {
...
@@ -46,7 +46,7 @@ func UploadFile(c *gin.Context) {
func
DeleteFile
(
c
*
gin
.
Context
)
{
func
DeleteFile
(
c
*
gin
.
Context
)
{
var
file
model
.
ExaFileUploadAndDownload
var
file
model
.
ExaFileUploadAndDownload
_
=
c
.
ShouldBindJSON
(
&
file
)
_
=
c
.
ShouldBindJSON
(
&
file
)
if
err
:=
service
.
DeleteFile
(
file
);
err
!=
nil
{
if
err
:=
service
.
DeleteFile
(
&
file
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"删除失败"
,
c
)
response
.
FailWithMessage
(
"删除失败"
,
c
)
return
return
...
@@ -65,7 +65,7 @@ func DeleteFile(c *gin.Context) {
...
@@ -65,7 +65,7 @@ func DeleteFile(c *gin.Context) {
func
GetFileList
(
c
*
gin
.
Context
)
{
func
GetFileList
(
c
*
gin
.
Context
)
{
var
pageInfo
request
.
PageInfo
var
pageInfo
request
.
PageInfo
_
=
c
.
ShouldBindJSON
(
&
pageInfo
)
_
=
c
.
ShouldBindJSON
(
&
pageInfo
)
err
,
list
,
total
:=
service
.
GetFileRecordInfoList
(
pageInfo
)
err
,
list
,
total
:=
service
.
GetFileRecordInfoList
(
&
pageInfo
)
if
err
!=
nil
{
if
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"获取失败"
,
c
)
response
.
FailWithMessage
(
"获取失败"
,
c
)
...
@@ -75,6 +75,6 @@ func GetFileList(c *gin.Context) {
...
@@ -75,6 +75,6 @@ func GetFileList(c *gin.Context) {
Total
:
total
,
Total
:
total
,
Page
:
pageInfo
.
Page
,
Page
:
pageInfo
.
Page
,
PageSize
:
pageInfo
.
PageSize
,
PageSize
:
pageInfo
.
PageSize
,
},
"获取成功"
,
c
)
},
"获取成功"
,
c
)
}
}
}
}
server/api/v1/exa_simple_uploader.go
浏览文件 @
fb4dba16
...
@@ -42,7 +42,7 @@ func SimpleUploaderUpload(c *gin.Context) {
...
@@ -42,7 +42,7 @@ func SimpleUploaderUpload(c *gin.Context) {
return
return
}
}
chunk
.
CurrentChunkPath
=
chunkPath
chunk
.
CurrentChunkPath
=
chunkPath
err
=
service
.
SaveChunk
(
chunk
)
err
=
service
.
SaveChunk
(
&
chunk
)
if
err
!=
nil
{
if
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"切片创建失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"切片创建失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"切片创建失败"
,
c
)
response
.
FailWithMessage
(
"切片创建失败"
,
c
)
...
@@ -69,7 +69,7 @@ func CheckFileMd5(c *gin.Context) {
...
@@ -69,7 +69,7 @@ func CheckFileMd5(c *gin.Context) {
response
.
OkWithDetailed
(
gin
.
H
{
response
.
OkWithDetailed
(
gin
.
H
{
"chunks"
:
chunks
,
"chunks"
:
chunks
,
"isDone"
:
isDone
,
"isDone"
:
isDone
,
},
"查询成功"
,
c
)
},
"查询成功"
,
c
)
}
}
}
}
...
...
server/api/v1/sys_api.go
浏览文件 @
fb4dba16
...
@@ -26,7 +26,7 @@ func CreateApi(c *gin.Context) {
...
@@ -26,7 +26,7 @@ func CreateApi(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
:=
service
.
CreateApi
(
api
);
err
!=
nil
{
if
err
:=
service
.
CreateApi
(
&
api
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"创建失败"
,
c
)
response
.
FailWithMessage
(
"创建失败"
,
c
)
}
else
{
}
else
{
...
@@ -49,7 +49,7 @@ func DeleteApi(c *gin.Context) {
...
@@ -49,7 +49,7 @@ func DeleteApi(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
:=
service
.
DeleteApi
(
api
);
err
!=
nil
{
if
err
:=
service
.
DeleteApi
(
&
api
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"删除失败"
,
c
)
response
.
FailWithMessage
(
"删除失败"
,
c
)
}
else
{
}
else
{
...
@@ -72,7 +72,7 @@ func GetApiList(c *gin.Context) {
...
@@ -72,7 +72,7 @@ func GetApiList(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
,
list
,
total
:=
service
.
GetAPIInfoList
(
pageInfo
.
SysApi
,
pageInfo
.
PageInfo
,
pageInfo
.
OrderKey
,
pageInfo
.
Desc
);
err
!=
nil
{
if
err
,
list
,
total
:=
service
.
GetAPIInfoList
(
&
pageInfo
.
SysApi
,
&
pageInfo
.
PageInfo
,
pageInfo
.
OrderKey
,
pageInfo
.
Desc
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"获取失败"
,
c
)
response
.
FailWithMessage
(
"获取失败"
,
c
)
}
else
{
}
else
{
...
@@ -124,7 +124,7 @@ func UpdateApi(c *gin.Context) {
...
@@ -124,7 +124,7 @@ func UpdateApi(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
:=
service
.
UpdateApi
(
api
);
err
!=
nil
{
if
err
:=
service
.
UpdateApi
(
&
api
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"修改失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"修改失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"修改失败"
,
c
)
response
.
FailWithMessage
(
"修改失败"
,
c
)
}
else
{
}
else
{
...
...
server/api/v1/sys_authority.go
浏览文件 @
fb4dba16
...
@@ -26,11 +26,11 @@ func CreateAuthority(c *gin.Context) {
...
@@ -26,11 +26,11 @@ func CreateAuthority(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
,
authBack
:=
service
.
CreateAuthority
(
authority
);
err
!=
nil
{
if
err
,
authBack
:=
service
.
CreateAuthority
(
&
authority
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"创建失败"
+
err
.
Error
(),
c
)
response
.
FailWithMessage
(
"创建失败"
+
err
.
Error
(),
c
)
}
else
{
}
else
{
response
.
OkWithDetailed
(
response
.
SysAuthorityResponse
{
Authority
:
authBack
},
"创建成功"
,
c
)
response
.
OkWithDetailed
(
response
.
SysAuthorityResponse
{
Authority
:
*
authBack
},
"创建成功"
,
c
)
}
}
}
}
...
@@ -53,7 +53,7 @@ func CopyAuthority(c *gin.Context) {
...
@@ -53,7 +53,7 @@ func CopyAuthority(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
,
authBack
:=
service
.
CopyAuthority
(
copyInfo
);
err
!=
nil
{
if
err
,
authBack
:=
service
.
CopyAuthority
(
&
copyInfo
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"拷贝失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"拷贝失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"拷贝失败"
+
err
.
Error
(),
c
)
response
.
FailWithMessage
(
"拷贝失败"
+
err
.
Error
(),
c
)
}
else
{
}
else
{
...
@@ -99,11 +99,11 @@ func UpdateAuthority(c *gin.Context) {
...
@@ -99,11 +99,11 @@ func UpdateAuthority(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
,
authority
:=
service
.
UpdateAuthority
(
auth
);
err
!=
nil
{
if
err
,
authority
:=
service
.
UpdateAuthority
(
&
auth
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"更新失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"更新失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"更新失败"
+
err
.
Error
(),
c
)
response
.
FailWithMessage
(
"更新失败"
+
err
.
Error
(),
c
)
}
else
{
}
else
{
response
.
OkWithDetailed
(
response
.
SysAuthorityResponse
{
Authority
:
authority
},
"更新成功"
,
c
)
response
.
OkWithDetailed
(
response
.
SysAuthorityResponse
{
Authority
:
*
authority
},
"更新成功"
,
c
)
}
}
}
}
...
@@ -122,7 +122,7 @@ func GetAuthorityList(c *gin.Context) {
...
@@ -122,7 +122,7 @@ func GetAuthorityList(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
,
list
,
total
:=
service
.
GetAuthorityInfoList
(
pageInfo
);
err
!=
nil
{
if
err
,
list
,
total
:=
service
.
GetAuthorityInfoList
(
&
pageInfo
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"获取失败"
+
err
.
Error
(),
c
)
response
.
FailWithMessage
(
"获取失败"
+
err
.
Error
(),
c
)
}
else
{
}
else
{
...
@@ -150,7 +150,7 @@ func SetDataAuthority(c *gin.Context) {
...
@@ -150,7 +150,7 @@ func SetDataAuthority(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
:=
service
.
SetDataAuthority
(
auth
);
err
!=
nil
{
if
err
:=
service
.
SetDataAuthority
(
&
auth
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"设置失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"设置失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"设置失败"
+
err
.
Error
(),
c
)
response
.
FailWithMessage
(
"设置失败"
+
err
.
Error
(),
c
)
}
else
{
}
else
{
...
...
server/api/v1/sys_auto_code.go
浏览文件 @
fb4dba16
...
@@ -37,7 +37,7 @@ func CreateTemp(c *gin.Context) {
...
@@ -37,7 +37,7 @@ func CreateTemp(c *gin.Context) {
return
return
}
}
}
}
err
:=
service
.
CreateTemp
(
a
)
err
:=
service
.
CreateTemp
(
&
a
)
if
err
!=
nil
{
if
err
!=
nil
{
if
errors
.
Is
(
err
,
model
.
AutoMoveErr
)
{
if
errors
.
Is
(
err
,
model
.
AutoMoveErr
)
{
c
.
Writer
.
Header
()
.
Add
(
"success"
,
"false"
)
c
.
Writer
.
Header
()
.
Add
(
"success"
,
"false"
)
...
...
server/api/v1/sys_dictionary.go
浏览文件 @
fb4dba16
...
@@ -22,7 +22,7 @@ import (
...
@@ -22,7 +22,7 @@ import (
func
CreateSysDictionary
(
c
*
gin
.
Context
)
{
func
CreateSysDictionary
(
c
*
gin
.
Context
)
{
var
dictionary
model
.
SysDictionary
var
dictionary
model
.
SysDictionary
_
=
c
.
ShouldBindJSON
(
&
dictionary
)
_
=
c
.
ShouldBindJSON
(
&
dictionary
)
if
err
:=
service
.
CreateSysDictionary
(
dictionary
);
err
!=
nil
{
if
err
:=
service
.
CreateSysDictionary
(
&
dictionary
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"创建失败"
,
c
)
response
.
FailWithMessage
(
"创建失败"
,
c
)
}
else
{
}
else
{
...
@@ -41,7 +41,7 @@ func CreateSysDictionary(c *gin.Context) {
...
@@ -41,7 +41,7 @@ func CreateSysDictionary(c *gin.Context) {
func
DeleteSysDictionary
(
c
*
gin
.
Context
)
{
func
DeleteSysDictionary
(
c
*
gin
.
Context
)
{
var
dictionary
model
.
SysDictionary
var
dictionary
model
.
SysDictionary
_
=
c
.
ShouldBindJSON
(
&
dictionary
)
_
=
c
.
ShouldBindJSON
(
&
dictionary
)
if
err
:=
service
.
DeleteSysDictionary
(
dictionary
);
err
!=
nil
{
if
err
:=
service
.
DeleteSysDictionary
(
&
dictionary
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"删除失败"
,
c
)
response
.
FailWithMessage
(
"删除失败"
,
c
)
}
else
{
}
else
{
...
@@ -102,7 +102,7 @@ func GetSysDictionaryList(c *gin.Context) {
...
@@ -102,7 +102,7 @@ func GetSysDictionaryList(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
,
list
,
total
:=
service
.
GetSysDictionaryInfoList
(
pageInfo
);
err
!=
nil
{
if
err
,
list
,
total
:=
service
.
GetSysDictionaryInfoList
(
&
pageInfo
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"获取失败"
,
c
)
response
.
FailWithMessage
(
"获取失败"
,
c
)
}
else
{
}
else
{
...
...
server/api/v1/sys_dictionary_detail.go
浏览文件 @
fb4dba16
...
@@ -22,7 +22,7 @@ import (
...
@@ -22,7 +22,7 @@ import (
func
CreateSysDictionaryDetail
(
c
*
gin
.
Context
)
{
func
CreateSysDictionaryDetail
(
c
*
gin
.
Context
)
{
var
detail
model
.
SysDictionaryDetail
var
detail
model
.
SysDictionaryDetail
_
=
c
.
ShouldBindJSON
(
&
detail
)
_
=
c
.
ShouldBindJSON
(
&
detail
)
if
err
:=
service
.
CreateSysDictionaryDetail
(
detail
);
err
!=
nil
{
if
err
:=
service
.
CreateSysDictionaryDetail
(
&
detail
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"创建失败"
,
c
)
response
.
FailWithMessage
(
"创建失败"
,
c
)
}
else
{
}
else
{
...
@@ -41,7 +41,7 @@ func CreateSysDictionaryDetail(c *gin.Context) {
...
@@ -41,7 +41,7 @@ func CreateSysDictionaryDetail(c *gin.Context) {
func
DeleteSysDictionaryDetail
(
c
*
gin
.
Context
)
{
func
DeleteSysDictionaryDetail
(
c
*
gin
.
Context
)
{
var
detail
model
.
SysDictionaryDetail
var
detail
model
.
SysDictionaryDetail
_
=
c
.
ShouldBindJSON
(
&
detail
)
_
=
c
.
ShouldBindJSON
(
&
detail
)
if
err
:=
service
.
DeleteSysDictionaryDetail
(
detail
);
err
!=
nil
{
if
err
:=
service
.
DeleteSysDictionaryDetail
(
&
detail
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"删除失败"
,
c
)
response
.
FailWithMessage
(
"删除失败"
,
c
)
}
else
{
}
else
{
...
@@ -102,7 +102,7 @@ func FindSysDictionaryDetail(c *gin.Context) {
...
@@ -102,7 +102,7 @@ func FindSysDictionaryDetail(c *gin.Context) {
func
GetSysDictionaryDetailList
(
c
*
gin
.
Context
)
{
func
GetSysDictionaryDetailList
(
c
*
gin
.
Context
)
{
var
pageInfo
request
.
SysDictionaryDetailSearch
var
pageInfo
request
.
SysDictionaryDetailSearch
_
=
c
.
ShouldBindQuery
(
&
pageInfo
)
_
=
c
.
ShouldBindQuery
(
&
pageInfo
)
if
err
,
list
,
total
:=
service
.
GetSysDictionaryDetailInfoList
(
pageInfo
);
err
!=
nil
{
if
err
,
list
,
total
:=
service
.
GetSysDictionaryDetailInfoList
(
&
pageInfo
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"获取失败"
,
c
)
response
.
FailWithMessage
(
"获取失败"
,
c
)
}
else
{
}
else
{
...
...
server/api/v1/sys_jwt_blacklist.go
浏览文件 @
fb4dba16
...
@@ -19,7 +19,7 @@ import (
...
@@ -19,7 +19,7 @@ import (
func
JsonInBlacklist
(
c
*
gin
.
Context
)
{
func
JsonInBlacklist
(
c
*
gin
.
Context
)
{
token
:=
c
.
Request
.
Header
.
Get
(
"x-token"
)
token
:=
c
.
Request
.
Header
.
Get
(
"x-token"
)
jwt
:=
model
.
JwtBlacklist
{
Jwt
:
token
}
jwt
:=
model
.
JwtBlacklist
{
Jwt
:
token
}
if
err
:=
service
.
JsonInBlacklist
(
jwt
);
err
!=
nil
{
if
err
:=
service
.
JsonInBlacklist
(
&
jwt
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"jwt作废失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"jwt作废失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"jwt作废失败"
,
c
)
response
.
FailWithMessage
(
"jwt作废失败"
,
c
)
}
else
{
}
else
{
...
...
server/api/v1/sys_menu.go
浏览文件 @
fb4dba16
...
@@ -108,7 +108,7 @@ func AddBaseMenu(c *gin.Context) {
...
@@ -108,7 +108,7 @@ func AddBaseMenu(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
:=
service
.
AddBaseMenu
(
menu
);
err
!=
nil
{
if
err
:=
service
.
AddBaseMenu
(
&
menu
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"添加失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"添加失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"添加失败"
,
c
)
response
.
FailWithMessage
(
"添加失败"
,
c
)
...
@@ -159,7 +159,7 @@ func UpdateBaseMenu(c *gin.Context) {
...
@@ -159,7 +159,7 @@ func UpdateBaseMenu(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
:=
service
.
UpdateBaseMenu
(
menu
);
err
!=
nil
{
if
err
:=
service
.
UpdateBaseMenu
(
&
menu
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"更新失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"更新失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"更新失败"
,
c
)
response
.
FailWithMessage
(
"更新失败"
,
c
)
}
else
{
}
else
{
...
@@ -214,6 +214,6 @@ func GetMenuList(c *gin.Context) {
...
@@ -214,6 +214,6 @@ func GetMenuList(c *gin.Context) {
Total
:
total
,
Total
:
total
,
Page
:
pageInfo
.
Page
,
Page
:
pageInfo
.
Page
,
PageSize
:
pageInfo
.
PageSize
,
PageSize
:
pageInfo
.
PageSize
,
},
"获取成功"
,
c
)
},
"获取成功"
,
c
)
}
}
}
}
\ No newline at end of file
server/api/v1/sys_operation_record.go
浏览文件 @
fb4dba16
...
@@ -22,7 +22,7 @@ import (
...
@@ -22,7 +22,7 @@ import (
func
CreateSysOperationRecord
(
c
*
gin
.
Context
)
{
func
CreateSysOperationRecord
(
c
*
gin
.
Context
)
{
var
sysOperationRecord
model
.
SysOperationRecord
var
sysOperationRecord
model
.
SysOperationRecord
_
=
c
.
ShouldBindJSON
(
&
sysOperationRecord
)
_
=
c
.
ShouldBindJSON
(
&
sysOperationRecord
)
if
err
:=
service
.
CreateSysOperationRecord
(
sysOperationRecord
);
err
!=
nil
{
if
err
:=
service
.
CreateSysOperationRecord
(
&
sysOperationRecord
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"创建失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"创建失败"
,
c
)
response
.
FailWithMessage
(
"创建失败"
,
c
)
}
else
{
}
else
{
...
@@ -41,7 +41,7 @@ func CreateSysOperationRecord(c *gin.Context) {
...
@@ -41,7 +41,7 @@ func CreateSysOperationRecord(c *gin.Context) {
func
DeleteSysOperationRecord
(
c
*
gin
.
Context
)
{
func
DeleteSysOperationRecord
(
c
*
gin
.
Context
)
{
var
sysOperationRecord
model
.
SysOperationRecord
var
sysOperationRecord
model
.
SysOperationRecord
_
=
c
.
ShouldBindJSON
(
&
sysOperationRecord
)
_
=
c
.
ShouldBindJSON
(
&
sysOperationRecord
)
if
err
:=
service
.
DeleteSysOperationRecord
(
sysOperationRecord
);
err
!=
nil
{
if
err
:=
service
.
DeleteSysOperationRecord
(
&
sysOperationRecord
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"删除失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"删除失败"
,
c
)
response
.
FailWithMessage
(
"删除失败"
,
c
)
}
else
{
}
else
{
...
@@ -60,7 +60,7 @@ func DeleteSysOperationRecord(c *gin.Context) {
...
@@ -60,7 +60,7 @@ func DeleteSysOperationRecord(c *gin.Context) {
func
DeleteSysOperationRecordByIds
(
c
*
gin
.
Context
)
{
func
DeleteSysOperationRecordByIds
(
c
*
gin
.
Context
)
{
var
IDS
request
.
IdsReq
var
IDS
request
.
IdsReq
_
=
c
.
ShouldBindJSON
(
&
IDS
)
_
=
c
.
ShouldBindJSON
(
&
IDS
)
if
err
:=
service
.
DeleteSysOperationRecordByIds
(
IDS
);
err
!=
nil
{
if
err
:=
service
.
DeleteSysOperationRecordByIds
(
&
IDS
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"批量删除失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"批量删除失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"批量删除失败"
,
c
)
response
.
FailWithMessage
(
"批量删除失败"
,
c
)
}
else
{
}
else
{
...
@@ -102,7 +102,7 @@ func FindSysOperationRecord(c *gin.Context) {
...
@@ -102,7 +102,7 @@ func FindSysOperationRecord(c *gin.Context) {
func
GetSysOperationRecordList
(
c
*
gin
.
Context
)
{
func
GetSysOperationRecordList
(
c
*
gin
.
Context
)
{
var
pageInfo
request
.
SysOperationRecordSearch
var
pageInfo
request
.
SysOperationRecordSearch
_
=
c
.
ShouldBindQuery
(
&
pageInfo
)
_
=
c
.
ShouldBindQuery
(
&
pageInfo
)
if
err
,
list
,
total
:=
service
.
GetSysOperationRecordInfoList
(
pageInfo
);
err
!=
nil
{
if
err
,
list
,
total
:=
service
.
GetSysOperationRecordInfoList
(
&
pageInfo
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"获取失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"获取失败"
,
c
)
response
.
FailWithMessage
(
"获取失败"
,
c
)
}
else
{
}
else
{
...
...
server/api/v1/sys_system.go
浏览文件 @
fb4dba16
...
@@ -34,7 +34,7 @@ func GetSystemConfig(c *gin.Context) {
...
@@ -34,7 +34,7 @@ func GetSystemConfig(c *gin.Context) {
func
SetSystemConfig
(
c
*
gin
.
Context
)
{
func
SetSystemConfig
(
c
*
gin
.
Context
)
{
var
sys
model
.
System
var
sys
model
.
System
_
=
c
.
ShouldBindJSON
(
&
sys
)
_
=
c
.
ShouldBindJSON
(
&
sys
)
if
err
:=
service
.
SetSystemConfig
(
sys
);
err
!=
nil
{
if
err
:=
service
.
SetSystemConfig
(
&
sys
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"设置失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"设置失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"设置失败"
,
c
)
response
.
FailWithMessage
(
"设置失败"
,
c
)
}
else
{
}
else
{
...
@@ -53,7 +53,7 @@ func SetSystemConfig(c *gin.Context) {
...
@@ -53,7 +53,7 @@ func SetSystemConfig(c *gin.Context) {
func
ReloadSystem
(
c
*
gin
.
Context
)
{
func
ReloadSystem
(
c
*
gin
.
Context
)
{
var
sys
model
.
System
var
sys
model
.
System
_
=
c
.
ShouldBindJSON
(
&
sys
)
_
=
c
.
ShouldBindJSON
(
&
sys
)
if
err
:=
service
.
SetSystemConfig
(
sys
);
err
!=
nil
{
if
err
:=
service
.
SetSystemConfig
(
&
sys
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"重启系统失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"重启系统失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"重启系统失败"
,
c
)
response
.
FailWithMessage
(
"重启系统失败"
,
c
)
}
else
{
}
else
{
...
...
server/api/v1/sys_user.go
浏览文件 @
fb4dba16
...
@@ -88,7 +88,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
...
@@ -88,7 +88,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
}
else
{
}
else
{
var
blackJWT
model
.
JwtBlacklist
var
blackJWT
model
.
JwtBlacklist
blackJWT
.
Jwt
=
jwtStr
blackJWT
.
Jwt
=
jwtStr
if
err
:=
service
.
JsonInBlacklist
(
blackJWT
);
err
!=
nil
{
if
err
:=
service
.
JsonInBlacklist
(
&
blackJWT
);
err
!=
nil
{
response
.
FailWithMessage
(
"jwt作废失败"
,
c
)
response
.
FailWithMessage
(
"jwt作废失败"
,
c
)
return
return
}
}
...
@@ -118,12 +118,12 @@ func Register(c *gin.Context) {
...
@@ -118,12 +118,12 @@ func Register(c *gin.Context) {
return
return
}
}
user
:=
&
model
.
SysUser
{
Username
:
R
.
Username
,
NickName
:
R
.
NickName
,
Password
:
R
.
Password
,
HeaderImg
:
R
.
HeaderImg
,
AuthorityId
:
R
.
AuthorityId
}
user
:=
&
model
.
SysUser
{
Username
:
R
.
Username
,
NickName
:
R
.
NickName
,
Password
:
R
.
Password
,
HeaderImg
:
R
.
HeaderImg
,
AuthorityId
:
R
.
AuthorityId
}
err
,
userReturn
:=
service
.
Register
(
*
user
)
err
,
userReturn
:=
service
.
Register
(
user
)
if
err
!=
nil
{
if
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"注册失败"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"注册失败"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithDetailed
(
response
.
SysUserResponse
{
User
:
userReturn
},
"注册失败"
,
c
)
response
.
FailWithDetailed
(
response
.
SysUserResponse
{
User
:
*
userReturn
},
"注册失败"
,
c
)
}
else
{
}
else
{
response
.
OkWithDetailed
(
response
.
SysUserResponse
{
User
:
userReturn
},
"注册成功"
,
c
)
response
.
OkWithDetailed
(
response
.
SysUserResponse
{
User
:
*
userReturn
},
"注册成功"
,
c
)
}
}
}
}
...
@@ -165,7 +165,7 @@ func GetUserList(c *gin.Context) {
...
@@ -165,7 +165,7 @@ func GetUserList(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
,
list
,
total
:=
service
.
GetUserInfoList
(
pageInfo
);
err
!=
nil
{
if
err
,
list
,
total
:=
service
.
GetUserInfoList
(
&
pageInfo
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"获取失败"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"获取失败"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"获取失败"
,
c
)
response
.
FailWithMessage
(
"获取失败"
,
c
)
}
else
{
}
else
{
...
@@ -244,7 +244,7 @@ func SetUserInfo(c *gin.Context) {
...
@@ -244,7 +244,7 @@ func SetUserInfo(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
,
ReqUser
:=
service
.
SetUserInfo
(
user
);
err
!=
nil
{
if
err
,
ReqUser
:=
service
.
SetUserInfo
(
&
user
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"设置失败"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"设置失败"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"设置失败"
,
c
)
response
.
FailWithMessage
(
"设置失败"
,
c
)
}
else
{
}
else
{
...
...
server/api/v1/sys_work_flow.go
浏览文件 @
fb4dba16
...
@@ -23,7 +23,7 @@ func CreateWorkFlow(c *gin.Context) {
...
@@ -23,7 +23,7 @@ func CreateWorkFlow(c *gin.Context) {
response
.
FailWithMessage
(
err
.
Error
(),
c
)
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
return
}
}
if
err
:=
service
.
Create
(
wk
);
err
!=
nil
{
if
err
:=
service
.
Create
(
&
wk
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"注册失败!"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"注册失败!"
,
zap
.
Any
(
"err"
,
err
))
response
.
FailWithMessage
(
"注册失败"
,
c
)
response
.
FailWithMessage
(
"注册失败"
,
c
)
}
else
{
}
else
{
...
...
server/middleware/jwt.go
浏览文件 @
fb4dba16
...
@@ -42,7 +42,7 @@ func JWTAuth() gin.HandlerFunc {
...
@@ -42,7 +42,7 @@ func JWTAuth() gin.HandlerFunc {
return
return
}
}
if
err
,
_
=
service
.
FindUserByUuid
(
claims
.
UUID
.
String
());
err
!=
nil
{
if
err
,
_
=
service
.
FindUserByUuid
(
claims
.
UUID
.
String
());
err
!=
nil
{
_
=
service
.
JsonInBlacklist
(
model
.
JwtBlacklist
{
Jwt
:
token
})
_
=
service
.
JsonInBlacklist
(
&
model
.
JwtBlacklist
{
Jwt
:
token
})
response
.
FailWithDetailed
(
gin
.
H
{
"reload"
:
true
},
err
.
Error
(),
c
)
response
.
FailWithDetailed
(
gin
.
H
{
"reload"
:
true
},
err
.
Error
(),
c
)
c
.
Abort
()
c
.
Abort
()
}
}
...
@@ -57,7 +57,7 @@ func JWTAuth() gin.HandlerFunc {
...
@@ -57,7 +57,7 @@ func JWTAuth() gin.HandlerFunc {
if
err
!=
nil
{
if
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"get redis jwt failed"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"get redis jwt failed"
,
zap
.
Any
(
"err"
,
err
))
}
else
{
// 当之前的取成功时才进行拉黑操作
}
else
{
// 当之前的取成功时才进行拉黑操作
_
=
service
.
JsonInBlacklist
(
model
.
JwtBlacklist
{
Jwt
:
RedisJwtToken
})
_
=
service
.
JsonInBlacklist
(
&
model
.
JwtBlacklist
{
Jwt
:
RedisJwtToken
})
}
}
// 无论如何都要记录当前的活跃状态
// 无论如何都要记录当前的活跃状态
_
=
service
.
SetRedisJWT
(
newToken
,
newClaims
.
Username
)
_
=
service
.
SetRedisJWT
(
newToken
,
newClaims
.
Username
)
...
...
server/middleware/operation.go
浏览文件 @
fb4dba16
...
@@ -31,7 +31,7 @@ func OperationRecord() gin.HandlerFunc {
...
@@ -31,7 +31,7 @@ func OperationRecord() gin.HandlerFunc {
if
claims
,
ok
:=
c
.
Get
(
"claims"
);
ok
{
if
claims
,
ok
:=
c
.
Get
(
"claims"
);
ok
{
waitUse
:=
claims
.
(
*
request
.
CustomClaims
)
waitUse
:=
claims
.
(
*
request
.
CustomClaims
)
userId
=
int
(
waitUse
.
ID
)
userId
=
int
(
waitUse
.
ID
)
}
else
{
}
else
{
id
,
err
:=
strconv
.
Atoi
(
c
.
Request
.
Header
.
Get
(
"x-user-id"
))
id
,
err
:=
strconv
.
Atoi
(
c
.
Request
.
Header
.
Get
(
"x-user-id"
))
if
err
!=
nil
{
if
err
!=
nil
{
userId
=
0
userId
=
0
...
@@ -47,7 +47,7 @@ func OperationRecord() gin.HandlerFunc {
...
@@ -47,7 +47,7 @@ func OperationRecord() gin.HandlerFunc {
UserID
:
userId
,
UserID
:
userId
,
}
}
values
:=
c
.
Request
.
Header
.
Values
(
"content-type"
)
values
:=
c
.
Request
.
Header
.
Values
(
"content-type"
)
if
len
(
values
)
>
0
&&
strings
.
Contains
(
values
[
0
],
"boundary"
)
{
if
len
(
values
)
>
0
&&
strings
.
Contains
(
values
[
0
],
"boundary"
)
{
record
.
Body
=
"file"
record
.
Body
=
"file"
}
}
writer
:=
responseBodyWriter
{
writer
:=
responseBodyWriter
{
...
@@ -65,7 +65,7 @@ func OperationRecord() gin.HandlerFunc {
...
@@ -65,7 +65,7 @@ func OperationRecord() gin.HandlerFunc {
record
.
Latency
=
latency
record
.
Latency
=
latency
record
.
Resp
=
writer
.
body
.
String
()
record
.
Resp
=
writer
.
body
.
String
()
if
err
:=
service
.
CreateSysOperationRecord
(
record
);
err
!=
nil
{
if
err
:=
service
.
CreateSysOperationRecord
(
&
record
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"create operation record error:"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"create operation record error:"
,
zap
.
Any
(
"err"
,
err
))
}
}
}
}
...
...
server/service/exa_customer.go
浏览文件 @
fb4dba16
...
@@ -12,8 +12,8 @@ import (
...
@@ -12,8 +12,8 @@ import (
//@param: e model.ExaCustomer
//@param: e model.ExaCustomer
//@return: err error
//@return: err error
func
CreateExaCustomer
(
e
model
.
ExaCustomer
)
(
err
error
)
{
func
CreateExaCustomer
(
e
*
model
.
ExaCustomer
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Create
(
&
e
)
.
Error
err
=
global
.
GVA_DB
.
Create
(
e
)
.
Error
return
err
return
err
}
}
...
@@ -23,8 +23,8 @@ func CreateExaCustomer(e model.ExaCustomer) (err error) {
...
@@ -23,8 +23,8 @@ func CreateExaCustomer(e model.ExaCustomer) (err error) {
//@param: e model.ExaCustomer
//@param: e model.ExaCustomer
//@return: err error
//@return: err error
func
DeleteExaCustomer
(
e
model
.
ExaCustomer
)
(
err
error
)
{
func
DeleteExaCustomer
(
e
*
model
.
ExaCustomer
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Delete
(
e
)
.
Error
err
=
global
.
GVA_DB
.
Delete
(
*
e
)
.
Error
return
err
return
err
}
}
...
@@ -62,7 +62,7 @@ func GetCustomerInfoList(sysUserAuthorityID string, info request.PageInfo) (err
...
@@ -62,7 +62,7 @@ func GetCustomerInfoList(sysUserAuthorityID string, info request.PageInfo) (err
db
:=
global
.
GVA_DB
.
Model
(
&
model
.
ExaCustomer
{})
db
:=
global
.
GVA_DB
.
Model
(
&
model
.
ExaCustomer
{})
var
a
model
.
SysAuthority
var
a
model
.
SysAuthority
a
.
AuthorityId
=
sysUserAuthorityID
a
.
AuthorityId
=
sysUserAuthorityID
err
,
auth
:=
GetAuthorityInfo
(
a
)
err
,
auth
:=
GetAuthorityInfo
(
&
a
)
var
dataId
[]
string
var
dataId
[]
string
for
_
,
v
:=
range
auth
.
DataAuthorityId
{
for
_
,
v
:=
range
auth
.
DataAuthorityId
{
dataId
=
append
(
dataId
,
v
.
AuthorityId
)
dataId
=
append
(
dataId
,
v
.
AuthorityId
)
...
...
server/service/exa_file_upload_download.go
浏览文件 @
fb4dba16
...
@@ -16,8 +16,8 @@ import (
...
@@ -16,8 +16,8 @@ import (
//@param: file model.ExaFileUploadAndDownload
//@param: file model.ExaFileUploadAndDownload
//@return: error
//@return: error
func
Upload
(
file
model
.
ExaFileUploadAndDownload
)
error
{
func
Upload
(
file
*
model
.
ExaFileUploadAndDownload
)
error
{
return
global
.
GVA_DB
.
Create
(
&
file
)
.
Error
return
global
.
GVA_DB
.
Create
(
file
)
.
Error
}
}
//@author: [piexlmax](https://github.com/piexlmax)
//@author: [piexlmax](https://github.com/piexlmax)
...
@@ -38,14 +38,14 @@ func FindFile(id uint) (error, model.ExaFileUploadAndDownload) {
...
@@ -38,14 +38,14 @@ func FindFile(id uint) (error, model.ExaFileUploadAndDownload) {
//@param: file model.ExaFileUploadAndDownload
//@param: file model.ExaFileUploadAndDownload
//@return: err error
//@return: err error
func
DeleteFile
(
file
model
.
ExaFileUploadAndDownload
)
(
err
error
)
{
func
DeleteFile
(
file
*
model
.
ExaFileUploadAndDownload
)
(
err
error
)
{
var
fileFromDb
model
.
ExaFileUploadAndDownload
var
fileFromDb
model
.
ExaFileUploadAndDownload
err
,
fileFromDb
=
FindFile
(
file
.
ID
)
err
,
fileFromDb
=
FindFile
(
file
.
ID
)
oss
:=
upload
.
NewOss
()
oss
:=
upload
.
NewOss
()
if
err
=
oss
.
DeleteFile
(
fileFromDb
.
Key
);
err
!=
nil
{
if
err
=
oss
.
DeleteFile
(
fileFromDb
.
Key
);
err
!=
nil
{
return
errors
.
New
(
"文件删除失败"
)
return
errors
.
New
(
"文件删除失败"
)
}
}
err
=
global
.
GVA_DB
.
Where
(
"id = ?"
,
file
.
ID
)
.
Unscoped
()
.
Delete
(
file
)
.
Error
err
=
global
.
GVA_DB
.
Where
(
"id = ?"
,
file
.
ID
)
.
Unscoped
()
.
Delete
(
*
file
)
.
Error
return
err
return
err
}
}
...
@@ -55,7 +55,7 @@ func DeleteFile(file model.ExaFileUploadAndDownload) (err error) {
...
@@ -55,7 +55,7 @@ func DeleteFile(file model.ExaFileUploadAndDownload) (err error) {
//@param: info request.PageInfo
//@param: info request.PageInfo
//@return: err error, list interface{}, total int64
//@return: err error, list interface{}, total int64
func
GetFileRecordInfoList
(
info
request
.
PageInfo
)
(
err
error
,
list
interface
{},
total
int64
)
{
func
GetFileRecordInfoList
(
info
*
request
.
PageInfo
)
(
err
error
,
list
interface
{},
total
int64
)
{
limit
:=
info
.
PageSize
limit
:=
info
.
PageSize
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
db
:=
global
.
GVA_DB
db
:=
global
.
GVA_DB
...
@@ -85,7 +85,7 @@ func UploadFile(header *multipart.FileHeader, noSave string) (err error, file mo
...
@@ -85,7 +85,7 @@ func UploadFile(header *multipart.FileHeader, noSave string) (err error, file mo
Tag
:
s
[
len
(
s
)
-
1
],
Tag
:
s
[
len
(
s
)
-
1
],
Key
:
key
,
Key
:
key
,
}
}
return
Upload
(
f
),
f
return
Upload
(
&
f
),
f
}
}
return
return
}
}
server/service/exa_simple_uploader.go
浏览文件 @
fb4dba16
...
@@ -17,8 +17,8 @@ import (
...
@@ -17,8 +17,8 @@ import (
//@param: uploader model.ExaSimpleUploader
//@param: uploader model.ExaSimpleUploader
//@return: err error
//@return: err error
func
SaveChunk
(
uploader
model
.
ExaSimpleUploader
)
(
err
error
)
{
func
SaveChunk
(
uploader
*
model
.
ExaSimpleUploader
)
(
err
error
)
{
return
global
.
GVA_DB
.
Create
(
uploader
)
.
Error
return
global
.
GVA_DB
.
Create
(
*
uploader
)
.
Error
}
}
//@author: [piexlmax](https://github.com/piexlmax)
//@author: [piexlmax](https://github.com/piexlmax)
...
...
server/service/jwt_black_list.go
浏览文件 @
fb4dba16
...
@@ -14,8 +14,8 @@ import (
...
@@ -14,8 +14,8 @@ import (
//@param: jwtList model.JwtBlacklist
//@param: jwtList model.JwtBlacklist
//@return: err error
//@return: err error
func
JsonInBlacklist
(
jwtList
model
.
JwtBlacklist
)
(
err
error
)
{
func
JsonInBlacklist
(
jwtList
*
model
.
JwtBlacklist
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Create
(
&
jwtList
)
.
Error
err
=
global
.
GVA_DB
.
Create
(
jwtList
)
.
Error
return
return
}
}
...
...
server/service/sys_api.go
浏览文件 @
fb4dba16
...
@@ -14,11 +14,11 @@ import (
...
@@ -14,11 +14,11 @@ import (
//@param: api model.SysApi
//@param: api model.SysApi
//@return: err error
//@return: err error
func
CreateApi
(
api
model
.
SysApi
)
(
err
error
)
{
func
CreateApi
(
api
*
model
.
SysApi
)
(
err
error
)
{
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"path = ? AND method = ?"
,
api
.
Path
,
api
.
Method
)
.
First
(
&
model
.
SysApi
{})
.
Error
,
gorm
.
ErrRecordNotFound
)
{
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"path = ? AND method = ?"
,
api
.
Path
,
api
.
Method
)
.
First
(
&
model
.
SysApi
{})
.
Error
,
gorm
.
ErrRecordNotFound
)
{
return
errors
.
New
(
"存在相同api"
)
return
errors
.
New
(
"存在相同api"
)
}
}
return
global
.
GVA_DB
.
Create
(
&
api
)
.
Error
return
global
.
GVA_DB
.
Create
(
api
)
.
Error
}
}
//@author: [piexlmax](https://github.com/piexlmax)
//@author: [piexlmax](https://github.com/piexlmax)
...
@@ -27,8 +27,8 @@ func CreateApi(api model.SysApi) (err error) {
...
@@ -27,8 +27,8 @@ func CreateApi(api model.SysApi) (err error) {
//@param: api model.SysApi
//@param: api model.SysApi
//@return: err error
//@return: err error
func
DeleteApi
(
api
model
.
SysApi
)
(
err
error
)
{
func
DeleteApi
(
api
*
model
.
SysApi
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Delete
(
api
)
.
Error
err
=
global
.
GVA_DB
.
Delete
(
*
api
)
.
Error
ClearCasbin
(
1
,
api
.
Path
,
api
.
Method
)
ClearCasbin
(
1
,
api
.
Path
,
api
.
Method
)
return
err
return
err
}
}
...
@@ -39,7 +39,7 @@ func DeleteApi(api model.SysApi) (err error) {
...
@@ -39,7 +39,7 @@ func DeleteApi(api model.SysApi) (err error) {
//@param: api model.SysApi, info request.PageInfo, order string, desc bool
//@param: api model.SysApi, info request.PageInfo, order string, desc bool
//@return: err error
//@return: err error
func
GetAPIInfoList
(
api
model
.
SysApi
,
info
request
.
PageInfo
,
order
string
,
desc
bool
)
(
err
error
,
list
interface
{},
total
int64
)
{
func
GetAPIInfoList
(
api
*
model
.
SysApi
,
info
*
request
.
PageInfo
,
order
string
,
desc
bool
)
(
err
error
,
list
interface
{},
total
int64
)
{
limit
:=
info
.
PageSize
limit
:=
info
.
PageSize
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
db
:=
global
.
GVA_DB
.
Model
(
&
model
.
SysApi
{})
db
:=
global
.
GVA_DB
.
Model
(
&
model
.
SysApi
{})
...
@@ -109,7 +109,7 @@ func GetApiById(id float64) (err error, api model.SysApi) {
...
@@ -109,7 +109,7 @@ func GetApiById(id float64) (err error, api model.SysApi) {
//@param: api model.SysApi
//@param: api model.SysApi
//@return: err error
//@return: err error
func
UpdateApi
(
api
model
.
SysApi
)
(
err
error
)
{
func
UpdateApi
(
api
*
model
.
SysApi
)
(
err
error
)
{
var
oldA
model
.
SysApi
var
oldA
model
.
SysApi
err
=
global
.
GVA_DB
.
Where
(
"id = ?"
,
api
.
ID
)
.
First
(
&
oldA
)
.
Error
err
=
global
.
GVA_DB
.
Where
(
"id = ?"
,
api
.
ID
)
.
First
(
&
oldA
)
.
Error
if
oldA
.
Path
!=
api
.
Path
||
oldA
.
Method
!=
api
.
Method
{
if
oldA
.
Path
!=
api
.
Path
||
oldA
.
Method
!=
api
.
Method
{
...
@@ -124,7 +124,7 @@ func UpdateApi(api model.SysApi) (err error) {
...
@@ -124,7 +124,7 @@ func UpdateApi(api model.SysApi) (err error) {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
else
{
}
else
{
err
=
global
.
GVA_DB
.
Save
(
&
api
)
.
Error
err
=
global
.
GVA_DB
.
Save
(
api
)
.
Error
}
}
}
}
return
err
return
err
...
...
server/service/sys_authority.go
浏览文件 @
fb4dba16
...
@@ -16,7 +16,7 @@ import (
...
@@ -16,7 +16,7 @@ import (
//@param: auth model.SysAuthority
//@param: auth model.SysAuthority
//@return: err error, authority model.SysAuthority
//@return: err error, authority model.SysAuthority
func
CreateAuthority
(
auth
model
.
SysAuthority
)
(
err
error
,
authority
model
.
SysAuthority
)
{
func
CreateAuthority
(
auth
*
model
.
SysAuthority
)
(
err
error
,
authority
*
model
.
SysAuthority
)
{
var
authorityBox
model
.
SysAuthority
var
authorityBox
model
.
SysAuthority
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"authority_id = ?"
,
auth
.
AuthorityId
)
.
First
(
&
authorityBox
)
.
Error
,
gorm
.
ErrRecordNotFound
)
{
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"authority_id = ?"
,
auth
.
AuthorityId
)
.
First
(
&
authorityBox
)
.
Error
,
gorm
.
ErrRecordNotFound
)
{
return
errors
.
New
(
"存在相同角色id"
),
auth
return
errors
.
New
(
"存在相同角色id"
),
auth
...
@@ -31,7 +31,7 @@ func CreateAuthority(auth model.SysAuthority) (err error, authority model.SysAut
...
@@ -31,7 +31,7 @@ func CreateAuthority(auth model.SysAuthority) (err error, authority model.SysAut
//@param: copyInfo response.SysAuthorityCopyResponse
//@param: copyInfo response.SysAuthorityCopyResponse
//@return: err error, authority model.SysAuthority
//@return: err error, authority model.SysAuthority
func
CopyAuthority
(
copyInfo
response
.
SysAuthorityCopyResponse
)
(
err
error
,
authority
model
.
SysAuthority
)
{
func
CopyAuthority
(
copyInfo
*
response
.
SysAuthorityCopyResponse
)
(
err
error
,
authority
model
.
SysAuthority
)
{
var
authorityBox
model
.
SysAuthority
var
authorityBox
model
.
SysAuthority
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"authority_id = ?"
,
copyInfo
.
Authority
.
AuthorityId
)
.
First
(
&
authorityBox
)
.
Error
,
gorm
.
ErrRecordNotFound
)
{
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"authority_id = ?"
,
copyInfo
.
Authority
.
AuthorityId
)
.
First
(
&
authorityBox
)
.
Error
,
gorm
.
ErrRecordNotFound
)
{
return
errors
.
New
(
"存在相同角色id"
),
authority
return
errors
.
New
(
"存在相同角色id"
),
authority
...
@@ -61,7 +61,7 @@ func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, autho
...
@@ -61,7 +61,7 @@ func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, autho
//@param: auth model.SysAuthority
//@param: auth model.SysAuthority
//@return:err error, authority model.SysAuthority
//@return:err error, authority model.SysAuthority
func
UpdateAuthority
(
auth
model
.
SysAuthority
)
(
err
error
,
authority
model
.
SysAuthority
)
{
func
UpdateAuthority
(
auth
*
model
.
SysAuthority
)
(
err
error
,
authority
*
model
.
SysAuthority
)
{
err
=
global
.
GVA_DB
.
Where
(
"authority_id = ?"
,
auth
.
AuthorityId
)
.
First
(
&
model
.
SysAuthority
{})
.
Updates
(
&
auth
)
.
Error
err
=
global
.
GVA_DB
.
Where
(
"authority_id = ?"
,
auth
.
AuthorityId
)
.
First
(
&
model
.
SysAuthority
{})
.
Updates
(
&
auth
)
.
Error
return
err
,
auth
return
err
,
auth
}
}
...
@@ -97,7 +97,7 @@ func DeleteAuthority(auth *model.SysAuthority) (err error) {
...
@@ -97,7 +97,7 @@ func DeleteAuthority(auth *model.SysAuthority) (err error) {
//@param: info request.PageInfo
//@param: info request.PageInfo
//@return: err error, list interface{}, total int64
//@return: err error, list interface{}, total int64
func
GetAuthorityInfoList
(
info
request
.
PageInfo
)
(
err
error
,
list
interface
{},
total
int64
)
{
func
GetAuthorityInfoList
(
info
*
request
.
PageInfo
)
(
err
error
,
list
interface
{},
total
int64
)
{
limit
:=
info
.
PageSize
limit
:=
info
.
PageSize
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
db
:=
global
.
GVA_DB
db
:=
global
.
GVA_DB
...
@@ -117,7 +117,7 @@ func GetAuthorityInfoList(info request.PageInfo) (err error, list interface{}, t
...
@@ -117,7 +117,7 @@ func GetAuthorityInfoList(info request.PageInfo) (err error, list interface{}, t
//@param: auth model.SysAuthority
//@param: auth model.SysAuthority
//@return: err error, sa model.SysAuthority
//@return: err error, sa model.SysAuthority
func
GetAuthorityInfo
(
auth
model
.
SysAuthority
)
(
err
error
,
sa
model
.
SysAuthority
)
{
func
GetAuthorityInfo
(
auth
*
model
.
SysAuthority
)
(
err
error
,
sa
model
.
SysAuthority
)
{
err
=
global
.
GVA_DB
.
Preload
(
"DataAuthorityId"
)
.
Where
(
"authority_id = ?"
,
auth
.
AuthorityId
)
.
First
(
&
sa
)
.
Error
err
=
global
.
GVA_DB
.
Preload
(
"DataAuthorityId"
)
.
Where
(
"authority_id = ?"
,
auth
.
AuthorityId
)
.
First
(
&
sa
)
.
Error
return
err
,
sa
return
err
,
sa
}
}
...
@@ -128,7 +128,7 @@ func GetAuthorityInfo(auth model.SysAuthority) (err error, sa model.SysAuthority
...
@@ -128,7 +128,7 @@ func GetAuthorityInfo(auth model.SysAuthority) (err error, sa model.SysAuthority
//@param: auth model.SysAuthority
//@param: auth model.SysAuthority
//@return:error
//@return:error
func
SetDataAuthority
(
auth
model
.
SysAuthority
)
error
{
func
SetDataAuthority
(
auth
*
model
.
SysAuthority
)
error
{
var
s
model
.
SysAuthority
var
s
model
.
SysAuthority
global
.
GVA_DB
.
Preload
(
"DataAuthorityId"
)
.
First
(
&
s
,
"authority_id = ?"
,
auth
.
AuthorityId
)
global
.
GVA_DB
.
Preload
(
"DataAuthorityId"
)
.
First
(
&
s
,
"authority_id = ?"
,
auth
.
AuthorityId
)
err
:=
global
.
GVA_DB
.
Model
(
&
s
)
.
Association
(
"DataAuthorityId"
)
.
Replace
(
&
auth
.
DataAuthorityId
)
err
:=
global
.
GVA_DB
.
Model
(
&
s
)
.
Association
(
"DataAuthorityId"
)
.
Replace
(
&
auth
.
DataAuthorityId
)
...
...
server/service/sys_auto_code.go
浏览文件 @
fb4dba16
...
@@ -28,7 +28,7 @@ type tplData struct {
...
@@ -28,7 +28,7 @@ type tplData struct {
//@param: model.AutoCodeStruct
//@param: model.AutoCodeStruct
//@return: error
//@return: error
func
CreateTemp
(
autoCode
model
.
AutoCodeStruct
)
(
err
error
)
{
func
CreateTemp
(
autoCode
*
model
.
AutoCodeStruct
)
(
err
error
)
{
basePath
:=
"resource/template"
basePath
:=
"resource/template"
// 获取 basePath 文件夹下所有tpl文件
// 获取 basePath 文件夹下所有tpl文件
tplFileList
,
err
:=
GetAllTplFile
(
basePath
,
nil
)
tplFileList
,
err
:=
GetAllTplFile
(
basePath
,
nil
)
...
@@ -87,7 +87,7 @@ func CreateTemp(autoCode model.AutoCodeStruct) (err error) {
...
@@ -87,7 +87,7 @@ func CreateTemp(autoCode model.AutoCodeStruct) (err error) {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
err
=
value
.
template
.
Execute
(
f
,
autoCode
);
err
!=
nil
{
if
err
=
value
.
template
.
Execute
(
f
,
*
autoCode
);
err
!=
nil
{
return
err
return
err
}
}
_
=
f
.
Close
()
_
=
f
.
Close
()
...
@@ -209,7 +209,6 @@ func addAutoMoveFile(data *tplData) {
...
@@ -209,7 +209,6 @@ func addAutoMoveFile(data *tplData) {
}
}
}
}
//@author: [piexlmax](https://github.com/piexlmax)
//@author: [piexlmax](https://github.com/piexlmax)
//@author: [SliverHorn](https://github.com/SliverHorn)
//@author: [SliverHorn](https://github.com/SliverHorn)
//@function: CreateApi
//@function: CreateApi
...
@@ -269,4 +268,4 @@ func AutoCreateApi(a *model.AutoCodeStruct) (err error) {
...
@@ -269,4 +268,4 @@ func AutoCreateApi(a *model.AutoCodeStruct) (err error) {
return
nil
return
nil
})
})
return
err
return
err
}
}
\ No newline at end of file
server/service/sys_base_menu.go
浏览文件 @
fb4dba16
...
@@ -36,7 +36,7 @@ func DeleteBaseMenu(id float64) (err error) {
...
@@ -36,7 +36,7 @@ func DeleteBaseMenu(id float64) (err error) {
//@param: menu model.SysBaseMenu
//@param: menu model.SysBaseMenu
//@return:err error
//@return:err error
func
UpdateBaseMenu
(
menu
model
.
SysBaseMenu
)
(
err
error
)
{
func
UpdateBaseMenu
(
menu
*
model
.
SysBaseMenu
)
(
err
error
)
{
var
oldMenu
model
.
SysBaseMenu
var
oldMenu
model
.
SysBaseMenu
upDateMap
:=
make
(
map
[
string
]
interface
{})
upDateMap
:=
make
(
map
[
string
]
interface
{})
upDateMap
[
"keep_alive"
]
=
menu
.
KeepAlive
upDateMap
[
"keep_alive"
]
=
menu
.
KeepAlive
...
...
server/service/sys_dictionary.go
浏览文件 @
fb4dba16
...
@@ -14,11 +14,11 @@ import (
...
@@ -14,11 +14,11 @@ import (
//@param: sysDictionary model.SysDictionary
//@param: sysDictionary model.SysDictionary
//@return: err error
//@return: err error
func
CreateSysDictionary
(
sysDictionary
model
.
SysDictionary
)
(
err
error
)
{
func
CreateSysDictionary
(
sysDictionary
*
model
.
SysDictionary
)
(
err
error
)
{
if
(
!
errors
.
Is
(
global
.
GVA_DB
.
First
(
&
model
.
SysDictionary
{},
"type = ?"
,
sysDictionary
.
Type
)
.
Error
,
gorm
.
ErrRecordNotFound
))
{
if
(
!
errors
.
Is
(
global
.
GVA_DB
.
First
(
&
model
.
SysDictionary
{},
"type = ?"
,
sysDictionary
.
Type
)
.
Error
,
gorm
.
ErrRecordNotFound
))
{
return
errors
.
New
(
"存在相同的type,不允许创建"
)
return
errors
.
New
(
"存在相同的type,不允许创建"
)
}
}
err
=
global
.
GVA_DB
.
Create
(
&
sysDictionary
)
.
Error
err
=
global
.
GVA_DB
.
Create
(
sysDictionary
)
.
Error
return
err
return
err
}
}
...
@@ -28,8 +28,8 @@ func CreateSysDictionary(sysDictionary model.SysDictionary) (err error) {
...
@@ -28,8 +28,8 @@ func CreateSysDictionary(sysDictionary model.SysDictionary) (err error) {
//@param: sysDictionary model.SysDictionary
//@param: sysDictionary model.SysDictionary
//@return: err error
//@return: err error
func
DeleteSysDictionary
(
sysDictionary
model
.
SysDictionary
)
(
err
error
)
{
func
DeleteSysDictionary
(
sysDictionary
*
model
.
SysDictionary
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Delete
(
sysDictionary
)
.
Delete
(
&
sysDictionary
.
SysDictionaryDetails
)
.
Error
err
=
global
.
GVA_DB
.
Delete
(
*
sysDictionary
)
.
Delete
(
sysDictionary
.
SysDictionaryDetails
)
.
Error
return
err
return
err
}
}
...
@@ -78,7 +78,7 @@ func GetSysDictionary(Type string, Id uint) (err error, sysDictionary model.SysD
...
@@ -78,7 +78,7 @@ func GetSysDictionary(Type string, Id uint) (err error, sysDictionary model.SysD
//@param: info request.SysDictionarySearch
//@param: info request.SysDictionarySearch
//@return: err error, list interface{}, total int64
//@return: err error, list interface{}, total int64
func
GetSysDictionaryInfoList
(
info
request
.
SysDictionarySearch
)
(
err
error
,
list
interface
{},
total
int64
)
{
func
GetSysDictionaryInfoList
(
info
*
request
.
SysDictionarySearch
)
(
err
error
,
list
interface
{},
total
int64
)
{
limit
:=
info
.
PageSize
limit
:=
info
.
PageSize
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
// 创建db
// 创建db
...
...
server/service/sys_dictionary_detail.go
浏览文件 @
fb4dba16
...
@@ -12,8 +12,8 @@ import (
...
@@ -12,8 +12,8 @@ import (
//@param: sysDictionaryDetail model.SysDictionaryDetail
//@param: sysDictionaryDetail model.SysDictionaryDetail
//@return: err error
//@return: err error
func
CreateSysDictionaryDetail
(
sysDictionaryDetail
model
.
SysDictionaryDetail
)
(
err
error
)
{
func
CreateSysDictionaryDetail
(
sysDictionaryDetail
*
model
.
SysDictionaryDetail
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Create
(
&
sysDictionaryDetail
)
.
Error
err
=
global
.
GVA_DB
.
Create
(
sysDictionaryDetail
)
.
Error
return
err
return
err
}
}
...
@@ -23,8 +23,8 @@ func CreateSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (e
...
@@ -23,8 +23,8 @@ func CreateSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (e
//@param: sysDictionaryDetail model.SysDictionaryDetail
//@param: sysDictionaryDetail model.SysDictionaryDetail
//@return: err error
//@return: err error
func
DeleteSysDictionaryDetail
(
sysDictionaryDetail
model
.
SysDictionaryDetail
)
(
err
error
)
{
func
DeleteSysDictionaryDetail
(
sysDictionaryDetail
*
model
.
SysDictionaryDetail
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Delete
(
sysDictionaryDetail
)
.
Error
err
=
global
.
GVA_DB
.
Delete
(
*
sysDictionaryDetail
)
.
Error
return
err
return
err
}
}
...
@@ -56,7 +56,7 @@ func GetSysDictionaryDetail(id uint) (err error, sysDictionaryDetail model.SysDi
...
@@ -56,7 +56,7 @@ func GetSysDictionaryDetail(id uint) (err error, sysDictionaryDetail model.SysDi
//@param: info request.SysDictionaryDetailSearch
//@param: info request.SysDictionaryDetailSearch
//@return: err error
//@return: err error
func
GetSysDictionaryDetailInfoList
(
info
request
.
SysDictionaryDetailSearch
)
(
err
error
,
list
interface
{},
total
int64
)
{
func
GetSysDictionaryDetailInfoList
(
info
*
request
.
SysDictionaryDetailSearch
)
(
err
error
,
list
interface
{},
total
int64
)
{
limit
:=
info
.
PageSize
limit
:=
info
.
PageSize
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
// 创建db
// 创建db
...
...
server/service/sys_menu.go
浏览文件 @
fb4dba16
...
@@ -89,11 +89,11 @@ func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.Sys
...
@@ -89,11 +89,11 @@ func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.Sys
//@param: menu model.SysBaseMenu
//@param: menu model.SysBaseMenu
//@return: err error
//@return: err error
func
AddBaseMenu
(
menu
model
.
SysBaseMenu
)
(
err
error
)
{
func
AddBaseMenu
(
menu
*
model
.
SysBaseMenu
)
(
err
error
)
{
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"name = ?"
,
menu
.
Name
)
.
First
(
&
model
.
SysBaseMenu
{})
.
Error
,
gorm
.
ErrRecordNotFound
)
{
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"name = ?"
,
menu
.
Name
)
.
First
(
&
model
.
SysBaseMenu
{})
.
Error
,
gorm
.
ErrRecordNotFound
)
{
err
=
errors
.
New
(
"存在重复name,请修改name"
)
err
=
errors
.
New
(
"存在重复name,请修改name"
)
}
}
err
=
global
.
GVA_DB
.
Create
(
&
menu
)
.
Error
err
=
global
.
GVA_DB
.
Create
(
menu
)
.
Error
return
err
return
err
}
}
...
...
server/service/sys_operation_record.go
浏览文件 @
fb4dba16
...
@@ -12,8 +12,8 @@ import (
...
@@ -12,8 +12,8 @@ import (
//@param: sysOperationRecord model.SysOperationRecord
//@param: sysOperationRecord model.SysOperationRecord
//@return: err error
//@return: err error
func
CreateSysOperationRecord
(
sysOperationRecord
model
.
SysOperationRecord
)
(
err
error
)
{
func
CreateSysOperationRecord
(
sysOperationRecord
*
model
.
SysOperationRecord
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Create
(
&
sysOperationRecord
)
.
Error
err
=
global
.
GVA_DB
.
Create
(
sysOperationRecord
)
.
Error
return
err
return
err
}
}
...
@@ -24,7 +24,7 @@ func CreateSysOperationRecord(sysOperationRecord model.SysOperationRecord) (err
...
@@ -24,7 +24,7 @@ func CreateSysOperationRecord(sysOperationRecord model.SysOperationRecord) (err
//@param: ids request.IdsReq
//@param: ids request.IdsReq
//@return: err error
//@return: err error
func
DeleteSysOperationRecordByIds
(
ids
request
.
IdsReq
)
(
err
error
)
{
func
DeleteSysOperationRecordByIds
(
ids
*
request
.
IdsReq
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Delete
(
&
[]
model
.
SysOperationRecord
{},
"id in (?)"
,
ids
.
Ids
)
.
Error
err
=
global
.
GVA_DB
.
Delete
(
&
[]
model
.
SysOperationRecord
{},
"id in (?)"
,
ids
.
Ids
)
.
Error
return
err
return
err
}
}
...
@@ -35,8 +35,8 @@ func DeleteSysOperationRecordByIds(ids request.IdsReq) (err error) {
...
@@ -35,8 +35,8 @@ func DeleteSysOperationRecordByIds(ids request.IdsReq) (err error) {
//@param: sysOperationRecord model.SysOperationRecord
//@param: sysOperationRecord model.SysOperationRecord
//@return: err error
//@return: err error
func
DeleteSysOperationRecord
(
sysOperationRecord
model
.
SysOperationRecord
)
(
err
error
)
{
func
DeleteSysOperationRecord
(
sysOperationRecord
*
model
.
SysOperationRecord
)
(
err
error
)
{
err
=
global
.
GVA_DB
.
Delete
(
sysOperationRecord
)
.
Error
err
=
global
.
GVA_DB
.
Delete
(
*
sysOperationRecord
)
.
Error
return
err
return
err
}
}
...
@@ -58,7 +58,7 @@ func GetSysOperationRecord(id uint) (err error, sysOperationRecord model.SysOper
...
@@ -58,7 +58,7 @@ func GetSysOperationRecord(id uint) (err error, sysOperationRecord model.SysOper
//@param: info request.SysOperationRecordSearch
//@param: info request.SysOperationRecordSearch
//@return: err error, list interface{}, total int64
//@return: err error, list interface{}, total int64
func
GetSysOperationRecordInfoList
(
info
request
.
SysOperationRecordSearch
)
(
err
error
,
list
interface
{},
total
int64
)
{
func
GetSysOperationRecordInfoList
(
info
*
request
.
SysOperationRecordSearch
)
(
err
error
,
list
interface
{},
total
int64
)
{
limit
:=
info
.
PageSize
limit
:=
info
.
PageSize
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
// 创建db
// 创建db
...
...
server/service/sys_system.go
浏览文件 @
fb4dba16
...
@@ -24,7 +24,7 @@ func GetSystemConfig() (err error, conf config.Server) {
...
@@ -24,7 +24,7 @@ func GetSystemConfig() (err error, conf config.Server) {
//@param: system model.System
//@param: system model.System
//@return: err error
//@return: err error
func
SetSystemConfig
(
system
model
.
System
)
(
err
error
)
{
func
SetSystemConfig
(
system
*
model
.
System
)
(
err
error
)
{
cs
:=
utils
.
StructToMap
(
system
.
Config
)
cs
:=
utils
.
StructToMap
(
system
.
Config
)
for
k
,
v
:=
range
cs
{
for
k
,
v
:=
range
cs
{
global
.
GVA_VP
.
Set
(
k
,
v
)
global
.
GVA_VP
.
Set
(
k
,
v
)
...
@@ -41,19 +41,18 @@ func SetSystemConfig(system model.System) (err error) {
...
@@ -41,19 +41,18 @@ func SetSystemConfig(system model.System) (err error) {
func
GetServerInfo
()
(
server
*
utils
.
Server
,
err
error
)
{
func
GetServerInfo
()
(
server
*
utils
.
Server
,
err
error
)
{
var
s
utils
.
Server
var
s
utils
.
Server
s
.
Os
=
utils
.
InitOS
()
s
.
Os
=
utils
.
InitOS
()
if
s
.
Cpu
,
err
=
utils
.
InitCPU
();
err
!=
nil
{
if
s
.
Cpu
,
err
=
utils
.
InitCPU
();
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"func utils.InitCPU() Failed!"
,
zap
.
String
(
"err"
,
err
.
Error
()))
global
.
GVA_LOG
.
Error
(
"func utils.InitCPU() Failed!"
,
zap
.
String
(
"err"
,
err
.
Error
()))
return
&
s
,
err
return
&
s
,
err
}
}
if
s
.
Rrm
,
err
=
utils
.
InitRAM
();
err
!=
nil
{
if
s
.
Rrm
,
err
=
utils
.
InitRAM
();
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"func utils.InitRAM() Failed!"
,
zap
.
String
(
"err"
,
err
.
Error
()))
global
.
GVA_LOG
.
Error
(
"func utils.InitRAM() Failed!"
,
zap
.
String
(
"err"
,
err
.
Error
()))
return
&
s
,
err
return
&
s
,
err
}
}
if
s
.
Disk
,
err
=
utils
.
InitDisk
();
err
!=
nil
{
if
s
.
Disk
,
err
=
utils
.
InitDisk
();
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"func utils.InitDisk() Failed!"
,
zap
.
String
(
"err"
,
err
.
Error
()))
global
.
GVA_LOG
.
Error
(
"func utils.InitDisk() Failed!"
,
zap
.
String
(
"err"
,
err
.
Error
()))
return
&
s
,
err
return
&
s
,
err
}
}
return
&
s
,
nil
return
&
s
,
nil
}
}
server/service/sys_user.go
浏览文件 @
fb4dba16
...
@@ -10,14 +10,13 @@ import (
...
@@ -10,14 +10,13 @@ import (
"gorm.io/gorm"
"gorm.io/gorm"
)
)
//@author: [piexlmax](https://github.com/piexlmax)
//@author: [piexlmax](https://github.com/piexlmax)
//@function: Register
//@function: Register
//@description: 用户注册
//@description: 用户注册
//@param: u model.SysUser
//@param: u model.SysUser
//@return: err error, userInter model.SysUser
//@return: err error, userInter model.SysUser
func
Register
(
u
model
.
SysUser
)
(
err
error
,
userInter
model
.
SysUser
)
{
func
Register
(
u
*
model
.
SysUser
)
(
err
error
,
userInter
*
model
.
SysUser
)
{
var
user
model
.
SysUser
var
user
model
.
SysUser
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"username = ?"
,
u
.
Username
)
.
First
(
&
user
)
.
Error
,
gorm
.
ErrRecordNotFound
)
{
// 判断用户名是否注册
if
!
errors
.
Is
(
global
.
GVA_DB
.
Where
(
"username = ?"
,
u
.
Username
)
.
First
(
&
user
)
.
Error
,
gorm
.
ErrRecordNotFound
)
{
// 判断用户名是否注册
return
errors
.
New
(
"用户名已注册"
),
userInter
return
errors
.
New
(
"用户名已注册"
),
userInter
...
@@ -25,7 +24,7 @@ func Register(u model.SysUser) (err error, userInter model.SysUser) {
...
@@ -25,7 +24,7 @@ func Register(u model.SysUser) (err error, userInter model.SysUser) {
// 否则 附加uuid 密码md5简单加密 注册
// 否则 附加uuid 密码md5简单加密 注册
u
.
Password
=
utils
.
MD5V
([]
byte
(
u
.
Password
))
u
.
Password
=
utils
.
MD5V
([]
byte
(
u
.
Password
))
u
.
UUID
=
uuid
.
NewV4
()
u
.
UUID
=
uuid
.
NewV4
()
err
=
global
.
GVA_DB
.
Create
(
&
u
)
.
Error
err
=
global
.
GVA_DB
.
Create
(
u
)
.
Error
return
err
,
u
return
err
,
u
}
}
...
@@ -61,7 +60,7 @@ func ChangePassword(u *model.SysUser, newPassword string) (err error, userInter
...
@@ -61,7 +60,7 @@ func ChangePassword(u *model.SysUser, newPassword string) (err error, userInter
//@param: info request.PageInfo
//@param: info request.PageInfo
//@return: err error, list interface{}, total int64
//@return: err error, list interface{}, total int64
func
GetUserInfoList
(
info
request
.
PageInfo
)
(
err
error
,
list
interface
{},
total
int64
)
{
func
GetUserInfoList
(
info
*
request
.
PageInfo
)
(
err
error
,
list
interface
{},
total
int64
)
{
limit
:=
info
.
PageSize
limit
:=
info
.
PageSize
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
offset
:=
info
.
PageSize
*
(
info
.
Page
-
1
)
db
:=
global
.
GVA_DB
.
Model
(
&
model
.
SysUser
{})
db
:=
global
.
GVA_DB
.
Model
(
&
model
.
SysUser
{})
...
@@ -100,7 +99,7 @@ func DeleteUser(id float64) (err error) {
...
@@ -100,7 +99,7 @@ func DeleteUser(id float64) (err error) {
//@param: reqUser model.SysUser
//@param: reqUser model.SysUser
//@return: err error, user model.SysUser
//@return: err error, user model.SysUser
func
SetUserInfo
(
reqUser
model
.
SysUser
)
(
err
error
,
user
model
.
SysUser
)
{
func
SetUserInfo
(
reqUser
*
model
.
SysUser
)
(
err
error
,
user
*
model
.
SysUser
)
{
err
=
global
.
GVA_DB
.
Updates
(
&
reqUser
)
.
Error
err
=
global
.
GVA_DB
.
Updates
(
&
reqUser
)
.
Error
return
err
,
reqUser
return
err
,
reqUser
}
}
...
@@ -125,8 +124,8 @@ func FindUserById(id int) (err error, user *model.SysUser) {
...
@@ -125,8 +124,8 @@ func FindUserById(id int) (err error, user *model.SysUser) {
func
FindUserByUuid
(
uuid
string
)
(
err
error
,
user
*
model
.
SysUser
)
{
func
FindUserByUuid
(
uuid
string
)
(
err
error
,
user
*
model
.
SysUser
)
{
var
u
model
.
SysUser
var
u
model
.
SysUser
if
err
=
global
.
GVA_DB
.
Where
(
"`uuid` = ?"
,
uuid
)
.
First
(
&
u
)
.
Error
;
err
!=
nil
{
if
err
=
global
.
GVA_DB
.
Where
(
"`uuid` = ?"
,
uuid
)
.
First
(
&
u
)
.
Error
;
err
!=
nil
{
return
errors
.
New
(
"用户不存在"
),
&
u
return
errors
.
New
(
"用户不存在"
),
&
u
}
}
return
nil
,
&
u
return
nil
,
&
u
}
}
\ No newline at end of file
server/service/sys_workflow.go
浏览文件 @
fb4dba16
...
@@ -11,7 +11,7 @@ import (
...
@@ -11,7 +11,7 @@ import (
//@param: wk model.SysWorkflow
//@param: wk model.SysWorkflow
//@return: error
//@return: error
func
Create
(
wk
model
.
SysWorkflow
)
error
{
func
Create
(
wk
*
model
.
SysWorkflow
)
error
{
err
:=
global
.
GVA_DB
.
Create
(
&
wk
)
.
Error
err
:=
global
.
GVA_DB
.
Create
(
wk
)
.
Error
return
err
return
err
}
}
Mr.奇淼(
@a303176530
mentioned in commit
bf975af6
·
7月 01, 2021
mentioned in commit
bf975af6
mentioned in commit bf975af6762263fed9ea3eb12f35e9bd6697db69
开关提交列表
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录