Merge branch 'dev' of https://github.com/wenjianzhang/go-admin into dev
This commit is contained in:
commit
c396f318ef
4 files changed
+59
-2
No files matched your search
@@ -24,6 +24,7 @@
|
|||||||
系统初始化极度简单,只需要配置文件中,修改数据库连接,系统启动后会自动初始化数据库信息以及必须的基础数据
|
系统初始化极度简单,只需要配置文件中,修改数据库连接,系统启动后会自动初始化数据库信息以及必须的基础数据
|
||||||
|
|
||||||
[在线文档国际](https://wenjianzhang.github.io/go-admin-site)
|
[在线文档国际](https://wenjianzhang.github.io/go-admin-site)
|
||||||
|
|
||||||
[在线文档国内](http://mydearzwj.gitee.io/go-admin-site/)
|
[在线文档国内](http://mydearzwj.gitee.io/go-admin-site/)
|
||||||
|
|
||||||
[前端项目](https://github.com/wenjianzhang/go-admin-ui)
|
[前端项目](https://github.com/wenjianzhang/go-admin-ui)
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/jinzhu/gorm"
|
||||||
|
"go-admin/global"
|
||||||
|
mycasbin "go-admin/pkg/casbin"
|
||||||
|
"go-admin/pkg/logger"
|
||||||
|
"go-admin/router"
|
||||||
|
"log"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
var err error
|
||||||
|
global.Eloquent, err = gorm.Open("mysql", "root:123456@tcp/inmg?charset=utf8&parseTime=True&loc=Local")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
mycasbin.Setup()
|
||||||
|
logger.Setup()
|
||||||
|
global.GinEngine = gin.Default()
|
||||||
|
router.InitRouter()
|
||||||
|
log.Fatal(global.GinEngine.Run(":8000"))
|
||||||
|
}
|
||||||
Vendored
+27
@@ -0,0 +1,27 @@
|
|||||||
|
package cache
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Adapter interface {
|
||||||
|
Connect()
|
||||||
|
Get(key string) (string, error)
|
||||||
|
Set(key string, val interface{}, expire int) error
|
||||||
|
Del(key string) error
|
||||||
|
HashGet(hk, key string) (string, error)
|
||||||
|
HashDel(hk, key string) error
|
||||||
|
Increase(key string) error
|
||||||
|
Expire(key string, dur time.Duration) error
|
||||||
|
SetQueue(name string, message Message) error
|
||||||
|
GetQueue(name string, f func(message Message) error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type Message interface {
|
||||||
|
SetID(string)
|
||||||
|
SetStream(string)
|
||||||
|
SetValue(map[string]interface{})
|
||||||
|
GetID() string
|
||||||
|
GetStream() string
|
||||||
|
GetValue() map[string]interface{}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ package router
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"go-admin/global"
|
||||||
"go-admin/handler"
|
"go-admin/handler"
|
||||||
"go-admin/middleware"
|
"go-admin/middleware"
|
||||||
_ "go-admin/pkg/jwtauth"
|
_ "go-admin/pkg/jwtauth"
|
||||||
@@ -10,8 +11,12 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func InitRouter() *gin.Engine {
|
func InitRouter() *gin.Engine {
|
||||||
|
var r *gin.Engine
|
||||||
r := gin.New()
|
if global.GinEngine == nil {
|
||||||
|
r = gin.New()
|
||||||
|
} else {
|
||||||
|
r = global.GinEngine
|
||||||
|
}
|
||||||
if config2.SslConfig.Enable {
|
if config2.SslConfig.Enable {
|
||||||
r.Use(handler.TlsHandler())
|
r.Use(handler.TlsHandler())
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user