++

ai_news/ai_news.py

@@ -125,14 +125,13 @@ class AINEWS:
         config_path = os.path.join(current_dir, 'config.json')
 
         config = {}
-        
+
         if os.path.exists('config.json'):
             with open('config.json', 'r', encoding='utf-8') as f:
                 config = json.load(f)
 
         if not config:
 
-
             # 检查 config.json 文件是否存在
             if not os.path.exists(config_path):
                 # 如果不存在，创建并写入默认的 JSON 数据
@@ -158,6 +157,7 @@ class AINEWS:
         k = config[key]
         return k
         # return k['target_url_list'], k['prompt_words'], k['role'], k['use_browser'], k['ai_host'], k['message_bot_key']
+
     # endregion
 
     # region 使用httpx获取网页内容
@@ -193,6 +193,7 @@ class AINEWS:
             url_to_text = {url: text for url, text in results}
 
             return url_to_text
+
     # endregion
 
     # region 使用Playwright获取HTML内容
@@ -253,6 +254,7 @@ class AINEWS:
             await browser.close()
 
         return url_to_text
+
     # endregion
 
     # region 滚动页面
@@ -271,6 +273,7 @@ class AINEWS:
             await page.evaluate(f"window.scrollTo({{top: {scroll_position}, behavior: 'smooth'}})")
             await asyncio.sleep(0.5)  # 使用异步 sleep
         await page.evaluate("window.scrollTo({top: 0, behavior: 'smooth'})")
+
     # endregion
 
     # region 网页截图
@@ -290,6 +293,7 @@ class AINEWS:
         # 进行整页截图
         await page.screenshot(path=screenshot_path, full_page=True)
         print(f"截图已保存到: {screenshot_path}")
+
     # endregion
 
     # region 禁止网页显示图片
