gandc/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-03-14 05:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix urls + use the new buildURL func

Browse Source
This commit is contained in:
Hamidreza Ghavami
2023-05-31 03:39:41 +04:30
parent 8bf6604ed6
commit 8f4fb47e27
6 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -23,7 +23,6 @@ xray panel supporting multi-protocol, **Multi-lang (English,Farsi,Chinese,Russia
| Subscription link + userInfo | :heavy_check_mark: |
| Calculate expire date on first usage | :heavy_check_mark: |
**If you think this project is helpful to you, you may wish to give a** :star2:
**Buy Me a Coffee :**
@@ -31,7 +30,6 @@ xray panel supporting multi-protocol, **Multi-lang (English,Farsi,Chinese,Russia
- Tron USDT (TRC20): `TYTq73Gj6dJ67qe58JVPD9zpjW2cc9XgVz`
- Tezos (XTZ): tz2Wnh2SsY1eezXrcLChu6idWpgdHzUFQcts
# Install & Upgrade to latest version
```
@@ -207,7 +205,7 @@ Reference syntax:
- CPU threshold notification
- Threshold for Expiration time and Traffic to report in advance
- Support client report menu if client's telegram username added to the user's configurations
- Support telegram traffic report searched with UID (VMESS/VLESS) or Password (TROJAN) - anonymously
- Support telegram traffic report searched with UUID (VMESS/VLESS) or Password (TROJAN) - anonymously
- Menu based bot
- Search client by email ( only admin )
- Check all inbounds

8
web/html/common/qrcode_modal.html
View File

@@ -83,12 +83,8 @@
});
},
genSubLink(subID) {
protocol = app.subSettings.tls ? "https://" : "http://";
hostName = app.subSettings.domain === "" ? window.location.hostname : app.subSettings.domain;
subPort = app.subSettings.port;
port = (subPort === 443 && app.subSettings.tls) || (subPort === 80 && !app.subSettings.tls) ? "" : ":" + String(subPort);
subPath = app.subSettings.path;
return protocol + hostName + port + subPath + subID;
const { domain: host, port, tls: isTLS, path: base } = app.subSettings;
return buildURL({ host, port, isTLS, base, path: subID });
}
},
updated() {

8
web/html/xui/inbound_info_modal.html
View File

@@ -239,12 +239,8 @@
infoModal.visible = false;
},
genSubLink(subID) {
protocol = app.subSettings.tls ? "https://" : "http://";
hostName = app.subSettings.domain === "" ? window.location.hostname : app.subSettings.domain;
subPort = app.subSettings.port;
port = (subPort === 443 && app.subSettings.tls) || (subPort === 80 && !app.subSettings.tls) ? "" : ":" + String(subPort);
subPath = app.subSettings.path;
return protocol + hostName + port + subPath + subID;
const { domain: host, port, tls: isTLS, path: base } = app.subSettings;
return buildURL({ host, port, isTLS, base, path: subID });
}
};

2
web/html/xui/inbound_modal.html
View File

@@ -96,7 +96,7 @@
set multiDomain(value) {
if (value) {
inModal.inbound.stream.tls.server = "";
inModal.inbound.stream.tls.settings.domains = [{remark: "", domain: window.location.host.split(":")[0]}];
inModal.inbound.stream.tls.settings.domains = [{ remark: "", domain: window.location.hostname }];
} else {
inModal.inbound.stream.tls.server = "";
inModal.inbound.stream.tls.settings.domains = [];

2
web/html/xui/inbounds.html
View File

@@ -307,7 +307,7 @@
{ title: '{{ i18n "pages.inbounds.client" }}', width: 80, scopedSlots: { customRender: 'client' } },
{ title: '{{ i18n "pages.inbounds.traffic" }}↑|↓', width: 70, scopedSlots: { customRender: 'traffic' } },
{ title: '{{ i18n "pages.inbounds.expireDate" }}', width: 70, scopedSlots: { customRender: 'expiryTime' } },
{ title: 'UID', width: 120, dataIndex: "id" },
{ title: 'UUID', width: 120, dataIndex: "id" },
];
const innerTrojanColumns = [

12
web/html/xui/settings.html
View File

@@ -432,7 +432,7 @@
this.loading(false);
if (msg.success) {
this.user = {};
window.location.replace(basePath + "logout")
window.location.replace(basePath + "logout");
}
},
async restartPanel() {
@@ -451,12 +451,10 @@
if (msg.success) {
this.loading(true);
await PromiseUtil.sleep(5000);
let protocol = "http://";
if (this.allSetting.webCertFile !== "") {
protocol = "https://";
}
const { host } = window.location;
window.location.replace(protocol + host + this.allSetting.webBasePath + "xui/settings");
const { webCertFile, webKeyFile, webDomain: host, webPort: port, webBasePath: base } = this.allSetting;
const isTLS = webCertFile !== "" || webKeyFile !== "";
const url = buildURL({ host, port, isTLS, base, path: "xui/settings" });
window.location.replace(url);
}
},
async resetXrayConfigToDefault() {