mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-10-29 19:32:51 +00:00
Compare commits
No commits in common. "73a5722cca0b4c06f58630ace5d90f36dc544833" and "7a57b31ff3ed9c42f7ba736c09b4baeb2060c2b5" have entirely different histories.
73a5722cca
...
7a57b31ff3
5 changed files with 6 additions and 16 deletions
|
|
@ -1 +1 @@
|
|||
2.6.3
|
||||
2.6.2
|
||||
|
|
@ -725,8 +725,8 @@ class RealityStreamSettings extends XrayCommonClass {
|
|||
constructor(
|
||||
show = false,
|
||||
xver = 0,
|
||||
dest = 'google.com:443',
|
||||
serverNames = 'google.com,www.google.com',
|
||||
dest = 'yahoo.com:443',
|
||||
serverNames = 'yahoo.com,www.yahoo.com',
|
||||
privateKey = '',
|
||||
minClientVer = '',
|
||||
maxClientVer = '',
|
||||
|
|
@ -1385,7 +1385,6 @@ class Inbound extends XrayCommonClass {
|
|||
params.set("security", "reality");
|
||||
params.set("pbk", this.stream.reality.settings.publicKey);
|
||||
params.set("fp", this.stream.reality.settings.fingerprint);
|
||||
params.set("pqv", this.stream.reality.settings.mldsa65Verify);
|
||||
if (!ObjectUtil.isArrEmpty(this.stream.reality.serverNames)) {
|
||||
params.set("sni", this.stream.reality.serverNames.split(",")[0]);
|
||||
}
|
||||
|
|
@ -1560,7 +1559,6 @@ class Inbound extends XrayCommonClass {
|
|||
params.set("security", "reality");
|
||||
params.set("pbk", this.stream.reality.settings.publicKey);
|
||||
params.set("fp", this.stream.reality.settings.fingerprint);
|
||||
params.set("pqv", this.stream.reality.settings.mldsa65Verify);
|
||||
if (!ObjectUtil.isArrEmpty(this.stream.reality.serverNames)) {
|
||||
params.set("sni", this.stream.reality.serverNames.split(",")[0]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -388,8 +388,7 @@ class RealityStreamSettings extends CommonClass {
|
|||
fingerprint = '',
|
||||
serverName = '',
|
||||
shortId = '',
|
||||
spiderX = '',
|
||||
mldsa65Verify = ''
|
||||
spiderX = '/'
|
||||
) {
|
||||
super();
|
||||
this.publicKey = publicKey;
|
||||
|
|
@ -397,7 +396,6 @@ class RealityStreamSettings extends CommonClass {
|
|||
this.serverName = serverName;
|
||||
this.shortId = shortId
|
||||
this.spiderX = spiderX;
|
||||
this.mldsa65Verify = mldsa65Verify;
|
||||
}
|
||||
static fromJson(json = {}) {
|
||||
return new RealityStreamSettings(
|
||||
|
|
@ -406,7 +404,6 @@ class RealityStreamSettings extends CommonClass {
|
|||
json.serverName,
|
||||
json.shortId,
|
||||
json.spiderX,
|
||||
json.mldsa65Verify
|
||||
);
|
||||
}
|
||||
toJson() {
|
||||
|
|
@ -416,7 +413,6 @@ class RealityStreamSettings extends CommonClass {
|
|||
serverName: this.serverName,
|
||||
shortId: this.shortId,
|
||||
spiderX: this.spiderX,
|
||||
mldsa65Verify: this.mldsa65Verify
|
||||
};
|
||||
}
|
||||
};
|
||||
|
|
@ -791,8 +787,7 @@ class Outbound extends CommonClass {
|
|||
let sni = url.searchParams.get('sni') ?? '';
|
||||
let sid = url.searchParams.get('sid') ?? '';
|
||||
let spx = url.searchParams.get('spx') ?? '';
|
||||
let pqv = url.searchParams.get('pqv') ?? '';
|
||||
stream.reality = new RealityStreamSettings(pbk, fp, sni, sid, spx, pqv);
|
||||
stream.reality = new RealityStreamSettings(pbk, fp, sni, sid, spx);
|
||||
}
|
||||
|
||||
const regex = /([^@]+):\/\/([^@]+)@(.+):(\d+)(.*)$/;
|
||||
|
|
|
|||
|
|
@ -452,9 +452,6 @@
|
|||
<a-form-item label="Public Key">
|
||||
<a-input v-model.trim="outbound.stream.reality.publicKey"></a-input>
|
||||
</a-form-item>
|
||||
<a-form-item label="mldsa65 Verify">
|
||||
<a-input v-model.trim="outbound.stream.reality.mldsa65Verify"></a-input>
|
||||
</a-form-item>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ func (s *ServerService) GetXrayVersions() ([]string, error) {
|
|||
continue
|
||||
}
|
||||
|
||||
if major > 25 || (major == 25 && minor > 7) || (major == 25 && minor == 7 && patch >= 26) {
|
||||
if major > 25 || (major == 25 && minor > 6) || (major == 25 && minor == 6 && patch >= 8) {
|
||||
versions = append(versions, release.TagName)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue