Merge 528b75f644 into 5005bd4408

cmd/commands/version/version.go

@@ -57,7 +57,7 @@ Prints the current Bee, Beego and Go version alongside the platform information.
 }
 var outputFormat string
 
-const version = "1.11.0"
+const version = "1.12.0"
 
 func init() {
 	fs := flag.NewFlagSet("version", flag.ContinueOnError)

internal/app/module/beegopro/render.go

@@ -1,11 +1,15 @@
 package beegopro
 
 import (
+	"errors"
 	"github.com/beego/bee/internal/pkg/system"
 	beeLogger "github.com/beego/bee/logger"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/flosch/pongo2"
 	"github.com/smartwalle/pongo2render"
+	"go/format"
+	"io/ioutil"
+	"os"
 	"path"
 	"path/filepath"
 )
@@ -114,10 +118,36 @@ func (r *RenderFile) Exec(name string) {
 		beeLogger.Log.Fatalf("Could not create the %s render tmpl: %s", name, err)
 		return
 	}
-	err = r.write(r.FlushFile, buf)
-	if err != nil {
-		beeLogger.Log.Fatalf("Could not create file: %s", err)
-		return
+	_, err = os.Stat(r.Descriptor.DstPath)
+	var orgContent []byte
+	if err == nil {
+		if org, err := os.OpenFile(r.Descriptor.DstPath, os.O_RDONLY, 0666); err == nil {
+			orgContent,_ = ioutil.ReadAll(org)
+			org.Close()
+		} else {
+			beeLogger.Log.Infof("file err %s", err)
+		}
+	}
+	// Replace or create when content changes
+	output := []byte(buf)
+	if r.Option.EnableFormat && filepath.Ext(r.FlushFile) == ".go" {
+		// format code
+		var bts []byte
+		bts, err = format.Source([]byte(buf))
+		if err != nil {
+			err = errors.New("format buf error " + err.Error())
+			return
+		}
+		output = bts
+	}
+
+	if FileContentChange(orgContent,output) {
+		err = r.write(r.FlushFile, output)
+		if err != nil {
+			beeLogger.Log.Fatalf("Could not create file: %s", err)
+			return
+		}
+		beeLogger.Log.Infof("create file '%s' from %s", r.FlushFile, r.PackageName)
 	}
-	beeLogger.Log.Infof("create file '%s' from %s", r.FlushFile, r.PackageName)
 }
+

internal/app/module/beegopro/util.go

@@ -1,11 +1,11 @@
 package beegopro
 
 import (
+	"crypto/md5"
 	"errors"
 	"fmt"
 	"github.com/beego/bee/internal/pkg/utils"
 	beeLogger "github.com/beego/bee/logger"
-	"go/format"
 	"io/ioutil"
 	"os"
 	"path"
@@ -15,12 +15,12 @@ import (
 )
 
 // write to file
-func (c *RenderFile) write(filename string, buf string) (err error) {
+func (c *RenderFile) write(filename string, buf []byte) (err error) {
 	if utils.IsExist(filename) && !isNeedOverwrite(filename) {
 		return
 	}
 
-	filePath := path.Dir(filename)
+	filePath := filepath.Dir(filename)
 	err = createPath(filePath)
 	if err != nil {
 		err = errors.New("write create path " + err.Error())
@@ -37,9 +37,10 @@ func (c *RenderFile) write(filename string, buf string) (err error) {
 	name := path.Base(filename)
 
 	if utils.IsExist(filename) {
-		bakName := fmt.Sprintf("%s/%s.%s.bak", filePathBak, name, time.Now().Format("2006.01.02.15.04.05"))
+		bakName := fmt.Sprintf("%s/%s.%s.bak", filePathBak, filepath.Base(name), time.Now().Format("2006.01.02.15.04.05"))
 		beeLogger.Log.Infof("bak file '%s'", bakName)
 		if err := os.Rename(filename, bakName); err != nil {
+			fmt.Println(err)
 			err = errors.New("file is bak error, path is " + bakName)
 			return err
 		}
@@ -52,20 +53,7 @@ func (c *RenderFile) write(filename string, buf string) (err error) {
 		return
 	}
 
-	output := []byte(buf)
-
-	if c.Option.EnableFormat && filepath.Ext(filename) == ".go" {
-		// format code
-		var bts []byte
-		bts, err = format.Source([]byte(buf))
-		if err != nil {
-			err = errors.New("format buf error " + err.Error())
-			return
-		}
-		output = bts
-	}
-
-	err = ioutil.WriteFile(filename, output, 0644)
+	err = ioutil.WriteFile(filename, buf, 0644)
 	if err != nil {
 		err = errors.New("write write file " + err.Error())
 		return
@@ -183,3 +171,27 @@ func getModelType(orm string) (inputType, goType, mysqlType, tag string) {
 	}
 	return
 }
+
+func FileContentChange(org,new []byte) bool {
+	if len(org) == 0 {
+		return true
+	}
+	var orgContent,newContent string
+	for i, s := range strings.Split(string(org), "\n") {
+		if i > 1 {
+			orgContent += s
+		}
+	}
+	for i, s := range strings.Split(string(new), "\n") {
+		if i > 1 {
+			newContent += s
+		}
+	}
+	orgMd5 := md5.Sum([]byte(orgContent))
+	newMd5:= md5.Sum([]byte(newContent))
+	if orgMd5 != newMd5 {
+		return true
+	}
+	beeLogger.Log.Infof("File has no change in the content")
+	return false
+}