mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-05-08 14:36:13 +00:00
6099a07ff0
Add a configurable option to restart Xray when clients are auto-disabled and persist disable actions. Changes include: - New setting restartXrayOnClientDisable (default true), getters/setters in SettingService, UI toggle in general settings, and translations for multiple locales. - AddTraffic signature updated to return a third bool (clientsDisabled). disableInvalidClients now calls Xray API to remove users, marks client_traffics.enable=false, updates inbound.Settings JSON so clients appear disabled in stored settings, and returns appropriate counts/errors. - XrayTrafficJob now checks the clientsDisabled flag and restarts Xray when the setting is enabled (with fallback to mark Xray as needing restart on failure). - XrayService.GetXrayConfig call adjusted to ignore AddTraffic returns. - Subscription generation (subService/subJson/subClash) no longer filters clients by their enable flag when matching subId. - Minor fixes: check_client_ip_job now checks scanner.Err and improved API error handling/logging. These changes ensure auto-disabled clients are propagated to Xray and the stored inbound settings, and provide an option to restart Xray automatically after auto-disable events.
93 lines
2.8 KiB
JavaScript
93 lines
2.8 KiB
JavaScript
class AllSetting {
|
|
|
|
constructor(data) {
|
|
this.webListen = "";
|
|
this.webDomain = "";
|
|
this.webPort = 2053;
|
|
this.webCertFile = "";
|
|
this.webKeyFile = "";
|
|
this.webBasePath = "/";
|
|
this.sessionMaxAge = 360;
|
|
this.pageSize = 25;
|
|
this.expireDiff = 0;
|
|
this.trafficDiff = 0;
|
|
this.remarkModel = "-ieo";
|
|
this.datepicker = "gregorian";
|
|
this.tgBotEnable = false;
|
|
this.tgBotToken = "";
|
|
this.tgBotProxy = "";
|
|
this.tgBotAPIServer = "";
|
|
this.tgBotChatId = "";
|
|
this.tgRunTime = "@daily";
|
|
this.tgBotBackup = false;
|
|
this.tgBotLoginNotify = true;
|
|
this.tgCpu = 80;
|
|
this.tgLang = "en-US";
|
|
this.twoFactorEnable = false;
|
|
this.twoFactorToken = "";
|
|
this.xrayTemplateConfig = "";
|
|
this.subEnable = true;
|
|
this.subJsonEnable = false;
|
|
this.subTitle = "";
|
|
this.subSupportUrl = "";
|
|
this.subProfileUrl = "";
|
|
this.subAnnounce = "";
|
|
this.subEnableRouting = true;
|
|
this.subRoutingRules = "";
|
|
this.subListen = "";
|
|
this.subPort = 2096;
|
|
this.subPath = "/sub/";
|
|
this.subJsonPath = "/json/";
|
|
this.subClashEnable = true;
|
|
this.subClashPath = "/clash/";
|
|
this.subDomain = "";
|
|
this.externalTrafficInformEnable = false;
|
|
this.externalTrafficInformURI = "";
|
|
this.restartXrayOnClientDisable = true;
|
|
this.subCertFile = "";
|
|
this.subKeyFile = "";
|
|
this.subUpdates = 12;
|
|
this.subEncrypt = true;
|
|
this.subShowInfo = true;
|
|
this.subURI = "";
|
|
this.subJsonURI = "";
|
|
this.subClashURI = "";
|
|
this.subJsonFragment = "";
|
|
this.subJsonNoises = "";
|
|
this.subJsonMux = "";
|
|
this.subJsonRules = "";
|
|
|
|
this.timeLocation = "Local";
|
|
|
|
// LDAP settings
|
|
this.ldapEnable = false;
|
|
this.ldapHost = "";
|
|
this.ldapPort = 389;
|
|
this.ldapUseTLS = false;
|
|
this.ldapBindDN = "";
|
|
this.ldapPassword = "";
|
|
this.ldapBaseDN = "";
|
|
this.ldapUserFilter = "(objectClass=person)";
|
|
this.ldapUserAttr = "mail";
|
|
this.ldapVlessField = "vless_enabled";
|
|
this.ldapSyncCron = "@every 1m";
|
|
this.ldapFlagField = "";
|
|
this.ldapTruthyValues = "true,1,yes,on";
|
|
this.ldapInvertFlag = false;
|
|
this.ldapInboundTags = "";
|
|
this.ldapAutoCreate = false;
|
|
this.ldapAutoDelete = false;
|
|
this.ldapDefaultTotalGB = 0;
|
|
this.ldapDefaultExpiryDays = 0;
|
|
this.ldapDefaultLimitIP = 0;
|
|
|
|
if (data == null) {
|
|
return
|
|
}
|
|
ObjectUtil.cloneProps(this, data);
|
|
}
|
|
|
|
equals(other) {
|
|
return ObjectUtil.equals(this, other);
|
|
}
|
|
} |