修改获取登录 ip 和 ip 地址方式

back/config/util.ts

@@ -94,29 +94,31 @@ export async function getNetIp(req: any) {
   }
 
   try {
-    const baiduApi = got
-      .get(`https://www.cip.cc/${ip}`, { timeout: 10000, retry: 0 })
+    const csdnApi = got
+      .get(`https://searchplugin.csdn.net/api/v1/ip/get?ip=${ip}`, {
+        timeout: 10000,
+        retry: 0,
+      })
       .text();
-    const ipApi = got
+    const pconlineApi = got
       .get(`https://whois.pconline.com.cn/ipJson.jsp?ip=${ip}&json=true`, {
         timeout: 10000,
         retry: 0,
       })
       .buffer();
-    const [data, ipApiBody] = await await Promise.all<any>([baiduApi, ipApi]);
-
-    const ipRegx = /.*IP	:(.*)\n/;
-    const addrRegx = /.*数据二	:(.*)\n/;
-    if (data && ipRegx.test(data) && addrRegx.test(data)) {
-      const ip = data.match(ipRegx)[1];
-      const addr = data.match(addrRegx)[1];
-      return { address: addr, ip };
-    } else if (ipApiBody) {
-      const { addr, ip } = JSON.parse(iconv.decode(ipApiBody, 'GBK'));
-      return { address: `${addr}`, ip };
-    } else {
-      return { address: `获取失败`, ip };
+    const [csdnBody, pconlineBody] = await await Promise.all<any>([
+      csdnApi,
+      pconlineApi,
+    ]);
+    const csdnRes = JSON.parse(csdnBody);
+    const pconlineRes = JSON.parse(iconv.decode(pconlineBody, 'GBK'));
+    let address = '';
+    if (csdnBody && csdnRes.code == 200) {
+      address = csdnRes.data.address;
+    } else if (pconlineRes && pconlineRes.addr) {
+      address = pconlineRes.addr;
     }
+    return { address, ip };
   } catch (error) {
     return { address: `获取失败`, ip };
   }

back/services/user.ts

@@ -24,6 +24,9 @@ import { Request } from 'express';
 import ScheduleService from './schedule';
 import SockService from './sock';
 import dayjs from 'dayjs';
+import IP2Region from 'ip2region';
+import requestIp from 'request-ip';
+import uniq from 'lodash/uniq';
 
 @Service()
 export default class UserService {
@@ -103,7 +106,16 @@ export default class UserService {
         };
       }
 
-      const { ip, address } = await getNetIp(req);
+      const ip = requestIp.getClientIp(req) || '';
+      const query = new IP2Region();
+      const ipAddress = query.search(ip);
+      let address = '';
+      if (ipAddress) {
+        const { country, province, city, isp } = ipAddress;
+        address = uniq([country, province, city, isp])
+          .filter(Boolean)
+          .join(' ');
+      }
       if (username === cUsername && password === cPassword) {
         const data = createRandomString(50, 100);
         const expiration = twoFactorActivated ? 60 : 20;
@@ -125,13 +137,12 @@ export default class UserService {
           platform: req.platform,
           isTwoFactorChecking: false,
         });
-        await this.notificationService.notify(
+        this.notificationService.notify(
           '登录通知',
           `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
             req.platform
           }端 登录成功，ip地址 ${ip}`,
         );
-        await this.getLoginLog();
         await this.insertDb({
           type: AuthDataType.loginLog,
           info: {
@@ -154,13 +165,12 @@ export default class UserService {
           lastaddr: address,
           platform: req.platform,
         });
-        await this.notificationService.notify(
+        this.notificationService.notify(
           '登录通知',
           `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
             req.platform
           }端 登录失败，ip地址 ${ip}`,
         );
-        await this.getLoginLog();
         await this.insertDb({
           type: AuthDataType.loginLog,
           info: {

package.json

@@ -97,7 +97,9 @@
     "winston": "^3.6.0",
     "winston-daily-rotate-file": "^4.7.1",
     "yargs": "^17.3.1",
-    "tough-cookie": "^4.0.0"
+    "tough-cookie": "^4.0.0",
+    "request-ip": "3.3.0",
+    "ip2region": "2.3.0"
   },
   "devDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -128,6 +130,7 @@
     "@types/sockjs-client": "^1.5.1",
     "@types/tar": "^6.1.5",
     "@types/uuid": "^8.3.4",
+    "@types/request-ip": "0.0.41",
     "@uiw/codemirror-extensions-langs": "^4.21.9",
     "@uiw/react-codemirror": "^4.21.9",
     "@umijs/max": "^4.0.72",

pnpm-lock.yaml

@@ -61,6 +61,9 @@ dependencies:
   iconv-lite:
     specifier: ^0.6.3
     version: 0.6.3
+  ip2region:
+    specifier: 2.3.0
+    version: 2.3.0(@types/node@17.0.45)
   js-yaml:
     specifier: ^4.1.0
     version: 4.1.0
@@ -94,6 +97,9 @@ dependencies:
   reflect-metadata:
     specifier: ^0.1.13
     version: 0.1.13
+  request-ip:
+    specifier: 3.3.0
+    version: 3.3.0
   sequelize:
     specifier: ^6.25.5
     version: 6.32.0(@whyour/sqlite3@1.0.4)
@@ -201,6 +207,9 @@ devDependencies:
   '@types/react-dom':
     specifier: ^18.0.6
     version: 18.2.4
+  '@types/request-ip':
+    specifier: 0.0.41
+    version: 0.0.41
   '@types/serve-handler':
     specifier: ^6.1.1
     version: 6.1.1
@@ -5053,6 +5062,12 @@ packages:
       csstype: 3.1.2
     dev: true
 
+  /@types/request-ip@0.0.41:
+    resolution: {integrity: sha512-Qzz0PM2nSZej4lsLzzNfADIORZhhxO7PED0fXpg4FjXiHuJ/lMyUg+YFF5q8x9HPZH3Gl6N+NOM8QZjItNgGKg==}
+    dependencies:
+      '@types/node': 17.0.45
+    dev: true
+
   /@types/responselike@1.0.0:
     resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
     dependencies:
@@ -9829,6 +9844,14 @@ packages:
       loose-envify: 1.4.0
     dev: true
 
+  /ip2region@2.3.0(@types/node@17.0.45):
+    resolution: {integrity: sha512-zV5Xsadzrx9Ej6heoyhbXMsfGWWQ3C6bAIYStrHhw9kzLpGpVNlnAyRBxxPgxA1GNqr1Ti7oUxcWsMWNN3jZBg==}
+    peerDependencies:
+      '@types/node': '*'
+    dependencies:
+      '@types/node': 17.0.45
+    dev: false
+
   /ip@1.1.8:
     resolution: {integrity: sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==}
     dev: true
@@ -14211,6 +14234,10 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
+  /request-ip@3.3.0:
+    resolution: {integrity: sha512-cA6Xh6e0fDBBBwH77SLJaJPBmD3nWVAcF9/XAcsrIHdjhFzFiB5aNQFytdjCGPezU3ROwrR11IddKAM08vohxA==}
+    dev: false
+
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}