Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
祺技世界
gin-vue-admin
提交
35eb20f7
G
gin-vue-admin
项目概览
祺技世界
/
gin-vue-admin
与 Fork 源项目一致
Fork自
FLIPPED-AURORA / gin-vue-admin
通知
6
Star
0
Fork
0
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
提交
35eb20f7
编写于
3月 24, 2020
作者:
G
Granty1
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set logger to global variable
上级
9b0c7bfc
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
32 addition
and
37 deletion
+32
-37
QMPlusServer/cmd/windows.go
QMPlusServer/cmd/windows.go
+2
-2
QMPlusServer/init/initRedis/init_redis.go
QMPlusServer/init/initRedis/init_redis.go
+3
-3
QMPlusServer/init/initRouter/init_router.go
QMPlusServer/init/initRouter/init_router.go
+7
-7
QMPlusServer/init/initlog/qmlog/log.go
QMPlusServer/init/initlog/qmlog/log.go
+6
-3
QMPlusServer/init/qmsql/initMysql.go
QMPlusServer/init/qmsql/initMysql.go
+2
-2
QMPlusServer/init/registTable/regist_table.go
QMPlusServer/init/registTable/regist_table.go
+2
-2
QMPlusServer/main.go
QMPlusServer/main.go
+6
-8
QMPlusServer/middleware/cors.go
QMPlusServer/middleware/cors.go
+1
-1
QMPlusServer/middleware/logger.go
QMPlusServer/middleware/logger.go
+3
-3
QMPlusServer/static/config/config.json
QMPlusServer/static/config/config.json
+0
-6
未找到文件。
QMPlusServer/cmd/windows.go
浏览文件 @
35eb20f7
...
...
@@ -9,7 +9,7 @@ import (
"time"
)
func
RunWindowsServer
(
Router
*
gin
.
Engine
,
logger
log
.
Logger
)
{
func
RunWindowsServer
(
Router
*
gin
.
Engine
)
{
address
:=
fmt
.
Sprintf
(
":%d"
,
config
.
GinVueAdminconfig
.
System
.
Addr
)
s
:=
&
http
.
Server
{
Addr
:
address
,
...
...
@@ -19,7 +19,7 @@ func RunWindowsServer(Router *gin.Engine, logger log.Logger) {
MaxHeaderBytes
:
1
<<
20
,
}
time
.
Sleep
(
10
*
time
.
Microsecond
)
log
ger
.
Debug
(
"server run success on "
,
address
)
log
.
L
.
Debug
(
"server run success on "
,
address
)
fmt
.
Printf
(
`欢迎使用 Gin-Vue-Admin
作者:奇淼 And Spike666
...
...
QMPlusServer/init/initRedis/init_redis.go
浏览文件 @
35eb20f7
...
...
@@ -8,7 +8,7 @@ import (
var
DEFAULTREDIS
*
redis
.
Client
func
InitRedis
(
logger
log
.
Logger
)
(
client
*
redis
.
Client
)
{
func
InitRedis
()
(
client
*
redis
.
Client
)
{
client
=
redis
.
NewClient
(
&
redis
.
Options
{
Addr
:
config
.
GinVueAdminconfig
.
RedisAdmin
.
Addr
,
Password
:
config
.
GinVueAdminconfig
.
RedisAdmin
.
Password
,
// no password set
...
...
@@ -16,9 +16,9 @@ func InitRedis(logger log.Logger) (client *redis.Client) {
})
pong
,
err
:=
client
.
Ping
()
.
Result
()
if
err
!=
nil
{
log
ger
.
Error
(
err
)
log
.
L
.
Error
(
err
)
}
else
{
log
ger
.
Info
(
"redis connect ping response:"
,
pong
)
log
.
L
.
Info
(
"redis connect ping response:"
,
pong
)
DEFAULTREDIS
=
client
}
return
client
...
...
QMPlusServer/init/initRouter/init_router.go
浏览文件 @
35eb20f7
...
...
@@ -11,18 +11,18 @@ import (
)
//初始化总路由
func
InitRouter
(
logger
log
.
Logger
)
*
gin
.
Engine
{
func
InitRouter
()
*
gin
.
Engine
{
var
Router
=
gin
.
Default
()
//Router.Use(middleware.LoadTls()) // 打开就能玩https了
// 如果不需要日志 请关闭这里
Router
.
Use
(
middleware
.
Logger
MiddlewareFactory
(
logger
))
log
ger
.
Debug
(
"use middleware logger"
)
Router
.
Use
(
middleware
.
Logger
(
))
log
.
L
.
Debug
(
"use middleware logger"
)
// 跨域
Router
.
Use
(
middleware
.
Cors
MiddlewareFactory
())
log
ger
.
Debug
(
"use middleware cors"
)
Router
.
Use
(
middleware
.
Cors
())
log
.
L
.
Debug
(
"use middleware cors"
)
Router
.
GET
(
"/swagger/*any"
,
ginSwagger
.
WrapHandler
(
swaggerFiles
.
Handler
))
log
ger
.
Debug
(
"register swagger handler"
)
log
.
L
.
Debug
(
"register swagger handler"
)
// 方便统一添加路由组前缀 多服务器上线使用
ApiGroup
:=
Router
.
Group
(
""
)
router
.
InitUserRouter
(
ApiGroup
)
// 注册用户路由
...
...
@@ -36,6 +36,6 @@ func InitRouter(logger log.Logger) *gin.Engine {
router
.
InitJwtRouter
(
ApiGroup
)
// jwt相关路由
router
.
InitSystemRouter
(
ApiGroup
)
// system相关路由
router
.
InitCustomerRouter
(
ApiGroup
)
// 客户路由
log
ger
.
Info
(
"router register success"
)
log
.
L
.
Info
(
"router register success"
)
return
Router
}
QMPlusServer/init/initlog/qmlog/log.go
浏览文件 @
35eb20f7
...
...
@@ -22,7 +22,7 @@ const (
)
var
(
configNotFound
=
errors
.
New
(
"logger
config
not found"
)
configNotFound
=
errors
.
New
(
"logger
prefix
not found"
)
defaultFormatter
=
`%{time:2006/01/02 - 15:04:05.000} %{longfile} %{color:bold}▶ [%{level:.6s}] %{message}%{color:reset}`
)
...
...
@@ -31,8 +31,11 @@ type Logger struct{
logger
*
oplogging
.
Logger
}
func
NewLogger
()
(
log
.
Logger
,
error
)
{
func
NewLogger
()
error
{
c
:=
config
.
GinVueAdminconfig
.
Log
if
c
.
Prefix
==
""
{
return
configNotFound
}
logger
:=
oplogging
.
MustGetLogger
(
module
)
var
backends
[]
oplogging
.
Backend
backends
=
registerStdout
(
c
,
backends
)
...
...
@@ -40,7 +43,7 @@ func NewLogger() (log.Logger, error) {
oplogging
.
SetBackend
(
backends
...
)
log
.
SetLogger
(
logger
)
return
logger
,
nil
return
nil
}
func
registerStdout
(
c
config
.
Log
,
backends
[]
oplogging
.
Backend
)
[]
oplogging
.
Backend
{
...
...
QMPlusServer/init/qmsql/initMysql.go
浏览文件 @
35eb20f7
...
...
@@ -10,9 +10,9 @@ import (
var
DEFAULTDB
*
gorm
.
DB
//初始化数据库并产生数据库全局变量
func
InitMysql
(
admin
config
.
MysqlAdmin
,
logger
log
.
Logger
)
*
gorm
.
DB
{
func
InitMysql
(
admin
config
.
MysqlAdmin
)
*
gorm
.
DB
{
if
db
,
err
:=
gorm
.
Open
(
"mysql"
,
admin
.
Username
+
":"
+
admin
.
Password
+
"@("
+
admin
.
Path
+
")/"
+
admin
.
Dbname
+
"?"
+
admin
.
Config
);
err
!=
nil
{
log
ger
.
Error
(
"DEFAULTDB数据库启动异常"
,
err
)
log
.
L
.
Error
(
"DEFAULTDB数据库启动异常"
,
err
)
}
else
{
DEFAULTDB
=
db
DEFAULTDB
.
DB
()
.
SetMaxIdleConns
(
10
)
...
...
QMPlusServer/init/registTable/regist_table.go
浏览文件 @
35eb20f7
...
...
@@ -8,7 +8,7 @@ import (
)
//注册数据库表专用
func
RegistTable
(
db
*
gorm
.
DB
,
logger
log
.
Logger
)
{
func
RegistTable
(
db
*
gorm
.
DB
)
{
db
.
AutoMigrate
(
sysModel
.
SysUser
{},
sysModel
.
SysAuthority
{},
sysModel
.
SysMenu
{},
...
...
@@ -22,5 +22,5 @@ func RegistTable(db *gorm.DB, logger log.Logger) {
dbModel
.
ExaFileChunk
{},
dbModel
.
ExaCustomer
{},
)
log
ger
.
Debug
(
"register table success"
)
log
.
L
.
Debug
(
"register table success"
)
}
QMPlusServer/main.go
浏览文件 @
35eb20f7
...
...
@@ -21,23 +21,21 @@ import (
// @BasePath /
func
main
()
{
var
err
error
logger
,
err
:=
qmlog
.
NewLogger
()
if
err
!=
nil
{
if
err
:=
qmlog
.
NewLogger
();
err
!=
nil
{
fmt
.
Println
(
err
)
}
// 链接初始化数据库
db
:=
qmsql
.
InitMysql
(
config
.
GinVueAdminconfig
.
MysqlAdmin
,
logger
)
db
:=
qmsql
.
InitMysql
(
config
.
GinVueAdminconfig
.
MysqlAdmin
)
if
config
.
GinVueAdminconfig
.
System
.
UseMultipoint
{
// 初始化redis服务
_
=
initRedis
.
InitRedis
(
logger
)
_
=
initRedis
.
InitRedis
()
}
// 注册数据库表
registTable
.
RegistTable
(
db
,
logger
)
registTable
.
RegistTable
(
db
)
// 程序结束前关闭数据库链接
defer
qmsql
.
DEFAULTDB
.
Close
()
// 注册路由
Router
:=
initRouter
.
InitRouter
(
logger
)
Router
:=
initRouter
.
InitRouter
()
//Router.RunTLS(":443","ssl.pem", "ssl.key") // https支持 需要添加中间件
//sysType := runtime.GOOS
//
...
...
@@ -47,6 +45,6 @@ func main() {
//}
//if sysType == "windows" {
// WIN系统
cmd
.
RunWindowsServer
(
Router
,
logger
)
cmd
.
RunWindowsServer
(
Router
)
//}
}
QMPlusServer/middleware/cors.go
浏览文件 @
35eb20f7
...
...
@@ -6,7 +6,7 @@ import (
)
// 处理跨域请求,支持options访问
func
Cors
MiddlewareFactory
()
gin
.
HandlerFunc
{
func
Cors
()
gin
.
HandlerFunc
{
return
func
(
c
*
gin
.
Context
)
{
method
:=
c
.
Request
.
Method
c
.
Header
(
"Access-Control-Allow-Origin"
,
"*"
)
...
...
QMPlusServer/middleware/logger.go
浏览文件 @
35eb20f7
...
...
@@ -10,7 +10,7 @@ import (
"github.com/gin-gonic/gin"
)
func
Logger
MiddlewareFactory
(
logger
log
.
Logger
)
gin
.
HandlerFunc
{
func
Logger
(
)
gin
.
HandlerFunc
{
return
func
(
c
*
gin
.
Context
)
{
// request time
start
:=
time
.
Now
()
...
...
@@ -27,7 +27,7 @@ func LoggerMiddlewareFactory(logger log.Logger) gin.HandlerFunc {
// copy request content
req
,
_
:=
httputil
.
DumpRequest
(
c
.
Request
,
true
)
if
logFlag
{
log
ger
.
Debug
(
log
.
L
.
Debug
(
"Request:"
,
method
,
clientIP
,
path
,
string
(
req
))
}
// replace writer
...
...
@@ -44,7 +44,7 @@ func LoggerMiddlewareFactory(logger log.Logger) gin.HandlerFunc {
latency
:=
end
.
Sub
(
start
)
statusCode
:=
c
.
Writer
.
Status
()
if
logFlag
{
log
ger
.
Debug
(
log
.
L
.
Debug
(
"Response:"
,
statusCode
,
latency
,
...
...
QMPlusServer/static/config/config.json
浏览文件 @
35eb20f7
...
...
@@ -30,11 +30,5 @@
"keyLong"
:
6
,
"imgWidth"
:
120
,
"imgHeight"
:
40
},
"log"
:
{
"prefix"
:
"[GIN-VUE-ADMIN]"
,
"logFile"
:
false
,
"stdout"
:
[
"DEBUG"
],
"file"
:
[
"WARNING"
]
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录