From 5b3ecac1f5721ead9d70b2c646a9d32073fc309f Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Mon, 30 Sep 2019 22:34:16 +0800
Subject: [PATCH] luci-app-ssr-plus-jsda: fix ip checking

---
 .../luasrc/view/shadowsocksr/ip_info.htm      | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/ip_info.htm b/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/ip_info.htm
index 6dc3818223..9b27f49abd 100644
--- a/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/ip_info.htm
+++ b/package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/ip_info.htm
@@ -2,13 +2,13 @@
 	<meta charset="utf-8">
 	<meta http-equiv="x-dns-prefetch-control" content="on">
 	<link rel="dns-prefetch" href="//cdn.jsdelivr.net">
-	<link rel="dns-prefetch" href="//ipv4.ip.sb">
+	<link rel="dns-prefetch" href="//api.ipify.org">
 	<link rel="dns-prefetch" href="//myip.ipip.net">
 	<link rel="dns-prefetch" href="//api.ipify.org">
 	<link rel="dns-prefetch" href="//api.ttt.sh">
 	<link rel="dns-prefetch" href="//api.skk.moe">
 	<link rel="dns-prefetch" href="//dt.skk.moe">
-	<link rel="preconnect" href="https://ipv4.ip.sb">
+	<link rel="preconnect" href="https://api.ipify.org">
 	<link rel="preconnect" href="https://myip.ipip.net">
 	<script src="https://pv.sohu.com/cityjson?ie=utf-8"></script>
 	<link rel="preconnect" href="https://api.ipify.org">
@@ -128,7 +128,7 @@
 				<span class="ip-title">搜狐&nbsp;&nbsp;&nbsp;&nbsp;国内:</span><span class="ip-result" id="ip-sohu"></span> <span class="ip-geo" id="ip-sohu-ipip"></span>
 			</p>
 			<p>
-				<span class="ip-title">IP.SB&nbsp;&nbsp;海外:</span><span class="ip-result" id="ip-ipsb"></span> <span class="ip-geo" id="ip-ipsb-geo"></span>
+				<span class="ip-title">Ipify&nbsp;&nbsp;海外:</span><span class="ip-result" id="ip-ipify"></span> <span class="ip-geo" id="ip-ipify-geo"></span>
 			</p>
 			<p>
 				<span class="ip-title">IPAPI&nbsp;&nbsp;海外:</span><span class="ip-result" id="ip-ipapi"></span> <span class="ip-geo" id="ip-ipapi-geo"></span>
@@ -166,7 +166,7 @@
 		$$.getElementById('ip-sohu').innerHTML = '查询中...';
 		$$.getElementById('ip-ipapi').innerHTML = '查询中...';
 		$$.getElementById('ip-ipipnet').innerHTML = '查询中...';
-		$$.getElementById('ip-ipsb').innerHTML = '查询中...';
+		$$.getElementById('ip-ipify').innerHTML = '查询中...';
 		let random = parseInt(Math.random() * 100000000);
 		let IP = {
 			get: (url, type) =>
@@ -210,20 +210,25 @@
 						$$.getElementById('ip-ipipnet-geo').innerHTML = `${data[1]}`;
 					});
 			},
-			getSohuIP: (data) => {
-				$$.getElementById('ip-sohu').innerHTML = returnCitySN.cip;
-				IP.parseIPIpip(returnCitySN.cip, 'ip-sohu-ipip');
-			},
-			getIpsbIP: (data) => {
-				$$.getElementById('ip-ipsb').innerHTML = data.address;
-				$$.getElementById('ip-ipsb-geo').innerHTML = `${data.country} ${data.province} ${data.city} ${data.isp.name}`
-			},
-			getIPApiIP: () => {
-				IP.get(`https://ipapi.co/json?z=${random}`, 'json')
-					.then(resp => {
-						$$.getElementById('ip-ipapi').innerHTML = resp.data.ip;
-						IP.parseIPIpip(resp.data.ip, 'ip-ipapi-geo');
-					})
+            getSohuIP: (data) => {
+                $$.getElementById('ip-sohu').innerHTML = returnCitySN.cip;
+                IP.parseIPIpip(returnCitySN.cip, 'ip-sohu-ipip');
+            },
+            getIpifyIP: () => {
+                IP.get(`https://api.ipify.org/?format=json&z=${random}`, 'json')
+                    .then((resp) => {
+                        $$.getElementById('ip-ipify').innerHTML = resp.data.ip;
+                        return resp.data.ip
+                    }).then((ip) => {
+                        IP.parseIPIpip(ip, 'ip-ipify-geo');
+                    })
+            },
+            getIPApiIP: () => {
+                IP.get(`https://ipapi.co/json?z=${random}`, 'json')
+                    .then(resp => {
+                        $$.getElementById('ip-ipapi').innerHTML = resp.data.ip;
+                        IP.parseIPIpip(resp.data.ip, 'ip-ipapi-geo');
+                    })
 			}
 		};
 
@@ -271,10 +276,11 @@
 
 			 const $$ = document;
 			 random = parseInt(Math.random() * 100000000);
-			 window.ipCallback = (data) => IP.getTaobaoIP(data);
+			 window.ipCallback = (data) => IP.getIpipnetIP(data);;
 			   IP.getIpipnetIP();
 			   IP.getSohuIP();
 			   IP.getIPApiIP();
+			   IP.getIpifyIP();
 			   HTTP.runcheck();
 	   	   setTimeout("myip_Load()",1000*8);
 		   }