From 61f267245a7300247ac5b807950f1fad55ab8948 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Thu, 22 Sep 2022 15:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AEdrivers=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/custom.conf | 1 +
 utils/files.py   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/base/custom.conf b/base/custom.conf
index dbe1ee1..9aa903e 100644
--- a/base/custom.conf
+++ b/base/custom.conf
@@ -4,6 +4,7 @@
 
 {
    "spider": "{{host}}/files/custom_spider.jar",
+   "drives": [{"name":"阿里","password":"43886374072944a2bcc55a0ed129ab48","type":"alidrive"}],
 #  "lives":[{"group":"redirect","channels":[{"name":"我的直播","urls":["proxy://do=live&type=txt&ext={{host}}/txt/直播.txt"]}]}],
    "sites":[
         {
diff --git a/utils/files.py b/utils/files.py
index d3ed901..33a4e10 100644
--- a/utils/files.py
+++ b/utils/files.py
@@ -87,7 +87,9 @@ def custom_merge(original:dict,custom:dict):
 
     original.update(updateObj)
     for key in extend_obj.keys():
-        if original.get('key') and isinstance(original[key],list):
+        # original[key].extend(extend_obj[key])
+        # print(key,original.get(key))
+        if original.get(key) and isinstance(original[key],list):
             original[key].extend(extend_obj[key])
         else:
             original[key] = extend_obj[key]
-- 
GitLab