|
@@ -266,6 +266,8 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
|
|
|
|
|
|
String base64_auth_string;
|
|
|
|
|
|
+ String base64_auth_string1 ="";
|
|
|
+
|
|
|
switch (pushType){
|
|
|
case "STUDENT":
|
|
|
base64_auth_string = encryptBASE64(this.studentAppKey + ":" + this.studentMasterSecret);
|
|
@@ -275,8 +277,16 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
|
|
|
break;
|
|
|
default:
|
|
|
base64_auth_string = encryptBASE64(this.systemAppKey + ":" + this.systemMasterSecret);
|
|
|
+ base64_auth_string1 = encryptBASE64(this.schoolAppKey + ":" + this.schoolMasterSecret);
|
|
|
break;
|
|
|
}
|
|
|
+ extracted(alias, registerIds, base64_auth_string, baseUrl);
|
|
|
+ if (StringUtils.isNotEmpty(base64_auth_string1)) {
|
|
|
+ extracted(alias, registerIds, base64_auth_string1, baseUrl);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private static void extracted(String alias, List<String> registerIds, String base64_auth_string, String baseUrl) {
|
|
|
String authorization = "Basic " + base64_auth_string;
|
|
|
|
|
|
List<String> removeIds = Lists.newArrayList();
|