健康小屋- 返回信封统一

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/LoginController.java

@@ -47,17 +47,17 @@ public class LoginController extends EnvelopRestEndpoint {
            @ApiParam(name = "msgType", value = "消息类型（login：登录验证，checkPhone：验证安全手机，resetPhone：重设安全手机", required = true)@RequestParam(required = true, name = "msgType") String msgType,
            @ApiParam(name = "username", value = "手机账号", required = true)@RequestParam(required = true, name = "username") String username ) throws  Exception{
        if (StringUtils.isEmpty(clientId)) {
            throw new InvalidRequestException("clientId");
            failed("clientId 为空！");
        }
        if (StringUtils.isEmpty(username)){
            throw new InvalidRequestException("username");
            failed("username 为空！");
        }
        //验证请求间隔超时，防止频繁获取验证码
//        if (!wlyyRedisVerifyCodeService.isIntervalTimeout(clientId, username)) {
//            throw new IllegalAccessException("SMS request frequency is too fast");
//        }
        if (!wlyyRedisVerifyCodeService.isIntervalTimeout(clientId, username)) {
            throw new IllegalAccessException("SMS request frequency is too fast");
        }
        //发送短信获取验证码
        ResponseEntity<HashMap> result = loginService.sendDemoSms(clientId,msgType,username);
        ResponseEntity<HashMap> result = loginService.sendSms(clientId,msgType,username);
        return result;
    }
