Merge branch 'dev' into docker_package

This commit is contained in:
wangliwen 2022-07-28 19:01:03 +08:00
commit 648ce5ced7
1 changed files with 5 additions and 2 deletions

View File

@ -26,6 +26,7 @@ import org.apache.shiro.session.UnknownSessionException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -50,6 +51,8 @@ public class SysNoticeServiceImpl extends CrudServiceImpl<SysNoticeDao, SysNotic
private SysUserService sysUserService; private SysUserService sysUserService;
@Autowired @Autowired
private WebSocketServer webSocketServer; private WebSocketServer webSocketServer;
@Autowired
private JdbcTemplate jdbcTemplate;
@Override @Override
public QueryWrapper<SysNoticeEntity> getWrapper(Map<String, Object> params) { public QueryWrapper<SysNoticeEntity> getWrapper(Map<String, Object> params) {
@ -113,14 +116,14 @@ public class SysNoticeServiceImpl extends CrudServiceImpl<SysNoticeDao, SysNotic
try { try {
baseDao.insert(entity); baseDao.insert(entity);
} catch (UnknownSessionException unknownSessionException) { } catch (UnknownSessionException unknownSessionException) {
logger.info("发送站内信shiro异常 " + JSON.toJSONString(entity), unknownSessionException);
} }
//发送通知 //发送通知
dto.setId(entity.getId()); dto.setId(entity.getId());
sendNotice(dto); sendNotice(dto);
} catch (Exception exception) { } catch (Exception exception) {
logger.error("发送站内信异常" + JSON.toJSONString(entity), exception); logger.error("发送站内信异常 " + JSON.toJSONString(entity), exception);
} }
} }