Merge branch 'dev' into docs

.github/workflows/go.yml

@@ -2,7 +2,7 @@ name: Go
 
 on:
   push:
-    branches: ["main"]
+    branches: ["main", "dev"]
     paths-ignore:
       [
         "README.*",

cmd/server.go

@@ -1,11 +1,11 @@
 package cmd
 
 import (
-	config "go-gin-boilerplate/configs"
+	"go-gin-boilerplate/configs"
 	"go-gin-boilerplate/internal/pkg/logger"
 	"go-gin-boilerplate/internal/pkg/mysql"
 	"go-gin-boilerplate/internal/pkg/redis"
-	routes "go-gin-boilerplate/internal/router"
+	"go-gin-boilerplate/internal/router"
 
 	"net/http"
 
@@ -41,17 +41,14 @@ func init() {
 
 func start() {
 
-	// init routes
-	r, err := routes.Init()
-	if err != nil {
-		panic(err)
-	}
+	// init router
+	r := router.Router
 
 	// init logger
 	logger := logger.LogrusLogger
 
 	// load env config
-	EnvConfig := config.EnvConfig
+	EnvConfig := configs.EnvConfig
 
 	// connect database
 	mysql.Connect(&EnvConfig.Mysql)

internal/middlewares/cors.go

@@ -8,11 +8,13 @@ import (
 
 // Cors middleware
 func Cors() gin.HandlerFunc {
+
 	return cors.New(cors.Config{
 		AllowOrigins:     []string{"*"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Content-Type", "Accept", "Authorization"},
 		ExposeHeaders:    []string{"Content-Length"},
 		AllowCredentials: true,
 	})
+
 }

internal/middlewares/errorHandle.go

@@ -1,30 +1,37 @@
 package middlewares
 
 import (
+	"log"
 	"net/http"
 	"runtime/debug"
 
 	"github.com/gin-gonic/gin"
 )
 
 // ErrorHandle is a middleware to handle panic
-func ErrorHandle(c *gin.Context) {
-	defer func() {
-		if err := recover(); err != nil {
-			// log error
-
-			// print stack trace
-			debug.PrintStack()
-
-			// return error response
-			c.JSON(http.StatusInternalServerError, gin.H{
-				"code":    http.StatusInternalServerError,
-				"message": "Internal Server Error",
-			})
-
-			// abort request
-			c.Abort()
-		}
-	}()
-	c.Next()
+func ErrorHandle() gin.HandlerFunc {
+	return func(c *gin.Context) {
+
+		defer func() {
+			if err := recover(); err != nil {
+				// log error
+				log.Println(err)
+
+				// print stack trace
+				debug.PrintStack()
+
+				// return error response
+				c.JSON(http.StatusInternalServerError, gin.H{
+					"code":    http.StatusInternalServerError,
+					"message": "Internal Server Error",
+				})
+
+				// abort request
+				c.Abort()
+			}
+		}()
+
+		c.Next()
+	}
+
 }

internal/middlewares/jwt.go

@@ -36,7 +36,6 @@ func Jwt() gin.HandlerFunc {
 		}
 
 		ctx.Next()
-
 	}
 
 }

internal/middlewares/middleware.go

@@ -5,7 +5,7 @@ import "github.com/gin-gonic/gin"
 // loads all middlewares, ErrorHandle, Cors
 func LoadMiddlewares(r *gin.Engine) *gin.Engine {
 
-	r.Use(ErrorHandle)
+	r.Use(ErrorHandle())
 	r.Use(Cors())
 
 	return r

internal/pkg/logger/logger.go

@@ -11,6 +11,7 @@ var (
 
 	LogrusLogger *logrus.Logger
 
+	// export Logger
 	Logger *logrus.Logger
 )
 

internal/router/example.go

@@ -1,4 +1,4 @@
-package routes
+package router
 
 import (
 	"go-gin-boilerplate/internal/controllers"

internal/router/public.go

@@ -1,4 +1,4 @@
-package routes
+package router
 
 import (
 	"go-gin-boilerplate/internal/controllers"

internal/router/router.go

@@ -1,4 +1,4 @@
-package routes
+package router
 
 import (
 	"go-gin-boilerplate/internal/middlewares"
@@ -10,29 +10,24 @@ import (
 	_ "go-gin-boilerplate/api/swagger" // docs.go
 )
 
-func Init() (*gin.Engine, error) {
-	r := gin.Default()
+var Router *gin.Engine
 
-	// public := LoadPublicRoutes(r)
-	// api := r.Group("/api")
-	// {
-	// 	public
-	// }
+func init() {
+	Router = gin.Default()
+
+	// Global middlewares
+	Router.Use(middlewares.ErrorHandle())
+	Router.Use(middlewares.Cors())
 
 	// public routes, no auth required
-	LoadPublicRoutes(r)
+	LoadPublicRoutes(Router)
 
 	// user routes
-	LoadUserRoutes(r)
-
-	// Loading middlewares
-	middlewares.LoadMiddlewares(r)
+	LoadUserRoutes(Router)
 
 	// example routes
-	LoadExampleRoutes(r)
+	LoadExampleRoutes(Router)
 
 	// init swagger
-	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerfiles.Handler))
-
-	return r, nil
+	Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerfiles.Handler))
 }

internal/router/user.go

@@ -1,4 +1,4 @@
-package routes
+package router
 
 import (
 	"go-gin-boilerplate/internal/controllers"