Merge pull request #7 from go-ignite/ss-url

merge ss-url feature
go-ignite · Jan 28, 2018 · 09e7333 · 09e7333
2 parents a53bbd8 + d0aeea5
commit 09e7333
Show file tree

Hide file tree

Showing 18 changed files with 214 additions and 570 deletions.
diff --git a/controllers/panel.go b/controllers/panel.go
@@ -9,6 +9,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/go-ignite/ignite/models"
 	"github.com/go-ignite/ignite/ss"
+	"github.com/go-ignite/ignite/utils"
 )
 
 var (
@@ -65,6 +66,7 @@ func (router *MainRouter) PanelIndexHandler(c *gin.Context) {
 		ServiceMethod: user.ServiceMethod,
 		ServiceType:   user.ServiceType,
 		Expired:       user.Expired.Format("2006-01-02"),
+		ServiceURL:    utils.ServiceURL(user.ServiceType, utils.HOST_Address, user.ServicePort, user.ServiceMethod, user.ServicePwd),
 	}
 	if uInfo.ServiceMethod == "" {
 		uInfo.ServiceMethod = "aes-256-cfb"

diff --git a/models/user.go b/models/user.go
@@ -35,5 +35,6 @@ type UserInfo struct {
 	ServicePwd         string
 	ServiceMethod      string
 	ServiceType        string
+	ServiceURL         string
 	Expired            string
 }
diff --git a/static/css/bootstrap-theme.css b/static/css/bootstrap-theme.css
diff --git a/static/css/bootstrap-theme.css.map b/static/css/bootstrap-theme.css.map