1 files changed, 36 insertions, 6 deletions

diff --git a/sub/sub.go b/sub/sub.go
index b642f7f2..2a4a37f4 100644
--- a/sub/sub.go
+++ b/sub/sub.go
@@ -47,23 +47,53 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 
 	engine := gin.Default()
 
-	subPath, err := s.settingService.GetSubPath()
+	subDomain, err := s.settingService.GetSubDomain()
 	if err != nil {
 		return nil, err
 	}
 
-	subDomain, err := s.settingService.GetSubDomain()
+	if subDomain != "" {
+		engine.Use(middleware.DomainValidatorMiddleware(subDomain))
+	}
+
+	LinksPath, err := s.settingService.GetSubPath()
 	if err != nil {
 		return nil, err
 	}
 
-	if subDomain != "" {
-		engine.Use(middleware.DomainValidatorMiddleware(subDomain))
+	JsonPath, err := s.settingService.GetSubJsonPath()
+	if err != nil {
+		return nil, err
+	}
+
+	Encrypt, err := s.settingService.GetSubEncrypt()
+	if err != nil {
+		return nil, err
+	}
+
+	ShowInfo, err := s.settingService.GetSubShowInfo()
+	if err != nil {
+		return nil, err
+	}
+
+	RemarkModel, err := s.settingService.GetRemarkModel()
+	if err != nil {
+		RemarkModel = "-ieo"
+	}
+
+	SubUpdates, err := s.settingService.GetSubUpdates()
+	if err != nil {
+		SubUpdates = "10"
+	}
+
+	SubJsonFragment, err := s.settingService.GetSubJsonFragment()
+	if err != nil {
+		SubJsonFragment = ""
 	}
 
-	g := engine.Group(subPath)
+	g := engine.Group("/")
 
-	s.sub = NewSUBController(g)
+	s.sub = NewSUBController(g, LinksPath, JsonPath, Encrypt, ShowInfo, RemarkModel, SubUpdates, SubJsonFragment)
 
 	return engine, nil
 }