diff --git a/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml b/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml index e1ae7f9..2554a13 100644 --- a/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml +++ b/src/main/java/com/dd/admin/business/note/mapper/xml/NoteMapper.xml @@ -198,7 +198,7 @@ n.note_id, n.note_title, n.follow_id, - a.author_name, + a.author_name followName, a.AVATAR_URL, n.create_time, b.FIRST_PICTURE, CASE diff --git a/src/main/java/com/dd/admin/business/operationLog/mapper/xml/OperationLogMapper.xml b/src/main/java/com/dd/admin/business/operationLog/mapper/xml/OperationLogMapper.xml index 8ca6e9f..e39dfcd 100644 --- a/src/main/java/com/dd/admin/business/operationLog/mapper/xml/OperationLogMapper.xml +++ b/src/main/java/com/dd/admin/business/operationLog/mapper/xml/OperationLogMapper.xml @@ -29,7 +29,7 @@ diff --git a/src/main/java/com/dd/admin/common/utils/AddressUtils.java b/src/main/java/com/dd/admin/common/utils/AddressUtils.java index e89698e..f2c77bc 100644 --- a/src/main/java/com/dd/admin/common/utils/AddressUtils.java +++ b/src/main/java/com/dd/admin/common/utils/AddressUtils.java @@ -25,10 +25,13 @@ public class AddressUtils { String rspStr = RegionUtil.getRegion(ip); if (StringUtils.isNotEmpty(rspStr)) { String[] obj = rspStr.split("\\|"); + String country = obj[0]; String region = obj[2]; String city = obj[3]; if("0".equals(city)){ return String.format("%s", region); + } if("0".equals(region)){ + return String.format("%s", country); } return String.format("%s", city); } @@ -75,7 +78,7 @@ public class AddressUtils { public static void main(String[] args) { - String realAddress = getRealAddress("103.85.74.92"); + String realAddress = getRealAddress("23.142.200.80"); ; System.out.println("realAddress = " + realAddress); } diff --git a/src/main/java/com/dd/admin/common/utils/PureNetUtils.java b/src/main/java/com/dd/admin/common/utils/PureNetUtils.java index 1f4bb2a..c432ffe 100644 --- a/src/main/java/com/dd/admin/common/utils/PureNetUtils.java +++ b/src/main/java/com/dd/admin/common/utils/PureNetUtils.java @@ -2,7 +2,6 @@ package com.dd.admin.common.utils; import com.alibaba.fastjson.JSONObject; -import com.sun.javaws.Main; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/web/src/views/login/login.vue b/web/src/views/login/login.vue index b9521ab..70833f2 100644 --- a/web/src/views/login/login.vue +++ b/web/src/views/login/login.vue @@ -211,7 +211,8 @@ - 移动端登陆 http://8.146.211.120:8081/ + 移动端登陆 http://8.146.211.120:8081/

+ gitee https://gitee.com/ddeatrr/springboot_vue_xhs