Skip to content

埋点修复统计分析定时任务问题 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuyuleilei wants to merge 1 commit into
base: master-latest
Choose a base branch
from
Open

埋点修复统计分析定时任务问题 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion event/controllers/controllers.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion event/modules/models.js
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 17 additions & 11 deletions event/routes/timer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = async (serverType = "master") => {
const startTime = new Date().getTime();
let count = 0;
const fixed = async () => {
count++;
count ++;
const tempDate = new Date()
const tempTime = new Date().getTime()
const wrongTime = startTime + count * 1000
Expand All @@ -30,23 +30,29 @@ module.exports = async (serverType = "master") => {
// 只有master服务才会执行计算服务
if (serverType === "master") {
try {
// 每天的0点，定时执行生成每天的表
if (hourTimeStr == "00:00:01") {
SdkReleaseController.timerCreateTableByDay().catch((e) => {
// 每天的0点05分，定时执行生成今天的表
if (hourTimeStr == "00:05:01") {
SdkReleaseController.timerCreateTableByDay(0).catch((e)=>{
log.printError(e)
});
});
}
//每天凌晨0点10分开始跑定时执行计算规则
if (hourTimeStr === '00:10:00') {
// 每天的23:55点，定时执行生成明天的表
if (hourTimeStr == "23:55:01") {
SdkReleaseController.timerCreateTableByDay(1).catch((e)=>{
log.printError(e)
});
}
//每天凌晨0点10分开始分析昨天的执行计算规则
if (hourTimeStr === '00:10:00'){
TimerStatisticController.calculateDataPreDay('', -1);
}
// 凌晨2点30开始删除过期的数据库表
if (hourTimeStr == "02:30:00") {
Common.startDelete()
}
// 每小时的16分，开始统计今天的数据
// 每小时的46分，开始统计今天的数据
let isOpenTodayStatistic = accountInfo.isOpenTodayStatistic
if (isOpenTodayStatistic && minuteTimeStr == "16:00") {
if (isOpenTodayStatistic && minuteTimeStr == "46:00") {
TimerStatisticController.calculateDataPreDay('', 0);
}
// 每隔1分钟，取出全局变量global.eventInfo.logCountInMinute的值，并清0
Expand All @@ -57,11 +63,11 @@ module.exports = async (serverType = "master") => {
global.eventInfo.logCountInMinuteList.shift()
}
}
} catch (e) {
} catch(e) {
log.printError("定时器执行报错：", e)
}
setTimeout(fixed, nextTime);
}
setTimeout(fixed, nextTime);
}
setTimeout(fixed, 1000);
}, 6000);
Expand Down
4 changes: 1 addition & 3 deletions event/util/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,9 +574,7 @@ const Utils = {
"wecustomerkey","weuserid","createdat"]
const fieldNameConvert = JSON.stringify(fieldName).toLowerCase()
fieldParams.forEach((item) => {
if (fieldNameConvert.indexOf(item) !== -1) {
goOnFlag = false
} else if (fieldNameConvert.indexOf(item) !== -1) {
if (fieldNameConvert === item) {
goOnFlag = false
}
})
Expand Down
4 changes: 2 additions & 2 deletions .../resource/common.9717214baeea113df34f.css → .../resource/common.5384c030d4c21b626b14.css
View file
Open in desktop

Large diffs are not rendered by default.

0 ...ce/createProject.9717214baeea113df34f.css → ...ce/createProject.5384c030d4c21b626b14.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions event/views/resource/createProject.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

flex(100, 1);
</script>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././createProject.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././createProject.5384c030d4c21b626b14.css" rel="stylesheet"></head>

<body>
<div id="app">
Expand All @@ -61,6 +61,6 @@
<div class="wen-li"></div>
</div>
</div>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/createProject.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/createProject.5384c030d4c21b626b14.min.js"></script></body>

</html>
0 ...esource/dataView.9717214baeea113df34f.css → ...esource/dataView.5384c030d4c21b626b14.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions event/views/resource/dataView.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

flex(100, 1);
</script>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././dataView.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././dataView.5384c030d4c21b626b14.css" rel="stylesheet"></head>

<body>
<div id="app">
Expand All @@ -61,6 +61,6 @@
<div class="wen-li"></div>
</div>
</div>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/dataView.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/dataView.5384c030d4c21b626b14.min.js"></script></body>

</html>
0 ...rce/eventFactory.9717214baeea113df34f.css → ...rce/eventFactory.5384c030d4c21b626b14.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions event/views/resource/eventFactory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

flex(100, 1);
</script>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././eventFactory.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././eventFactory.5384c030d4c21b626b14.css" rel="stylesheet"></head>

<body>
<div id="app">
Expand All @@ -61,6 +61,6 @@
<div class="wen-li"></div>
</div>
</div>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/eventFactory.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/eventFactory.5384c030d4c21b626b14.min.js"></script></body>

</html>
0 ...urce/eventFields.9717214baeea113df34f.css → ...urce/eventFields.5384c030d4c21b626b14.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions event/views/resource/eventFields.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

flex(100, 1);
</script>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././eventFields.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././eventFields.5384c030d4c21b626b14.css" rel="stylesheet"></head>

<body>
<div id="app">
Expand All @@ -61,6 +61,6 @@
<div class="wen-li"></div>
</div>
</div>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/eventFields.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/eventFields.5384c030d4c21b626b14.min.js"></script></body>

</html>
0 ...source/eventTest.9717214baeea113df34f.css → ...source/eventTest.5384c030d4c21b626b14.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions event/views/resource/eventTest.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

flex(100, 1);
</script>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././eventTest.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././eventTest.5384c030d4c21b626b14.css" rel="stylesheet"></head>

<body>
<div id="app">
Expand All @@ -61,6 +61,6 @@
<div class="wen-li"></div>
</div>
</div>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/eventTest.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/eventTest.5384c030d4c21b626b14.min.js"></script></body>

</html>
4 changes: 2 additions & 2 deletions event/views/resource/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Webpack App</title>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././createProject.9717214baeea113df34f.css" rel="stylesheet"><link href="././dataView.9717214baeea113df34f.css" rel="stylesheet"><link href="././eventFactory.9717214baeea113df34f.css" rel="stylesheet"><link href="././eventFields.9717214baeea113df34f.css" rel="stylesheet"><link href="././eventTest.9717214baeea113df34f.css" rel="stylesheet"><link href="././resetPwd.9717214baeea113df34f.css" rel="stylesheet"><link href="././sdkPublish.9717214baeea113df34f.css" rel="stylesheet"><link href="././setting.9717214baeea113df34f.css" rel="stylesheet"><link href="././updatePurchaseCode.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././createProject.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././dataView.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././eventFactory.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././eventFields.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././eventTest.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././resetPwd.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././sdkPublish.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././setting.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././updatePurchaseCode.5384c030d4c21b626b14.css" rel="stylesheet"></head>
<body>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/createProject.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/dataView.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/eventFactory.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/eventFields.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/eventTest.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/resetPwd.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/sdkPublish.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/setting.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/updatePurchaseCode.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/createProject.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/dataView.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/eventFactory.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/eventFields.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/eventTest.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/resetPwd.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/sdkPublish.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/setting.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/updatePurchaseCode.5384c030d4c21b626b14.min.js"></script></body>
</html>
2 changes: 1 addition & 1 deletion ...rce/js/common.9717214baeea113df34f.min.js → ...rce/js/common.5384c030d4c21b626b14.min.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...createProject.9717214baeea113df34f.min.js → ...createProject.5384c030d4c21b626b14.min.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/js/dataView.9717214baeea113df34f.min.js → ...e/js/dataView.5384c030d4c21b626b14.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../eventFactory.9717214baeea113df34f.min.js → .../eventFactory.5384c030d4c21b626b14.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...s/eventFields.9717214baeea113df34f.min.js → ...s/eventFields.5384c030d4c21b626b14.min.js
View file
Open in desktop

Large diffs are not rendered by default.

0 .../js/eventTest.9717214baeea113df34f.min.js → .../js/eventTest.5384c030d4c21b626b14.min.js
View file
Open in desktop
File renamed without changes.
0 ...e/js/resetPwd.9717214baeea113df34f.min.js → ...e/js/resetPwd.5384c030d4c21b626b14.min.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...js/sdkPublish.9717214baeea113df34f.min.js → ...js/sdkPublish.5384c030d4c21b626b14.min.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...ce/js/setting.9717214baeea113df34f.min.js → ...ce/js/setting.5384c030d4c21b626b14.min.js
View file
Open in desktop
File renamed without changes.
0 ...ePurchaseCode.9717214baeea113df34f.min.js → ...ePurchaseCode.5384c030d4c21b626b14.min.js
View file
Open in desktop
File renamed without changes.
0 ...esource/resetPwd.9717214baeea113df34f.css → ...esource/resetPwd.5384c030d4c21b626b14.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions event/views/resource/resetPwd.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

flex(100, 1);
</script>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././resetPwd.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././resetPwd.5384c030d4c21b626b14.css" rel="stylesheet"></head>

<body>
<div id="app">
Expand All @@ -61,6 +61,6 @@
<div class="wen-li"></div>
</div>
</div>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/resetPwd.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/resetPwd.5384c030d4c21b626b14.min.js"></script></body>

</html>
0 ...ource/sdkPublish.9717214baeea113df34f.css → ...ource/sdkPublish.5384c030d4c21b626b14.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions event/views/resource/sdkPublish.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

flex(100, 1);
</script>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././sdkPublish.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././sdkPublish.5384c030d4c21b626b14.css" rel="stylesheet"></head>

<body>
<div id="app">
Expand All @@ -61,6 +61,6 @@
<div class="wen-li"></div>
</div>
</div>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/sdkPublish.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/sdkPublish.5384c030d4c21b626b14.min.js"></script></body>

</html>
0 ...resource/setting.9717214baeea113df34f.css → ...resource/setting.5384c030d4c21b626b14.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions event/views/resource/setting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

flex(100, 1);
</script>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././setting.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././setting.5384c030d4c21b626b14.css" rel="stylesheet"></head>

<body>
<div id="app">
Expand All @@ -61,6 +61,6 @@
<div class="wen-li"></div>
</div>
</div>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/setting.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/setting.5384c030d4c21b626b14.min.js"></script></body>

</html>
0 ...datePurchaseCode.9717214baeea113df34f.css → ...datePurchaseCode.5384c030d4c21b626b14.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions event/views/resource/updatePurchaseCode.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

flex(100, 1);
</script>
<link href="././common.9717214baeea113df34f.css" rel="stylesheet"><link href="././updatePurchaseCode.9717214baeea113df34f.css" rel="stylesheet"></head>
<link href="././common.5384c030d4c21b626b14.css" rel="stylesheet"><link href="././updatePurchaseCode.5384c030d4c21b626b14.css" rel="stylesheet"></head>

<body>
<div id="app">
Expand All @@ -61,6 +61,6 @@
<div class="wen-li"></div>
</div>
</div>
<script type="text/javascript" src="./js/common.9717214baeea113df34f.min.js"></script><script type="text/javascript" src="./js/updatePurchaseCode.9717214baeea113df34f.min.js"></script></body>
<script type="text/javascript" src="./js/common.5384c030d4c21b626b14.min.js"></script><script type="text/javascript" src="./js/updatePurchaseCode.5384c030d4c21b626b14.min.js"></script></body>

</html>