sync main to docs

.github/workflows/build.yml

@@ -94,6 +94,14 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: nicesteven/easy-admin
+
+      - name: Build and push Docker image version
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: nicesteven/easy-admin:1.3.0
 
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671

Makefile

@@ -9,7 +9,7 @@ LDFLAGS := -s -w
 # application name
 PROJECT:=easy-admin
 # application version
-VERSION := 1.2.0
+VERSION := 1.3.0
 # application url
 URL := https://github.com/nicelizhi/easy-admin
 
@@ -26,7 +26,7 @@ build-ui:
 
 # build go application
 build:
-	CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -a -installsuffix "" -o $(PROJECT) .
+	CGO_ENABLED=0 go mod tidy && go build -ldflags="$(LDFLAGS)" -a -installsuffix "" -o $(PROJECT) .
 
 # make build-linux
 build-linux:
@@ -55,9 +55,14 @@ start:
 	nohup ./$(PROJECT) server -c=config/settings.dev_steve.yml >> acc.txt &
 	ps aux | grep "$(PROJECT)"
 
+.PHONY: easy-admin
 stop:
 	pkill $(PROJECT)
 
 # debug file
 debug:
-	dlv debug $(file)
+	dlv debug $(file)
+
+.PHONY: docs
+docs:
+	swag init -g easy-admin.go --parseDependency --parseDepth=6 --instanceName admin -o ./docs/admin

README.md

@@ -13,7 +13,7 @@
 
 ## About Easy-Admin
 
