Commit c62e60bd by HlQ

feat: 推送发货记录钉钉消息添加日志打印

fix: 修复获取内网IP真实地址异常的问题
1 parent df422a00
...@@ -184,6 +184,7 @@ public class DeliveryRecordServiceImpl extends MPJBaseServiceImpl<DeliveryRecord ...@@ -184,6 +184,7 @@ public class DeliveryRecordServiceImpl extends MPJBaseServiceImpl<DeliveryRecord
msg.put("msgtype", "action_card").set("action_card", content); msg.put("msgtype", "action_card").set("action_card", content);
jsonNode.set("msg", msg); jsonNode.set("msg", msg);
log.info("发货钉钉消息推送信息:合同编号:{},名称:{},接收人:{}", contract.getContractNo(), contract.getName(), userid);
return jsonNode.toString(); return jsonNode.toString();
} }
......
...@@ -5,6 +5,7 @@ import com.maxmind.geoip2.DatabaseReader; ...@@ -5,6 +5,7 @@ import com.maxmind.geoip2.DatabaseReader;
import com.maxmind.geoip2.record.AbstractNamedRecord; import com.maxmind.geoip2.record.AbstractNamedRecord;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.hutool.core.io.file.FileUtil; import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.net.Ipv4Util;
import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.text.StrUtil;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -179,6 +180,9 @@ public class IPUtil { ...@@ -179,6 +180,9 @@ public class IPUtil {
private static String cityPath; private static String cityPath;
public static String getAddr(String ip) { public static String getAddr(String ip) {
if (Ipv4Util.isInnerIP(ip)) {
return "Country:%s, Province:%s, City:%s, ASN:%s".formatted("内网IP", "内网IP", "内网IP", "内网IP");
}
var cityDB = FileUtil.file(cityPath); var cityDB = FileUtil.file(cityPath);
var asnDB = FileUtil.file(asnPath); var asnDB = FileUtil.file(asnPath);
try (DatabaseReader cityReader = new DatabaseReader.Builder(cityDB) try (DatabaseReader cityReader = new DatabaseReader.Builder(cityDB)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!