feta: allow use -d to specify dist path

ENTRYPOINT.sh

@@ -10,7 +10,16 @@ if [ -n "$API_SERVER" ];then
 fi
 
 # redis地址
-sed -i "s/Address: 127.0.0.1:6379/Address: redis:6379/g" config.yaml
+if [ -n "$REDIS_ADDR" ];then
+  sed -i "s/Address: 127.0.0.1:6379/Address: $REDIS_ADDR/g" config.yaml
+else
+  sed -i "s/Address: 127.0.0.1:6379/Address: redis:6379/g" config.yaml
+fi
+
+# redis 密码
+if [ -n "$REDIS_PWD" ];then
+  sed -i "s/Password:/Password: $REDIS_PWD/g" config.yaml
+fi
 
 # 是否开启debug模式
 if [ -n "$DEBUG_ENABLE" ];then

app/middleware/cors.go

@@ -8,7 +8,7 @@ import (
 func Cors() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		c.Header("Access-Control-Allow-Origin", config.Web.Cors)
-		c.Header("Server", "busuanzi-by-xcsoft/2.7.2")
+		c.Header("Server", "busuanzi-by-xcsoft/2.7.3")
 		if c.Request.Method == "OPTIONS" {
 			c.Header("Access-Control-Allow-Methods", "GET, POST, HEAD, OPTIONS")
 			c.Header("Access-Control-Allow-Headers", "x-bsz-referer, Authorization")

config/config.go

@@ -8,16 +8,21 @@ import (
 )
 
 var (
-	C          *Config
-	Redis      RedisConfig
-	Web        WebConfig
-	Bsz        BszConfig
+	C     *Config
+	Redis RedisConfig
+	Web   WebConfig
+	Bsz   BszConfig
+)
+
+var (
 	configPath string
+	DistPath   string
 )
 
 func init() {
 	// get config file path
 	flag.StringVar(&configPath, "c", "config.yaml", "config path")
+	flag.StringVar(&DistPath, "d", "dist", "dist path")
 	flag.Parse()
 
 	data, err := ioutil.ReadFile(configPath)

process/webutil/route.go

@@ -3,6 +3,7 @@ package webutil
 import (
 	"busuanzi/app/controller"
 	"busuanzi/app/middleware"
+	"busuanzi/config"
 	"github.com/gin-gonic/gin"
 )
 
@@ -15,7 +16,7 @@ func initRoute(r *gin.Engine) {
 		{
 			static.Use(middleware.Cache())
 			static.GET("/", controller.Index)
-			static.StaticFile("/js", "dist/busuanzi.js")
+			static.StaticFile("/js", config.DistPath+"/busuanzi.js")
 		}
 		r.NoRoute(middleware.Cache(), controller.Index)
 	}

process/webutil/webutil.go

@@ -21,7 +21,7 @@ func Init() {
 	}
 	r.Use(gin.Recovery())
 	r.Use(middleware.Cors())
-	r.LoadHTMLFiles("dist/index.html")
+	r.LoadHTMLFiles(config.DistPath + "/index.html")
 
 	// routers
 	initRoute(r)