-Easyadmin is a Quick, beautiful and modern admin gererator for Go VUE application.
+Easyadmin is a Quick, beautiful and modern admin generator for Go VUE application.
 
 English | [简体中文](https://nicelizhi.github.io/easy-admin/zh/)
 
@@ -48,8 +48,6 @@ English | [简体中文](https://nicelizhi.github.io/easy-admin/zh/)
 
 - TimeZone Support
 
-- Static packaging for vue page
-
 
 ## Internal
 
@@ -103,4 +101,4 @@ http://localhost:8000/swagger/admin/index.html
 [https://gitee.com/nicelizhi/easy-admin/issues](https://gitee.com/nicelizhi/easy-admin/issues)  (中国)
 
 # Discussions
-[https://github.com/nicelizhi/easy-admin/discussions](https://github.com/nicelizhi/easy-admin/discussions) 
+[https://github.com/nicelizhi/easy-admin/discussions](https://github.com/nicelizhi/easy-admin/discussions) 

app/admin/apis/captcha.go

@@ -3,6 +3,7 @@ package apis
 import (
 	"github.com/nicelizhi/easy-admin-core/sdk/api"
 	"github.com/nicelizhi/easy-admin-core/sdk/pkg/captcha"
+	_ "github.com/nicelizhi/easy-admin-core/sdk/pkg/response"
 
 	ginI18n "github.com/gin-contrib/i18n"
 	"github.com/gin-gonic/gin"
@@ -21,14 +22,12 @@ type System struct {
 func (e System) GenerateCaptchaHandler(c *gin.Context) {
 	err := e.MakeContext(c).Errors
 	if err != nil {
-		//e.Error(500, err, "服务初始化失败！")
 		e.Error(500, err, ginI18n.MustGetMessage(c, "Service initialization failed"))
 		return
 	}
 	id, b64s, err := captcha.DriverDigitFunc()
 	if err != nil {
 		e.Logger.Errorf("DriverDigitFunc error, %s", err.Error())
-		//e.Error(500, err, "验证码获取失败")
 		e.Error(500, err, ginI18n.MustGetMessage(c, "Failed to obtain verification code"))
 		return
 	}

app/admin/apis/sys_config.go

@@ -8,6 +8,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
+	_ "github.com/nicelizhi/easy-admin-core/sdk/pkg/response"
 	"github.com/nicelizhi/easy-admin/app/admin/models"
 	"github.com/nicelizhi/easy-admin/app/admin/service"
 	"github.com/nicelizhi/easy-admin/app/admin/service/dto"

app/admin/apis/sys_login_log.go

@@ -9,6 +9,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
+	_ "github.com/nicelizhi/easy-admin-core/sdk/pkg/response"
 	"github.com/nicelizhi/easy-admin/app/admin/service"
 	"github.com/nicelizhi/easy-admin/app/admin/service/dto"
 )

app/admin/apis/sys_menu.go

@@ -1,6 +1,8 @@
 package apis
 
 import (
+	"fmt"
+
 	"github.com/nicelizhi/easy-admin/app/admin/models"
 
 	"github.com/nicelizhi/easy-admin-core/sdk/api"
@@ -10,6 +12,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
+	_ "github.com/nicelizhi/easy-admin-core/sdk/pkg/response"
 	"github.com/nicelizhi/easy-admin/app/admin/service"
 	"github.com/nicelizhi/easy-admin/app/admin/service/dto"
 )
@@ -76,7 +79,41 @@ func (e SysMenu) CusGetPage(c *gin.Context) {
 		return
 	}
 
-	list2 := make(map[string]interface{}, 0)
+	list2 := make([]interface{}, 0)
+
+	for index, item := range list {
+		var litem = make(map[string]interface{})
+		var meta = make(map[string]interface{})
+		var children = make([]interface{}, 0)
+		for index1, item2 := range item.Children {
+			var litem2 = make(map[string]interface{})
+			var meta2 = make(map[string]interface{})
+
+			litem2["name"] = item2.MenuName
+			litem2["path"] = item2.Path
+			meta2["locale"] = item2.Permission
+			meta2["requiresAuth"] = true
+			meta2["hideInMenu"] = false
+			meta2["icon"] = item2.Icon
+			meta2["order"] = item2.Sort
+			meta2["roles"] = item2.Permission
+			litem2["meta"] = meta2
+			fmt.Println(index1)
+			children = append(children[:len(children)], litem2)
+		}
+
+		meta["locale"] = item.Permission
+		meta["requiresAuth"] = true
+		meta["hideInMenu"] = false
+		meta["icon"] = item.Icon
+		meta["order"] = item.Sort
+		litem["name"] = item.MenuName
+		litem["path"] = item.Path
+		litem["meta"] = meta
+		litem["children"] = children
+		fmt.Println(index, " = ", item)
+		list2 = append(list2[:len(list2)], litem)
+	}
 
 	e.OK(list2, ginI18n.MustGetMessage(c, "Query successful"))
 }

app/admin/apis/sys_opera_log.go

@@ -8,6 +8,7 @@ import (
 	"github.com/nicelizhi/easy-admin/app/admin/service/dto"
 
 	"github.com/nicelizhi/easy-admin-core/sdk/api"
+	_ "github.com/nicelizhi/easy-admin-core/sdk/pkg/response"
 
 	ginI18n "github.com/gin-contrib/i18n"
 	"github.com/gin-gonic/gin"

app/admin/apis/sys_user.go

@@ -446,7 +446,7 @@ func (e SysUser) GetInfo(c *gin.Context) {
 	req.Id = user.GetUserId(c)
 	err = s.Get(&req, p, &sysUser)
 	if err != nil {
-		e.Error(http.StatusUnauthorized, err, "登录失败")
+		e.Error(http.StatusUnauthorized, err, ginI18n.MustGetMessage(c, "Login failed"))
 		return
 	}
 	mp["introduction"] = " am a super administrator"

app/admin/models/initdb.go

@@ -23,7 +23,7 @@ func InitDb(db *gorm.DB) (err error) {
 func ExecSql(db *gorm.DB, filePath string) error {
 	sql, err := Ioutil(filePath)
 	if err != nil {
-		fmt.Println("数据库基础数据初始化脚本读取失败！原因:", err.Error())
+		fmt.Println("Error Detail: ", err.Error())
 		return err
 	}
 	sqlList := strings.Split(sql, ";")

cmd/migrate/migration/models/initdb.go

@@ -40,7 +40,7 @@ func InitDb(db *gorm.DB) (err error) {
 func ExecSql(db *gorm.DB, filePath string) error {
 	sql, err := Ioutil(filePath)
 	if err != nil {
-		fmt.Println("数据库基础数据初始化脚本读取失败！原因:", err.Error())
+		fmt.Println("Error Detail:", err.Error())
 		return err
 	}
 	sqlList := strings.Split(sql, ";")

cmd/server/server.go

@@ -12,6 +12,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/gin-contrib/gzip"
 	"github.com/nicelizhi/easy-admin-core/config/source/file"
 	"github.com/nicelizhi/easy-admin-core/sdk"
 	"github.com/nicelizhi/easy-admin-core/sdk/api"
@@ -180,9 +181,14 @@ func initRouter() {
 		log.Fatal("not support other engine")
 		//os.Exit(-1)
 	}
-	if config.SslConfig.Enable {
-		r.Use(handler.TlsHandler())
+	// if config.SslConfig.Enable {
+	r.Use(handler.TlsHandler()) // add more secure for it
+	// }
+
+	if config.ApplicationConfig.Gzip {
+		r.Use(gzip.Gzip(config.ApplicationConfig.GzipLevel))
 	}
+
 	r.Use(common.Sentinel()).
 		Use(common.RequestId(pkg.TrafficKey)).
 		Use(api.SetRequestLogger).
@@ -199,6 +205,7 @@ func initRouter() {
 		flag := strings.Contains(accept, "text/html")
 		if flag {
 			ctx.Writer.WriteHeader(200)
+			ctx.Header("Content-Type", "text/html; charset=utf-8")
 			ctx.Writer.WriteString(string(resource.Html))
 			ctx.Writer.Flush()
 		}

common/global/adm.go

@@ -2,8 +2,8 @@ package global
 
 const (
 	// Version easy-admin version info
-	Version     = "1.2.0"
-	VersionNum  = 120                                        // version number
+	Version     = "1.3.0"
+	VersionNum  = 130                                        // version number
 	HomePage    = "https://github.com/nicelizhi/easy-admin/" //project home page
 	TemplateVer = "v1"
 )

common/middleware/handler/auth.go

@@ -92,7 +92,7 @@ func Authenticator(c *gin.Context) (interface{}, error) {
 	if config.ApplicationConfig.Mode != "dev" {
 		if !captcha.Verify(loginVals.UUID, loginVals.Code, true) {
 			username = loginVals.Username
-			msg = "验证码错误"
+			msg = ginI18n.MustGetMessage(c, "Verification code error")
 			status = "1"
 
 			return nil, jwt.ErrInvalidVerificationode
@@ -104,7 +104,7 @@ func Authenticator(c *gin.Context) (interface{}, error) {
 
 		return map[string]interface{}{"user": sysUser, "role": role}, nil
 	} else {
-		msg = "登录失败"
+		msg = ginI18n.MustGetMessage(c, "Login failed")
 		status = "1"
 		log.Warnf("%s login failed!", loginVals.Username)
 	}

common/middleware/handler/httpshandler.go

@@ -9,14 +9,33 @@ import (
 
 func TlsHandler() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		secureMiddleware := secure.New(secure.Options{
-			SSLRedirect: true,
-			SSLHost:     config.SslConfig.Domain,
-		})
-		err := secureMiddleware.Process(c.Writer, c.Request)
-		if err != nil {
-			return
+		if config.SslConfig.Enable {
+			secureMiddleware := secure.New(secure.Options{
+				SSLRedirect:   true,
+				SSLHost:       config.SslConfig.Domain,
+				IsDevelopment: true,
+			})
+			err := secureMiddleware.Process(c.Writer, c.Request)
+			if err != nil {
+				c.Abort()
+				return
+			}
+		} else {
+			secureMiddleware := secure.New(secure.Options{
+				IsDevelopment: true,
+			})
+			err := secureMiddleware.Process(c.Writer, c.Request)
+			if err != nil {
+				c.Abort()
+				return
+			}
 		}
+
+		// Avoid header rewrite if response is a redirection.
+		if status := c.Writer.Status(); status > 300 && status < 399 {
+			c.Abort()
+		}
+
 		c.Next()
 	}
 }

config/settings.full.yml

@@ -16,6 +16,15 @@ settings:
     timezone: "Africa/Cairo"
     # local
     local: "en"
+    # gzip enable
+    gzip: true
+    #gzip level 
+    # options 1、BestCompression 1、BestSpeed 1、DefaultCompression 1、NoCompression
+    # NoCompression      = 0
+    # BestSpeed          = 1
+    # BestCompression    = 9
+    # DefaultCompression = -1
+    gziplevel: 9
   ssl:
     # https domain
     domain: localhost:8000

docs/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Easy Admin Change log
 > All notable changes to this project will be documented in this file.
 
+## [v1.3.0](https://github.com/nicelizhi/easy-admin/releases/tag/1.3.0)
+. fix the lang support
+. add gzip support and gzip config
+. add acro vue support function
+
+## [v1.2.0](https://github.com/nicelizhi/easy-admin/releases/tag/1.2.0)
+. change the db deleted_at to flag.
+. fix the cores bug
+. fix the cores security
+. fix the easy-admin ui
+. add MSSQL db sql
+. fix the build docker to docker hub
+
 ## [v1.1.0](https://github.com/nicelizhi/easy-admin/releases/tag/1.1.0)
 . fix the redis queue client bug