fengji

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ParamEnum.java

@@ -9,6 +9,7 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum  ParamEnum implements BaseEnum<Integer, ParamEnum> {
 
     ONE(1,""),
+    // INIT_PASSWORD(123456,"初始密码"),
     INIT_PASSWORD(123456,"初始密码"),
     TEACHER_ATTENDANCE_TIME_GAP(-20,"教师正常签到时差");
 

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

@@ -87,7 +87,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null){
 				if(StringUtils.isEmpty(user.getPassword())){
-					employee.setPassword(new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
+					// 修改 gym + 联系人手机后4位
+					int phoneStrLen = employee.getPhone().length();
+					employee.setPassword(new BCryptPasswordEncoder().encode("gym" + employee.getPhone().substring(phoneStrLen - 4, phoneStrLen)));
+					// employee.setPassword(new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
 				}
 				employee.setUserId(user.getId());
 				employee.setId(user.getId());

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

@@ -316,6 +316,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (Objects.equals(messageSender.getSendMode(), "EMAIL")) {
 			Integer userId = receivers.keySet().stream().findFirst().orElse(-1);
 			loadEmailInfo(userId);
+			LOGGER.info("batch 发送邮件 {} ", userId);
 		}
 		if(StringUtils.isNotEmpty(jpushType) && jpushType == "STUDENT"){
 			//如果不是缴费信息
@@ -347,6 +348,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (messageConfig == null) {
 			throw new BizException("消息类型错误");
 		}else if(messageConfig.getSendFlag() == null || messageConfig.getSendFlag() == 0){
+			LOGGER.error("batch 发送标志为空" );
 			return;
 		}
 		Date date = new Date();
@@ -376,6 +378,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		} else if (messageSender.getSendMode().equals("EMAIL")) {
 			mode = MessageSendMode.EMAIL;
 		}
+		LOGGER.info("batch 添加消息");
 		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,
 				url, messageConfig.getGroup(),jpushType);
 	}