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

Merge branch 'main' into main

Browse source
This commit is contained in:
AKILA INDUNIL 2025-04-18 16:51:48 +05:30 committed by GitHub
commit c4839fb178
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web/html/settings.html
View file

@ -319,19 +319,11 @@
this.loading(false); this.loading(false);
await this.updateAllSetting(); await this.updateAllSetting();
}, },
generateRandomString(length) {
var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
let randomString = "";
for (let i = 0; i < length; i++) {
randomString += chars[Math.floor(Math.random() * chars.length)];
}
return randomString;
},
async getNewSecret() { async getNewSecret() {
if (!this.changeSecret) { if (!this.changeSecret) {
this.changeSecret = true; this.changeSecret = true;
this.user.loginSecret = ''; this.user.loginSecret = '';
const newSecret = this.generateRandomString(64); const newSecret = RandomUtil.randomSeq(64);
await PromiseUtil.sleep(1000); await PromiseUtil.sleep(1000);
this.user.loginSecret = newSecret; this.user.loginSecret = newSecret;
this.changeSecret = false; this.changeSecret = false;

43
web/html/xray.html
View file

@ -131,7 +131,7 @@
{{template "modals/fakednsModal"}} {{template "modals/fakednsModal"}}
{{template "modals/warpModal"}} {{template "modals/warpModal"}}
<script> <script>
const rulesColumns = [ const rulesColumns = [
{ title: "#", align: 'center', width: 15, scopedSlots: { customRender: 'action' } }, { title: "#", align: 'center', width: 15, scopedSlots: { customRender: 'action' } },
{ title: '{{ i18n "pages.xray.rules.source"}}', children: [ { title: '{{ i18n "pages.xray.rules.source"}}', children: [
{ title: 'IP', dataIndex: "source", align: 'center', width: 20, ellipsis: true }, { title: 'IP', dataIndex: "source", align: 'center', width: 20, ellipsis: true },
@ -383,47 +383,6 @@
if(msg.obj.length > 1) Vue.prototype.$message.error(msg.obj); if(msg.obj.length > 1) Vue.prototype.$message.error(msg.obj);
} }
}, },
async fetchUserSecret() {
this.loading(true);
const userMessage = await HttpUtil.post("/panel/setting/getUserSecret", this.user);
if (userMessage.success) {
this.user = userMessage.obj;
}
this.loading(false);
},
async updateSecret() {
this.loading(true);
const msg = await HttpUtil.post("/panel/setting/updateUserSecret", this.user);
if (msg.success) {
this.user = msg.obj;
window.location.replace(basePath + "logout");
}
this.loading(false);
await this.updateXraySetting();
},
generateRandomString(length) {
var chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
let randomString = "";
for (let i = 0; i < length; i++) {
randomString += chars[Math.floor(Math.random() * chars.length)];
}
return randomString;
},
async getNewSecret() {
this.loading(true);
await PromiseUtil.sleep(600);
const newSecret = this.generateRandomString(64);
this.user.loginSecret = newSecret;
document.getElementById("token").textContent = newSecret;
this.loading(false);
},
async toggleToken(value) {
if (value) {
await this.getNewSecret();
} else {
this.user.loginSecret = "";
}
},
async resetXrayConfigToDefault() { async resetXrayConfigToDefault() {
this.loading(true); this.loading(true);
const msg = await HttpUtil.get("/panel/setting/getDefaultJsonConfig"); const msg = await HttpUtil.get("/panel/setting/getDefaultJsonConfig");