后台格式规范化 引入casbin做鉴权

QMPlusServer/init/initRouter/initRouter.go

@@ -1,26 +0,0 @@
-package initRouter
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/swaggo/gin-swagger"
-	"github.com/swaggo/gin-swagger/swaggerFiles"
-	_ "main/docs"
-	"main/middleware"
-	"main/router"
-)
-
-//初始化总路由
-func InitRouter() *gin.Engine {
-	var Router = gin.Default()
-	Router.Use(middleware.Logger()) // 如果不需要日志 请关闭这里
-	Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
-	//Router.Use(middleware.Logger())
-	router.InitUserRouter(Router)                  // 注册用户路由
-	router.InitBaseRouter(Router)                  // 注册基础功能路由
-	router.InitMenuRouter(Router)                  // 注册menu路由
-	router.InitAuthorityRouter(Router)             // 注册角色路由
-	router.InitApiRouter(Router)                   // 注册功能api路由
-	router.InitFileUploadAndDownloadRouter(Router) // 文件上传下载功能路由
-	router.InitWorkflowRouter(Router)              // 工作流相关路由
-	return Router
-}

QMPlusServer/init/initRouter/init_router.go

@@ -0,0 +1,28 @@
+package initRouter
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/swaggo/gin-swagger"
+	"github.com/swaggo/gin-swagger/swaggerFiles"
+	_ "main/docs"
+	"main/middleware"
+	"main/router"
+)
+
+//初始化总路由
+func InitRouter() *gin.Engine {
+	var Router = gin.Default()
+	//Router.Use(middleware.LoadTls())  // 打开就能玩https了
+	Router.Use(middleware.Logger()) // 如果不需要日志 请关闭这里
+	Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
+	//Router.Use(middleware.Logger())
+	router.InitUserRouter(Router)             // 注册用户路由
+	router.InitBaseRouter(Router)                                          								// 注册基础功能路由 不做鉴权
+	router.InitMenuRouter(Router)        							// 注册menu路由
+	router.InitAuthorityRouter(Router)         								// 注册角色路由
+	router.InitApiRouter(Router)       							   // 注册功能api路由
+	router.InitFileUploadAndDownloadRouter(Router)                      // 文件上传下载功能路由
+	router.InitWorkflowRouter(Router)                                         // 工作流相关路由
+	router.InitCasbinRouter(Router)
+	return Router
+}

QMPlusServer/init/qmlog/qmlog.go

@@ -11,9 +11,8 @@ import (
 )
 
 var QMLog = logrus.New()
-
 //禁止logrus的输出
-func InitLog() {
+func InitLog() *logrus.Logger{
 	src, err := os.OpenFile(os.DevNull, os.O_APPEND|os.O_WRONLY, os.ModeAppend)
 	if err != nil {
 		fmt.Println("err", err)
@@ -33,4 +32,5 @@ func InitLog() {
 	}
 	lfHook := lfshook.NewHook(writeMap, &logrus.JSONFormatter{})
 	QMLog.AddHook(lfHook)
+	return QMLog
 }

QMPlusServer/init/registTable/registTable.go

@@ -1,20 +0,0 @@
-package registTable
-
-import (
-	"github.com/jinzhu/gorm"
-	"main/model/dbModel"
-)
-
-//注册数据库表专用
-func RegistTable(db *gorm.DB) {
-	db.AutoMigrate(dbModel.User{},
-		dbModel.Authority{},
-		dbModel.Menu{},
-		dbModel.Api{},
-		dbModel.ApiAuthority{},
-		dbModel.BaseMenu{},
-		dbModel.FileUploadAndDownload{},
-		dbModel.Workflow{},
-		dbModel.WorkflowStepInfo{},
-	)
-}

QMPlusServer/init/registTable/regist_table.go

@@ -0,0 +1,21 @@
+package registTable
+
+import (
+	"github.com/jinzhu/gorm"
+	"main/model/dbModel"
+	"main/model/sysModel"
+)
+
+//注册数据库表专用
+func RegistTable(db *gorm.DB) {
+	db.AutoMigrate(sysModel.SysUser{},
+		sysModel.SysAuthority{},
+		sysModel.SysMenu{},
+		sysModel.SysApi{},
+		sysModel.SysApiAuthority{},
+		sysModel.SysBaseMenu{},
+		dbModel.ExaFileUploadAndDownload{},
+		sysModel.SysWorkflow{},
+		sysModel.SysWorkflowStepInfo{},
+	)
+}