From 2dc52e3ba49433a54368c3b64ba3539b4bb051ae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 五月 2019 16:15:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
index e6e204b..0d316a9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/DynamicInfoJob.java
@@ -31,9 +31,9 @@
 	@Scheduled(cron = "0 0/10 6-23 * * ?")
 	public void insetDynamicInfo() {
 		
-//		if (!Constant.IS_TASK) {
-//			return;
-//		}
+		if (!Constant.IS_TASK) {
+			return;
+		}
 		
 		try {
 			dynamicInfoService.insertTimeHotSale();
@@ -64,9 +64,9 @@
 	@Scheduled(cron = "0 0 6,7,15,16,21,22,23 * * ? ")
 	public void insetShopInfo1() {
 		
-//		if (!Constant.IS_TASK) {
-//			return;
-//		}
+		if (!Constant.IS_TASK) {
+			return;
+		}
 		
 		try {
 			dynamicInfoService.insertShopInfo();
@@ -85,9 +85,9 @@
 	@Scheduled(cron = "0 0/30 8,9,10 * * ?")
 	public void insetShopInfo2() {
 		
-//		if (!Constant.IS_TASK) {
-//			return;
-//		}
+		if (!Constant.IS_TASK) {
+			return;
+		}
 		
 		try {
 			dynamicInfoService.insertShopInfo();
@@ -107,9 +107,9 @@
 	@Scheduled(cron = "0 0/30 11,12,13,14 * * ?")
 	public void insetShopInfo3() {
 		
-//		if (!Constant.IS_TASK) {
-//			return;
-//		}
+		if (!Constant.IS_TASK) {
+			return;
+		}
 		
 		try {
 			dynamicInfoService.insertShopInfo();
@@ -129,9 +129,9 @@
 	@Scheduled(cron = "0 0/30 17,18,19,20 * * ? ")
 	public void insetShopInfo4() {
 		
-//		if (!Constant.IS_TASK) {
-//			return;
-//		}
+		if (!Constant.IS_TASK) {
+			return;
+		}
 		
 		try {
 			dynamicInfoService.insertShopInfo();
@@ -151,10 +151,10 @@
 	@Scheduled(cron = "0 0 0 * * ?")
 	public void remove() {
 		
-//		if (!Constant.IS_TASK) {
-//			return;
-//		}
-//		
+		if (!Constant.IS_TASK) {
+			return;
+		}
+		
 		try {
 			dynamicInfoService.removeByDate(DateUtil.reduceDay(3, new Date()));
 		} catch (Exception e) {
@@ -173,10 +173,10 @@
 	@Scheduled(cron = "0 0/3 * * * ?")
 	public void activityNeedPublish() {
 		
-//		if (!Constant.IS_TASK) {
-//			return;
-//		}
-//		
+		if (!Constant.IS_TASK) {
+			return;
+		}
+		
 		try {
 			List<RecommendActivity> list = activityService.getNeedPublish();
 			if (list == null || list.size() == 0) {

--
Gitblit v1.8.0