修改package

- impl 增加 biz

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;

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;

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);
     }
 }

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;

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;

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;

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;

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;

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;

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;

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 {
 

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 {
 

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;
 

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 {
 

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;
 

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;
 

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

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;

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;
 

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;
 

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 {
 

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 {
 

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;
 
 /**
  * 错误码枚举类

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;

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;
 

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;
 

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;
 

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

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 {
 

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;

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;

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;

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;

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;

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 那看到有个报错

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;
 

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;
 

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

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;
 

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;
 

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

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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 {
+}

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;
 

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;
     /**

user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/package-info.java

@@ -0,0 +1 @@
+package cn.iocoder.mall.user.biz;

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;

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;

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;
 

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;
 

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;
 

user/user-service-impl/src/main/java/cn/iocoder/mall/user/dataobject/UserLoginLogDO.java

@@ -1,4 +0,0 @@
-package cn.iocoder.mall.user.dataobject;
-
-public class UserLoginLogDO {
-}

user/user-service-impl/src/main/java/cn/iocoder/mall/user/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.mall.user;

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

user/user-service-impl/src/main/resources/mapper/MobileCodeMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.user.dao.MobileCodeMapper">
+<mapper namespace="cn.iocoder.mall.user.biz.dao.MobileCodeMapper">
 
     <insert id="insert" parameterType="MobileCodeDO">
         INSERT INTO mobile_code (

user/user-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.user.dao.OAuth2AccessTokenMapper">
+<mapper namespace="cn.iocoder.mall.user.biz.dao.OAuth2AccessTokenMapper">
 
     <insert id="insert" parameterType="OAuth2AccessTokenDO">
         INSERT INTO oauth2_access_token (

user/user-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.user.dao.OAuth2RefreshTokenMapper">
+<mapper namespace="cn.iocoder.mall.user.biz.dao.OAuth2RefreshTokenMapper">
 
     <insert id="insert" parameterType="OAuth2RefreshTokenDO">
         INSERT INTO oauth2_refresh_token (

user/user-service-impl/src/main/resources/mapper/UserAccessLogMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.user.dao.UserAccessLogMapper">
+<mapper namespace="cn.iocoder.mall.user.biz.dao.UserAccessLogMapper">
 
     <!--<sql id="FIELDS">-->
       <!--id, username, nickname, password, status,-->

user/user-service-impl/src/main/resources/mapper/UserAddress.xml

@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.user.dao.UserAddressMapper">
+<mapper namespace="cn.iocoder.mall.user.biz.dao.UserAddressMapper">
 
     <sql id="FIELDS">
-        id, user_id, areaNo, `name`, mobile, address,
+        id, user_id, area_no, `name`, mobile, address,
         create_time, update_time, deleted
     </sql>
 
     <insert id="insert" parameterType="UserAddressDO" useGeneratedKeys="true" keyProperty="id">
         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}
         )
     </insert>
 
-    <update id="updateById" resultType="Integer">
+    <update id="updateById">
         UPDATE user_address
         <set>
-            <if test="area_no != null">
-                , area_no = #{areaNo}
+            <if test="userAddressDO.areaNo != null">
+                , area_no = #{userAddressDO.areaNo}
             </if>
-            <if test="name != null">
-                , `name` = #{name}
+            <if test="userAddressDO.name != null">
+                , `name` = #{userAddressDO.name}
             </if>
-            <if test="mobile != null">
-                , mobile = #{mobile}
+            <if test="userAddressDO.mobile != null">
+                , mobile = #{userAddressDO.mobile}
             </if>
-            <if test="address != null">
-                , address = #{address}
+            <if test="userAddressDO.address != null">
+                , address = #{userAddressDO.address}
             </if>
-            <if test="updateTime != null">
-                , update_time = #{updateTime}
+            <if test="userAddressDO.updateTime != null">
+                , update_time = #{userAddressDO.updateTime}
             </if>
-            <if test="deleted != null">
-                , deleted = #{deleted}
+            <if test="userAddressDO.deleted != null">
+                , deleted = #{userAddressDO.deleted}
             </if>
         </set>
         WHERE id = #{id}
     </update>
 
-    <select id="selectByUserIdAndId" resultType="cn.iocoder.mall.user.dataobject.UserAddressDO">
+    <select id="selectByUserIdAndId" resultType="cn.iocoder.mall.user.biz.dataobject.UserAddressDO">
         SELECT
         <include refid="FIELDS" />
         FROM user_address
@@ -49,7 +49,7 @@
         AND id = #{id}
     </select>
 
-    <select id="selectByUserIdAndDeleted" resultType="cn.iocoder.mall.user.dataobject.UserAddressDO">
+    <select id="selectByUserIdAndDeleted" resultType="cn.iocoder.mall.user.biz.dataobject.UserAddressDO">
         SELECT
         <include refid="FIELDS" />
         FROM user_address

user/user-service-impl/src/main/resources/mapper/UserMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.user.dao.UserMapper">
+<mapper namespace="cn.iocoder.mall.user.biz.dao.UserMapper">
 
     <sql id="FIELDS">
       id, mobile, nickname, avatar, status,

user/user-service-impl/src/main/resources/mapper/UserRegisterMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.user.dao.UserRegisterMapper">
+<mapper namespace="cn.iocoder.mall.user.biz.dao.UserRegisterMapper">
 
     <insert id="insert" parameterType="UserRegisterDO">
         INSERT INTO user_register (