Merge pull request #117 from wenjianzhang/v1

fix[log print]: fixed log writer error (#114)
This commit is contained in:
wenjianzhang authored and GitHub committed 2020-06-12 00:04:57 +08:00
commit b0acf85f10
13 files changed
+100 -11

No files matched your search

+4
View File
@@ -86,6 +86,10 @@
[使用生成工具轻松实现业务](https://www.bilibili.com/video/BV1Dg4y1i79D)
[go-admin菜单的配置说明](https://www.bilibili.com/video/BV1Wp4y1D715)
[多命令启动方式讲解以及IDE配置](https://www.bilibili.com/video/BV1Fg4y1q7ph)
**如有问题请先看上述使用文档和文章,若不能满足,欢迎 issue 和 pr ,视频教程和文档持续更新中**
## 📦 本地开发
+8 -2
View File
@@ -84,8 +84,14 @@ func run() error {
go func() {
// 服务连接
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Fatalf("listen: %s\n", err)
if config2.ApplicationConfig.IsHttps {
if err := srv.ListenAndServeTLS(config2.SslConfig.Pem, config2.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
log.Fatalf("listen: %s\n", err)
}
} else {
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Fatalf("listen: %s\n", err)
}
}
}()
content, _ := ioutil.ReadFile("./static/go-admin.txt")
+5
View File
@@ -6,6 +6,11 @@ settings:
port: 8000
readtimeout: 1
writertimeout: 2
domain: localhost:8000
ishttps: false
ssl:
key: keystring
pem: temp/pem.pem
log:
dir: temp/logs
jwt:
+1 -2
View File
@@ -20,7 +20,6 @@ require (
github.com/json-iterator/go v1.1.8 // indirect
github.com/mailru/easyjson v0.7.1 // indirect
github.com/mattn/go-isatty v0.0.10 // indirect
github.com/mitchellh/go-homedir v1.1.0
github.com/mojocn/base64Captcha v1.3.1
github.com/mssola/user_agent v0.5.1
github.com/pkg/errors v0.8.1
@@ -29,11 +28,11 @@ require (
github.com/shirou/gopsutil v2.20.3+incompatible
github.com/sirupsen/logrus v1.2.0
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.3
github.com/spf13/viper v1.6.2
github.com/swaggo/gin-swagger v1.2.0
github.com/swaggo/swag v1.6.5
github.com/ugorji/go v1.1.7 // indirect
github.com/unrolled/secure v1.0.8
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
golang.org/x/tools v0.0.0-20200402223321-bcf690261a44 // indirect
+4
View File
@@ -300,8 +300,12 @@ github.com/ugorji/go/codec v1.1.5-pre h1:5YV9PsFAN+ndcCtTM7s60no7nY7eTG3LPtxhSwu
github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2tfCQDUqRd8fI=
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/unrolled/secure v1.0.8 h1:JaMvKbe4CRt8oyxVXn+xY+6jlqd7pyJNSVkmsBxxQsM=
github.com/unrolled/secure v1.0.8/go.mod h1:fO+mEan+FLB0CdEnHf6Q4ZZVNqG+5fuLFnP8p0BXDPI=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+21
View File
@@ -0,0 +1,21 @@
package handler
import (
"github.com/gin-gonic/gin"
"github.com/unrolled/secure"
"go-admin/tools/config"
)
func TlsHandler() gin.HandlerFunc {
return func(c *gin.Context) {
secureMiddleware := secure.New(secure.Options{
SSLRedirect: true,
SSLHost: config.ApplicationConfig.Domain,
})
err := secureMiddleware.Process(c.Writer, c.Request)
if err != nil {
return
}
c.Next()
}
}
+1 -1
View File
@@ -28,7 +28,7 @@ func Casbin() (*casbin.Enforcer, error) {
if err := e.LoadPolicy(); err == nil {
return e, err
} else {
fmt.Print("casbin rbac_model or policy init error, message: %v", err)
fmt.Printf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
return nil, err
}
}
+1 -1
View File
@@ -14,6 +14,6 @@ func TestJob(c *cron.Cron) {
log.Println(err)
log.Println("start error")
} else {
log.Println("Start Success; ID: %v", id)
log.Printf("Start Success; ID: %v \r\n", id)
}
}
+5
View File
@@ -2,14 +2,19 @@ package router
import (
"github.com/gin-gonic/gin"
"go-admin/handler"
"go-admin/middleware"
_ "go-admin/pkg/jwtauth"
"go-admin/tools"
config2 "go-admin/tools/config"
)
func InitRouter() *gin.Engine {
r := gin.New()
if config2.ApplicationConfig.IsHttps {
r.Use(handler.TlsHandler())
}
middleware.InitMiddleware(r)
// the jwt middleware
authMiddleware, err := middleware.AuthInit()
+5 -4
View File
@@ -7,18 +7,19 @@ import (
"text/template"
)
func TestGoModelTemplate(t *testing.T) {
t1, err := template.ParseFiles("model.go.template")
if err != nil {
t.Error(err)
}
table := tools.SysTables{}
table.TableName = "sys_tables"
table.TBName = "sys_tables"
tab, err := table.Get()
if err != nil {
t.Error(err)
}
file, err := os.Create("models/"+table.PackageName+".go")
file, err := os.Create("models/" + table.PackageName + ".go")
if err != nil {
t.Error(err)
}
@@ -34,9 +35,9 @@ func TestGoApiTemplate(t *testing.T) {
t.Error(err)
}
table := tools.SysTables{}
table.TableName = "sys_tables"
table.TBName = "sys_tables"
tab, _ := table.Get()
file, err := os.Create("apis/"+table.PackageName+".go")
file, err := os.Create("apis/" + table.PackageName + ".go")
if err != nil {
t.Error(err)
}
+21 -1
View File
@@ -11,6 +11,8 @@ type Application struct {
JwtSecret string
Mode string
DemoMsg string
Domain string
IsHttps bool
}
func InitApplication(cfg *viper.Viper) *Application {
@@ -18,12 +20,30 @@ func InitApplication(cfg *viper.Viper) *Application {
ReadTimeout: cfg.GetInt("readTimeout"),
WriterTimeout: cfg.GetInt("writerTimeout"),
Host: cfg.GetString("host"),
Port: cfg.GetString("port"),
Port: portDefault(cfg),
Name: cfg.GetString("name"),
JwtSecret: cfg.GetString("jwtSecret"),
Mode: cfg.GetString("mode"),
DemoMsg: cfg.GetString("demoMsg"),
Domain: cfg.GetString("domain"),
IsHttps: cfg.GetBool("ishttps"),
}
}
var ApplicationConfig = new(Application)
func portDefault(cfg *viper.Viper) string {
if cfg.GetString("port") == "" {
return "8000"
} else {
return cfg.GetString("port")
}
}
func isHttpsDefault(cfg *viper.Viper) bool {
if cfg.GetString("ishttps") == "" || cfg.GetBool("ishttps") == false{
return false
} else {
return true
}
}
+7
View File
@@ -13,6 +13,7 @@ var cfgDatabase *viper.Viper
var cfgApplication *viper.Viper
var cfgJwt *viper.Viper
var cfgLog *viper.Viper
var cfgSsl *viper.Viper
//载入配置文件
@@ -53,6 +54,12 @@ func ConfigSetup(path string) {
panic("config not found settings.log")
}
LogConfig = InitLog(cfgLog)
cfgSsl = viper.Sub("settings.ssl")
if cfgSsl == nil {
panic("config not found settings.ssl")
}
SslConfig = InitSsl(cfgSsl)
}
+17
View File
@@ -0,0 +1,17 @@
package config
import "github.com/spf13/viper"
type Ssl struct {
KeyStr string
Pem string
}
func InitSsl(cfg *viper.Viper) *Ssl {
return &Ssl{
KeyStr: cfg.GetString("key"),
Pem: cfg.GetString("pem"),
}
}
var SslConfig = new(Ssl)