forked from github/dataease
feat: 定时报告镜像测试
This commit is contained in:
parent
5fafcd610b
commit
12878873c3
20
Dockerfile
20
Dockerfile
@ -1,13 +1,19 @@
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
ADD simsun.ttc /usr/share/fonts/
|
||||
|
||||
RUN cd /usr/share/fonts/ \
|
||||
&& mkfontscale \
|
||||
&& mkfontdir \
|
||||
&& fc-cache -fv
|
||||
|
||||
ARG IMAGE_TAG
|
||||
|
||||
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
|
||||
|
||||
RUN apk add chromium=77.0.3865.120-r0 --no-cache
|
||||
|
||||
RUN apk add chromium-chromedriver=77.0.3865.120-r0 --no-cache
|
||||
|
||||
RUN mkdir -p /opt/apps
|
||||
|
||||
RUN mkdir -p /opt/dataease/data/feature/full
|
||||
|
@ -203,7 +203,7 @@ public class EmailService {
|
||||
props.put("mail.smtp.starttls.enable", "true");
|
||||
}
|
||||
props.put("mail.smtp.timeout", "30000");
|
||||
props.put("mail.smtp.connectiontimeout", "5000");
|
||||
props.put("mail.smtp.connectiontimeout", "10000");
|
||||
javaMailSender.setJavaMailProperties(props);
|
||||
try {
|
||||
javaMailSender.testConnection();
|
||||
@ -221,7 +221,7 @@ public class EmailService {
|
||||
helper.setText("这是一封测试邮件,邮件发送成功", true);
|
||||
helper.setTo(recipients);
|
||||
javaMailSender.send(mimeMessage);
|
||||
} catch (MessagingException e) {
|
||||
} catch (Exception e) {
|
||||
LogUtil.error(e.getMessage(), e);
|
||||
DEException.throwException(Translator.get("connection_failed"));
|
||||
}
|
||||
|
@ -75,7 +75,6 @@ router.beforeEach(async(to, from, next) => {
|
||||
export const loadMenus = (next, to) => {
|
||||
buildMenus().then(res => {
|
||||
const datas = res.data
|
||||
disableSomeMenu(datas)
|
||||
const filterDatas = filterRouter(datas)
|
||||
const asyncRouter = filterAsyncRouter(filterDatas)
|
||||
asyncRouter.push({ path: '*', redirect: '/404', hidden: true })
|
||||
@ -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是否有效
|
||||
|
BIN
simsun.ttc
Normal file
BIN
simsun.ttc
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user