提交 12878873 authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw

feat: 定时报告镜像测试

上级 5fafcd61
FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre #FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre
FROM alpine
ARG IMAGE_TAG RUN echo -e 'http://mirrors.aliyun.com/alpine/v3.15/main/\nhttp://mirrors.aliyun.com/alpine/v3.15/community/' > /etc/apk/repositories
RUN apk add openjdk8 chromium chromium-chromedriver fontconfig --no-cache --allow-untrusted
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories ADD simsun.ttc /usr/share/fonts/
RUN apk add chromium=77.0.3865.120-r0 --no-cache RUN cd /usr/share/fonts/ \
&& mkfontscale \
&& mkfontdir \
&& fc-cache -fv
RUN apk add chromium-chromedriver=77.0.3865.120-r0 --no-cache ARG IMAGE_TAG
RUN mkdir -p /opt/apps RUN mkdir -p /opt/apps
......
...@@ -203,7 +203,7 @@ public class EmailService { ...@@ -203,7 +203,7 @@ public class EmailService {
props.put("mail.smtp.starttls.enable", "true"); props.put("mail.smtp.starttls.enable", "true");
} }
props.put("mail.smtp.timeout", "30000"); props.put("mail.smtp.timeout", "30000");
props.put("mail.smtp.connectiontimeout", "5000"); props.put("mail.smtp.connectiontimeout", "10000");
javaMailSender.setJavaMailProperties(props); javaMailSender.setJavaMailProperties(props);
try { try {
javaMailSender.testConnection(); javaMailSender.testConnection();
...@@ -221,7 +221,7 @@ public class EmailService { ...@@ -221,7 +221,7 @@ public class EmailService {
helper.setText("这是一封测试邮件,邮件发送成功", true); helper.setText("这是一封测试邮件,邮件发送成功", true);
helper.setTo(recipients); helper.setTo(recipients);
javaMailSender.send(mimeMessage); javaMailSender.send(mimeMessage);
} catch (MessagingException e) { } catch (Exception e) {
LogUtil.error(e.getMessage(), e); LogUtil.error(e.getMessage(), e);
DEException.throwException(Translator.get("connection_failed")); DEException.throwException(Translator.get("connection_failed"));
} }
......
...@@ -75,7 +75,6 @@ router.beforeEach(async(to, from, next) => { ...@@ -75,7 +75,6 @@ router.beforeEach(async(to, from, next) => {
export const loadMenus = (next, to) => { export const loadMenus = (next, to) => {
buildMenus().then(res => { buildMenus().then(res => {
const datas = res.data const datas = res.data
disableSomeMenu(datas)
const filterDatas = filterRouter(datas) const filterDatas = filterRouter(datas)
const asyncRouter = filterAsyncRouter(filterDatas) const asyncRouter = filterAsyncRouter(filterDatas)
asyncRouter.push({ path: '*', redirect: '/404', hidden: true }) asyncRouter.push({ path: '*', redirect: '/404', hidden: true })
...@@ -89,17 +88,6 @@ export const loadMenus = (next, to) => { ...@@ -89,17 +88,6 @@ export const loadMenus = (next, to) => {
}) })
}) })
} }
const disableSomeMenu = datas => {
datas.forEach(menu => {
if (menu.name === 'system') {
menu.children.forEach(item => {
if (item.name === 'sys-task') {
item.children = [item.children[0]]
}
})
}
})
}
/** /**
* 验证path是否有效 * 验证path是否有效
......
File added
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论