教务端集成推送

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -32,10 +32,10 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	@Value("${push.jiguang.masterSecret.teacher}")
 	private String teacherMasterSecret;
 
-	@Value("${push.jiguang.appKey.system}")
-	private String systemAppKey;
-	@Value("${push.jiguang.masterSecret.system}")
-	private String systemMasterSecret;
+	@Value("${push.jiguang.appKey.edu}")
+	private String eduAppKey;
+	@Value("${push.jiguang.masterSecret.edu}")
+	private String eduMasterSecret;
 
 	@Value("${push.jiguang.apns_production:false}")
 	private boolean apns_production = true; // 推送环境 True 表示推送生产环境，False 表示要推送开发环境
@@ -127,7 +127,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 				base64_auth_string = encryptBASE64(this.teacherAppKey + ":" + this.teacherMasterSecret);
 				break;
 			default:
-				base64_auth_string = encryptBASE64(this.systemAppKey + ":" + this.systemMasterSecret);
+				base64_auth_string = encryptBASE64(this.eduAppKey + ":" + this.eduMasterSecret);
 				break;
 		}
 		String authorization = "Basic " + base64_auth_string;
@@ -215,12 +215,20 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		this.teacherMasterSecret = teacherMasterSecret;
 	}
 
-	public void setSystemAppKey(String systemAppKey) {
-		this.systemAppKey = systemAppKey;
+	public String getEduAppKey() {
+		return eduAppKey;
 	}
 
-	public void setSystemMasterSecret(String systemMasterSecret) {
-		this.systemMasterSecret = systemMasterSecret;
+	public void setEduAppKey(String eduAppKey) {
+		this.eduAppKey = eduAppKey;
+	}
+
+	public String getEduMasterSecret() {
+		return eduMasterSecret;
+	}
+
+	public void setEduMasterSecret(String eduMasterSecret) {
+		this.eduMasterSecret = eduMasterSecret;
 	}
 
 	public void setApns_production(boolean apns_production) {