Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -210,5 +210,5 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @param organId
      * @return
      */
-    Map<String, Object> queryIncomeStatistics(String organId);
+    Map<String, Object> queryIncomeStatistics(@Param("organId") String organId);
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/MessageSenderPluginContext.java

@@ -49,10 +49,10 @@ public class MessageSenderPluginContext implements ApplicationContextAware {
 		private static final long serialVersionUID = -3964872523891264522L;
 
 		{
-			put(JiguangPushPlugin.getName(), StringUtils.uncapitalize(JiguangPushPlugin.class.getSimpleName()));
-			put(MOxintongSMSPlugin.getName(), StringUtils.uncapitalize(MOxintongSMSPlugin.class.getSimpleName()));
-			put(ShiyuanSMSPlugin.getName(), StringUtils.uncapitalize(ShiyuanSMSPlugin.class.getSimpleName()));
-			put(YimeiSmsPlugin.getName(), StringUtils.uncapitalize(YimeiSmsPlugin.class.getSimpleName()));
+			put(StringUtils.lowerCase(JiguangPushPlugin.getName()), StringUtils.uncapitalize(JiguangPushPlugin.class.getSimpleName()));
+			put(StringUtils.lowerCase(MOxintongSMSPlugin.getName()), StringUtils.uncapitalize(MOxintongSMSPlugin.class.getSimpleName()));
+			put(StringUtils.lowerCase(ShiyuanSMSPlugin.getName()), StringUtils.uncapitalize(ShiyuanSMSPlugin.class.getSimpleName()));
+			put(StringUtils.lowerCase(YimeiSmsPlugin.getName()), StringUtils.uncapitalize(YimeiSmsPlugin.class.getSimpleName()));
 		}
 	};
 

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

@@ -37,7 +37,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	private String reqURL = "https://api.jpush.cn/v3/push";// 请求极光地址
 
 	public static String getName() {
-		return "Jiguang";
+		return "jiguang";
 	}
 
 	/**
@@ -198,7 +198,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 
 	public static void main(String[] args) throws IOException {
 		
-		String str = "1048953,1048955,1048958,1048959,1048960,1048961,1048965,1048967,1048970,1048974,1048977,1048981,1048983,1048990,1048993,1048996,1048998,1048999,1049000,1049003,1049005,1049006,1049008,1049009,1049013,1049019,1049024,1049034,1049036,1049038,1049039,1049040,1049042,1049043,1049045,1049048,1049049,1049051,1049053,1049057,1049062,1049066,1049076,1049077,1049079,1049090,1049117,1049118,1049122,1049123,1049149,1049251,1049363,1049368,1049524,1055861,1055862,1055863,1055865,1056784,1084443,1094555,1094575";
+		String str = "2094588";
 		
 		
 		JiguangPushPlugin plugin = new JiguangPushPlugin();

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

@@ -32,7 +32,7 @@ public class MOxintongSMSPlugin implements MessageSenderPlugin, InitializingBean
 	private String reqUrl;
 
 	public static String getName() {
-		return "MOxintong";
+		return "moxintong";
 	}
 
 	@Override

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

@@ -40,7 +40,7 @@ public class ShiyuanSMSPlugin implements MessageSenderPlugin, InitializingBean {
 	// private String extno = "";//扩展码(不用填写)
 
 	public static String getName() {
-		return "Shiyuan";
+		return "shiyuan";
 	}
 
 	@Override