merge: merge master

conf/config.dev.yaml

@@ -29,3 +29,4 @@ sonic:
   mode: "development"
   work_dir: "./" # 不填默认为当前路径，用来存放日志文件、数据库文件、模板、上传的附件等(The default is the current directory. Used to store log files, database files, templates, upload files)
   log_dir: "./logs" # 不填则使用work_dir 路径下的log路径 (If it is empty, use the "log" path under work_dir)
+  admin_url_path: admin_random

config/model.go

@@ -49,5 +49,5 @@ type Sonic struct {
 	TemplateDir       string `mapstructure:"template_dir"`
 	ThemeDir          string
 	AdminResourcesDir string
-	AdminUrlPath      string `mapstructure:"admin_url_path"`
+	AdminURLPath      string `mapstructure:"admin_url_path"`
 }

event/listener/start.go

@@ -87,11 +87,11 @@ func (s *StartListener) printStartInfo(ctx context.Context) error {
 	log.Info(site)
 	fmt.Println(site)
 
-	adminUrlPath, err := s.optionService.GetAdminUrlPath(ctx)
+	adminURLPath, err := s.optionService.GetAdminURLPath(ctx)
 	if err != nil {
 		return err
 	}
-	adminSite := logger.BlueBold + "Sonic admin started at         " + blogURL + "/" + adminUrlPath + logger.Reset
+	adminSite := logger.BlueBold + "Sonic admin started at         " + blogURL + "/" + adminURLPath + logger.Reset
 	log.Info(adminSite)
 	fmt.Println(adminSite)
 	return nil

handler/content/view.go

@@ -60,7 +60,8 @@ func (v *ViewHandler) Install(ctx *gin.Context) {
 	if isInstall {
 		return
 	}
-	ctx.Redirect(http.StatusTemporaryRedirect, "admin/#install")
+	adminURLPath, _ := v.OptionService.GetAdminURLPath(ctx)
+	ctx.Redirect(http.StatusTemporaryRedirect, adminURLPath+"/#install")
 }
 
 func (v *ViewHandler) Logo(ctx *gin.Context) (interface{}, error) {

handler/router.go

@@ -36,7 +36,7 @@ func (s *Server) RegisterRouters() {
 		})
 		{
 			staticRouter := router.Group("/")
-			staticRouter.StaticFS("admin", gin.Dir(s.Config.Sonic.AdminResourcesDir, false))
+			staticRouter.StaticFS(s.Config.Sonic.AdminURLPath, gin.Dir(s.Config.Sonic.AdminResourcesDir, false))
 			staticRouter.StaticFS("/css", gin.Dir(filepath.Join(s.Config.Sonic.AdminResourcesDir, "css"), false))
 			staticRouter.StaticFS("/js", gin.Dir(filepath.Join(s.Config.Sonic.AdminResourcesDir, "js"), false))
 			staticRouter.StaticFS("/images", gin.Dir(filepath.Join(s.Config.Sonic.AdminResourcesDir, "images"), false))

service/impl/option.go

@@ -470,6 +470,6 @@ func (o *optionServiceImpl) GetAttachmentType(ctx context.Context) consts.Attach
 	}
 }
 
-func (o *optionServiceImpl) GetAdminUrlPath(ctx context.Context) (string, error) {
+func (o *optionServiceImpl) GetAdminURLPath(ctx context.Context) (string, error) {
-	return o.Config.Sonic.AdminUrlPath, nil
+	return o.Config.Sonic.AdminURLPath, nil
 }

service/option.go

@@ -32,7 +32,7 @@ type OptionService interface {
 	GetLinkPrefix(ctx context.Context) (string, error)
 	GetSheetPrefix(ctx context.Context) (string, error)
 	GetAttachmentType(ctx context.Context) consts.AttachmentType
-	GetAdminUrlPath(ctx context.Context) (string, error)
+	GetAdminURLPath(ctx context.Context) (string, error)
 }
 
 type ClientOptionService interface {