Commit 32713100 by shentao

Merge branch 'release' into 'master'

Release

See merge request !553
parents 23735fba 4729ee80
...@@ -3220,6 +3220,9 @@ public class MarkDataServiceImpl implements MarkDataService { ...@@ -3220,6 +3220,9 @@ public class MarkDataServiceImpl implements MarkDataService {
case "followersNum": case "followersNum":
key = "followers_num"; key = "followers_num";
break; break;
case "shareNum":
key = "share_num";
break;
} }
if (null == entry.getValue() || entry.getValue().toString().contains("desc")) { if (null == entry.getValue() || entry.getValue().toString().contains("desc")) {
sort = SortBuilders.fieldSort(key).order(SortOrder.DESC); sort = SortBuilders.fieldSort(key).order(SortOrder.DESC);
......
...@@ -120,7 +120,7 @@ public class ControlCenter { ...@@ -120,7 +120,7 @@ public class ControlCenter {
} }
@Async("scheduledExecutor") @Async("scheduledExecutor")
// @Scheduled(cron = "0 30 3 L * ?") @Scheduled(cron = "0 30 3 1 * ?")
public void monthlyCustomXhsInteractionUpdate() { public void monthlyCustomXhsInteractionUpdate() {
log.info("每月互动量更新-启动"); log.info("每月互动量更新-启动");
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment