Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FLIPPED-AURORA
gin-vue-admin
提交
2f1fbe12
G
gin-vue-admin
项目概览
FLIPPED-AURORA
/
gin-vue-admin
大约 1 年 前同步成功
通知
334
Star
18155
Fork
5506
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
2f1fbe12
编写于
12月 07, 2020
作者:
m0_50812349
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
自定义logger保留gorm的格式输出控制台, 修改SetUserInfo的校验规则为IdVerify
上级
415142e2
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
75 addition
and
24 deletion
+75
-24
server/api/v1/sys_user.go
server/api/v1/sys_user.go
+1
-1
server/config.yaml
server/config.yaml
+1
-1
server/config/gorm.go
server/config/gorm.go
+1
-1
server/initialize/gorm.go
server/initialize/gorm.go
+47
-11
server/initialize/logger.go
server/initialize/logger.go
+25
-8
server/utils/verify.go
server/utils/verify.go
+0
-2
未找到文件。
server/api/v1/sys_user.go
浏览文件 @
2f1fbe12
...
...
@@ -240,7 +240,7 @@ func DeleteUser(c *gin.Context) {
func
SetUserInfo
(
c
*
gin
.
Context
)
{
var
user
model
.
SysUser
_
=
c
.
ShouldBindJSON
(
&
user
)
if
err
:=
utils
.
Verify
(
user
,
utils
.
SetUser
Verify
);
err
!=
nil
{
if
err
:=
utils
.
Verify
(
user
,
utils
.
Id
Verify
);
err
!=
nil
{
response
.
FailWithMessage
(
err
.
Error
(),
c
)
return
}
...
...
server/config.yaml
浏览文件 @
2f1fbe12
...
...
@@ -60,7 +60,7 @@ mysql:
max-idle-conns
:
10
max-open-conns
:
100
log-mode
:
false
log-zap
:
false
log-zap
:
"
"
# local configuration
local
:
...
...
server/config/gorm.go
浏览文件 @
2f1fbe12
...
...
@@ -9,5 +9,5 @@ type Mysql struct {
MaxIdleConns
int
`mapstructure:"max-idle-conns" json:"maxIdleConns" yaml:"max-idle-conns"`
MaxOpenConns
int
`mapstructure:"max-open-conns" json:"maxOpenConns" yaml:"max-open-conns"`
LogMode
bool
`mapstructure:"log-mode" json:"logMode" yaml:"log-mode"`
LogZap
bool
`mapstructure:"log-zap" json:"logZap" yaml:"log-zap"`
LogZap
string
`mapstructure:"log-zap" json:"logZap" yaml:"log-zap"`
}
server/initialize/gorm.go
浏览文件 @
2f1fbe12
...
...
@@ -10,7 +10,11 @@ import (
"os"
)
// Gorm 初始化数据库并产生数据库全局变量
//@author: SliverHorn
//@function: Gorm
//@description: 初始化数据库并产生数据库全局变量
//@return: *gorm.DB
func
Gorm
()
*
gorm
.
DB
{
switch
global
.
GVA_CONFIG
.
System
.
DbType
{
case
"mysql"
:
...
...
@@ -20,7 +24,12 @@ func Gorm() *gorm.DB {
}
}
// MysqlTables 注册数据库表专用
// MysqlTables
//@author: SliverHorn
//@function: MysqlTables
//@description: 注册数据库表专用
//@param: db *gorm.DB
func
MysqlTables
(
db
*
gorm
.
DB
)
{
err
:=
db
.
AutoMigrate
(
model
.
SysUser
{},
...
...
@@ -52,7 +61,12 @@ func MysqlTables(db *gorm.DB) {
global
.
GVA_LOG
.
Info
(
"register table success"
)
}
// GormMysql 初始化Mysql数据库
//
//@author: SliverHorn
//@function: GormMysql
//@description: 初始化Mysql数据库
//@return: *gorm.DB
func
GormMysql
()
*
gorm
.
DB
{
m
:=
global
.
GVA_CONFIG
.
Mysql
dsn
:=
m
.
Username
+
":"
+
m
.
Password
+
"@tcp("
+
m
.
Path
+
")/"
+
m
.
Dbname
+
"?"
+
m
.
Config
...
...
@@ -76,14 +90,35 @@ func GormMysql() *gorm.DB {
}
}
// gormConfig 根据配置决定是否开启日志
//@author: SliverHorn
//@function: gormConfig
//@description: 根据配置决定是否开启日志
//@param: mod bool
//@return: *gorm.Config
func
gormConfig
(
mod
bool
)
*
gorm
.
Config
{
if
global
.
GVA_CONFIG
.
Mysql
.
LogZap
{
switch
global
.
GVA_CONFIG
.
Mysql
.
LogZap
{
case
"Silent"
:
return
&
gorm
.
Config
{
Logger
:
Default
.
LogMode
(
logger
.
Info
),
Logger
:
Default
.
LogMode
(
logger
.
Silent
),
DisableForeignKeyConstraintWhenMigrating
:
true
,
}
case
"Error"
:
return
&
gorm
.
Config
{
Logger
:
Default
.
LogMode
(
logger
.
Error
),
DisableForeignKeyConstraintWhenMigrating
:
true
,
}
case
"Warn"
:
return
&
gorm
.
Config
{
Logger
:
Default
.
LogMode
(
logger
.
Warn
),
DisableForeignKeyConstraintWhenMigrating
:
true
,
}
case
"Info"
:
return
&
gorm
.
Config
{
Logger
:
Default
.
LogMode
(
logger
.
Info
),
DisableForeignKeyConstraintWhenMigrating
:
true
,
}
default
:
if
mod
{
return
&
gorm
.
Config
{
Logger
:
logger
.
Default
.
LogMode
(
logger
.
Info
),
...
...
@@ -95,4 +130,5 @@ func gormConfig(mod bool) *gorm.Config {
DisableForeignKeyConstraintWhenMigrating
:
true
,
}
}
}
}
server/initialize/logger.go
浏览文件 @
2f1fbe12
...
...
@@ -14,8 +14,8 @@ import (
)
var
(
Discard
=
New
(
log
.
New
(
ioutil
.
Discard
,
""
,
log
.
LstdFlags
),
GormConfig
{})
Default
=
New
(
log
.
New
(
os
.
Stdout
,
"
\r\n
"
,
log
.
LstdFlags
),
GormConfig
{
Discard
=
New
(
log
.
New
(
ioutil
.
Discard
,
""
,
log
.
LstdFlags
),
log
.
New
(
ioutil
.
Discard
,
""
,
log
.
LstdFlags
),
GormConfig
{})
Default
=
New
(
log
.
New
(
os
.
Stdout
,
"
\r\n
"
,
log
.
LstdFlags
),
log
.
New
(
os
.
Stdout
,
"
\r\n
"
,
log
.
LstdFlags
),
GormConfig
{
SlowThreshold
:
200
*
time
.
Millisecond
,
LogLevel
:
logger
.
Warn
,
Colorful
:
true
,
...
...
@@ -31,7 +31,7 @@ type traceRecorder struct {
Err
error
}
func
New
(
writer
Writer
,
config
GormConfig
)
logger
.
Interface
{
func
New
(
writer
Writer
,
gormWriter
logger
.
Writer
,
config
GormConfig
)
logger
.
Interface
{
var
(
infoStr
=
"%s
\n
[info] "
warnStr
=
"%s
\n
[warn] "
...
...
@@ -52,6 +52,7 @@ func New(writer Writer, config GormConfig) logger.Interface {
return
&
GormLogger
{
Writer
:
writer
,
gormWriter
:
gormWriter
,
GormConfig
:
config
,
infoStr
:
infoStr
,
warnStr
:
warnStr
,
...
...
@@ -75,6 +76,7 @@ type GormConfig struct {
type
GormLogger
struct
{
Writer
gormWriter
logger
.
Writer
GormConfig
infoStr
,
warnStr
,
errStr
string
traceStr
,
traceErrStr
,
traceWarnStr
string
...
...
@@ -135,6 +137,7 @@ func (g *GormLogger) Trace(ctx context.Context, begin time.Time, fc func() (stri
}
func
(
g
*
GormLogger
)
Printf
(
message
string
,
data
...
interface
{})
{
if
global
.
GVA_CONFIG
.
Mysql
.
LogZap
==
"Info"
&&
!
global
.
GVA_CONFIG
.
Mysql
.
LogMode
{
switch
len
(
data
)
{
case
0
:
global
.
GVA_LOG
.
Info
(
message
)
...
...
@@ -147,4 +150,18 @@ func (g *GormLogger) Printf(message string, data ...interface{}) {
case
4
:
global
.
GVA_LOG
.
Info
(
"gorm"
,
zap
.
Any
(
"src"
,
data
[
0
]),
zap
.
Any
(
"duration"
,
data
[
1
]),
zap
.
Any
(
"rows"
,
data
[
2
]),
zap
.
Any
(
"sql"
,
data
[
3
]))
}
return
}
switch
len
(
data
)
{
case
0
:
g
.
gormWriter
.
Printf
(
message
,
""
)
case
1
:
g
.
gormWriter
.
Printf
(
message
,
data
[
0
]
.
(
string
))
case
2
:
g
.
gormWriter
.
Printf
(
message
,
data
[
0
]
.
(
string
),
data
[
1
]
.
(
float64
))
case
3
:
g
.
gormWriter
.
Printf
(
message
,
data
[
0
]
.
(
string
),
data
[
1
]
.
(
float64
),
data
[
2
]
.
(
string
))
case
4
:
g
.
gormWriter
.
Printf
(
message
,
data
[
0
]
.
(
string
),
data
[
1
]
.
(
float64
),
data
[
2
]
.
(
string
),
data
[
3
]
.
(
string
))
}
}
server/utils/verify.go
浏览文件 @
2f1fbe12
...
...
@@ -6,12 +6,10 @@ var (
MenuVerify
=
Rules
{
"Path"
:
{
NotEmpty
()},
"ParentId"
:
{
NotEmpty
()},
"Name"
:
{
NotEmpty
()},
"Component"
:
{
NotEmpty
()},
"Sort"
:
{
Ge
(
"0"
)}}
MenuMetaVerify
=
Rules
{
"Title"
:
{
NotEmpty
()}}
LoginVerify
=
Rules
{
"CaptchaId"
:
{
NotEmpty
()},
"Captcha"
:
{
NotEmpty
()},
"Username"
:
{
NotEmpty
()},
"Password"
:
{
NotEmpty
()}}
SetUserVerify
=
Rules
{
"ID"
:
{
NotEmpty
()},
"Username"
:
{
NotEmpty
()},
"NickName"
:
{
NotEmpty
()},
"HeaderImg"
:
{
NotEmpty
()}}
RegisterVerify
=
Rules
{
"Username"
:
{
NotEmpty
()},
"NickName"
:
{
NotEmpty
()},
"Password"
:
{
NotEmpty
()},
"AuthorityId"
:
{
NotEmpty
()}}
PageInfoVerify
=
Rules
{
"Page"
:
{
NotEmpty
()},
"PageSize"
:
{
NotEmpty
()}}
CustomerVerify
=
Rules
{
"CustomerName"
:
{
NotEmpty
()},
"CustomerPhoneData"
:
{
NotEmpty
()}}
AutoCodeVerify
=
Rules
{
"Abbreviation"
:
{
NotEmpty
()},
"StructName"
:
{
NotEmpty
()},
"PackageName"
:
{
NotEmpty
()},
"Fields"
:
{
NotEmpty
()}}
WorkFlowVerify
=
Rules
{
"WorkflowNickName"
:
{
NotEmpty
()},
"WorkflowName"
:
{
NotEmpty
()},
"WorkflowDescription"
:
{
NotEmpty
()},
"WorkflowStepInfo"
:
{
NotEmpty
()}}
AuthorityVerify
=
Rules
{
"AuthorityId"
:
{
NotEmpty
()},
"AuthorityName"
:
{
NotEmpty
()},
"ParentId"
:
{
NotEmpty
()}}
AuthorityIdVerify
=
Rules
{
"AuthorityId"
:
{
NotEmpty
()}}
OldAuthorityVerify
=
Rules
{
"OldAuthorityId"
:
{
NotEmpty
()}}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录