Merge remote-tracking branch 'origin/master'

cooleshow-common/src/main/java/com/yonge/cooleshow/common/service/impl/RedisIdGeneratorService.java

@@ -32,6 +32,9 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 	@Value("${message.debugMode}")
 	private boolean debugMode;
 
+	@Value("${message.authCode}")
+	private boolean authCode;
+
 	/**
 	 * @Description
 	 * @author butterfly
@@ -95,7 +98,7 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 
 	@Override
 	public boolean verifyValidCode(String mobile, String authCode,String keyEnum) {
-		if (debugMode) {
+		if (debugMode || this.authCode) {
 			if (defaultPwd.equals(authCode)) {
 				return true;
 			}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentSearch.java

@@ -68,12 +68,10 @@ public class StudentSearch extends QueryInfo{
         return isVip;
     }
 
-    public void setIsVip(YesOrNoEnum isVip) {
-        this.isVip = isVip;
+    public void setIsVip(Integer isVip) {
+        this.isVip = YesOrNoEnum.valueOf(isVip);
     }
 
-
-
     public Date getStartTime() {
         return startTime;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/YesOrNoEnum.java

@@ -23,4 +23,14 @@ public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
     public Integer getCode() {
         return this.code;
     }
+
+    public static YesOrNoEnum valueOf(Integer code) {
+    	YesOrNoEnum[] values = YesOrNoEnum.values();
+        for (YesOrNoEnum value : values) {
+            if(value.getCode().equals(code)){
+                return value;
+            }
+        }
+        return null;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageServiceImpl.java

@@ -73,6 +73,9 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Value("${message.debugMode}")
 	private boolean debugMode;
 
+	@Value("${message.authCode}")
+	private boolean authCode;
+
 	@Override
 	public BaseDAO<Long, SysMessage> getDAO() {
 		return sysMessageDao;
@@ -211,9 +214,21 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			LOGGER.error("接收地址不能为空");
 			return;
 		}
+		if (StringUtils.isEmpty(url)) {
+			url = selectConfigUrl(type.getCode());
+		}
 
-		String[] tos = new String[receivers.size()];
-		tos = receivers.entrySet().stream().map(longStringEntry -> String.valueOf(longStringEntry.getKey())).collect(Collectors.toList()).toArray(tos);
+		String[] tos;
+		if(messageSender.getSendMode().equals(MessageSender.JIGUANG.getSendMode())) {
+			tos= new String[receivers.size()];
+			tos = receivers.entrySet()
+						   .stream()
+						   .map(longStringEntry -> String.valueOf(longStringEntry.getKey()))
+						   .collect(Collectors.toList())
+						   .toArray(tos);
+		} else {
+			tos = receivers.values().toArray(new String[receivers.size()]);
+		}
 		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type.getCode());
 		if (messageConfig == null) {
 			throw new BizException("消息类型错误");
@@ -334,7 +349,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 		String key = getVerificationCodeCacheKey(messageType, receiver);
 		int code = DEFAULT_CODE;
-		if (debugMode == false) {
+		if (debugMode == false && !authCode) {
 			code = getRandomCode(messageType, receiver);
 		}
 		Map<Long, String> receivers = new HashMap<>(1);

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -44,7 +44,7 @@
         , t.musician_date_ as "musicianDate"
         , t.live_flag_ as "liveFlag"
         , t.live_date_ as "liveDate"
-        , t,browse_ as "browse"
+        , t.browse_ as "browse"
         , t.memo_ as "memo"
         , t.create_time_ as "createTime"
         , t.update_time_ as "updateTime"

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/AwSmsPlugin.java

@@ -35,7 +35,7 @@ public class AwSmsPlugin implements MessageSenderPlugin, InitializingBean {
 	 */
 	private String pswd = "9#O!9hSJ";
 
-	private String signature = "【管乐迷】";
+	private String signature = "【酷乐秀】";
 
 	public static String getName() {
 		return "awsms";

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/message/provider/JiguangPushPlugin.java

@@ -59,7 +59,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	 * @param content 消息内容
 	 * @return json对象
 	 */
-	private JSONObject generateJson(String[] alias, String alert, String content, String url,String sound,String channelId) {
+	private JSONObject generateJson(String[] alias, String alert, String content, String url,String sound,String channelId,String type) {
 		JSONObject json = new JSONObject();
 		JSONArray platform = new JSONArray();// 平台
 		platform.add("android");
@@ -89,9 +89,21 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 		JSONObject android_extras = new JSONObject();// android额外参数
 		android_extras.put("type", "infomation");
 		android_extras.put("url", url);
+		android_extras.put("third_url_encode",true);
 		android_extras.put("memo", url);
 		android.put("extras", android_extras);
 
+		JSONObject android_intent = new JSONObject();// android额外参数
+		if ("STUDENT".equals(type)) {
+			android_intent.put("url",
+							   "intent:#Intent;action=cn.jiguang.push.customAction;component=com.cooleshow.student/com.cooleshow.student.ui.main.MainActivity;end");
+		} else {
+			android_intent.put("url",
+							   "intent:#Intent;action=cn.jiguang.push.customAction;component=com.cooleshow.teacher/com.cooleshow.teacher.ui.main.MainActivity;end");
+		}
+		android.put("intent",android_intent);
+
+
 		JSONObject ios = new JSONObject();// ios通知内容
 		ios.put("alert", alert);
 		ios.put("sound", sound);
@@ -141,7 +153,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 				break;
 		}
 		String authorization = "Basic " + base64_auth_string;
-		return sendPostRequest(generateJson(alias, alert, content, url,sound,channelId).toString(), authorization);
+		return sendPostRequest(generateJson(alias, alert, content, url,sound,channelId,type).toString(), authorization);
 	}
 
 	/**