Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2998baef
authored
Oct 19, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix: logback
parent
3d8cbf07
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
server-common/src/main/java/com/makeit/utils/msg/MsgSendUtil.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-web/src/main/java/com/makeit/mqtt/PushCallback.java
server-web/src/main/resources/logback-spring.xml
server-common/src/main/java/com/makeit/utils/msg/MsgSendUtil.java
View file @
2998baef
package
com
.
makeit
.
utils
.
msg
;
import
com.alibaba.fastjson.JSON
;
import
com.makeit.utils.msg.dto.MsgSendDTO
;
import
com.makeit.utils.msg.sender.IMsgSender
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
@Component
@Slf4j
public
class
MsgSendUtil
{
@Autowired
private
List
<
IMsgSender
>
msgSenderList
;
...
...
@@ -19,6 +22,7 @@ public class MsgSendUtil {
public
void
send
(
MsgSendDTO
msgSendDTO
){
for
(
IMsgSender
msgSender
:
msgSenderList
)
{
if
(
msgSender
.
support
(
msgSendDTO
.
getSendTypeEnum
())){
log
.
info
(
"开始发送告警信息:{}"
,
JSON
.
toJSONString
(
msgSendDTO
));
msgSender
.
send
(
msgSendDTO
);
}
}
...
...
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
2998baef
package
com
.
makeit
.
service
.
platform
.
alarm
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
...
...
@@ -316,6 +317,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
* @param notifyChannelList 通知渠道
*/
private
void
noticeByChannel
(
PlatAlarmConfig
alarmConfig
,
PlatAlarmRecord
alarmRecord
,
Set
<
String
>
phoneSet
,
Set
<
String
>
emailSet
,
List
<
SendTypeEnum
>
notifyChannelList
)
{
log
.
info
(
"开始短信通知:{}"
,
JSON
.
toJSONString
(
alarmConfig
));
String
notifyChannel
=
alarmConfig
.
getNotifyChannel
();
if
(
StringUtils
.
isEmpty
(
notifyChannel
)){
return
;
...
...
server-web/src/main/java/com/makeit/mqtt/PushCallback.java
View file @
2998baef
...
...
@@ -80,7 +80,7 @@ public class PushCallback implements MqttCallback {
// 收到消息并设置返回字符串格式
String
payload
=
new
String
(
message
.
getPayload
(),
"UTF-8"
);
logger
.
info
(
"接收消息主题:{}, 接收消息QoS:{}"
,
topic
,
message
.
getQos
());
//
logger.info("接收消息主题:{}, 接收消息QoS:{}", topic, message.getQos());
logger
.
info
(
"接收消息内容:payload格式:{}"
,
payload
);
// 解析数据
...
...
server-web/src/main/resources/logback-spring.xml
View file @
2998baef
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<property
name=
"logback.logdir"
value=
"/
home/group1_lzy/iot-plaf
form-server/logs"
/>
<property
name=
"logback.logdir"
value=
"/
opt/iot-plat
form-server/logs"
/>
<property
name=
"logback.appname"
value=
"app"
/>
<property
name=
"pattern"
...
...
@@ -116,12 +116,16 @@
</encoder>
</appender>
<springProfile
name=
"dev
,dev2
"
>
<springProfile
name=
"dev"
>
<root
level=
"INFO"
>
<appender-ref
ref=
"CONSOLE"
/>
<appender-ref
ref=
"FILEINFOLOG"
/>
<appender-ref
ref=
"FILEERRORLOG"
/>
<appender-ref
ref=
"FILEWARNLOG"
/>
</root>
<logger
name=
"com.makeit"
level=
"INFO"
additivity=
"false"
>
<appender-ref
ref=
"CONSOLE"
/>
<logger
name=
"com.makeit"
level=
"DEBUG"
additivity=
"false"
>
<appender-ref
ref=
"FILEINFOLOG"
/>
<appender-ref
ref=
"FILEERRORLOG"
/>
<appender-ref
ref=
"FILEWARNLOG"
/>
</logger>
</springProfile>
...
...
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