Merge remote-tracking branch 'origin/master'

edu-cms/pom.xml

@@ -18,6 +18,12 @@
 		<dependency>
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-datasource</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-simple</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		
 		<dependency>

edu-thirdparty/src/main/java/com/keao/edu/thirdparty/message/provider/JiguangPushPlugin.java

@@ -24,19 +24,19 @@ import com.keao.edu.util.http.HttpUtil;
 @Service
 public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean {
 
-	@Value("${push.jiguang.appKey.student}")
+	@Value("${push.jiguang.appKey.student:1}")
 	private String studentAppKey;
-	@Value("${push.jiguang.masterSecret.student}")
+	@Value("${push.jiguang.masterSecret.student:1}")
 	private String studentMasterSecret;
 
-	@Value("${push.jiguang.appKey.teacher}")
+	@Value("${push.jiguang.appKey.teacher:1}")
 	private String teacherAppKey;
-	@Value("${push.jiguang.masterSecret.teacher}")
+	@Value("${push.jiguang.masterSecret.teacher:1}")
 	private String teacherMasterSecret;
 
-	@Value("${push.jiguang.appKey.system}")
+	@Value("${push.jiguang.appKey.system:1}")
 	private String systemAppKey;
-	@Value("${push.jiguang.masterSecret.system}")
+	@Value("${push.jiguang.masterSecret.system:1}")
 	private String systemMasterSecret;
 
 	@Value("${push.jiguang.apns_production:false}")