From 1fd3326c5c9ad1a9ab7fb01cec5024c11fe5607e Mon Sep 17 00:00:00 2001
From: Peng-YM <1048217874pengym@gmail.com>
Date: Tue, 1 Sep 2020 03:27:54 +0800
Subject: [PATCH] ...
---
backend/.idea/workspace.xml | 67 ++++++++++++++--------------
backend/sub-store.js | 2 +-
web/src/components/KeywordFilter.vue | 2 +-
web/src/components/RegexFilter.vue | 2 +-
4 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index fbde46c..7887c97 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -22,7 +22,6 @@
-
@@ -87,7 +86,7 @@
-
+
@@ -107,7 +106,7 @@
-
+
@@ -115,10 +114,10 @@
-
+
-
+
@@ -126,10 +125,10 @@
-
+
-
+
@@ -137,10 +136,10 @@
-
+
-
+
@@ -148,10 +147,10 @@
-
+
-
+
@@ -159,10 +158,10 @@
-
+
-
+
@@ -170,10 +169,10 @@
-
+
-
+
@@ -181,10 +180,10 @@
-
+
-
+
@@ -192,10 +191,10 @@
-
+
-
+
@@ -203,10 +202,10 @@
-
+
-
+
@@ -214,10 +213,10 @@
-
+
-
+
@@ -225,10 +224,10 @@
-
+
-
+
@@ -236,10 +235,10 @@
-
+
-
+
@@ -247,10 +246,10 @@
-
+
-
+
@@ -258,10 +257,10 @@
-
+
-
+
@@ -269,10 +268,10 @@
-
+
-
+
@@ -280,7 +279,7 @@
-
+
diff --git a/backend/sub-store.js b/backend/sub-store.js
index b4180fc..9455b68 100644
--- a/backend/sub-store.js
+++ b/backend/sub-store.js
@@ -1341,7 +1341,7 @@ function QX_Producer() {
obfs_opts = `,obfs=over-tls,obfs-host=${proxy.sni},tls-verification=${proxy.scert ? "false" : "true"}`;
}
}
- return `vmess=${proxy.server}:${proxy.port},method=${proxy.cipher},password=${proxy.uuid}${obfs_opts}${proxy.tfo ? ",fast-open=true" : ",fast-open=false"}${proxy.udp ? ",udp-relay=true" : ",udp-relay=false"},tag=${proxy.name}`
+ return `vmess=${proxy.server}:${proxy.port},method=${proxy.cipher === 'auto' ? "none" : proxy.cipher},password=${proxy.uuid}${obfs_opts}${proxy.tfo ? ",fast-open=true" : ",fast-open=false"}${proxy.udp ? ",udp-relay=true" : ",udp-relay=false"},tag=${proxy.name}`
case 'trojan':
return `trojan=${proxy.server}:${proxy.port},password=${proxy.password},tls-host=${proxy.sni},tls-verification=${proxy.scert ? "false" : "true"}${proxy.tfo ? ",fast-open=true" : ",fast-open=false"}${proxy.udp ? ",udp-relay=true" : ",udp-relay=false"},tag=${proxy.name}`
case 'http':
diff --git a/web/src/components/KeywordFilter.vue b/web/src/components/KeywordFilter.vue
index 18febe3..ce21399 100644
--- a/web/src/components/KeywordFilter.vue
+++ b/web/src/components/KeywordFilter.vue
@@ -88,7 +88,7 @@ export default {
created() {
if (this.args) {
this.keywords = this.args.keywords || [];
- if (this.args.keep) this.mode = this.args.keep ? "IN" : "OUT";
+ if (typeof this.args.keep !== 'undefined') this.mode = this.args.keep ? "IN" : "OUT";
else this.mode = "IN";
}
},
diff --git a/web/src/components/RegexFilter.vue b/web/src/components/RegexFilter.vue
index 5f5a0d6..f9dff8f 100644
--- a/web/src/components/RegexFilter.vue
+++ b/web/src/components/RegexFilter.vue
@@ -104,7 +104,7 @@ export default {
created() {
if (this.args) {
this.regexps = this.args.regex || [];
- if (this.args.keep) this.mode = this.args.keep ? "IN" : "OUT";
+ if (typeof this.args.keep !== 'undefined') this.mode = this.args.keep ? "IN" : "OUT";
else this.mode = "IN";
}
}