1、陪练课调整

2、付费陪练课

mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -16,6 +16,7 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
+import com.ym.mec.util.http.HttpUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -232,7 +233,7 @@ public class PracticeGroupController extends BaseController {
             Map<Integer, String> userPhoneMap = new HashMap<>();
             userPhoneMap.put(userId, student.getPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_COMPLETED_STUDY_REPORT,
-                    userPhoneMap, null, 0, null, "STUDENT", smsUrl);
+                    userPhoneMap, null, 0, null, "STUDENT", HttpUtil.getSortUrl(smsUrl));
         }
 
         return succeed();

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

@@ -1,21 +1,7 @@
 package com.ym.mec.util.http;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLDecoder;
-import java.nio.charset.Charset;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.util.compress.ZipUtil;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -34,12 +20,25 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
-import com.ym.mec.util.compress.ZipUtil;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 public class HttpUtil {
 
 	public static String getSortUrl(String url){
-		/*try {
+		try {
 			Map<String,Object> paramMap = new HashMap<>();
 			paramMap.put("format","json");
 			paramMap.put("url",URLDecoder.decode(url,"UTF-8"));
@@ -47,9 +46,8 @@ public class HttpUtil {
 			String s = get("http://mrw.so/api.htm", paramMap);
 			return JSONObject.parseObject(s).getString("url");
 		}catch (Exception e){
-			e.printStackTrace();
-		}*/
-		return url;
+			return url;
+		}
 	}
 
 	/**