Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java

@@ -68,6 +68,7 @@ public enum CodeMessageEnum {
     SYSTEM_ERROR_AUTH_USER_HAS_DISABLED(500, "SYSTEM.ERROR.AUTH.USER.HAS.DISABLED"),
     SYSTEM_ERROR_AUTH_USER_ACCOUNT_PASSWORD(500, "SYSTEM.ERROR.AUTH.USER.ACCOUNT.PASSWORD"),
     SYSTEM_ERROR_AUTH_USER_PASSWORD(500, "SYSTEM.ERROR.AUTH.USER.PASSWORD"),
+    SYSTEM_ERROR_AUTH_USER_OLD_PASSWORD(500, "SYSTEM.ERROR.AUTH.USER.OLD.PASSWORD"),
     SYSTEM_ERROR_AUTH_USER_PAY_PASSWORD_BLANK(500, "SYSTEM.ERROR.AUTH.USER.PAY.PASSWORD.BLANK"),
     SYSTEM_ERROR_WECHAT_USER_NOT_EXIST(520, "SYSTEM.ERROR.WECHAT.USER.NOT.EXIST"),
     SYSTEM_ERROR_AUTH_USER_MAIL_NOT_SET(500, "SYSTEM.ERROR.AUTH.USER.MAIL.NOT.SET"),

server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java

@@ -262,7 +262,7 @@ public class IotProductDeviceService extends IotCommonService {
         try {
 
             ResponseMessage responseMessage = sendPost(url, request);
-            if (responseMessage.getStatus() == 200) {
+            if (responseMessage.getStatus() == 200 && responseMessage.getResult() != null) {
                 IotPagerResult pagerResult = JSON.parseObject(responseMessage.getResult().toString(), IotPagerResult.class);
                 List<DeviceOperationLogEntity> deviceOperationLogEntities = JSONArray.parseArray(pagerResult.getData().toString()).toJavaList(DeviceOperationLogEntity.class);
                 return deviceOperationLogEntities;

server-common/src/main/resources/locale/business_messages.properties

@@ -64,6 +64,7 @@ SYSTEM.ERROR.DUPLICATE.REQUEST=请勿重复请求
 SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=用户不存在/已冻结
 SYSTEM.ERROR.AUTH.USER.ACCOUNT.PASSWORD=账号或者密码错误!
 SYSTEM.ERROR.AUTH.USER.PASSWORD=密码错误
+SYSTEM.ERROR.AUTH.USER.OLD.PASSWORD=旧密码错误
 SYSTEM.ERROR.AUTH.USER.PAY.PASSWORD.BLANK=支付密码未设置
 SYSTEM.ERROR.AUTH.USER.MAIL.NOT.SET=邮箱未设置
 SYSTEM.ERROR.AUTH.USER.PASSWORD.NOT.EQUALS=新密码与确认密码不一致

server-service/src/main/java/com/makeit/service/wechat/impl/PlatUserWechatServiceImpl.java

@@ -29,10 +29,10 @@ public class PlatUserWechatServiceImpl implements PlatUserWechatService {
     public void changePassword(PlatUserChangePasswordDTO dto) {
         PlatUser platUser = platUserService.getById(dto.getId());
         if (platUser == null) {
-            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_AUTH_USER_PASSWORD);
+            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_AUTH_USER_HAS_DISABLED);
         }
         if (!PasswordUtils.validatePassword(dto.getOldPassword(), platUser.getPassword())) {
-            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_AUTH_USER_PASSWORD);
+            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_AUTH_USER_OLD_PASSWORD);
         }
 
         if(dto.getNewPassword()!=null && !dto.getNewPassword().equals(dto.getQueryPassword())){