chore: merge master into v1.14.x

.env

@@ -1,6 +1,6 @@
 APP_NAME=Goravel
 APP_ENV=local
-APP_KEY=h20Gmg7UIuUDD66gfUSUjIkPLU8KLqMK
+APP_KEY=ABCDEFGHIJKLMNOPQRSTUVWXYZ123456
 APP_DEBUG=true
 APP_URL=http://localhost
 APP_HOST=127.0.0.1
@@ -9,17 +9,17 @@ APP_PORT=3000
 GRPC_HOST=127.0.0.1
 GRPC_PORT=3001
 
-JWT_SECRET=L9qknFZyWHDSVXXe1TjUsR7XQsxkbb8B
+JWT_SECRET=ABCDEFGHIJKLMNOPQRSTUVWXYZ123456
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
 
-DB_CONNECTION=postgres
-DB_HOST=127.0.0.1
-DB_PORT=5432
+DB_CONNECTION=sqlite
+DB_HOST=
+DB_PORT=
 DB_DATABASE=goravel
-DB_USERNAME=goravel
-DB_PASSWORD=goravel
+DB_USERNAME=
+DB_PASSWORD=
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=

.env.example

@@ -6,8 +6,8 @@ APP_URL=http://localhost
 APP_HOST=127.0.0.1
 APP_PORT=3000
 
-GRPC_HOST=127.0.0.1
-GRPC_PORT=3001
+GRPC_HOST=
+GRPC_PORT=
 
 JWT_SECRET=
 
@@ -21,6 +21,9 @@ DB_DATABASE=goravel
 DB_USERNAME=root
 DB_PASSWORD=
 
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=
 REDIS_PORT=6379

.github/workflows/test.yml

@@ -11,13 +11,6 @@ jobs:
         go: [ "1.21", "1.22" ]
     runs-on: ubuntu-latest
     steps:
-      - name: Set up PostgreSQL
-        uses: harmon758/postgresql-action@v1
-        with:
-          postgresql version: '11'
-          postgresql db: 'goravel'
-          postgresql user: 'goravel'
-          postgresql password: 'goravel'
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
@@ -33,7 +26,5 @@ jobs:
             ${{ runner.os }}-go-
       - name: Install dependencies
         run: go mod tidy
-      - name: Run migrate
-        run: go run . artisan migrate
       - name: Run tests
         run: go test -timeout 1h ./...

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18.3-alpine3.16 AS builder
+FROM golang:alpine AS builder
 
 ENV GO111MODULE=on \
     CGO_ENABLED=0  \
@@ -10,14 +10,15 @@ COPY . .
 RUN go mod tidy
 RUN go build --ldflags "-extldflags -static" -o main .
 
-FROM alpine:3.16
+FROM alpine:latest
 
 WORKDIR /www
 
 COPY --from=builder /build/main /www/
 COPY --from=builder /build/database/ /www/database/
 COPY --from=builder /build/public/ /www/public/
 COPY --from=builder /build/storage/ /www/storage/
+COPY --from=builder /build/resources/ /www/resources/
 COPY --from=builder /build/.env /www/.env
 
-ENTRYPOINT ["/www/main"]
+ENTRYPOINT ["/www/main"]

README.md

@@ -52,15 +52,15 @@ Welcome to star, PR and issues！
 
 ### Integration of single page application into the framework
 
-[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L41)
+[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L44)
 
 ### View nesting
 
-[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L52)
+[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L53)
 
 ### Localization
 
-[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L60)
+[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L61)
 
 ### Session
 

README_zh.md

@@ -55,15 +55,15 @@ Laravel！
 
 ### 单页面前端应用集成到框架
 
-[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L43)
+[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L44)
 
 ### 视图嵌套
 
-[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L52)
+[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L53)
 
 ### 本地化
 
