Merge branch 'master_1204_cy' into 'master'

xxl-job-core/pom.xml

@@ -50,6 +50,19 @@
 			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+		<dependency>
+		    <groupId>org.apache.httpcomponents</groupId>
+		    <artifactId>httpclient</artifactId>
+		    <version>4.5.6</version>
+		</dependency>
+        
+		<dependency>
+		  <groupId>org.slf4j</groupId>
+		  <artifactId>slf4j-nop</artifactId>
+		  <version>1.7.2</version>
+		</dependency>
 
 	</dependencies>
 

xxl-job-core/src/main/java/com/xxl/job/core/util/ConstantVar.java

@@ -4,8 +4,10 @@ public class ConstantVar {
 
 	public static final String MASTER_URL = "https://www.weixiaotong.com.cn/weixt/api/";
 
-	public static final String DEVELOP_URL = "https://weixt.spacetech.com.cn:8090/weixt/api/";
+	public static final String DEMO_URL = "https://demo.spacetech.com.cn/weixt/api/";
 
-	public static final String DEMO_URL = "http://demo.spacetech.com.cn/weixt/api/";
+	public static final String DEVELOP_URL = "http://weixt.spacetech.com.cn:8090/weixt/api/";
+
+	public static final String CITY = "330000330400,330000330500";// 嘉兴，湖州
 
 }

xxl-job-core/src/main/java/com/xxl/job/core/util/DateUtil.java

@@ -2838,4 +2838,12 @@ public class DateUtil {
 		return (second / 3600 > 0 ? hour + ":" : "") + min + "'" + sec + "''";
 
 	}
+
+	public static String makeYesterdayStr() {
+		Date date = getCurrentTimeDate();
+		Long yesterday = date.getTime() - 1000 * 60 * 60 * 24L;
+		date.setTime(yesterday);
+		String dateStr = DateUtil.dateToString(date, DateUtil.DATETIME_FORMAT);
+		return dateStr;
+	}
 }
\ No newline at end of file