Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
李苗
/
Vion-DevOps
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit c62e60bd
authored
Jan 21, 2026
by
HlQ
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
feat: 推送发货记录钉钉消息添加日志打印
fix: 修复获取内网IP真实地址异常的问题
1 parent
df422a00
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
src/main/java/vion/service/impl/DeliveryRecordServiceImpl.java
src/main/java/vion/utils/ip/IPUtil.java
src/main/java/vion/service/impl/DeliveryRecordServiceImpl.java
View file @
c62e60b
...
@@ -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
();
}
}
...
...
src/main/java/vion/utils/ip/IPUtil.java
View file @
c62e60b
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment