From 50c311ffc373b72900ca164ce17db2cca21cc6cb Mon Sep 17 00:00:00 2001
From: Shawn <45581750+KOP-XIAO@users.noreply.github.com>
Date: Thu, 25 Jun 2020 09:58:30 +0800
Subject: [PATCH] ssd bug fixed

---
 .DS_Store                  | Bin 14340 -> 14340 bytes
 Scripts/resource-parser.js |  10 ++++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 2cf191d84fa8fb7e76467067ac0e15de18dcaa5e..0e2dbb849dc8b855d83eca4e446aca5286d30ff2 100644
GIT binary patch
delta 1349
zcmeH_%TE(g6vpp|JZ7$;+=9wwC`y0^6rsFKkfb2R=tAnVC@(bwGvH7<t!+`n7|;-n
zkCiu)NW_@9aI2!ObfbxJqluBITNiGOkEL7hbmot6!Cl<sp6}e8bAIPrOf9A!zb_ZO
zAtFk+4K9wb+a>-|N{21Ow6oTPWv0c)GCm)(^@QoqkE-fgv9E+}Dd&7}X3RP}V`VR}
zT1Cl4D+8R48hX}@CJpDS!JaE_eszHJ5l87uoANfi4|PFKV;O7CWV)BQeFvqnxMdqG
z<CSU-Q9dv+t&f@0%uwAz?H!b#IA^9aR?=n%ykO^U$_K}jiG*xC<Ht@f9PZ})lvBE2
z&twm!Ok1|~&Z{4hZ4EhEuVFY%i9i0({0s7uyd@vVC-RwmAz#Ti@`L;&zsPU$7x^ee
z5fu1Qg{|0z1~egr7PO)ZJ?KRQedxzg#4v#4IE_hIm_i&`T*3k_;|gwK8TYV)`*?&W
zc#2g#!z;YT8<IPD5G$pX;=2~|Y5Vrm`ax?vX&;k>#6n#}JYa1?FPjp@6?}d`LNaF+
zXHZtOCKpnnRckehoQ)~DCk<-#s@wpBs|K}3MPYfa)~vOt5<1)9YVCBFBI&XMSM8)-
zs$2lechxZMQ6y$o=&BLASM?W2FEAn|H}#At@PX%W)SwnYG)p9{XhR3W=*Aw2#eovV
zK^(>qhB1nh63rQjCXQ*?IFDJ(;i5!z71wYbH*gDgu!Or<7TDals#gUzu3K~6nvTcm
Ke`d|5hx8vaS2|q)

delta 1040
zcmeIw%S)7D6oB#bSQGPoTE5QcT&ho~8JS9_i`AGmkW$W!NF>t5NQxo9MRZ|mrXV8h
zGEoaL>MdGCP(z!@B9dBE%OJr*q!wK$f`}GvirTcQ7nN2)e?Tn{4`*?HoMNt+yYnnq
zmT1&t!P}ldDxI<Q`%sNO7G3XG2lH;XyC+-Nb;w<pEx38b@VJVjcSo##OS}@6#nLJn
z=@nOUa##jrP|nI_xh_L;S02d|8Ie(WD&z86-pE^dC!gete3ftV9k3~<f)MkVPn0?q
zv78koXd+2FDKd1hfgZN9jb8fL%RcsVfFl$+72q^yxWrYiQDTT&+~*;W^+jJqf1JI<
z<Fu#Jzb}dX;S%dr#mrfis><iDuBna0>X)u;S)*^v*`i1N%{^AsvDH1V^&$`qg%?B}
zN0oWK6GKDXlxZqE)s{8dj`FBJYqBPqY+FrNd24cWb<)%ss&lHgw(0HFp}**r<fc3@
za?j<Z@%kX2jo1(QiHAypgqe#&Eio2SPXlq|wTfn1SUX{sri*SivWd;?Aj?kU<{G!0
nam!QSDE%DggpZR9FvvO1qq)EpO2bK~t^EH3{L2pzAF+P{drI{z

diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js
index 59e0854..67032a5 100644
--- a/Scripts/resource-parser.js
+++ b/Scripts/resource-parser.js
@@ -1,5 +1,5 @@
 /** 
-☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧  ⟦2020-06-25 09:39⟧
+☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧  ⟦2020-06-25 09:59⟧
 ----------------------------------------------------------
 🚫 发现 𝐁𝐔𝐆 请反馈: @Shawn_KOP_bot
 ⛳️ 关注 🆃🅶 相关频道: https://t.me/QuanX_API
@@ -799,10 +799,16 @@ function SSD2QX(subs,Pudp,Ptfo){
 	ptfo= Ptfo==1? "fast-open=true":"fast-open=false";
 	for (var i in cnt.servers) {
         ip=cnt.servers[i].server;
-		if(obfs==""){
+		if(cnt.servers[i].plugin_options){
 			obfs=cnt.servers[i].plugin_options.split(";")[0]!=null ? ", "+cnt.servers[i].plugin_options.split(";")[0]: "";
 			obfshost=cnt.servers[i].plugin_options.split(";")[1]!=null ? ", "+cnt.servers[i].plugin_options.split(";")[1]: "";
 		}
+		if(cnt.servers[i].encryption){  //独立的加密方式
+			mtd="method="+cnt.servers[i].encryption 
+		}
+		if(cnt.servers[i].password){  //独立的密码
+			pwd="password="+cnt.servers[i].password 
+		}
         if(ip.indexOf(".")>0){ //排除难搞的 ipv6 节点
             port=cnt.servers[i].port?":"+cnt.servers[i].port:port;
             tag="tag="+cnt.servers[i].remarks;