Merge branch '20200305' into 'master'

refactor: 密码找回

See merge request huang/thingsboard3.3.2!57

@@ -43,6 +43,7 @@ public enum ErrorMessage {
   CONVERT_JS_IS_ALONE(400024,"转换脚本只能启用一个"),
   CONVERT_JS_IS_ALONE(400024,"转换脚本只能启用一个"),
   PHONE_OR_EMAIL_HAS_REGISTER(400025,"手机或邮箱已被使用"),
   PHONE_OR_EMAIL_HAS_REGISTER(400025,"手机或邮箱已被使用"),
   CONTACT_ALREADY_ASSOCIATED(400026,"当前联系人已被设备配置关联"),
   CONTACT_ALREADY_ASSOCIATED(400026,"当前联系人已被设备配置关联"),
+  MSG_CODE_NOT_MATCHED(400027,"验证码不正确"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private final int code;
   private String message;
   private String message;

@@ -14,6 +14,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
 import java.time.Instant;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZoneOffset;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.UUID;
@@ -64,7 +65,7 @@ public class DeviceProfileDTO extends TenantDTO {
 
 
     public DeviceProfileDTO(UUID id, String name, Long time, String description, DeviceTransportType transportType, UUID defaultRuleChainId,boolean isDefault,String image,DeviceProfileType type,Object profileData) {
     public DeviceProfileDTO(UUID id, String name, Long time, String description, DeviceTransportType transportType, UUID defaultRuleChainId,boolean isDefault,String image,DeviceProfileType type,Object profileData) {
         setId(id.toString());
         setId(id.toString());
-        setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.UTC));
+        setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.of("+8")));
         this.name = name;
         this.name = name;
         this.isDefault = isDefault;
         this.isDefault = isDefault;
         this.image = image;
         this.image = image;
@@ -78,7 +79,7 @@ public class DeviceProfileDTO extends TenantDTO {
 
 
     public DeviceProfileDTO(UUID id, String name, Long time, String description, DeviceTransportType transportType, String defaultRuleChainId,boolean isDefault,String image,DeviceProfileType type, String convertJs) {
     public DeviceProfileDTO(UUID id, String name, Long time, String description, DeviceTransportType transportType, String defaultRuleChainId,boolean isDefault,String image,DeviceProfileType type, String convertJs) {
         setId(id.toString());
         setId(id.toString());
-        setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.UTC));
+        setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.of("+8")));
         this.name = name;
         this.name = name;
         this.isDefault = isDefault;
         this.isDefault = isDefault;
         this.image = image;
         this.image = image;

@@ -59,6 +59,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         sceneLinkageDTO.setTenantId(tenantId);
         sceneLinkageDTO.setTenantId(tenantId);
         // 第一步保存场景,获取场景ID
         // 第一步保存场景,获取场景ID
         // 场景对象
         // 场景对象
+        sceneLinkageDTO.setStatus(0);
         SceneLinkage sceneLinkage = sceneLinkageDTO.getEntity(SceneLinkage.class);
         SceneLinkage sceneLinkage = sceneLinkageDTO.getEntity(SceneLinkage.class);
         // 新增
         // 新增
         int insert = sceneLinkageMapper.insert(sceneLinkage);
         int insert = sceneLinkageMapper.insert(sceneLinkage);

@@ -143,6 +143,7 @@ public class YtNoticeServiceImpl implements YtNoticeService {
     private void sms4Alarm(AlarmInfoDTO alarmInfo,String templateId, Organization organization,List<AlarmContact> contacts){
     private void sms4Alarm(AlarmInfoDTO alarmInfo,String templateId, Organization organization,List<AlarmContact> contacts){
         SmsReqDTO info = new SmsReqDTO();
         SmsReqDTO info = new SmsReqDTO();
         info.setId(templateId);
         info.setId(templateId);
+        info.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_ALARM_NOTICE.name());
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
         LinkedHashMap<String, String> params = new LinkedHashMap<>();
         //name-其他；device_name-其他；level-其他；location-其他；alarm_value-其他；
         //name-其他；device_name-其他；level-其他；location-其他；alarm_value-其他；
         params.put("type", alarmInfo.getType());
         params.put("type", alarmInfo.getType());
@@ -186,6 +187,7 @@ public class YtNoticeServiceImpl implements YtNoticeService {
             info.setBody(body);
             info.setBody(body);
             info.setEmailFormatEnum(EmailFormatEnum.TEXT.name());
             info.setEmailFormatEnum(EmailFormatEnum.TEXT.name());
             info.setId(templateId);
             info.setId(templateId);
+            info.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_ALARM_NOTICE.name());
 
 
             mailService.sendEmail(info);
             mailService.sendEmail(info);
         }
         }

@@ -461,13 +461,10 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
                             })
                             })
                     .orElse(false);
                     .orElse(false);
     if (!correct) {
     if (!correct) {
-      throw new BadCredentialsException("验证码不正确");
+      throw new YtDataValidationException(ErrorMessage.MSG_CODE_NOT_MATCHED.getMessage());
     }
     }
     String pwd = forget.getPassword();
     String pwd = forget.getPassword();
-    if (StringUtils.isEmpty(pwd)
-//            || StringUtils.isEmpty(forget.getResetPassword())
-//            || !pwd.equals(forget.getResetPassword())
-    ) {
+    if (StringUtils.isEmpty(pwd)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }