custom

sun2ot · Nov 20, 2023 · fa9ce05 · fa9ce05
1 parent 918a92a
commit fa9ce05
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

diff --git a/src/views/Subconverter.vue b/src/views/Subconverter.vue
@@ -78,13 +78,13 @@
                     </el-popover>
                     <el-popover placement="bottom" style="margin-left: 10px">
                       <el-row>
-                        <el-checkbox v-model="form.tpl.surge.doh" label="Surge.DoH"></el-checkbox>
+                        <el-checkbox v-model="form.tpl.clash.doh" label="Clash.DoH"></el-checkbox>
                       </el-row>
                       <el-row>
-                        <el-checkbox v-model="form.tpl.clash.doh" label="Clash.DoH"></el-checkbox>
+                        <el-checkbox v-model="form.tpl.provider.expand" label="provider模式"></el-checkbox>
                       </el-row>
                       <el-row>
-                        <el-checkbox v-model="form.insert" label="网易云"></el-checkbox>
+                        <el-checkbox v-model="form.tpl.surge.doh" label="Surge.DoH"></el-checkbox>
                       </el-row>
                       <el-button slot="reference">定制功能</el-button>
                     </el-popover>
@@ -210,11 +210,16 @@ export default {
           ClashR: "clashr",
           Surge2: "surge&ver=2",
         },
-        backendOptions: [{ value: "http://127.0.0.1:25500/sub?" }],
+        backendOptions: [{ value: "http://127.0.0.1:25500/sub?" }, {value: "https://sub.085404.xyz/sub?"}],
         remoteConfig: [
           {
             label: "universal",
             options: [
+              {
+                label: "sun2ot",
+                value:
+                  "https://raw.githubusercontent.com/sun2ot/ClashRules/main/config/test.ini"
+              },
               {
                 label: "No-Urltest",
                 value:
@@ -310,7 +315,10 @@ export default {
             doh: false // dns 查询是否使用 DoH
           },
           clash: {
-            doh: false
+            doh: true
+          },
+          provider: {
+            expand: true // 是否将规则列表以provider形式附加到配置文件中
           }
         }
       },
@@ -451,7 +459,11 @@ export default {
 
         if (this.form.clientType === "clash") {
           if (this.form.tpl.clash.doh === true) {
-            this.customSubUrl += "&clash.doh=true";
+            this.customSubUrl += "&clash.dns=1";
+          }
+          if (this.form.tpl.expand === true) {
+            // urlencode 中, expand=false 表示 provider 模式
+            this.customSubUrl += "&expand=false";
           }
 
           this.customSubUrl += "&new_name=" + this.form.new_name.toString();
@@ -625,6 +637,7 @@ export default {
           this.form.udp = params.get("udp") === "true";
           this.form.tpl.surge.doh = params.get("surge.doh") === "true";
           this.form.tpl.clash.doh = params.get("clash.doh") === "true";
+          this.form.tpl.expand = params.get("expand") === "true";
           this.form.new_name = params.get("new_name") === "true";
 
           // Hide the configuration dialog