mirror of
https://github.com/asdlokj1qpi233/subconverter.git
synced 2025-10-26 02:42:25 +00:00
fix error
Some checks failed
GitHub CI / Linux aarch64 Build (push) Failing after 43s
GitHub CI / Linux amd64 Build (push) Failing after 20s
GitHub CI / Linux armv7 Build (push) Failing after 32s
GitHub CI / Linux x86 Build (push) Failing after 18s
Publish Docker Image / Build linux/386 Image (push) Failing after 6m32s
Publish Docker Image / Build linux/amd64 Image (push) Failing after 27m34s
Publish Docker Image / Build linux/arm/v7 Image (push) Failing after 31m23s
Publish Docker Image / Build linux/arm64 Image (push) Failing after 34m18s
Publish Docker Image / Merge (push) Has been skipped
GitHub CI / macOS arm Build (push) Has been cancelled
GitHub CI / macOS x86 Build (push) Has been cancelled
GitHub CI / Windows amd64 Build (push) Has been cancelled
GitHub CI / Windows x86 Build (push) Has been cancelled
Some checks failed
GitHub CI / Linux aarch64 Build (push) Failing after 43s
GitHub CI / Linux amd64 Build (push) Failing after 20s
GitHub CI / Linux armv7 Build (push) Failing after 32s
GitHub CI / Linux x86 Build (push) Failing after 18s
Publish Docker Image / Build linux/386 Image (push) Failing after 6m32s
Publish Docker Image / Build linux/amd64 Image (push) Failing after 27m34s
Publish Docker Image / Build linux/arm/v7 Image (push) Failing after 31m23s
Publish Docker Image / Build linux/arm64 Image (push) Failing after 34m18s
Publish Docker Image / Merge (push) Has been skipped
GitHub CI / macOS arm Build (push) Has been cancelled
GitHub CI / macOS x86 Build (push) Has been cancelled
GitHub CI / Windows amd64 Build (push) Has been cancelled
GitHub CI / Windows x86 Build (push) Has been cancelled
This commit is contained in:
@@ -1250,7 +1250,7 @@ std::string proxyToSingle(std::vector<Proxy> &nodes, int types, extra_settings &
|
||||
proxyStr = "hysteria2://" + password + "@" + hostname + ":" + port + (ports.empty() ? "" : "," + ports)
|
||||
+ "?insecure=" +
|
||||
(x.AllowInsecure.get() ? "1" : "0");
|
||||
if (!obfsparam.empty) {
|
||||
if (!obfsparam.empty()) {
|
||||
proxyStr += "&obfs=" + obfsparam;
|
||||
if (!obfsPassword.empty()) {
|
||||
proxyStr += "&obfs-password=" + obfsparam;
|
||||
@@ -2197,7 +2197,7 @@ proxyToLoon(std::vector<Proxy> &nodes, const std::string &base_conf,
|
||||
|
||||
tribool scv = ext.skip_cert_verify;
|
||||
scv.define(x.AllowInsecure);
|
||||
tribool udp = x.UDP.is_undef() ? ext.udp.is_undef() ? false : ext.udp : x.UDP;
|
||||
tribool udp = x.UDP.is_undef() ? ext.udp.is_undef() ? false : ext.udp.get() : x.UDP.get();
|
||||
std::string proxy;
|
||||
|
||||
switch (x.Type) {
|
||||
|
||||
Reference in New Issue
Block a user