diff --git a/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java b/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java index 04f3b5d..581a35b 100644 --- a/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java +++ b/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java @@ -50,13 +50,15 @@ public class CustomExceptionHandle { * 自定义异常统一处理类 */ @ExceptionHandler(value = BizException.class) - public ApiResponse handle(BizException bizException) { + public ApiResponse handle(HttpServletResponse response, BizException bizException) { + response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); return ApiResponse.buildResponse(bizException.getCode(), bizException.getMsg()); } @ExceptionHandler(value =IOException.class) - public ApiResponse handle(IOException e) { - LOGGER.error("系统异常 -> {}", e.getMessage(), e); + public ApiResponse handle(HttpServletResponse response, IOException e) { + response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); + LOGGER.error("IO异常 -> {}", e.getMessage(), e); return ApiResponse.buildResult(BizCodeEnum.SERVER_UNKONWN_ERROR); } @@ -64,7 +66,8 @@ public class CustomExceptionHandle { * 异常统一返回处理 */ @ExceptionHandler(value = Exception.class) - public ApiResponse handle(Exception e) { + public ApiResponse handle(HttpServletResponse response, Exception e) { + response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); LOGGER.error("系统异常 -> {}", e.getMessage(), e); return ApiResponse.buildResult(BizCodeEnum.SERVER_UNKONWN_ERROR); } @@ -73,7 +76,8 @@ public class CustomExceptionHandle { * 移动端自定义异常统一处理类 */ @ExceptionHandler(value = AppException.class) - public ApiResponse handle(AppException appException) { + public ApiResponse handle(HttpServletResponse response, AppException appException) { + response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); return ApiResponse.buildResponse(appException.getCode(), appException.getMsg()); } @@ -81,7 +85,8 @@ public class CustomExceptionHandle { * 移动端自定义异常统一处理类 */ @ExceptionHandler(value = HttpMessageNotReadableException.class) - public ApiResponse handle(HttpMessageNotReadableException httpMessageNotReadableException) { + public ApiResponse handle(HttpServletResponse response, HttpMessageNotReadableException httpMessageNotReadableException) { + response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); return ApiResponse.buildResponse(500, "请求参数格式错误"); } diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java index dba4647..1544a7b 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java @@ -20,7 +20,6 @@ import com.ycwl.basic.model.pc.mp.MpConfigEntity; import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.service.mobile.AppMemberService; import com.ycwl.basic.utils.ApiResponse; -import com.ycwl.basic.utils.BeanCopierUtils; import com.ycwl.basic.utils.JwtTokenUtil; import com.ycwl.basic.utils.SnowFlakeUtil; import lombok.extern.slf4j.Slf4j; @@ -96,14 +95,39 @@ public class AppMemberServiceImpl implements AppMemberService { List list = memberMapper.list(memberReqQuery); if (list.isEmpty()) { MemberEntity memberEntity = new MemberEntity(); - BeanCopierUtils.copyProperties(userInfoDTO, memberEntity); memberEntity.setId(SnowFlakeUtil.getLongId()); memberEntity.setScenicId(scenicId); memberEntity.setOpenId(openId.toString()); + memberEntity.setNickname(userInfoDTO.getNickname()); + memberEntity.setAvatarUrl(userInfoDTO.getAvatarUrl()); + memberEntity.setAgreement(1); + memberEntity.setPhone(userInfoDTO.getPhone()); + memberEntity.setCountry(userInfoDTO.getCountry()); + memberEntity.setProvince(userInfoDTO.getProvince()); + memberEntity.setCity(userInfoDTO.getCity()); memberMapper.add(memberEntity); - BeanCopierUtils.copyProperties(memberEntity, memberRespVO); + memberRespVO.setId(memberEntity.getId()); + memberRespVO.setOpenId(memberEntity.getOpenId()); + memberRespVO.setNickname(memberEntity.getNickname()); + memberRespVO.setAvatarUrl(memberEntity.getAvatarUrl()); + memberRespVO.setAgreement(1); + memberRespVO.setPhone(memberEntity.getPhone()); + memberRespVO.setCountry(memberEntity.getCountry()); + memberRespVO.setProvince(memberEntity.getProvince()); + memberRespVO.setCity(memberEntity.getCity()); + memberRespVO.setScenicId(memberEntity.getScenicId()); } else { - BeanCopierUtils.copyProperties(list.get(NumberConstant.ZERO), memberRespVO); + MemberRespVO temp = list.getFirst(); + memberRespVO.setId(temp.getId()); + memberRespVO.setOpenId(temp.getOpenId()); + memberRespVO.setNickname(temp.getNickname()); + memberRespVO.setAvatarUrl(temp.getAvatarUrl()); + memberRespVO.setAgreement(1); + memberRespVO.setPhone(temp.getPhone()); + memberRespVO.setCountry(temp.getCountry()); + memberRespVO.setProvince(temp.getProvince()); + memberRespVO.setCity(temp.getCity()); + memberRespVO.setScenicId(temp.getScenicId()); } jwtInfo.setUserId(memberRespVO.getId()); jwtInfo.setName(memberRespVO.getNickname()); @@ -127,7 +151,9 @@ public class AppMemberServiceImpl implements AppMemberService { public ApiResponse update(WeChatUserInfoUpdateDTO userInfoUpdateDTO) { MemberEntity memberEntity = new MemberEntity(); memberEntity.setId(Long.parseLong(BaseContextHandler.getUserId())); - BeanCopierUtils.copyProperties(userInfoUpdateDTO, memberEntity); + memberEntity.setNickname(userInfoUpdateDTO.getNickname()); + memberEntity.setAvatarUrl(userInfoUpdateDTO.getAvatarUrl()); + memberEntity.setAgreement(userInfoUpdateDTO.getAgreement()); return ApiResponse.success(memberMapper.update(memberEntity)); } diff --git a/src/main/java/com/ycwl/basic/utils/BeanCopierUtils.java b/src/main/java/com/ycwl/basic/utils/BeanCopierUtils.java deleted file mode 100644 index 203c548..0000000 --- a/src/main/java/com/ycwl/basic/utils/BeanCopierUtils.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ycwl.basic.utils; - -import org.springframework.cglib.beans.BeanCopier; - -import java.util.HashMap; -import java.util.Map; - -/** - * @date 2022年03月09日 9:04 - * @author wenshijia - * BeanCopier工具类 - */ -public class BeanCopierUtils { - - public static Map beanCopierCacheMap = new HashMap<>(); - - /** - * - * 将soruce对象的属性转换给target对象 - * @date 2022/3/9 9:11 - * @param source 需要转换的对象 - * @param target 目标对象 - */ - public static void copyProperties(Object source, Object target) { - BeanCopier beanCopier; - - String cacheKey = source.getClass().toString() + target.getClass().toString(); - - if (!beanCopierCacheMap.containsKey(cacheKey)) { - synchronized (BeanCopierUtils.class) { - if (!beanCopierCacheMap.containsKey(cacheKey)) { - beanCopier = BeanCopier.create(source.getClass(), target.getClass(), false); - beanCopierCacheMap.put(cacheKey, beanCopier); - } else { - beanCopier = beanCopierCacheMap.get(cacheKey); - } - } - } else { - beanCopier = beanCopierCacheMap.get(cacheKey); - } - - beanCopier.copy(source, target, null); - } -}