diff options
Diffstat (limited to 'web/controller')
| -rw-r--r-- | web/controller/xraySetting.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/web/controller/xraySetting.go b/web/controller/xraySetting.go index d244d030..a4c8b600 100644 --- a/web/controller/xraySetting.go +++ b/web/controller/xraySetting.go @@ -9,6 +9,7 @@ import ( type XraySettingController struct { XraySettingService service.XraySettingService SettingService service.SettingService + InboundService service.InboundService } func NewXraySettingController(g *gin.RouterGroup) *XraySettingController { @@ -31,7 +32,13 @@ func (a *XraySettingController) getXraySetting(c *gin.Context) { jsonMsg(c, I18nWeb(c, "pages.settings.toasts.getSettings"), err) return } - jsonObj(c, xraySetting, nil) + inboundTags, err := a.InboundService.GetInboundTags() + if err != nil { + jsonMsg(c, I18nWeb(c, "pages.settings.toasts.getSettings"), err) + return + } + xrayResponse := "{ \"xraySetting\": " + xraySetting + ", \"inboundTags\": " + inboundTags + " }" + jsonObj(c, xrayResponse, nil) } func (a *XraySettingController) updateSetting(c *gin.Context) { |