From 7a8f4b4bd566b2f4a71459519287e25cf49e3085 Mon Sep 17 00:00:00 2001 From: caorong Date: Sat, 26 May 2018 22:37:37 +0800 Subject: [PATCH] update --- ipip.alfredworkflow | Bin 46136 -> 46102 bytes ipip.sh | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ipip.alfredworkflow b/ipip.alfredworkflow index 9743106ae8e4b1d5bab1f1ff7b04b3da9044de12..de3e7d95a7480f7abef671aa288e6b26bc982a98 100644 GIT binary patch delta 1906 zcmV-&2aWi+=mM7L0+3Gx7I6t%vo}_|Rg(@@B?Rtp30t!_R=ZUVg|xa%xQqDj$OZra zj+6hZ7Ju4s30oj>30rk|3jhHG^#K3?1QY-O0PR>?ZyQAvevW^|bQ^WskoDSeu8y53 zP8>B-RH8O{Kvhx3yJLIkdUv}!+r(-5f)GW}QiO_l39SHukSfyl0SOhN{+T4EPy7YW z?0xNZu-o#6CEL3*=Qig%Gv}NsE$+57bemWM0CYasop3HTbrxWtgyI{ zDV*hIq^3z|>en8YjCr4kOym)+a@ci#T?{^NK9KU?odGyK2XMaz7 zgi#yUG!n&AXuLbE;}+>w!UL>Zj8Xdt!X=885by}^Ag=1P5jm?n9I#fmh+3x_10XD7 zI~ue5xVAq-3p1q&aFT(s$5z8>5uL%BT5rbKHV0<{{IChmOJkTWq;bG^$FS12M*@m~ z{FXx;q7n_a6~|^qD@{>8O;5xKet#e;g~-&}RHuw$O>3VCM8rCj16{U$9H};1j;_OU z`)^Zk6CD5kYc`uragMinQuxlFlWSC$?PexJ&9Zn0Otac|#Z1NvtMceY#j!Lb*@z$P zwtun*$E^&1O$NzCx{QP^n^@9P0|KLnuHibis617e$rh#scls)+6N^~IbbmoWBdM5S zB!C&Ccc^)nk3jA)!4R9Mmol02h$u}1jZ!ms6h=KOg-pg>g*zx-(Aa!$hFiSQVDn-( z9c83tdo!5~R#mR7yqy$|_EEzkCKBOb>3sF+@zI0M(V>W>C6tG$Cc!F_bTonX8KxS4 z%C$|B$P=F@MH?Ww{|Dk3g_x1h2w2_+GCYy?Q;hYb(pZ5$cK5pdt03 zegExZcI=X`IP|K&_{hs(5!h8n*RP{R>QIDf2~mqjlQlD(=0QpAdXFfFZ=* zd=x$TZI^~a+d~uL?a{bD;RfIWgyayXhaJJkJezzfR4xazNz3>r0y3cPk7K|y0GwP@ zfMqXR3{sb{8_!;jIDc%gFHqbq#&ANd0;jLVY7(|7&cH)Y4iJL?f`nGFl8L|W5r0`?Kal_6oH2jLiBVEQylSs>k z&MZSKq88qjK!0jECnjo-umJFSiqoGz?tFPq95nm-1h{3+>owc-r{Z}zcp2d@QK18c zKo9~#S9*yi(sOY*|CZS}lyi1Ij>rbg$X7QjOAx!SzkAGkv=@K;b@=M_w}-FqJ@opu z(}M>mpMU=!<>{^pP>z*=eG6xB$573V#{~@<8LXr3Uw_vhAHC{4`UOQLOmDNBBF}Z% zppDZ|E8C&0X`5I{a4^g1Y5mh=2WEKvYZkh@n{~~A&8eFX%Z5&at~Oz&D=BeN5(paX zLZ(}k-xtKh1?!whEID?MF=RvUFvG+)>*FL}h(^ttfi1NU@_s9p2AG9)o5HdBulFy* zfM7U`qkj;ZH6R2-Usb&s1hJbWw;zW3r}vVk`+^1xhL-YO+~p-5x@#JCis^-1*OqaK z+eu=uTwBOb0Hyns3^PtOm_vs$Z00QuOJ3eV&h;CxZvO`fw*iNQQ*$d51sj&ZZ+!w} z0$C;5z4u+n`~y%+0RkQa6aWAK2mtd0kxAJV`I9NLwGD-|x=gr>`0vOD0054Y>$4;& s+HeV5b$AN^0R;5{000CO0000`O9ci10000300RIF0RRB>vH$=808LVa;{X5v delta 1896 zcmV-u2bcJk=mNOt0+3Gx<#B9Tvo}_|Rg(@@B?RYjY+186R=ZUV%z^Pr{IMJ+ zVUz!>7JuMzY*`6%Y*}@93jhHG^#K3?1QY-O0PR>yZ`(!?K3l(H!x&NHnxbU+A`%m zEMFoi%9Wb*Rspueoo{AmzZvfAY-wSqt)eYrT7Oj6%0e!a6%f&6U7=dDENrYViv?j} zK2xJ6#*CsQ zZEtU9Fh^x%z0HA^v}WoCF@o|zHV!ZN~ltj z_E=`5yd&0do5UyK2^Ke_*FT1I>E=oh@NT^QylT*9m#la?V6|Zqr9o8&fiQ_> ztIX;{t*2l%?KaUEc+-Xml7Yh=D0Ym&m4JC{z_ODRrt?V}@VBj-Nr@dH(T88NiA@xu z;*M-vOm8PmluMeYs|Y+0g+flL9e=7(MzN}PPNcA_IuwD9T0f0MA5B}+V7dKYFgJY< zet(q7WD>}6(>_7(^eL%MHOXqFQq(A?uY+r5=SDh}ax@mX6YAR5sUJeiqI&*<3n~ql~mISCYbt!p)U89kDR#E>b{y zsA&?z#Vd4+qxnzEz#5`T`LfXNSVV1H792ZBte_m)W0=CiHI&;!;2;t#iR)aJxE9Ar zQj=TuWQad*0?S%M@14IpJ%3Y>#X2g1NqMM6tkR}dL^9Ay%sJl!*Q`iT+MV^%M|}Ls zm^W`aHgEUw)vu2Z{&;%y=*Oe4pB~+L>qy^7>1+b0= zx^xMhLgFs0!-ELu%9T09T0~2YKuPkJ=}W!cgPp`>4#i49IdcCqDWx}c9h^d zV`xnW?GHwf5?_Qn+MqG2IC~+U5PVt$D?v)Q@;ztJ$*xTY!;`HC6J(%^asGKx5=OZJ zAv(nILdqF)eezJKTz~eZQP23N8%Q7BKaRf60O91O{8;v?g+l587i-d?K_;_+)dlf?Qbp%iq{-)eW{xl4_4q>zRR2cdCfDROHZ)y;Gmy^6J_jhm#1c3a}&`SIP>+_iEx zQ*c2WM$^O!5mz*efPX~1K;T$mF{_Aj9-`k-Av{YF@d7CE^TjxC0;%luI?@gwd4DH9 z+EyJOX2)q8Jb&X0H^#@Lv9Mz&A3?mcj0;`Fa*K$Iy2eahEuuEw5y5IXn~t1Hf`fzG zCmj9!$?=yr2d>T@0Jn`ft!^2fC|tMwhY|j8HYmw(aPU(=h?SSFAh{L?^0%zUft{1< zaThjVMZU0Jtw8R+{`NlayPo~|>hWK%zj^%n=3Tc3JAc~0bNKmp|52Te9UP_Z$+7Q= z8rT@B3v#ufNh5#*KrDM_iI4HSZ{}t!oueVLuB<#9#Fp;rt>JR)n$d8O~t0XyBx$~*N0h9Ey$PLVa i@k;)+?4s%h003c=$+IK`;BjnOlku}31{Sjb0002|Kb|=N diff --git a/ipip.sh b/ipip.sh index a9c34b6..316898c 100755 --- a/ipip.sh +++ b/ipip.sh @@ -4,12 +4,17 @@ ip='{query}' result=$(curl -s https://www.ipip.net/ip.html -H "User-Agent: Safari/537.36" -H "Referer: https://www.ipip.net/" --data "ip=${ip}" --compressed) +# echo $ip +# echo "$result" + /bin/echo '' /bin/echo '' -address=`echo "$result" | grep '
' -A 1 |tail -n 1| sed "s/<\/span>//g" | sed "s/ //g"` -info=`echo "$result" |grep '' | sed -e 's/<[^>]*>//g' | sed "s/ //g" | sed "s/购买此数据//g" |sed "s/(.*)//g"` +address=`echo "$result" | grep '地理位置' -A 1 | head -n 2 |tail -n 1| sed -e 's/<[^>]*>//g' | sed "s/ //g"` + +info=`echo "$result" |grep 'IDC' |head -n 2|tail -n 1 | sed -e 's/<[^>]*>//g' | sed "s/ //g" |sed "s/(.*)//g"` + # echo $address # echo $info