diff options
Diffstat (limited to 'web/assets')
| -rw-r--r-- | web/assets/js/model/models.js | 4 | ||||
| -rw-r--r-- | web/assets/js/model/xray.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/web/assets/js/model/models.js b/web/assets/js/model/models.js index 762d1174..1accec71 100644 --- a/web/assets/js/model/models.js +++ b/web/assets/js/model/models.js @@ -181,7 +181,7 @@ class AllSetting { this.tgBotChatId = ""; this.tgRunTime = "@daily"; this.tgBotBackup = false; - this.tgBotLoginNotify = false; + this.tgBotLoginNotify = true; this.tgCpu = ""; this.tgLang = "en-US"; this.xrayTemplateConfig = ""; @@ -194,7 +194,7 @@ class AllSetting { this.subCertFile = ""; this.subKeyFile = ""; this.subUpdates = 0; - this.subShowInfo = false; + this.subShowInfo = true; this.timeLocation = "Asia/Tehran"; diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 47800884..481bb9a0 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -1659,10 +1659,10 @@ class Inbound extends XrayCommonClass { JSON.parse(this.settings).clients.forEach((client,index) => { if(this.tls && !ObjectUtil.isArrEmpty(this.stream.tls.settings.domains)){ this.stream.tls.settings.domains.forEach((domain) => { - link += this.genLink(domain.domain, remark + '-' + client.email + '-' + domain.remark, index) + '\r\n'; + link += this.genLink(domain.domain, [remark, client.email, domain.remark].filter(x => x.length > 0).join('-'), index) + '\r\n'; }); } else { - link += this.genLink(address, remark + '-' + client.email, index) + '\r\n'; + link += this.genLink(address, [remark, client.email].filter(x => x.length > 0).join('-'), index) + '\r\n'; } }); return link; |