Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-04-19 21:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

small fixes #1300

Browse source
This commit is contained in:
Alireza Ahmadi 2023-12-08 19:44:52 +01:00
parent 68ee4e003c
commit e5fc20b8ae
4 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
web/assets/js/model/xray.js
View file

@ -1080,9 +1080,9 @@ class Inbound extends XrayCommonClass {
} }
get serverName() { get serverName() {
if (this.stream.isTls || this.stream.isXtls || this.stream.isReality) { if (this.stream.isTls) return this.stream.tls.server;
return this.stream.tls.server; if (this.stream.isXtls) return this.stream.xtls.server;
} if (this.stream.isReality) return this.stream.reality.serverNames;
return ""; return "";
} }

20
web/html/xui/inbound_info_modal.html
View file

@ -51,19 +51,15 @@
</table> </table>
</td></tr> </td></tr>
<tr colspan="2" v-if="dbInbound.hasLink()"> <tr colspan="2" v-if="dbInbound.hasLink()">
<td v-if="inbound.tls"> <td>
tls: <a-tag color="green">{{ i18n "enabled" }}</a-tag><br /> {{ i18n "security" }}
tls {{ i18n "domainName" }}: <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag> <a-tag :color="inbound.stream.security == 'none' ? 'red' : 'green'">[[ inbound.stream.security ]]</a-tag>
<br />
<template v-if="inbound.stream.security != 'none'">
{{ i18n "domainName" }}
<a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
</template>
</td> </td>
<td v-else-if="inbound.xtls">
xtls: <a-tag color="green">{{ i18n "enabled" }}</a-tag><br />
xtls {{ i18n "domainName" }}: <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
</td>
<td v-else-if="inbound.reality">
reality: <a-tag color="green">{{ i18n "enabled" }}</a-tag><br />
reality Destination: <a-tag :color="inbound.stream.reality.dest ? 'green' : 'orange'">[[ inbound.stream.reality.dest ]]</a-tag>
</td>
<td v-else>tls: <a-tag color="red">{{ i18n "disabled" }}</a-tag></td>
</tr> </tr>
</table> </table>
<table v-if="dbInbound.isSS" style="margin-bottom: 10px; width: 100%;"> <table v-if="dbInbound.isSS" style="margin-bottom: 10px; width: 100%;">

3
web/service/inbound.go
View file

@ -1004,7 +1004,8 @@ func (s *InboundService) GetInboundTags() (string, error) {
if err != nil && err != gorm.ErrRecordNotFound { if err != nil && err != gorm.ErrRecordNotFound {
return "", err return "", err
} }
return "[\"" + strings.Join(inboundTags, "\", \"") + "\"]", nil tags, _ := json.Marshal(inboundTags)
return string(tags), nil
} }
func (s *InboundService) MigrationRemoveOrphanedTraffics() { func (s *InboundService) MigrationRemoveOrphanedTraffics() {

6
web/translation/translate.en_US.toml
View file

@ -287,14 +287,14 @@
"subEncrypt" = "Encrypt configs" "subEncrypt" = "Encrypt configs"
"subEncryptDesc" = "Encrypt the returned configs in subscription" "subEncryptDesc" = "Encrypt the returned configs in subscription"
"subShowInfo" = "Show usage info" "subShowInfo" = "Show usage info"
"subShowInfoDesc" = "Show remianed traffic and date after config name" "subShowInfoDesc" = "Show remained traffic and date after config name"
"subURI" = "Reverse Proxy URI" "subURI" = "Reverse Proxy URI"
"subURIDesc" = "Change base URI of subscription URL for using on behind of proxies" "subURIDesc" = "Change base URI of subscription URL for using on behind of proxies"
[pages.xray] [pages.xray]
"title" = "Xray Settings" "title" = "Xray Settings"
"save" = "Save Settings" "save" = "Save Settings"
"restart" = "Reastart Xray" "restart" = "Restart Xray"
"basicTemplate" = "Basic Template" "basicTemplate" = "Basic Template"
"advancedTemplate" = "Advanced Template" "advancedTemplate" = "Advanced Template"
"generalConfigs" = "General Configs" "generalConfigs" = "General Configs"
@ -446,7 +446,7 @@
"usage" = "❗ Please provide a text to search!" "usage" = "❗ Please provide a text to search!"
"getID" = "🆔 Your ID: <code>{{ .ID }}</code>" "getID" = "🆔 Your ID: <code>{{ .ID }}</code>"
"helpAdminCommands" = "Search for a client email:\r\n<code>/usage [Email]</code>\r\n \r\nSearch for inbounds (with client stats):\r\n<code>/inbound [Remark]</code>" "helpAdminCommands" = "Search for a client email:\r\n<code>/usage [Email]</code>\r\n \r\nSearch for inbounds (with client stats):\r\n<code>/inbound [Remark]</code>"
"helpClientCommands" = "To search for statistics, just use folowing command:\r\n \r\n<code>/usage [UUID|Password]</code>\r\n \r\nUse UUID for vmess/vless and Password for Trojan." "helpClientCommands" = "To search for statistics, just use the following command:\r\n \r\n<code>/usage [UUID|Password]</code>\r\n \r\nUse UUID for vmess/vless and Password for Trojan."
[tgbot.messages] [tgbot.messages]
"cpuThreshold" = "🔴 The CPU usage {{ .Percent }}% is more than threshold {{ .Threshold }}%" "cpuThreshold" = "🔴 The CPU usage {{ .Percent }}% is more than threshold {{ .Threshold }}%"