@@ -70,15 +70,15 @@ public class LoginController extends EnvelopRestEndpoint {
            @ApiParam(name = "username", value = "登录账号", required = true)@RequestParam(required = true, name = "username") String username,
            @ApiParam(name = "captcha", value = "短信验证码", required = true)@RequestParam(required = true, name = "captcha") String captcha) throws ManageException, ParseException {
        if (wlyyRedisVerifyCodeService.verification(clientId, username, captcha)) {
            return ObjEnvelop.getSuccess("验证码正确");
            return success("验证码正确");
        } else {
            return ObjEnvelop.getError("验证码错误");
            return failed("验证码错误");
        }
    }
    @PostMapping("/mobile/login")
    @ApiOperation(value = "【普通用户】-手机登录注册")
    public ObjEnvelop<User> mobileLogin(
    public Envelop mobileLogin(
            HttpServletRequest request,
            @ApiParam(name = "clientId", value = "应用id", required = true)@RequestParam(required = true, name = "clientId") String clientId,
            @ApiParam(name = "username", value = "账号", required = true)@RequestParam(required = true, name = "username") String username,
@@ -92,26 +92,22 @@ public class LoginController extends EnvelopRestEndpoint {
            return success(user);
        } else {
            return ObjEnvelop.getError("验证码错误");
            return failed("验证码错误");
        }
    }
    @PostMapping("/ijk/login")
    @ApiOperation(value = "【普通用户】-i健康用户登陆")
    public ObjEnvelop ijkLogin(
    public Envelop ijkLogin(
            HttpServletRequest request,
            @ApiParam(name = "clientId", value = "应用id", required = true)@RequestParam(required = true, name = "clientId") String clientId,
            @ApiParam(name = "username", value = "账号", required = true)@RequestParam(required = true, name = "username") String username,
            @ApiParam(name = "password", value = "密码", required = true)@RequestParam(required = true, name = "password") String password) throws ManageException {
        User user = loginService.iJklogin(request,clientId,username, password);
        if (user !=null) {
            ObjEnvelop envelop = new ObjEnvelop();
            envelop.setStatus(200);
            envelop.setMessage("登录成功");
            envelop.setObj(user);
            return envelop;
            return success("登录成功",user);
        }else {
            return ObjEnvelop.getError("登录失败");
            return failed("登录失败");
        }
    }
@@ -122,10 +118,10 @@ public class LoginController extends EnvelopRestEndpoint {
            @ApiParam(name = "userCode", value = "用户code", required = true)@RequestParam(required = true, name = "userCode") String userCode) {
        try {
            //修改用户状态  离线
           return ObjEnvelop.getSuccess("登出成功");
           return success("登出成功");
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("登出成功:" + e.getMessage(), -1);
            return failed("登出失败");
        }
    }
@@ -134,31 +130,36 @@ public class LoginController extends EnvelopRestEndpoint {
    @PostMapping("/mobile/manage/login")
    @ApiOperation(value = "【管理员】-手机验证登录")
    public ObjEnvelop administratorMobileLogin(
    public Envelop administratorMobileLogin(
            HttpServletRequest request,
            @ApiParam(name = "clientId", value = "应用id", required = true)@RequestParam(required = true, name = "clientId") String clientId,
            @ApiParam(name = "username", value = "账号", required = true)@RequestParam(required = true, name = "username") String username,
            @ApiParam(name = "captcha", value = "短信验证码", required = true)@RequestParam(required = true, name = "captcha") String captcha) throws ManageException, ParseException {
            @ApiParam(name = "captcha", value = "短信验证码", required = true)@RequestParam(required = true, name = "captcha") String captcha) throws ParseException {
        if (wlyyRedisVerifyCodeService.verification(clientId, username, captcha)) {
            User user = loginService.managerPhoneLogin(request,username);
            return ObjEnvelop.getSuccess("登录成功",user);
            User user = null;
            try {
                user = loginService.managerPhoneLogin(request,username);
            } catch (ManageException e) {
                return failed(e.getMessage());
            }
            return success("登录成功",user);
        } else {
            return ObjEnvelop.getError("验证码错误");
            return failed("验证码错误");
        }
    }
    @PostMapping("/manage/login")
    @ApiOperation(value = "【管理员】-用户账号登陆")
    public ObjEnvelop administratorLogin(
    public Envelop administratorLogin(
            HttpServletRequest request,
            @ApiParam(name = "clientId", value = "应用id", required = true)@RequestParam(required = true, name = "clientId") String clientId,
            @ApiParam(name = "username", value = "账号", required = true)@RequestParam(required = true, name = "username") String username,
            @ApiParam(name = "password", value = "密码", required = true)@RequestParam(required = true, name = "password") String password) throws ManageException {
        User user = loginService.managerLogin(request,clientId,username, password);
        if (user !=null) {
            return ObjEnvelop.getSuccess("登录成功",user);
            return success("登录成功",user);
        }else {
            return ObjEnvelop.getError("登录失败");
            return failed("登录失败");
        }
    }
@@ -172,9 +173,9 @@ public class LoginController extends EnvelopRestEndpoint {
            response.setDateHeader("Expire", 0);
            RandomValidateCode randomValidateCode = new RandomValidateCode();
            randomValidateCode.getRandcode(request, response);//输出验证码图片方法
            return ObjEnvelop.getSuccess("获取验证码成功");
            return success("获取验证码成功");
        } catch (Exception e) {
            return ObjEnvelop.getError("获取验证码失败");
            return failed("获取验证码失败");
        }
    }
@@ -183,14 +184,14 @@ public class LoginController extends EnvelopRestEndpoint {
    public Envelop checkImageCode(@ApiParam(name = "code",value = "输入的验证码")@RequestParam(value = "code",required = true)String code,
                                     HttpServletRequest request){
        if (StringUtils.isEmpty(code)){
            return ObjEnvelop.getError("请输入验证码！");
            return failed("请输入验证码！");
        }
        String codeRescource = String.valueOf(request.getSession().getAttribute(RandomValidateCode.RANDOMCODEKEY));
        if (code.toLowerCase().equals(codeRescource.toLowerCase())){
            request.getSession().removeAttribute(RandomValidateCode.RANDOMCODEKEY);
            return ObjEnvelop.getSuccess("验证码正确！");
            return success("验证码正确！");
        }else {
            return ObjEnvelop.getError("验证码错误！");
            return failed("验证码错误！");
        }
    }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/facilities/FacilitiesController.java

@@ -287,7 +287,7 @@ public class FacilitiesController extends EnvelopRestEndpoint {
    @PostMapping(value = "/batchImport")
    @ApiOperation(value = "设施列表导入（经纬度重复的不导入）")
    public ObjEnvelop importData(
    public Envelop importData(
            @ApiParam(name = "file", value = "文件", required = true)
            @RequestPart(value = "file") MultipartFile file,
            HttpServletRequest request) throws IOException, ManageException {
@@ -298,13 +298,13 @@ public class FacilitiesController extends EnvelopRestEndpoint {
            List<FacilityMsg> dataList = excelReader.getCorrectLs();
            if (dataList.size() > 0) {
                Map<String, Object> result = facilityService.batchInsertFacility(dataList);
                return ObjEnvelop.getSuccess("导入成功!", result);
                return success("导入成功!", result);
            }
        } catch (Exception e) {
            throw new ManageException("导入设施列表异常！", e);
        }
        return ObjEnvelop.getError("导入失败");
        return failed("导入失败");
    }
    @ApiOperation(value = "获取设施列表--不分页(app)", responseContainer = "List")
@@ -358,7 +358,7 @@ public class FacilitiesController extends EnvelopRestEndpoint {
        String filters = "createTime>=" + todayStart + ";createTime<=" + todayEnd;
        long countCreatedFacilitieToday = facilityService.getCount(filters);
        map.put("countCreatedFacilitieToday", countCreatedFacilitieToday);
        return ObjEnvelop.getSuccess("获取成功", map);
        return success("获取成功", map);
    }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/UserController.java

@@ -77,7 +77,7 @@ public class UserController  extends EnvelopRestEndpoint {
    public ObjEnvelop userDetail(
            @ApiParam(name = "userId", value = "用户id", required = true)@RequestParam(required = true, name = "userId") String userId ) {
        User user = userService.findById(userId);
        return ObjEnvelop.getSuccess("获取成功",user);
        return success("获取成功",user);
    }
@@ -85,7 +85,7 @@ public class UserController  extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取用户统计信息")
    public ObjEnvelop usedFacilityCount() {
        Map<String, Long> userStatistics = userService.findUserStatistics();
        return ObjEnvelop.getSuccess("获取成功",userStatistics);
        return success("获取成功",userStatistics);
    }
    @ApiOperation(value = "新增/更新（idy已存在）用户信息")
@@ -110,7 +110,7 @@ public class UserController  extends EnvelopRestEndpoint {
            @ApiParam(name = "operator", value = "操作者ID", required = true)@RequestParam(required = true, name = "operator") String operator ) throws ManageException {
        userService.updateStatus(userId,operator, HouseUserContant.activated_lock,reason);
        return ObjEnvelop.getSuccess("冻结成功");
        return success("冻结成功");
    }
@@ -120,7 +120,7 @@ public class UserController  extends EnvelopRestEndpoint {
            @ApiParam(name = "userId", value = "用户id", required = true)@RequestParam(required = true, name = "userId") String userId ,
            @ApiParam(name = "operator", value = "操作者ID", required = true)@RequestParam(required = true, name = "operator") String operator ) throws ManageException {
        userService.updateStatus(userId,operator, HouseUserContant.activated_active,null);
        return ObjEnvelop.getSuccess("激活成功");
        return success("激活成功");
    }
    @PostMapping("/updatePwd")
@@ -131,7 +131,7 @@ public class UserController  extends EnvelopRestEndpoint {
            @ApiParam(name = "newPwd", value = "新密码", required = true)@RequestParam(required = true, name = "newPwd") String newPwd ) throws ManageException {
        userService.updatePwd(userId,oldPwd,newPwd);
        return ObjEnvelop.getSuccess("更新密码成功");
        return success("更新密码成功");
    }
    @PostMapping("/updatePhone")
@@ -145,9 +145,9 @@ public class UserController  extends EnvelopRestEndpoint {
        //验证码
        if (wlyyRedisVerifyCodeService.verification(clientId, newPhone, captcha)) {
            userService.updateSecurePhone(userId,newPhone);
            return ObjEnvelop.getSuccess("更新安全手机号码成功");
            return success("更新安全手机号码成功");
        } else {
            return ObjEnvelop.getError("验证码错误");
            return failed("验证码错误");
        }
    }
@@ -159,7 +159,7 @@ public class UserController  extends EnvelopRestEndpoint {
            @ApiParam(name = "idCardNo", value = "身份证号码", required = true)@RequestParam(required = true, name = "idCardNo") String idCardNo ) throws ManageException {
        userService.checkIdCardNo(userId,name,idCardNo);
        return ObjEnvelop.getSuccess("用户实名认证完成！");
        return success("用户实名认证完成！");
    }
    @GetMapping("/existence")
@@ -169,9 +169,9 @@ public class UserController  extends EnvelopRestEndpoint {
        boolean b = userService.checkManageUser(telephone);
        if (b) {
            return ObjEnvelop.getSuccess("该管理员账号存在！",b);
            return success("该管理员账号存在！",b);
        }else {
            return ObjEnvelop.getSuccess("该管理员账号不存在！",b);
            return success("该管理员账号不存在！",b);
        }
    }
@@ -182,15 +182,15 @@ public class UserController  extends EnvelopRestEndpoint {
        User user = userService.findByLoginCodeAndUserType(loginName, LoginInfo.USER_TYPE_SUPER_AdminManager);
        if (user != null) {
            return ObjEnvelop.getSuccess("该管理员账号存在！",user);
            return success("该管理员账号存在！",user);
        }else {
            return ObjEnvelop.getSuccess("该管理员账号不存在！",user);
            return success("该管理员账号不存在！",user);
        }
    }
    @PostMapping(value = "/resetPassWord")
    @ApiOperation(value = "重设密码", notes = "根基传入的用户id和新的密码重设用户的密码")
    public ObjEnvelop resetPassWord(
    public Envelop resetPassWord(
            @ApiParam(name = "userId", value = "用户ID", defaultValue = "")
            @RequestParam(value = "userId") String userId,
            @ApiParam(name = "password", value = "密码", defaultValue = "")
@@ -198,9 +198,9 @@ public class UserController  extends EnvelopRestEndpoint {
        try {
            String resetPwd = userService.resetPwd(userId, password);
            return ObjEnvelop.getSuccess("重设密码成功",password);
            return success("重设密码成功",password);
        } catch (ManageException e) {
            return ObjEnvelop.getError(e.getMessage());
            return failed(e.getMessage());
        }
    }

svr/svr-healthy-house/src/main/resources/application.yml

@@ -80,11 +80,11 @@ fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
# 短信发送地址
jw:
  smsUrl: http://svr-base-hzy:10020/sms_gateway/send
  smsUrl: http://svr-base:10020/sms_gateway/send
---
spring:
  profiles: jwtest
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/healthy_house?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root

svr/svr-healthy-house/src/main/resources/bootstrap.yml

@@ -24,7 +24,7 @@ eureka:
---
spring:
  profiles: jwtest
  profiles: test
eureka: