Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/entity/SysMessageParams.java

@@ -29,6 +29,20 @@ public class SysMessageParams {
 
     private Object[] args;
 
+    public SysMessageParams() {
+    }
+
+    public SysMessageParams(MessageSenderPluginContext.MessageSender messageSender, MessageTypeEnum messageType, Map<Integer, String> receivers, Date triggerTime, Integer readStatus, String url, String jpushType, Object... args) {
+        this.messageSender = messageSender;
+        this.messageType = messageType;
+        this.receivers = receivers;
+        this.triggerTime = triggerTime;
+        this.readStatus = readStatus;
+        this.url = url;
+        this.jpushType = jpushType;
+        this.args = args;
+    }
+
     public MessageSenderPluginContext.MessageSender getMessageSender() {
         return messageSender;
     }

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/service/SysMessageService.java

@@ -150,4 +150,4 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param content
 	 */
 	void sendNoAuthPrivateMessage(String sender, String receiver, String content);
-}
+}

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/SysMessageController.java

@@ -30,7 +30,8 @@ public class SysMessageController extends BaseController {
     @PostMapping(value = "/batchSendMessage")
     public void batchSendMessage(@RequestBody SysMessageParams sysMessageParams){
         sysMessageService.batchSendMessage(sysMessageParams.getMessageSender(), sysMessageParams.getMessageType(), sysMessageParams.getReceivers(),
-                sysMessageParams.getTriggerTime(), sysMessageParams.getReadStatus(), sysMessageParams.getUrl(), sysMessageParams.getJpushType(), sysMessageParams.getArgs());
+                sysMessageParams.getTriggerTime(), sysMessageParams.getReadStatus(), sysMessageParams.getUrl(), sysMessageParams.getJpushType(),
+                sysMessageParams.getArgs());
     }
 
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -163,12 +163,8 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			Map<Integer, String> userPhoneMap = new HashMap<>();
 			userPhoneMap.put(examOrgan.getOrganId(), student.getPhone());
 
-			SysMessageParams sysMessageParams=new SysMessageParams();
-			sysMessageParams.setMessageSender(MessageSenderPluginContext.MessageSender.YIMEI);
-			sysMessageParams.setMessageType(MessageTypeEnum.EXAM_REGISTRATION_URL_PUSH);
-			sysMessageParams.setReceivers(userPhoneMap);
-			sysMessageParams.setReadStatus(0);
-			sysMessageParams.setArgs(new Object[]{registShortUrl});
+			SysMessageParams sysMessageParams=new SysMessageParams(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.EXAM_REGISTRATION_URL_PUSH,
+					userPhoneMap, null, 0, null, null, registShortUrl);
 			sysMessageFeignService.batchSendMessage(sysMessageParams);
 		}
 

edu-util/src/main/java/com/keao/edu/util/string/MessageFormatter.java

@@ -15,7 +15,7 @@ final public class MessageFormatter {
 	 * @param argArray
 	 * @return String
 	 */
-	final public static String arrayFormat(String messagePattern, Object... argArray) {
+	final public static String arrayFormat(String messagePattern, Object[] argArray) {
 		if (messagePattern == null) {
 			return "";
 		}