Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
b5cc991f
Commit
b5cc991f
authored
Apr 29, 2022
by
zhu-mingye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix wechat webhook sendMsg
parent
7af982dd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
AlertInstance.java
dlink-admin/src/main/java/com/dlink/model/AlertInstance.java
+2
-0
WeChatSender.java
...at/src/main/java/com/dlink/alert/wechat/WeChatSender.java
+1
-1
WeChatForm.tsx
dlink-web/src/pages/AlertInstance/components/WeChatForm.tsx
+0
-7
No files found.
dlink-admin/src/main/java/com/dlink/model/AlertInstance.java
View file @
b5cc991f
...
@@ -19,5 +19,7 @@ public class AlertInstance extends SuperEntity {
...
@@ -19,5 +19,7 @@ public class AlertInstance extends SuperEntity {
private
String
type
;
private
String
type
;
private
String
name
;
private
String
params
;
private
String
params
;
}
}
dlink-alert/dlink-alert-wechat/src/main/java/com/dlink/alert/wechat/WeChatSender.java
View file @
b5cc991f
...
@@ -81,7 +81,7 @@ public class WeChatSender {
...
@@ -81,7 +81,7 @@ public class WeChatSender {
String
data
=
""
;
String
data
=
""
;
if
(
sendType
.
equals
(
WeChatType
.
CHAT
.
getValue
()))
{
if
(
sendType
.
equals
(
WeChatType
.
CHAT
.
getValue
()))
{
data
=
markdownByAlert
(
KeyWord
,
content
,
userList
);;
data
=
markdownByAlert
(
title
,
content
,
userList
);;
}
else
{
}
else
{
data
=
markdownByAlert
(
title
,
content
,
userList
);
data
=
markdownByAlert
(
title
,
content
,
userList
);
}
}
...
...
dlink-web/src/pages/AlertInstance/components/WeChatForm.tsx
View file @
b5cc991f
...
@@ -127,13 +127,6 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => {
...
@@ -127,13 +127,6 @@ const WeChatForm: React.FC<AlertInstanceFormProps> = (props) => {
>
>
<
Input
placeholder=
"请输入用户"
/>
<
Input
placeholder=
"请输入用户"
/>
</
Form
.
Item
>
</
Form
.
Item
>
<
Form
.
Item
name=
"userSendMsg"
label=
"发送信息"
rules=
{
[{
required
:
true
,
message
:
'请输入发送信息!'
}]
}
>
<
Input
defaultValue=
'
{
"touser"
:
"{toUser}"
,
"agentid"
:{
agentId
},
"msgtype"
:
"{showType}"
,
"{showType}"
:{
"content"
:
"{msg}"
}
}
'
disabled
placeholder=
"请输入发送信息"
/>
</
Form
.
Item
>
<
Form
.
Item
<
Form
.
Item
name=
"agentId"
name=
"agentId"
label=
"代理ID"
label=
"代理ID"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment