fix 'assets' dir not found exception;

fix add user fail issue

pkg/server/controller/controller.go

@@ -23,7 +23,7 @@ const (
 	TokenFormatError = 5
 )
 
-var UserFormatReg = regexp.MustCompile("^\\w$")
+var UserFormatReg = regexp.MustCompile("^\\w+$")
 var TokenFormatReg = regexp.MustCompile("^[\\w!@#$%^&*()]+$")
 var TrimAllSpaceReg = regexp.MustCompile("[\\n\\t\\r\\s]")
 var TrimBreakLineReg = regexp.MustCompile("[\\n\\t\\r]")

pkg/server/controller/op.go

@@ -6,6 +6,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"gopkg.in/ini.v1"
 	"log"
+	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 )
@@ -24,9 +26,15 @@ func NewHandleController(config *HandleController) *HandleController {
 	return config
 }
 
-func (c *HandleController) Register(engine *gin.Engine) {
+func (c *HandleController) Register(rootDir string, engine *gin.Engine) {
+	assets := filepath.Join(rootDir, "assets")
+	_, err := os.Stat(assets)
+	if err != nil && !os.IsExist(err) {
+		assets = "./assets"
+	}
+
 	engine.Delims("${", "}")
-	engine.LoadHTMLGlob("./assets/templates/*")
+	engine.LoadHTMLGlob(filepath.Join(assets, "templates/*"))
 	engine.POST("/handler", c.MakeHandlerFunc())
 
 	var group *gin.RouterGroup
@@ -37,7 +45,7 @@ func (c *HandleController) Register(engine *gin.Engine) {
 	} else {
 		group = engine.Group("/")
 	}
-	group.Static("/static", "./assets/static")
+	group.Static("/static", filepath.Join(assets, "static"))
 	group.GET("/", c.MakeManagerFunc())
 	group.GET("/lang", c.MakeLangFunc())
 	group.GET("/tokens", c.MakeQueryTokensFunc())

pkg/server/server.go

@@ -13,21 +13,24 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 )
 
 type Server struct {
-	cfg  controller.HandleController
-	s    *http.Server
-	done chan struct{}
+	cfg     controller.HandleController
+	s       *http.Server
+	done    chan struct{}
+	rootDir string
 }
 
-func New(cfg controller.HandleController) (*Server, error) {
+func New(rootDir string, cfg controller.HandleController) (*Server, error) {
 	s := &Server{
-		cfg:  cfg,
-		done: make(chan struct{}),
+		cfg:     cfg,
+		done:    make(chan struct{}),
+		rootDir: rootDir,
 	}
 	if err := s.init(); err != nil {
 		return nil, err
@@ -74,14 +77,10 @@ func LoadSupportLanguage(dir string) ([]language.Tag, error) {
 	var tags []language.Tag
 
 	files, err := os.Open(dir)
-	if err != nil {
-		log.Printf("error opening directory: %v", err)
-		return tags, err
-	}
 
 	fileList, err := files.Readdir(-1)
 	if err != nil {
-		log.Printf("error reading directory: %v", err)
+		log.Printf("error read lang directory: %v", err)
 		return tags, err
 	}
 
@@ -103,15 +102,21 @@ func LoadSupportLanguage(dir string) ([]language.Tag, error) {
 	return tags, nil
 }
 
-func GinI18nLocalize() gin.HandlerFunc {
-	dir := "./assets/lang"
-	tags, err := LoadSupportLanguage(dir)
+func GinI18nLocalize(rootDir string) gin.HandlerFunc {
+	assets := filepath.Join(rootDir, "assets")
+	_, err := os.Stat(assets)
+	if err != nil && !os.IsExist(err) {
+		assets = "./assets"
+	}
+	lang := filepath.Join(assets, "lang")
+	tags, err := LoadSupportLanguage(lang)
 	if err != nil {
 		log.Panicf("language file is not found: %v", err)
 	}
+
 	return ginI18n.Localize(
 		ginI18n.WithBundle(&ginI18n.BundleCfg{
-			RootPath:         dir,
+			RootPath:         lang,
 			AcceptLanguage:   tags,
 			DefaultLanguage:  language.Chinese,
 			FormatBundleFile: "json",
@@ -133,10 +138,10 @@ func GinI18nLocalize() gin.HandlerFunc {
 func (s *Server) initHTTPServer() error {
 	gin.SetMode(gin.ReleaseMode)
 	engine := gin.New()
-	engine.Use(GinI18nLocalize())
+	engine.Use(GinI18nLocalize(s.rootDir))
 	s.s = &http.Server{
 		Handler: engine,
 	}
-	controller.NewHandleController(&s.cfg).Register(engine)
+	controller.NewHandleController(&s.cfg).Register(s.rootDir, engine)
 	return nil
 }