@@ -310,6 +314,7 @@ class AINEWS:
             }
             disableImages(); // 调用函数
         }''')
+
     # endregion
 
     # region 覆盖JavaScript的弹框方法，使其无效
@@ -369,6 +374,8 @@ class AINEWS:
             print('无数据, 程序退出')
             exit(0)
 
+        print(f'{role}\n{prompt_words}')
+
         if use_ai:
             # 处理发送 text 数据
             process_send = self.process_data(result_text, prompt_words, role, ai_host)
@@ -380,6 +387,7 @@ class AINEWS:
                 bot.send_message(process_text)
     # endregion
 
+
 if __name__ == "__main__":
     ainews = AINEWS()
     ainews.create_config_if_not_exists()

ai_news/config.json

@@ -12,7 +12,7 @@
     "use_browser": 1,
     "ai_host": "http://home.erhe.link:36001",
     "message_bot_key": "!CgWvWEnLbKYvhXLvil:chat.abeginner.cn",
-    "use_ai": 1,
+    "use_ai": 0,
     "target_url_list": [
       "https://wublock123.com",
       "https://m.odaily.news/newsflash",

manual/integrate_proxy/config_merge.yaml

@@ -0,0 +1,1109 @@
+allow-lan: true
+bind-address: '*'
+dns:
+  enable: false
+  fallback: []
+  ipv6: false
+  nameserver: []
+external-controller: 127.0.0.1:9090
+log-level: info
+mixed-port: 7890
+mode: rule
+proxies:
+- alterId: 0
+  cipher: auto
+  name: DE-Detour 01 AEAD
+  port: 15801
+  server: de-detour-01.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: DE-Detour 02 AEAD
+  port: 15802
+  server: de-detour-02.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: DE-Detour-03 AEAD
+  port: 15803
+  server: de-detour-03.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 01 AEAD
+  port: 15101
+  server: hkt-detour-01.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 02 AEAD
+  port: 15102
+  server: hkt-detour-02.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 05 AEAD
+  port: 15105
+  server: hkt-detour-05.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 06 AEAD
+  port: 15106
+  server: hkt-detour-06.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 09 AEAD
+  port: 15109
+  server: hkt-detour-09.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 10 AEAD
+  port: 15110
+  server: hkt-detour-10.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 11 AEAD
+  port: 15111
+  server: hkt-detour-11.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 12 AEAD
+  port: 15112
+  server: hkt-detour-12.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 13 AEAD
+  port: 15113
+  server: hkt-detour-13.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 14 AEAD
+  port: 15114
+  server: hkt-detour-14.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 17 AEAD
+  port: 15117
+  server: hkt-detour-17.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 18 AEAD
+  port: 15118
+  server: hkt-detour-18.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 19 AEAD
+  port: 15119
+  server: hkt-detour-19.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 20 AEAD
+  port: 15120
+  server: hkt-detour-20.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 21 AEAD
+  port: 15131
+  server: hkt-detour-21.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: HKT-Detour 23 AEAD
+  port: 15133
+  server: hkt-detour-23.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: JP-Detour 01 AEAD
+  port: 15601
+  server: jp-01.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: JP-Detour 02 AEAD
+  port: 15602
+  server: jp-02.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: JP-Detour 03 AEAD
+  port: 15603
+  server: jp-03.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: JP-Detour 04 AEAD
+  port: 15604
+  server: jp-04.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: JP-Detour 05 AEAD
+  port: 15605
+  server: jp-05.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: JP-Detour 06 AEAD
+  port: 15606
+  server: jp-06.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: LA-Detour 02 AEAD
+  port: 15502
+  server: la-detour-02.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: LA-Detour 03 AEAD
+  port: 15503
+  server: la-detour-03.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: LA-Detour 05 AEAD
+  port: 15505
+  server: la-detour-05.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: LA-Detour 07 AEAD
+  port: 15507
+  server: la-detour-07.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: LA-Detour 09 AEAD
+  port: 15509
+  server: la-detour-09.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: LA-Detour 10 AEAD
+  port: 15510
+  server: la-detour-10.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: Oz-Detour 01 AEAD
+  port: 15811
+  server: oz-detour-01.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: Oz-Detour 02 AEAD
+  port: 15812
+  server: oz-detour-02.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: SG-Detour 01 AEAD
+  port: 15301
+  server: sg-detour-01.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: SG-Detour 02 AEAD
+  port: 15302
+  server: sg-detour-02.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: SG-Detour 03 AEAD
+  port: 15303
+  server: sg-detour-03.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 01 AEAD
+  port: 15201
+  server: tw-detour-01.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 02 AEAD
+  port: 15202
+  server: tw-detour-02.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 03 AEAD
+  port: 15203
+  server: tw-detour-03.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 05 AEAD
+  port: 15205
+  server: tw-detour-05.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 06 AEAD
+  port: 15206
+  server: tw-detour-06.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 08 AEAD
+  port: 15208
+  server: tw-detour-08.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 09 AEAD
+  port: 15209
+  server: tw-detour-09.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 10 AEAD
+  port: 15210
+  server: tw-detour-10.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 12 AEAD
+  port: 15212
+  server: tw-detour-12.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 13 AEAD
+  port: 15213
+  server: tw-detour-13.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 15 AEAD
+  port: 15215
+  server: tw-detour-15.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 16 AEAD
+  port: 15216
+  server: tw-detour-16.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 18 AEAD
+  port: 15218
+  server: tw-detour-18.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 19 AEAD
+  port: 15219
+  server: tw-detour-19.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 20 AEAD
+  port: 15220
+  server: tw-detour-20.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 22 AEAD
+  port: 15222
+  server: tw-detour-22.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: TW-Detour 23 AEAD
+  port: 15223
+  server: tw-detour-23.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: UK Detour-01 AEAD
+  port: 15711
+  server: uk-detour-01.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: UK Detour-02 AEAD
+  port: 15712
+  server: uk-detour-02.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: UK Detour-03 AEAD
+  port: 15713
+  server: uk-detour-03.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: UK Detour-04 AEAD
+  port: 15714
+  server: uk-detour-04.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: UK Detour-05 AEAD
+  port: 15715
+  server: uk-detour-05.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- alterId: 0
+  cipher: auto
+  name: UK Detour-06 AEAD
+  port: 15716
+  server: uk-detour-06.grabgo.pro
+  type: vmess
+  uuid: 22a14509-a8ab-46cb-bb26-d47d4d18e1d6
+  ws-path: /
+- name: 剩余流量：95.64 GB
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12001
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 套餐到期：长期有效
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12001
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇦🇶 南极-广东专线 WARP
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32041'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇦🇷 阿根廷 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12066
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇦🇷 阿根廷-广东专线 DonWeb
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32015'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇦🇺 澳大利亚 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12068
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇦🇺 澳大利亚-广东专线 GCore
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32023'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇦🇺 澳大利亚-广东专线 VUAU
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32012'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇧🇷 巴西-广东专线 GCore 1
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32016'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇧🇷 巴西-广东专线 GCore 2
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32025'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇨🇦 加拿大-广东专线 BGP
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32039'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇨🇳 台湾 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12011
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇨🇳 台湾 02
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12012
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇩🇪 德国 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12070
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇩🇪 德国-广东专线 BGP
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32011'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇫🇷 法国 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12065
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇫🇷 法国-广东专线 BGP
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32009'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇬🇧 英国 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12069
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇬🇧 英国-广东专线 BGP
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32010'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12001
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港 02
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12002
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港 03
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12003
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港 04
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12004
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港 05
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12005
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港 06
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12006
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港-广东专线 Akari
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32037'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港-广东专线 BGP 1
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32443'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港-广东专线 BGP 2
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32445'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港-广东专线 GCore
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32027'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港-广东专线 HGC
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32042'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港-广东专线 HKBN
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32000'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港-广东专线 HKT
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32033'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇭🇰 香港-广东专线 NeaRoute
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32029'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇮🇩 印尼 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12061
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇮🇳 印度 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12072
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇮🇳 印度-广东专线 DOIN
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32017'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇮🇳 印度-广东专线 GCore
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32024'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇮🇹 意大利 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12062
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇯🇵 日本 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12031
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇯🇵 日本 02
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12032
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇯🇵 日本 03
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12033
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇯🇵 日本 04
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12034
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇯🇵 日本 05
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12035
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇯🇵 日本-广东专线 Akari
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32036'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇯🇵 日本-广东专线 BGP
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32004'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇯🇵 日本-广东专线 GCore
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32022'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇰🇷 韩国 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12041
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇰🇷 韩国-广东专线 VUKR
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32005'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇲🇴 澳门 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12007
+  server: cn1.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇲🇾 马来西亚 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12067
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇲🇾 马来西亚-广东专线 Shin
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32038'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇳🇬 尼日利亚 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12073
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇳🇬 尼日利亚-广东专线 Melbicom
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32034'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇳🇱 荷兰 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12074
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇵🇭 菲律宾-广东专线 Comfac
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32030'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇵🇭 菲律宾-广东专线 Zenlayer
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32013'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇵🇰 巴基斯坦 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12077
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇷🇺 俄罗斯 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12075
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇷🇺 俄罗斯-广东专线 PQ
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32008'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇸🇦 沙特-广东专线 STC
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32035'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇸🇪 瑞典 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12071
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇸🇬 新加坡 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12021
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇸🇬 新加坡 02
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12022
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇸🇬 新加坡 03
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12023
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇸🇬 新加坡 04
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12024
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇸🇬 新加坡 05
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12025
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇸🇬 新加坡-广东专线 BGP
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32007'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇹🇭 泰国 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12076
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇹🇭 泰国-广东专线 Bangmod
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32043'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇹🇷 土耳其 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12064
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇹🇷 土耳其-广东专线 GCore
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32026'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇹🇷 土耳其-广东专线 Kapteyan
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32014'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇹🇼 台湾-广东专线 NeaRoute
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32003'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇹🇼 台湾-广东专线 STUIX
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32040'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇺🇦 乌克兰-广东专线 Vik
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32019'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇺🇸 美国 01
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12051
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇺🇸 美国 02
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12052
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇺🇸 美国 03
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12053
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇺🇸 美国 04
+  password: d058a1cb-5dbd-4664-9d8b-ae26bc699ed4
+  port: 12054
+  server: cn2.cdn.xfltd-cdn.top
+  skip-cert-verify: true
+  sni: cdn.alibaba.com
+  type: trojan
+  udp: true
+- name: 🇺🇸 美国-广东专线 BGP 1
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32001'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇺🇸 美国-广东专线 BGP 2
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32028'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇺🇸 美国-广东专线 DAOport
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32031'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+- name: 🇺🇸 美国-广东专线 GCore
+  password: f2e8e50c-ffb8-48a1-a460-2e72dfaf7845
+  port: '32021'
+  server: lbso.bnnodeservice.com
+  sni: cert.bitbyte.one
+  type: trojan
+  udp: true
+proxy-groups: []
+secret: ''

manual/integrate_proxy/integrate_proxy_nogroup.py

@@ -47,15 +47,19 @@ def process_yaml_file(is_other):
 
         proxies = data['proxies']
         for proxy in proxies:
-            for keyword in need_list:
-                if is_other:
-                    if keyword not in proxy['name'] and proxy not in temp_data:
-                        print('{}: {}'.format(file_name, proxy['name']))
-                        temp_data.append(proxy)
-                else:
-                    if keyword in proxy['name'] and proxy not in temp_data:
-                        print('{}: {}'.format(file_name, proxy['name']))
-                        temp_data.append(proxy)
+            if i <= 1:
+                for keyword in need_list:
+                    if is_other:
+                        if keyword not in proxy['name'] and proxy not in temp_data:
+                            print('{}: {}'.format(file_name, proxy['name']))
+                            temp_data.append(proxy)
+                    else:
+                        if keyword in proxy['name'] and proxy not in temp_data:
+                            print('{}: {}'.format(file_name, proxy['name']))
+                            temp_data.append(proxy)
+            else:
+                print('{}: {}'.format(file_name, proxy['name']))
+                temp_data.append(proxy)
 
     sorted_proxies = sorted(temp_data, key=lambda x: x['name'] if 'name' in x else '')
 
@@ -64,10 +68,14 @@ def process_yaml_file(is_other):
 
 
 if __name__ == '__main__':
-    for i in range(2):
+    for i in range(3):
         process_yaml_file(i)
 
-        with open(f'config{i + 1}.yaml', 'w', encoding='utf-8') as file:
-            yaml.dump(config_template, file, allow_unicode=True, default_flow_style=False)
+        if i <= 1:
+            with open(f'config{i + 1}.yaml', 'w', encoding='utf-8') as file:
+                yaml.dump(config_template, file, allow_unicode=True, default_flow_style=False)
+        else:
+            with open(f'config_merge.yaml', 'w', encoding='utf-8') as file:
+                yaml.dump(config_template, file, allow_unicode=True, default_flow_style=False)
 
     print('done!')