From 2905c78f0099fdec9269ca2c97cbe9301efe5815 Mon Sep 17 00:00:00 2001
From: Li-GanMa <admin@ljxnet.cn>
Date: Sat, 11 Nov 2023 16:23:31 +0800
Subject: [PATCH] =?UTF-8?q?ip=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue               |  5 ++--
 src/components/IPinfo.vue | 59 +++++++++++++++++++++++++--------------
 src/components/Main.vue   |  6 ++--
 3 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4d63607..5e38166 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,9 +23,9 @@
       </div>
     </el-header>
     <el-main>
-      <MainUI :isVisible="isVisible" :IPinfo="IPinfo" />
+      <MainUI :isVisible="isVisible"/>
       <br>
-      <IPinfoUI :isVisible="isVisible" :IPinfo="IPinfo" />
+      <IPinfoUI :isVisible="isVisible"/>
     </el-main>
     <div style="height: fit-content;padding-bottom: 10px;">
       <div style="width: fit-content;margin-left: auto;margin-right: auto;">
@@ -49,7 +49,6 @@ import { ElMessage } from 'element-plus'
 import { toClipboard } from '@soerenmartius/vue3-clipboard'
 
 const isVisible = ref(true)
-const IPinfo = reactive({ globalInfo: null, localInfo: null })
 let GoToHomePage = () => {
   //window.open("https://netart.cn/")
   toClipboard('463481772')
diff --git a/src/components/IPinfo.vue b/src/components/IPinfo.vue
index 3b588f4..08aec6d 100644
--- a/src/components/IPinfo.vue
+++ b/src/components/IPinfo.vue
@@ -29,11 +29,10 @@
   
 <script lang="ts" setup>
 const props = defineProps({
-    isVisible: Boolean,
-    IPinfo: Object
+    isVisible: Boolean
 })
 import CountryCode from "../assets/CountryCode.json"
-import { reactive } from 'vue'
+import { reactive,watchEffect } from 'vue'
 import { ElMessage } from 'element-plus'
 import { toClipboard } from '@soerenmartius/vue3-clipboard'
 const info=reactive({
@@ -42,7 +41,10 @@ const info=reactive({
     localLay:0,
     globalLay:0,
 })
-
+const ip_cache=reactive(JSON.parse(localStorage.getItem("ip_cache")||"{}"))
+watchEffect(()=>{
+    localStorage.setItem("ip_cache",JSON.stringify(ip_cache))
+})
 const copy=(ip:string)=>{
     toClipboard(ip)
     ElMessage.success({
@@ -58,27 +60,45 @@ const provinceMatch=(str:string)=>{
 }
 
 async function getLocalIp() {
+    try {
+        const response = await  fetch('https://api.mir6.com/api/ip_json', { referrerPolicy: 'no-referrer' });
+        let resp = await response.json();
+        let localInfo:any={
+            ip:resp['data']['ip'],
+            isp:resp['data']['isp'],
+            isChinaMainland:provinceMatch(resp['data']['province'])?true:false,
+            province:provinceMatch(resp['data']['province']),
+            city:resp['data']['city'].replace(/市$/, ""),
+            area:resp['data']['districts'],
+        }
+        return localInfo
+    } catch (error) {
+        throw "获取本地IP失败"
+    }
+}
+
+async function cacheCtr(ip_addr:string){
+    let ret=ip_cache[ip_addr]
+    if(!ret || new Date().getTime()/1000-ret['time']>60*60*24*30){
+        ret=await getLocalIp()
+        ret['time']=new Date().getTime()/1000
+        ip_cache[ip_addr]=ret
+    }
+    return ret
+}
+
+async function watchLocalIp() {
     if(props.isVisible){
         try {
-            const response = await  fetch('https://pubstatic.b0.upaiyun.com/?_upnode', { referrerPolicy: 'no-referrer' });
+            const response = await  fetch('https://forge.speedtest.cn/api/location/info', { referrerPolicy: 'no-referrer' });
             let resp = await response.json();
-            let localInfo:any={
-                ip:resp['remote_addr'],
-                isp:resp['remote_addr_location']['isp'],
-                isChinaMainland:provinceMatch(resp['remote_addr_location']['province'])?true:false,
-                province:provinceMatch(resp['remote_addr_location']['province']),
-                city:resp['remote_addr_location']['city'].replace(/市$/, ""),
-                area:''
-            }
+            let localInfo:any=await cacheCtr(resp['ip'])
             info['localInfo']=localInfo
-            if(props.IPinfo){
-                props.IPinfo['localInfo']=localInfo
-            }
         } catch (error) {
             info['localInfo']=null
         }
     }
-    setTimeout(getLocalIp,info['localInfo']?5000:1000)
+    setTimeout(watchLocalIp,info['localInfo']?5000:1000)
 }
 async function getGlobalIp() {
     if(props.isVisible){
@@ -91,16 +111,13 @@ async function getGlobalIp() {
                 country:CountryCode[resp['country_code'] as keyof typeof CountryCode],
             }
             info['globalInfo']=globalInfo
-            if(props.IPinfo){
-                props.IPinfo['globalInfo']=globalInfo
-            }
         } catch (error) {
             info['globalInfo']=null
         }
     }
     setTimeout(getGlobalIp,  info['globalInfo']?5000:1000)
 }
-getLocalIp()
+watchLocalIp()
 getGlobalIp()
 async function get_lay(url:string,type:'localLay'|'globalLay') {
     if(props.isVisible){
diff --git a/src/components/Main.vue b/src/components/Main.vue
index bedf805..a17a188 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -234,8 +234,7 @@ import type { EChartsType } from "echarts";
 import iosSound from "../assets/ios.mp3";
 import andoridSound from "../assets/android.mp3";
 const props = defineProps({
-  isVisible: Boolean,
-  IPinfo: Object
+  isVisible: Boolean
 })
 import { ElMessage } from 'element-plus'
 import nodesJson from "../assets/nodes.json"
@@ -409,8 +408,7 @@ async function uploadLog() {
         url: runUrl.value,
         threadNum: threadNum.value,
         used: num,
-        time: time,
-        IPinfo: props.IPinfo
+        time: time
       })
     });
     resp = await resp.json()