Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -582,8 +582,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                         receivers, null, 0, null, studentRegistration.getParentsName(), studentRegistration.getName(), musicGroup.getName());
             }else {
                 String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + musicGroupId;
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_MUSIC_GROUP_ADD_STUDENT,
-                        receivers, null, 0, null, studentRegistration.getParentsName(), studentRegistration.getName(), musicGroup.getName(),HttpUtil.getSortUrl(studentApplyUrl));
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.SMS_MUSIC_GROUP_ADD_STUDENT,receivers, null, 0, null, studentRegistration.getParentsName(), studentRegistration.getName(), musicGroup.getName(),HttpUtil.getSortUrl(studentApplyUrl));
             }
             return userId;
         }

mec-util/src/main/java/com/ym/mec/util/http/HttpUtil.java

@@ -38,13 +38,18 @@ import com.ym.mec.util.compress.ZipUtil;
 
 public class HttpUtil {
 
-	public static String getSortUrl(String url) throws IOException {
-		Map<String,Object> paramMap = new HashMap<>();
-		paramMap.put("format","json");
-		paramMap.put("url",URLDecoder.decode(url,"UTF-8"));
-		paramMap.put("key","5dc941c5d3c3816ac84898d7@3d0e03b46a30f4fea51f038e5cd411c5");
-		String s = get("http://mrw.so/api.htm", paramMap);
-		return JSONObject.parseObject(s).getString("url");
+	public static String getSortUrl(String url){
+		try {
+			Map<String,Object> paramMap = new HashMap<>();
+			paramMap.put("format","json");
+			paramMap.put("url",URLDecoder.decode(url,"UTF-8"));
+			paramMap.put("key","5dc941c5d3c3816ac84898d7@3d0e03b46a30f4fea51f038e5cd411c5");
+			String s = get("http://mrw.so/api.htm", paramMap);
+			return JSONObject.parseObject(s).getString("url");
+		}catch (Exception e){
+			e.printStackTrace();
+		}
+		return url;
 	}
 
 	/**