diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java index ecc8f2ad7..a82a6c0d4 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/admins/AdminsUserController.java @@ -3,10 +3,10 @@ package cn.iocoder.mall.user.application.controller.admins; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.user.application.convert.UserConvert; import cn.iocoder.mall.user.application.vo.admins.AdminsUserPageVO; -import cn.iocoder.mall.user.service.api.UserService; -import cn.iocoder.mall.user.service.api.bo.UserPageBO; -import cn.iocoder.mall.user.service.api.dto.UserPageDTO; -import cn.iocoder.mall.user.service.api.dto.UserUpdateDTO; +import cn.iocoder.mall.user.api.dto.UserPageDTO; +import cn.iocoder.mall.user.api.dto.UserUpdateDTO; +import cn.iocoder.mall.user.api.UserService; +import cn.iocoder.mall.user.api.bo.UserPageBO; import com.alibaba.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/PassportController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/PassportController.java index 29c423a64..3951c14c2 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/PassportController.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/PassportController.java @@ -3,10 +3,10 @@ package cn.iocoder.mall.user.application.controller.users; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.user.application.convert.PassportConvert; import cn.iocoder.mall.user.sdk.annotation.PermitAll; -import cn.iocoder.mall.user.service.api.MobileCodeService; -import cn.iocoder.mall.user.service.api.OAuth2Service; -import cn.iocoder.mall.user.service.api.UserService; -import cn.iocoder.mall.user.service.api.bo.OAuth2AccessTokenBO; +import cn.iocoder.mall.user.api.MobileCodeService; +import cn.iocoder.mall.user.api.OAuth2Service; +import cn.iocoder.mall.user.api.UserService; +import cn.iocoder.mall.user.api.bo.OAuth2AccessTokenBO; import cn.iocoder.mall.user.application.vo.users.MobileRegisterVO; import com.alibaba.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserAddressController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserAddressController.java index bb28e6c1d..dec8f0346 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserAddressController.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserAddressController.java @@ -4,10 +4,10 @@ import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.user.application.convert.UserAddressConvert; import cn.iocoder.mall.user.application.po.UserAddressAddPO; import cn.iocoder.mall.user.application.po.UserAddressUpdatePO; +import cn.iocoder.mall.user.api.dto.UserAddressAddDTO; +import cn.iocoder.mall.user.api.dto.UserAddressUpdateDTO; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; -import cn.iocoder.mall.user.service.api.UserAddressService; -import cn.iocoder.mall.user.service.api.dto.UserAddressAddDTO; -import cn.iocoder.mall.user.service.api.dto.UserAddressUpdateDTO; +import cn.iocoder.mall.user.api.UserAddressService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +37,7 @@ public class UserAddressController { return userAddressService.addAddress(userAddressAddDTO); } - @PostMapping("update") + @PutMapping("update") @ApiOperation(value = "用户地址-更新") public CommonResult updateAddress(@RequestBody @Validated UserAddressUpdatePO userAddressUpdatePO) { Integer userId = UserSecurityContextHolder.getContext().getUserId(); @@ -57,6 +57,6 @@ public class UserAddressController { @ApiOperation(value = "用户地址列表") public CommonResult addressList() { Integer userId = UserSecurityContextHolder.getContext().getUserId(); - return userAddressService.addressList(userId); + return userAddressService.addressList(1); } } diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserController.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserController.java index 67d740a36..df4759a65 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserController.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserController.java @@ -2,11 +2,11 @@ package cn.iocoder.mall.user.application.controller.users; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.user.application.convert.UserConvert; +import cn.iocoder.mall.user.api.bo.UserBO; +import cn.iocoder.mall.user.api.dto.UserUpdateDTO; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; import cn.iocoder.mall.user.application.vo.users.UsersUserVO; -import cn.iocoder.mall.user.service.api.UserService; -import cn.iocoder.mall.user.service.api.bo.UserBO; -import cn.iocoder.mall.user.service.api.dto.UserUpdateDTO; +import cn.iocoder.mall.user.api.UserService; import com.alibaba.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java index 8ba1c0dea..a40ba1ed9 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/PassportConvert.java @@ -1,7 +1,7 @@ package cn.iocoder.mall.user.application.convert; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.service.api.bo.OAuth2AccessTokenBO; +import cn.iocoder.mall.user.api.bo.OAuth2AccessTokenBO; import cn.iocoder.mall.user.application.vo.users.MobileRegisterVO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/UserAddressConvert.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/UserAddressConvert.java index 430773355..84fe3fb12 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/UserAddressConvert.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/UserAddressConvert.java @@ -2,8 +2,8 @@ package cn.iocoder.mall.user.application.convert; import cn.iocoder.mall.user.application.po.UserAddressAddPO; import cn.iocoder.mall.user.application.po.UserAddressUpdatePO; -import cn.iocoder.mall.user.service.api.dto.UserAddressAddDTO; -import cn.iocoder.mall.user.service.api.dto.UserAddressUpdateDTO; +import cn.iocoder.mall.user.api.dto.UserAddressAddDTO; +import cn.iocoder.mall.user.api.dto.UserAddressUpdateDTO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/UserConvert.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/UserConvert.java index bdb929f0f..9b4637a52 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/UserConvert.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/convert/UserConvert.java @@ -3,8 +3,8 @@ package cn.iocoder.mall.user.application.convert; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.user.application.vo.admins.AdminsUserPageVO; import cn.iocoder.mall.user.application.vo.users.UsersUserVO; -import cn.iocoder.mall.user.service.api.bo.UserBO; -import cn.iocoder.mall.user.service.api.bo.UserPageBO; +import cn.iocoder.mall.user.api.bo.UserBO; +import cn.iocoder.mall.user.api.bo.UserPageBO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; diff --git a/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserAccessLogInterceptor.java b/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserAccessLogInterceptor.java index a13c61e86..a701afa09 100644 --- a/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserAccessLogInterceptor.java +++ b/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserAccessLogInterceptor.java @@ -1,8 +1,8 @@ package cn.iocoder.mall.user.sdk.interceptor; import cn.iocoder.common.framework.util.HttpUtil; -import cn.iocoder.mall.user.service.api.UserAccessLogService; -import cn.iocoder.mall.user.service.api.dto.UserAccessLogAddDTO; +import cn.iocoder.mall.user.api.UserAccessLogService; +import cn.iocoder.mall.user.api.dto.UserAccessLogAddDTO; import com.alibaba.dubbo.config.annotation.Reference; import com.alibaba.fastjson.JSON; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserSecurityInterceptor.java b/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserSecurityInterceptor.java index 73605789a..c39b50d8b 100644 --- a/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserSecurityInterceptor.java +++ b/user/user-sdk/src/main/java/cn/iocoder/mall/user/sdk/interceptor/UserSecurityInterceptor.java @@ -3,11 +3,11 @@ package cn.iocoder.mall.user.sdk.interceptor; import cn.iocoder.common.framework.exception.ServiceException; import cn.iocoder.common.framework.util.HttpUtil; import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.user.api.OAuth2Service; +import cn.iocoder.mall.user.api.bo.OAuth2AuthenticationBO; import cn.iocoder.mall.user.sdk.annotation.PermitAll; import cn.iocoder.mall.user.sdk.context.UserSecurityContext; import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder; -import cn.iocoder.mall.user.service.api.OAuth2Service; -import cn.iocoder.mall.user.service.api.bo.OAuth2AuthenticationBO; import com.alibaba.dubbo.config.annotation.Reference; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/MobileCodeService.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/MobileCodeService.java similarity index 87% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/MobileCodeService.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/MobileCodeService.java index 821b66a10..64037eccf 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/MobileCodeService.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/MobileCodeService.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api; +package cn.iocoder.mall.user.api; import cn.iocoder.common.framework.exception.ServiceException; import cn.iocoder.common.framework.vo.CommonResult; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/OAuth2Service.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/OAuth2Service.java similarity index 73% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/OAuth2Service.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/OAuth2Service.java index 5bc3224c7..6f6295686 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/OAuth2Service.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/OAuth2Service.java @@ -1,9 +1,9 @@ -package cn.iocoder.mall.user.service.api; +package cn.iocoder.mall.user.api; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.service.api.bo.OAuth2AccessTokenBO; -import cn.iocoder.mall.user.service.api.bo.OAuth2AuthenticationBO; +import cn.iocoder.mall.user.api.bo.OAuth2AccessTokenBO; +import cn.iocoder.mall.user.api.bo.OAuth2AuthenticationBO; public interface OAuth2Service { diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/UserAccessLogService.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserAccessLogService.java similarity index 62% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/UserAccessLogService.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserAccessLogService.java index c840b8ffc..5e454a244 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/UserAccessLogService.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserAccessLogService.java @@ -1,7 +1,7 @@ -package cn.iocoder.mall.user.service.api; +package cn.iocoder.mall.user.api; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.service.api.dto.UserAccessLogAddDTO; +import cn.iocoder.mall.user.api.dto.UserAccessLogAddDTO; public interface UserAccessLogService { diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/UserAddressService.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserAddressService.java similarity index 66% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/UserAddressService.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserAddressService.java index 5b783fd2b..ba66ed695 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/UserAddressService.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserAddressService.java @@ -1,9 +1,9 @@ -package cn.iocoder.mall.user.service.api; +package cn.iocoder.mall.user.api; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.service.api.bo.UserAddressBO; -import cn.iocoder.mall.user.service.api.dto.UserAddressAddDTO; -import cn.iocoder.mall.user.service.api.dto.UserAddressUpdateDTO; +import cn.iocoder.mall.user.api.bo.UserAddressBO; +import cn.iocoder.mall.user.api.dto.UserAddressAddDTO; +import cn.iocoder.mall.user.api.dto.UserAddressUpdateDTO; import java.util.List; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/UserService.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserService.java similarity index 75% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/UserService.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserService.java index 1dc7ba41f..aa59d7103 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/UserService.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserService.java @@ -1,10 +1,10 @@ -package cn.iocoder.mall.user.service.api; +package cn.iocoder.mall.user.api; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.service.api.bo.UserBO; -import cn.iocoder.mall.user.service.api.bo.UserPageBO; -import cn.iocoder.mall.user.service.api.dto.UserPageDTO; -import cn.iocoder.mall.user.service.api.dto.UserUpdateDTO; +import cn.iocoder.mall.user.api.bo.UserBO; +import cn.iocoder.mall.user.api.bo.UserPageBO; +import cn.iocoder.mall.user.api.dto.UserPageDTO; +import cn.iocoder.mall.user.api.dto.UserUpdateDTO; public interface UserService { diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/OAuth2AccessTokenBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java similarity index 95% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/OAuth2AccessTokenBO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java index d192a4d6f..1b7883149 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/OAuth2AccessTokenBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.bo; +package cn.iocoder.mall.user.api.bo; import java.io.Serializable; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/OAuth2AuthenticationBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java similarity index 88% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/OAuth2AuthenticationBO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java index 432b9fb97..424de512a 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/OAuth2AuthenticationBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.bo; +package cn.iocoder.mall.user.api.bo; import java.io.Serializable; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserAddressBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java similarity index 64% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserAddressBO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java index e6d21dc45..2aa55f9b8 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserAddressBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.bo; +package cn.iocoder.mall.user.api.bo; /** * @author Sin diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserAddressPageBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java similarity index 95% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserAddressPageBO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java index ca57a6e53..4efe04158 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserAddressPageBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.bo; +package cn.iocoder.mall.user.api.bo; import java.io.Serializable; import java.util.List; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java similarity index 97% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserBO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java index 6cf155de5..c22cc735c 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.bo; +package cn.iocoder.mall.user.api.bo; import java.util.Date; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserPageBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java similarity index 92% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserPageBO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java index b27d937ec..648ac3e85 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/bo/UserPageBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.bo; +package cn.iocoder.mall.user.api.bo; import java.util.List; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/constant/ThirdPlatformConstant.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/ThirdPlatformConstant.java similarity index 76% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/constant/ThirdPlatformConstant.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/ThirdPlatformConstant.java index 1e70e7f41..ae982609c 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/constant/ThirdPlatformConstant.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/ThirdPlatformConstant.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.constant; +package cn.iocoder.mall.user.api.constant; public class ThirdPlatformConstant { diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/constant/UserConstants.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserConstants.java similarity index 80% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/constant/UserConstants.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserConstants.java index 9ba1beb67..eb5e4b1e6 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/constant/UserConstants.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserConstants.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.constant; +package cn.iocoder.mall.user.api.constant; public class UserConstants { diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/constant/UserErrorCodeEnum.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserErrorCodeEnum.java similarity index 97% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/constant/UserErrorCodeEnum.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserErrorCodeEnum.java index 85d00966d..cdab2fc28 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/constant/UserErrorCodeEnum.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/constant/UserErrorCodeEnum.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.constant; +package cn.iocoder.mall.user.api.constant; /** * 错误码枚举类 diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserAccessLogAddDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java similarity index 98% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserAccessLogAddDTO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java index bccb98895..2dcbf155c 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserAccessLogAddDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.dto; +package cn.iocoder.mall.user.api.dto; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserAddressAddDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java similarity index 97% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserAddressAddDTO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java index 3807fbacb..29e5112ce 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserAddressAddDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.dto; +package cn.iocoder.mall.user.api.dto; import java.io.Serializable; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserAddressUpdateDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java similarity index 97% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserAddressUpdateDTO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java index 8552b4d5c..af4363237 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserAddressUpdateDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.dto; +package cn.iocoder.mall.user.api.dto; import java.io.Serializable; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserPageDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java similarity index 94% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserPageDTO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java index d76b71ddf..3be215353 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserPageDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.dto; +package cn.iocoder.mall.user.api.dto; import javax.validation.constraints.NotNull; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserUpdateDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java similarity index 94% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserUpdateDTO.java rename to user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java index cbb2af030..b4def8cf2 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/service/api/dto/UserUpdateDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.service.api.dto; +package cn.iocoder.mall.user.api.dto; /** * 用户更新 DTO diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/config/DatabaseConfiguration.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/config/DatabaseConfiguration.java similarity index 79% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/config/DatabaseConfiguration.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/config/DatabaseConfiguration.java index 5c0cbf303..d77b47807 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/config/DatabaseConfiguration.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/config/DatabaseConfiguration.java @@ -1,11 +1,11 @@ -package cn.iocoder.mall.user.config; +package cn.iocoder.mall.user.biz.config; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration -@MapperScan("cn.iocoder.mall.user.dao") // 扫描对应的 Mapper 接口 +@MapperScan("cn.iocoder.mall.user.biz.dao") // 扫描对应的 Mapper 接口 @EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理。为什么使用 proxyTargetClass 参数,参见 https://blog.csdn.net/huang_550/article/details/76492600 public class DatabaseConfiguration { diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/config/ServiceExceptionConfiguration.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/config/ServiceExceptionConfiguration.java similarity index 90% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/config/ServiceExceptionConfiguration.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/config/ServiceExceptionConfiguration.java index 7c5aff2ba..a315eb6bf 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/config/ServiceExceptionConfiguration.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/config/ServiceExceptionConfiguration.java @@ -1,7 +1,7 @@ -package cn.iocoder.mall.user.config; +package cn.iocoder.mall.user.biz.config; import cn.iocoder.common.framework.util.ServiceExceptionUtil; -import cn.iocoder.mall.user.service.api.constant.UserErrorCodeEnum; +import cn.iocoder.mall.user.api.constant.UserErrorCodeEnum; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.EventListener; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/OAuth2Convert.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/OAuth2Convert.java similarity index 78% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/OAuth2Convert.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/OAuth2Convert.java index 53183f5f1..d4640c6ce 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/OAuth2Convert.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/OAuth2Convert.java @@ -1,8 +1,8 @@ -package cn.iocoder.mall.user.convert; +package cn.iocoder.mall.user.biz.convert; -import cn.iocoder.mall.user.dataobject.OAuth2AccessTokenDO; -import cn.iocoder.mall.user.service.api.bo.OAuth2AccessTokenBO; -import cn.iocoder.mall.user.service.api.bo.OAuth2AuthenticationBO; +import cn.iocoder.mall.user.biz.dataobject.OAuth2AccessTokenDO; +import cn.iocoder.mall.user.api.bo.OAuth2AccessTokenBO; +import cn.iocoder.mall.user.api.bo.OAuth2AuthenticationBO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/UserAccessLogConvert.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserAccessLogConvert.java similarity index 67% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/UserAccessLogConvert.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserAccessLogConvert.java index a6e7ddb5e..bad7990ef 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/UserAccessLogConvert.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserAccessLogConvert.java @@ -1,7 +1,7 @@ -package cn.iocoder.mall.user.convert; +package cn.iocoder.mall.user.biz.convert; -import cn.iocoder.mall.user.dataobject.UserAccessLogDO; -import cn.iocoder.mall.user.service.api.dto.UserAccessLogAddDTO; +import cn.iocoder.mall.user.biz.dataobject.UserAccessLogDO; +import cn.iocoder.mall.user.api.dto.UserAccessLogAddDTO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/UserAddressConvert.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserAddressConvert.java similarity index 68% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/UserAddressConvert.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserAddressConvert.java index 71be6fad3..39f2f4ed1 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/UserAddressConvert.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserAddressConvert.java @@ -1,9 +1,9 @@ -package cn.iocoder.mall.user.convert; +package cn.iocoder.mall.user.biz.convert; -import cn.iocoder.mall.user.dataobject.UserAddressDO; -import cn.iocoder.mall.user.service.api.bo.UserAddressBO; -import cn.iocoder.mall.user.service.api.dto.UserAddressAddDTO; -import cn.iocoder.mall.user.service.api.dto.UserAddressUpdateDTO; +import cn.iocoder.mall.user.api.bo.UserAddressBO; +import cn.iocoder.mall.user.api.dto.UserAddressAddDTO; +import cn.iocoder.mall.user.api.dto.UserAddressUpdateDTO; +import cn.iocoder.mall.user.biz.dataobject.UserAddressDO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/UserConvert.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserConvert.java similarity index 68% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/UserConvert.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserConvert.java index ea54f275b..3b7a37a21 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/convert/UserConvert.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserConvert.java @@ -1,8 +1,8 @@ -package cn.iocoder.mall.user.convert; +package cn.iocoder.mall.user.biz.convert; -import cn.iocoder.mall.user.dataobject.UserDO; -import cn.iocoder.mall.user.service.api.bo.UserBO; -import cn.iocoder.mall.user.service.api.dto.UserUpdateDTO; +import cn.iocoder.mall.user.biz.dataobject.UserDO; +import cn.iocoder.mall.user.api.bo.UserBO; +import cn.iocoder.mall.user.api.dto.UserUpdateDTO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/MobileCodeMapper.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/MobileCodeMapper.java similarity index 84% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/MobileCodeMapper.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/MobileCodeMapper.java index 03b13b420..6691a75c5 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/MobileCodeMapper.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/MobileCodeMapper.java @@ -1,6 +1,6 @@ -package cn.iocoder.mall.user.dao; +package cn.iocoder.mall.user.biz.dao; -import cn.iocoder.mall.user.dataobject.MobileCodeDO; +import cn.iocoder.mall.user.biz.dataobject.MobileCodeDO; import org.springframework.stereotype.Repository; @Repository // 实际不加也没问entity,就是不想 IDEA 那看到有个报错 diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/OAuth2AccessTokenMapper.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2AccessTokenMapper.java similarity index 76% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/OAuth2AccessTokenMapper.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2AccessTokenMapper.java index 0472ce5f0..77f9c8918 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/OAuth2AccessTokenMapper.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2AccessTokenMapper.java @@ -1,6 +1,6 @@ -package cn.iocoder.mall.user.dao; +package cn.iocoder.mall.user.biz.dao; -import cn.iocoder.mall.user.dataobject.OAuth2AccessTokenDO; +import cn.iocoder.mall.user.biz.dataobject.OAuth2AccessTokenDO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/OAuth2RefreshTokenMapper.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2RefreshTokenMapper.java similarity index 72% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/OAuth2RefreshTokenMapper.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2RefreshTokenMapper.java index 04fcbcc43..281718b7e 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/OAuth2RefreshTokenMapper.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/OAuth2RefreshTokenMapper.java @@ -1,6 +1,6 @@ -package cn.iocoder.mall.user.dao; +package cn.iocoder.mall.user.biz.dao; -import cn.iocoder.mall.user.dataobject.OAuth2RefreshTokenDO; +import cn.iocoder.mall.user.biz.dataobject.OAuth2RefreshTokenDO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserAccessLogMapper.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserAccessLogMapper.java similarity index 60% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserAccessLogMapper.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserAccessLogMapper.java index c86c58b40..c40543473 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserAccessLogMapper.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserAccessLogMapper.java @@ -1,6 +1,6 @@ -package cn.iocoder.mall.user.dao; +package cn.iocoder.mall.user.biz.dao; -import cn.iocoder.mall.user.dataobject.UserAccessLogDO; +import cn.iocoder.mall.user.biz.dataobject.UserAccessLogDO; import org.springframework.stereotype.Repository; @Repository diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserAddressMapper.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserAddressMapper.java similarity index 86% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserAddressMapper.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserAddressMapper.java index 0e9fb93dc..d39ff22e6 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserAddressMapper.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserAddressMapper.java @@ -1,6 +1,6 @@ -package cn.iocoder.mall.user.dao; +package cn.iocoder.mall.user.biz.dao; -import cn.iocoder.mall.user.dataobject.UserAddressDO; +import cn.iocoder.mall.user.biz.dataobject.UserAddressDO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserMapper.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserMapper.java similarity index 87% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserMapper.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserMapper.java index 890117210..98fa9de4d 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserMapper.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserMapper.java @@ -1,6 +1,6 @@ -package cn.iocoder.mall.user.dao; +package cn.iocoder.mall.user.biz.dao; -import cn.iocoder.mall.user.dataobject.UserDO; +import cn.iocoder.mall.user.biz.dataobject.UserDO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserRegisterMapper.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserRegisterMapper.java similarity index 59% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserRegisterMapper.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserRegisterMapper.java index 3b586d8d3..633e822e9 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dao/UserRegisterMapper.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserRegisterMapper.java @@ -1,6 +1,6 @@ -package cn.iocoder.mall.user.dao; +package cn.iocoder.mall.user.biz.dao; -import cn.iocoder.mall.user.dataobject.UserRegisterDO; +import cn.iocoder.mall.user.biz.dataobject.UserRegisterDO; import org.springframework.stereotype.Repository; @Repository diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/MobileCodeDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java similarity index 97% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/MobileCodeDO.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java index 88a69fd96..749d614dd 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/MobileCodeDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.dataobject; +package cn.iocoder.mall.user.biz.dataobject; import java.util.Date; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/OAuth2AccessTokenDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java similarity index 97% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/OAuth2AccessTokenDO.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java index ce0a80c7c..e56922fd7 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/OAuth2AccessTokenDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.dataobject; +package cn.iocoder.mall.user.biz.dataobject; import java.util.Date; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/OAuth2RefreshTokenDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java similarity index 96% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/OAuth2RefreshTokenDO.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java index 3ba047b33..3fbedfdd2 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/OAuth2RefreshTokenDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.dataobject; +package cn.iocoder.mall.user.biz.dataobject; import java.util.Date; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserAccessLogDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java similarity index 98% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserAccessLogDO.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java index 94db1da25..3ebde3bfb 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserAccessLogDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.dataobject; +package cn.iocoder.mall.user.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserAddressDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java similarity index 97% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserAddressDO.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java index f76823339..c57dab881 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserAddressDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.dataobject; +package cn.iocoder.mall.user.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java similarity index 96% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserDO.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java index b82e06957..d43dfd6ca 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.dataobject; +package cn.iocoder.mall.user.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java new file mode 100644 index 000000000..8d5491e74 --- /dev/null +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java @@ -0,0 +1,4 @@ +package cn.iocoder.mall.user.biz.dataobject; + +public class UserLoginLogDO { +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserRegisterDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java similarity index 93% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserRegisterDO.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java index 2c9bc1c63..0437051e9 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserRegisterDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.dataobject; +package cn.iocoder.mall.user.biz.dataobject; import java.util.Date; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserThirdAuthDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java similarity index 92% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserThirdAuthDO.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java index ef7de1da2..ce363119c 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserThirdAuthDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.dataobject; +package cn.iocoder.mall.user.biz.dataobject; import java.util.Date; @@ -23,7 +23,7 @@ public class UserThirdAuthDO { /** * 开放平台 * - * @see cn.iocoder.mall.user.constant.ThirdPlatformConstant + * @see cn.iocoder.mall.user.api.constant.ThirdPlatformConstant */ private Integer platform; /** diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/package-info.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/package-info.java new file mode 100644 index 000000000..84cd1a131 --- /dev/null +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.mall.user.biz; \ No newline at end of file diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/MobileCodeServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/MobileCodeServiceImpl.java similarity index 94% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/MobileCodeServiceImpl.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/MobileCodeServiceImpl.java index 824ce668a..c8b000cda 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/MobileCodeServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/MobileCodeServiceImpl.java @@ -1,13 +1,13 @@ -package cn.iocoder.mall.user.service; +package cn.iocoder.mall.user.biz.service; import cn.iocoder.common.framework.constant.SysErrorCodeEnum; import cn.iocoder.common.framework.util.ServiceExceptionUtil; import cn.iocoder.common.framework.util.ValidationUtil; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.dao.MobileCodeMapper; -import cn.iocoder.mall.user.dataobject.MobileCodeDO; -import cn.iocoder.mall.user.service.api.MobileCodeService; -import cn.iocoder.mall.user.service.api.constant.UserErrorCodeEnum; +import cn.iocoder.mall.user.biz.dao.MobileCodeMapper; +import cn.iocoder.mall.user.biz.dataobject.MobileCodeDO; +import cn.iocoder.mall.user.api.MobileCodeService; +import cn.iocoder.mall.user.api.constant.UserErrorCodeEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/OAuth2ServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/OAuth2ServiceImpl.java similarity index 88% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/OAuth2ServiceImpl.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/OAuth2ServiceImpl.java index 456b99d4f..0c58772b8 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/OAuth2ServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/OAuth2ServiceImpl.java @@ -1,19 +1,19 @@ -package cn.iocoder.mall.user.service; +package cn.iocoder.mall.user.biz.service; import cn.iocoder.common.framework.exception.ServiceException; import cn.iocoder.common.framework.util.ServiceExceptionUtil; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.convert.OAuth2Convert; -import cn.iocoder.mall.user.dao.OAuth2AccessTokenMapper; -import cn.iocoder.mall.user.dao.OAuth2RefreshTokenMapper; -import cn.iocoder.mall.user.dataobject.MobileCodeDO; -import cn.iocoder.mall.user.dataobject.OAuth2AccessTokenDO; -import cn.iocoder.mall.user.dataobject.OAuth2RefreshTokenDO; -import cn.iocoder.mall.user.dataobject.UserDO; -import cn.iocoder.mall.user.service.api.OAuth2Service; -import cn.iocoder.mall.user.service.api.constant.UserErrorCodeEnum; -import cn.iocoder.mall.user.service.api.bo.OAuth2AccessTokenBO; -import cn.iocoder.mall.user.service.api.bo.OAuth2AuthenticationBO; +import cn.iocoder.mall.user.biz.dao.OAuth2AccessTokenMapper; +import cn.iocoder.mall.user.biz.dao.OAuth2RefreshTokenMapper; +import cn.iocoder.mall.user.biz.dataobject.MobileCodeDO; +import cn.iocoder.mall.user.biz.dataobject.OAuth2AccessTokenDO; +import cn.iocoder.mall.user.biz.dataobject.OAuth2RefreshTokenDO; +import cn.iocoder.mall.user.biz.dataobject.UserDO; +import cn.iocoder.mall.user.api.OAuth2Service; +import cn.iocoder.mall.user.api.bo.OAuth2AccessTokenBO; +import cn.iocoder.mall.user.api.bo.OAuth2AuthenticationBO; +import cn.iocoder.mall.user.api.constant.UserErrorCodeEnum; +import cn.iocoder.mall.user.biz.convert.OAuth2Convert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/UserAccessLogServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAccessLogServiceImpl.java similarity index 84% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/UserAccessLogServiceImpl.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAccessLogServiceImpl.java index 7c409586e..598decd2e 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/UserAccessLogServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAccessLogServiceImpl.java @@ -1,12 +1,12 @@ -package cn.iocoder.mall.user.service; +package cn.iocoder.mall.user.biz.service; import cn.iocoder.common.framework.util.StringUtil; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.convert.UserAccessLogConvert; -import cn.iocoder.mall.user.dao.UserAccessLogMapper; -import cn.iocoder.mall.user.dataobject.UserAccessLogDO; -import cn.iocoder.mall.user.service.api.UserAccessLogService; -import cn.iocoder.mall.user.service.api.dto.UserAccessLogAddDTO; +import cn.iocoder.mall.user.biz.dao.UserAccessLogMapper; +import cn.iocoder.mall.user.biz.dataobject.UserAccessLogDO; +import cn.iocoder.mall.user.api.UserAccessLogService; +import cn.iocoder.mall.user.api.dto.UserAccessLogAddDTO; +import cn.iocoder.mall.user.biz.convert.UserAccessLogConvert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/UserAddressServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAddressServiceImpl.java similarity index 85% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/UserAddressServiceImpl.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAddressServiceImpl.java index bf22e4b6b..78e755908 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/UserAddressServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserAddressServiceImpl.java @@ -1,16 +1,16 @@ -package cn.iocoder.mall.user.service; +package cn.iocoder.mall.user.biz.service; import cn.iocoder.common.framework.constant.DeletedStatusEnum; import cn.iocoder.common.framework.util.ServiceExceptionUtil; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.convert.UserAddressConvert; -import cn.iocoder.mall.user.dao.UserAddressMapper; -import cn.iocoder.mall.user.dataobject.UserAddressDO; -import cn.iocoder.mall.user.service.api.UserAddressService; -import cn.iocoder.mall.user.service.api.bo.UserAddressBO; -import cn.iocoder.mall.user.service.api.constant.UserErrorCodeEnum; -import cn.iocoder.mall.user.service.api.dto.UserAddressAddDTO; -import cn.iocoder.mall.user.service.api.dto.UserAddressUpdateDTO; +import cn.iocoder.mall.user.api.constant.UserErrorCodeEnum; +import cn.iocoder.mall.user.biz.convert.UserAddressConvert; +import cn.iocoder.mall.user.biz.dao.UserAddressMapper; +import cn.iocoder.mall.user.biz.dataobject.UserAddressDO; +import cn.iocoder.mall.user.api.UserAddressService; +import cn.iocoder.mall.user.api.bo.UserAddressBO; +import cn.iocoder.mall.user.api.dto.UserAddressAddDTO; +import cn.iocoder.mall.user.api.dto.UserAddressUpdateDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/UserServiceImpl.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserServiceImpl.java similarity index 89% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/UserServiceImpl.java rename to user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserServiceImpl.java index c43ef3fb6..e959e5c6a 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/service/UserServiceImpl.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserServiceImpl.java @@ -1,22 +1,22 @@ -package cn.iocoder.mall.user.service; +package cn.iocoder.mall.user.biz.service; import cn.iocoder.common.framework.constant.DeletedStatusEnum; import cn.iocoder.common.framework.constant.SysErrorCodeEnum; import cn.iocoder.common.framework.util.ServiceExceptionUtil; import cn.iocoder.common.framework.util.ValidationUtil; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.convert.UserConvert; -import cn.iocoder.mall.user.dao.UserMapper; -import cn.iocoder.mall.user.dao.UserRegisterMapper; -import cn.iocoder.mall.user.dataobject.UserDO; -import cn.iocoder.mall.user.dataobject.UserRegisterDO; -import cn.iocoder.mall.user.service.api.UserService; -import cn.iocoder.mall.user.service.api.bo.UserBO; -import cn.iocoder.mall.user.service.api.bo.UserPageBO; -import cn.iocoder.mall.user.service.api.constant.UserConstants; -import cn.iocoder.mall.user.service.api.constant.UserErrorCodeEnum; -import cn.iocoder.mall.user.service.api.dto.UserPageDTO; -import cn.iocoder.mall.user.service.api.dto.UserUpdateDTO; +import cn.iocoder.mall.user.biz.dao.UserMapper; +import cn.iocoder.mall.user.biz.dao.UserRegisterMapper; +import cn.iocoder.mall.user.biz.dataobject.UserDO; +import cn.iocoder.mall.user.biz.dataobject.UserRegisterDO; +import cn.iocoder.mall.user.api.UserService; +import cn.iocoder.mall.user.api.bo.UserBO; +import cn.iocoder.mall.user.api.bo.UserPageBO; +import cn.iocoder.mall.user.api.constant.UserConstants; +import cn.iocoder.mall.user.api.constant.UserErrorCodeEnum; +import cn.iocoder.mall.user.api.dto.UserPageDTO; +import cn.iocoder.mall.user.api.dto.UserUpdateDTO; +import cn.iocoder.mall.user.biz.convert.UserConvert; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserLoginLogDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserLoginLogDO.java deleted file mode 100644 index b716894b7..000000000 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserLoginLogDO.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.iocoder.mall.user.dataobject; - -public class UserLoginLogDO { -} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/package-info.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/package-info.java deleted file mode 100644 index 85f6bcf32..000000000 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package cn.iocoder.mall.user; \ No newline at end of file diff --git a/user/user-service-impl/src/main/resources/config/application.yaml b/user/user-service-impl/src/main/resources/config/application.yaml index 0c167aaed..dad5b9cc5 100644 --- a/user/user-service-impl/src/main/resources/config/application.yaml +++ b/user/user-service-impl/src/main/resources/config/application.yaml @@ -10,7 +10,7 @@ spring: mybatis: config-location: classpath:mybatis-config.xml mapper-locations: classpath:mapper/*.xml - type-aliases-package: cn.iocoder.mall.user.dataobject + type-aliases-package: cn.iocoder.mall.user.biz.dataobject # dubbo dubbo: @@ -22,7 +22,7 @@ dubbo: port: -1 name: dubbo scan: - base-packages: cn.iocoder.mall.user.service + base-packages: cn.iocoder.mall.user.biz.service demo: service: version: 1.0.0 \ No newline at end of file diff --git a/user/user-service-impl/src/main/resources/mapper/MobileCodeMapper.xml b/user/user-service-impl/src/main/resources/mapper/MobileCodeMapper.xml index 625da5667..a5599ef9a 100644 --- a/user/user-service-impl/src/main/resources/mapper/MobileCodeMapper.xml +++ b/user/user-service-impl/src/main/resources/mapper/MobileCodeMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO mobile_code ( diff --git a/user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml b/user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml index 6e77bd9c3..dbfdc9036 100644 --- a/user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml +++ b/user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO oauth2_access_token ( diff --git a/user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml b/user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml index b8ffe778f..c68474081 100644 --- a/user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml +++ b/user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO oauth2_refresh_token ( diff --git a/user/user-service-impl/src/main/resources/mapper/UserAccessLogMapper.xml b/user/user-service-impl/src/main/resources/mapper/UserAccessLogMapper.xml index 4168673ac..fe6b703d9 100644 --- a/user/user-service-impl/src/main/resources/mapper/UserAccessLogMapper.xml +++ b/user/user-service-impl/src/main/resources/mapper/UserAccessLogMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/user/user-service-impl/src/main/resources/mapper/UserAddress.xml b/user/user-service-impl/src/main/resources/mapper/UserAddress.xml index 4297e5617..4320d07e0 100644 --- a/user/user-service-impl/src/main/resources/mapper/UserAddress.xml +++ b/user/user-service-impl/src/main/resources/mapper/UserAddress.xml @@ -1,47 +1,47 @@ - + - id, user_id, areaNo, `name`, mobile, address, + id, user_id, area_no, `name`, mobile, address, create_time, update_time, deleted INSERT INTO user_address ( - user_id, areaNo, `name`, mobile, address + user_id, area_no, `name`, mobile, address ) VALUES ( #{userId}, #{areaNo}, #{name}, #{mobile}, #{address}, #{createTime}, #{updateTime}, #{deleted} ) - + UPDATE user_address - - , area_no = #{areaNo} + + , area_no = #{userAddressDO.areaNo} - - , `name` = #{name} + + , `name` = #{userAddressDO.name} - - , mobile = #{mobile} + + , mobile = #{userAddressDO.mobile} - - , address = #{address} + + , address = #{userAddressDO.address} - - , update_time = #{updateTime} + + , update_time = #{userAddressDO.updateTime} - - , deleted = #{deleted} + + , deleted = #{userAddressDO.deleted} WHERE id = #{id} - SELECT FROM user_address @@ -49,7 +49,7 @@ AND id = #{id} - SELECT FROM user_address diff --git a/user/user-service-impl/src/main/resources/mapper/UserMapper.xml b/user/user-service-impl/src/main/resources/mapper/UserMapper.xml index 688f60012..218e9aaa3 100644 --- a/user/user-service-impl/src/main/resources/mapper/UserMapper.xml +++ b/user/user-service-impl/src/main/resources/mapper/UserMapper.xml @@ -1,6 +1,6 @@ - + id, mobile, nickname, avatar, status, diff --git a/user/user-service-impl/src/main/resources/mapper/UserRegisterMapper.xml b/user/user-service-impl/src/main/resources/mapper/UserRegisterMapper.xml index 0db1ebabd..8b0453b39 100644 --- a/user/user-service-impl/src/main/resources/mapper/UserRegisterMapper.xml +++ b/user/user-service-impl/src/main/resources/mapper/UserRegisterMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO user_register (