-[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L60)
+[routes/web.go](https://github.com/goravel/example/blob/master/routes/web.go#L61)
 
 ### Session
 

app/http/controllers/auth_controller.go

@@ -0,0 +1,70 @@
+package controllers
+
+import (
+	"github.com/goravel/framework/contracts/http"
+	"github.com/goravel/framework/facades"
+
+	"goravel/app/models"
+)
+
+type AuthController struct {
+	// Dependent services
+}
+
+func NewAuthController() *AuthController {
+	return &AuthController{
+		// Inject services
+	}
+}
+
+func (r *AuthController) Login(ctx http.Context) http.Response {
+	// Create a user
+	var user models.User
+	if err := facades.Orm().Query().FirstOrCreate(&user, models.User{
+		Name: ctx.Request().Input("name", "Goravel"),
+	}); err != nil {
+		return ctx.Response().Json(http.StatusInternalServerError, http.Json{
+			"error": err.Error(),
+		})
+	}
+
+	var (
+		token string
+		err   error
+	)
+
+	// Use different guards to login
+	if guard := ctx.Request().Header("Guard"); guard == "" {
+		token, err = facades.Auth(ctx).LoginUsingID(user.ID)
+		if err != nil {
+			return ctx.Response().String(http.StatusInternalServerError, err.Error())
+		}
+	} else {
+		token, err = facades.Auth(ctx).Guard(guard).Login(user)
+		if err != nil {
+			return ctx.Response().String(http.StatusInternalServerError, err.Error())
+		}
+	}
+
+	return ctx.Response().Header("Authorization", "Bearer "+token).Success().Json(http.Json{
+		"user": user,
+	})
+}
+
+func (r *AuthController) Info(ctx http.Context) http.Response {
+	var user models.User
+
+	if guard := ctx.Request().Header("Guard"); guard == "" {
+		if err := facades.Auth(ctx).User(&user); err != nil {
+			return ctx.Response().String(http.StatusInternalServerError, err.Error())
+		}
+	} else {
+		if err := facades.Auth(ctx).Guard(guard).User(&user); err != nil {
+			return ctx.Response().String(http.StatusInternalServerError, err.Error())
+		}
+	}
+
+	return ctx.Response().Success().Json(http.Json{
+		"user": user,
+	})
+}

app/http/controllers/user_controller.go

@@ -0,0 +1,94 @@
+package controllers
+
+import (
+	"github.com/goravel/framework/contracts/http"
+	"github.com/goravel/framework/facades"
+
+	"goravel/app/models"
+)
+
+type UserController struct {
+	//Dependent services
+}
+
+func NewUserController() *UserController {
+	return &UserController{
+		//Inject services
+	}
+}
+
+func (r *UserController) Index(ctx http.Context) http.Response {
+	var users []models.User
+	if err := facades.Orm().Query().Get(&users); err != nil {
+		return ctx.Response().Json(http.StatusBadRequest, http.Json{
+			"error": err.Error(),
+		})
+	}
+
+	return ctx.Response().Success().Json(http.Json{
+		"users": users,
+	})
+}
+
+func (r *UserController) Show(ctx http.Context) http.Response {
+	var user models.User
+	if err := facades.Orm().Query().Where("id", ctx.Request().Input("id")).First(&user); err != nil {
+		return ctx.Response().Json(http.StatusBadRequest, http.Json{
+			"error": err.Error(),
+		})
+	}
+
+	return ctx.Response().Success().Json(http.Json{
+		"user": user,
+	})
+}
+
+func (r *UserController) Store(ctx http.Context) http.Response {
+	user := models.User{
+		Name:   ctx.Request().Input("name"),
+		Avatar: ctx.Request().Input("avatar"),
+	}
+	if err := facades.Orm().Query().Create(&user); err != nil {
+		return ctx.Response().Json(http.StatusBadRequest, http.Json{
+			"error": err.Error(),
+		})
+	}
+
+	return ctx.Response().Success().Json(http.Json{
+		"user": user,
+	})
+}
+
+func (r *UserController) Update(ctx http.Context) http.Response {
+	if _, err := facades.Orm().Query().Where("id", ctx.Request().Input("id")).Update(models.User{
+		Name: ctx.Request().Input("name"),
+	}); err != nil {
+		return ctx.Response().Json(http.StatusBadRequest, http.Json{
+			"error": err.Error(),
+		})
+	}
+
+	var user models.User
+	if err := facades.Orm().Query().Where("id", ctx.Request().Input("id")).First(&user); err != nil {
+		return ctx.Response().Json(http.StatusBadRequest, http.Json{
+			"error": err.Error(),
+		})
+	}
+
+	return ctx.Response().Success().Json(http.Json{
+		"user": user,
+	})
+}
+
+func (r *UserController) Destroy(ctx http.Context) http.Response {
+	result, err := facades.Orm().Query().Where("id", ctx.Request().Input("id")).Delete(&models.User{})
+	if err != nil {
+		return ctx.Response().Json(http.StatusBadRequest, http.Json{
+			"error": err.Error(),
+		})
+	}
+
+	return ctx.Response().Success().Json(http.Json{
+		"rows_affected": result.RowsAffected,
+	})
+}

app/http/controllers/validation_controller.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"github.com/goravel/framework/contracts/http"
 	"github.com/goravel/framework/facades"
+	"github.com/goravel/framework/support/carbon"
 
 	"goravel/app/http/requests"
 	"goravel/app/models"
@@ -29,6 +30,11 @@ air
 4.9 curl --location --request POST 'http://127.0.0.1:3000/validation/form' --header 'Content-Type: multipart/form-data' --form 'name="goravel"'
  ********************************/
 
+type User struct {
+	Name string          `json:"name" form:"name"`
+	Date carbon.DateTime `json:"date" form:"date"`
+}
+
 type ValidationController struct {
 	// Dependent services
 }
@@ -42,6 +48,7 @@ func NewValidationController() *ValidationController {
 func (r *ValidationController) Json(ctx http.Context) http.Response {
 	validator, err := ctx.Request().Validate(map[string]string{
 		"name": "required",
+		"date": "required|date",
 	})
 	if err != nil {
 		return ctx.Response().Json(http.StatusBadRequest, http.Json{
@@ -54,7 +61,7 @@ func (r *ValidationController) Json(ctx http.Context) http.Response {
 		})
 	}
 
-	var user models.User
+	var user User
 	if err := validator.Bind(&user); err != nil {
 		return ctx.Response().Json(http.StatusBadRequest, http.Json{
 			"message": err.Error(),
@@ -63,6 +70,7 @@ func (r *ValidationController) Json(ctx http.Context) http.Response {
 
 	return ctx.Response().Success().Json(http.Json{
 		"name": user.Name,
+		"date": user.Date.ToDateTimeString(),
 	})
 }
 
@@ -84,6 +92,7 @@ func (r *ValidationController) Request(ctx http.Context) http.Response {
 		"name":   userCreate.Name,
 		"tags":   userCreate.Tags,
 		"scores": userCreate.Scores,
+		"date":   userCreate.Date.ToDateTimeString(),
 	})
 }
 

app/http/controllers/validation_controller_test.go

@@ -4,11 +4,10 @@ import (
 	"testing"
 
 	"github.com/goravel/framework/contracts/http"
+	"github.com/goravel/framework/support/carbon"
 	testingmock "github.com/goravel/framework/testing/mock"
 	"github.com/goravel/gin"
 	"github.com/stretchr/testify/suite"
-
-	"goravel/app/models"
 )
 
 type ValidationControllerTestSuite struct {
@@ -36,11 +35,13 @@ func (s *ValidationControllerTestSuite) TestJson() {
 	mockContext.EXPECT().Request().Return(mockRequest).Once()
 	mockRequest.EXPECT().Validate(map[string]string{
 		"name": "required",
+		"date": "required|date",
 	}).Return(mockValidator, nil).Once()
 	mockValidator.EXPECT().Fails().Return(false).Once()
-	var user models.User
+	var user User
 	mockValidator.EXPECT().Bind(&user).Run(func(user any) {
-		user.(*models.User).Name = "Goravel"
+		user.(*User).Name = "Goravel"
+		user.(*User).Date = carbon.NewDateTime(carbon.Parse("2024-07-08 22:34:31"))
 	}).Return(nil).Once()
 	mockContext.EXPECT().Response().Return(mockResponse).Once()
 	mockResponseStatus := mockFactory.ResponseStatus()
@@ -49,6 +50,7 @@ func (s *ValidationControllerTestSuite) TestJson() {
 	resp := &gin.JsonResponse{}
 	mockResponseStatus.EXPECT().Json(http.Json{
 		"name": "Goravel",
+		"date": "2024-07-08 22:34:31",
 	}).Return(resp).Once()
 
 	s.Equal(resp, NewValidationController().Json(mockContext))