update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMessage.java

@@ -63,7 +63,19 @@ public class SysMessage {
 	
 	@ApiModelProperty(value = "消息组",required = false)
 	private String group;
-	
+
+	public SysMessage() {
+	}
+
+	public SysMessage(String title, String content, MessageSendMode type, String receiver, Integer userId, String memo) {
+		this.title = title;
+		this.content = content;
+		this.type = type;
+		this.receiver = receiver;
+		this.userId = userId;
+		this.memo = memo;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -1,7 +1,13 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SysMessageConfigDao;
+import com.ym.mec.biz.dal.dao.SysMessageDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.entity.SysMessage;
 import com.ym.mec.biz.dal.entity.SysMessageConfig;
+import com.ym.mec.biz.dal.enums.MessageSendMode;
 import com.ym.mec.biz.service.SmsCodeService;
 import com.ym.mec.biz.service.SysMessageConfigService;
 import com.ym.mec.common.redis.service.RedisCache;
@@ -26,6 +32,10 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 
 	@Autowired
 	private SysMessageConfigDao sysMessageConfigDao;
+	@Autowired
+	private SysMessageDao sysMessageDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public boolean verifyValidCode(String mobile, String authCode) {
@@ -38,11 +48,19 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 
 	@Override
 	public boolean sendValidCode(String mobile) throws Exception {
-		String code = RandomStringUtils.randomNumeric(6);
+//		String code = RandomStringUtils.randomNumeric(6);
+		String code = "123456";
 		// 发送验证码
 		SysMessageConfig messageConfig = sysMessageConfigDao.get(1);
 		String content = String.format(messageConfig.getContent(), code);
 		messageSenderPluginContext.send(MessageSenderPluginContext.MessageSender.YIMEI,"",content,mobile,"");
+		//保存发送记录
+		SysUser sysUser = sysUserFeignService.queryUserByMobile(mobile);
+		Integer userId = null;
+		if(sysUser != null){
+			userId = sysUser.getId();
+		}
+		sysMessageDao.insert(new SysMessage("",content, MessageSendMode.SMS,mobile,userId,""));
 		redisCache.put(loginVerifyCodeKey + mobile, code, expireTime);
 		return true;
 	}

mec-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -63,18 +63,9 @@
 	</delete>
 
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMessage">
-		insert into sys_message (id_, user_id_,
-		title_, content_,
-		type_, status_, receiver_,
-		send_time_, error_msg_,read_status_,memo_, create_on_,
-		modify_on_,group_)
-		values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT}, #{title,jdbcType=VARCHAR},
-		#{content,jdbcType=VARCHAR},
-		#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{receiver,jdbcType=VARCHAR},
-		#{sendTime},#{errorMsg,jdbcType=VARCHAR},#{readStatus},#{memo},
-		#{createOn},
-		#{modifyOn},#{group})
+		insert into sys_message (user_id_,title_, content_,type_, receiver_,
+		send_time_, error_msg_,memo_, create_on_,modify_on_,group_)
+		values (#{userId}, #{title},#{content},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{receiver},now(),#{errorMsg},#{memo},now(),now(),#{group})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.SysMessage">

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -213,7 +213,7 @@
             AND su.lock_flag_ = #{lockFlag}
         </if>
         <if test="subjectId != null">
-            AND t.subject_id_ LIKE CONCAT('%',#{subjectId},'%')
+            AND FIND_IN_SET(#{subjectId},t.subject_id_)
         </if>
         <if test="organId != null">
             AND su.organ_id_ = #{organId}

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

@@ -55,7 +55,7 @@ public class SmsCodeController extends BaseController {
         if(smsCodeService.verifyValidCode(phone,code)){
             return succeed();
         }
-        return failed();
+        return failed("验证码校验失败");
     }
 
     @PostMapping(value = "/verifyLoginImage")

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

@@ -51,6 +51,7 @@ public class YimeiSmsPlugin implements MessageSenderPlugin, InitializingBean {
 		String result = getParam(subject, content, receiver, host + "/simpleinter/sendSMS");
 		JSONObject json = JSONObject.parseObject(result);
 		if("SUCCESS".equals(json.get("code"))){
+
 			return true;
 		}else {
 			throw new Exception(json.getString("code"));