From 90391664cc9319ec9ba772810147e6fcb98eba5c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 14 Apr 2020 07:48:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20product=20=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=20product=20=E6=9C=8D=E5=8A=A1=E4=BE=9D=E8=B5=96=20us?=
 =?UTF-8?q?er=20=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/UserFavoriteController.java          |  4 ++--
 .../api/UserProductSpuCollectionsService.java  | 10 +++++-----
 .../api/bo/UserProductSpuCollectionsBO.java    |  2 +-
 .../bo/UserProductSpuCollectionsPageBO.java    |  2 +-
 .../dto/UserProductSpuCollectionsAddDTO.java   |  2 +-
 .../dto/UserProductSpuCollectionsPageDTO.java  |  2 +-
 .../UserProductSpuCollectionsUpdateDTO.java    |  2 +-
 product/product-service-impl/pom.xml           |  5 +++++
 .../UserProductSpuCollectionsConvert.java      |  8 ++++----
 .../dao/UserProductSpuCollectionsMapper.java   |  4 ++--
 .../UserProductSpuCollectionsConsumer.java     | 15 ++++++++-------
 .../UserProductSpuCollectionsServiceImpl.java  | 18 +++++++++---------
 .../src/main/resources/config/application.yaml |  5 ++++-
 .../mapper/UserProductSpuCollectionsMapper.xml |  6 +++---
 14 files changed, 47 insertions(+), 38 deletions(-)
 rename {user/user-service-api/src/main/java/cn/iocoder/mall/user => product/product-service-api/src/main/java/cn/iocoder/mall/product}/api/bo/UserProductSpuCollectionsBO.java (96%)
 rename {user/user-service-api/src/main/java/cn/iocoder/mall/user => product/product-service-api/src/main/java/cn/iocoder/mall/product}/api/bo/UserProductSpuCollectionsPageBO.java (92%)
 rename {user/user-service-api/src/main/java/cn/iocoder/mall/user => product/product-service-api/src/main/java/cn/iocoder/mall/product}/api/dto/UserProductSpuCollectionsAddDTO.java (96%)
 rename {user/user-service-api/src/main/java/cn/iocoder/mall/user => product/product-service-api/src/main/java/cn/iocoder/mall/product}/api/dto/UserProductSpuCollectionsPageDTO.java (93%)
 rename {user/user-service-api/src/main/java/cn/iocoder/mall/user => product/product-service-api/src/main/java/cn/iocoder/mall/product}/api/dto/UserProductSpuCollectionsUpdateDTO.java (92%)

diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java
index 97642ad73..1fe9d33fc 100644
--- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java
+++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java
@@ -2,8 +2,8 @@ package cn.iocoder.mall.product.application.controller.users;
 
 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.product.api.UserProductSpuCollectionsService;
-import cn.iocoder.mall.user.api.bo.UserProductSpuCollectionsPageBO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsPageDTO;
+import cn.iocoder.mall.product.api.bo.UserProductSpuCollectionsPageBO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsPageDTO;
 import cn.iocoder.mall.user.sdk.annotation.RequiresLogin;
 import cn.iocoder.mall.user.sdk.context.UserSecurityContextHolder;
 import io.swagger.annotations.Api;
diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java
index 82be4816f..d1ee152cf 100644
--- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java
+++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java
@@ -1,11 +1,11 @@
 package cn.iocoder.mall.product.api;
 
 import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.user.api.bo.UserProductSpuCollectionsBO;
-import cn.iocoder.mall.user.api.bo.UserProductSpuCollectionsPageBO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsAddDTO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsPageDTO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsUpdateDTO;
+import cn.iocoder.mall.product.api.bo.UserProductSpuCollectionsBO;
+import cn.iocoder.mall.product.api.bo.UserProductSpuCollectionsPageBO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsAddDTO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsPageDTO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsUpdateDTO;
 
 /**
  * UserProductSpuCollectionsService
diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsBO.java
similarity index 96%
rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsBO.java
rename to product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsBO.java
index d427a7fc6..bf6c1349a 100644
--- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsBO.java
+++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsBO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user.api.bo;
+package cn.iocoder.mall.product.api.bo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsPageBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsPageBO.java
similarity index 92%
rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsPageBO.java
rename to product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsPageBO.java
index ccfeddf4e..228e8206a 100644
--- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserProductSpuCollectionsPageBO.java
+++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsPageBO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user.api.bo;
+package cn.iocoder.mall.product.api.bo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsAddDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsAddDTO.java
similarity index 96%
rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsAddDTO.java
rename to product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsAddDTO.java
index d2e86ae4f..b6b5fa8db 100644
--- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsAddDTO.java
+++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsAddDTO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user.api.dto;
+package cn.iocoder.mall.product.api.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsPageDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsPageDTO.java
similarity index 93%
rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsPageDTO.java
rename to product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsPageDTO.java
index 484234a88..8b67ed46b 100644
--- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsPageDTO.java
+++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsPageDTO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user.api.dto;
+package cn.iocoder.mall.product.api.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsUpdateDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsUpdateDTO.java
similarity index 92%
rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsUpdateDTO.java
rename to product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsUpdateDTO.java
index 7dfd501a3..c51b3bf09 100644
--- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserProductSpuCollectionsUpdateDTO.java
+++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsUpdateDTO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.user.api.dto;
+package cn.iocoder.mall.product.api.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/product/product-service-impl/pom.xml b/product/product-service-impl/pom.xml
index 6fb079daa..6f9735b6c 100644
--- a/product/product-service-impl/pom.xml
+++ b/product/product-service-impl/pom.xml
@@ -18,6 +18,11 @@
             <artifactId>product-service-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.mall</groupId>
+            <artifactId>user-service-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <!-- DB 相关 -->
         <dependency>
diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java
index fa89d2d2e..06f2ef460 100644
--- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java
+++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java
@@ -1,10 +1,10 @@
 package cn.iocoder.mall.product.convert;
 
+import cn.iocoder.mall.product.api.bo.UserProductSpuCollectionsBO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsAddDTO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsUpdateDTO;
 import cn.iocoder.mall.product.api.message.ProductSpuCollectionMessage;
-import cn.iocoder.mall.user.api.bo.UserProductSpuCollectionsBO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsAddDTO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsUpdateDTO;
-import cn.iocoder.mall.user.biz.dataobject.UserProductSpuCollectionsDO;
+import cn.iocoder.mall.product.dataobject.UserProductSpuCollectionsDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java
index eba1f7aed..dca4610c8 100644
--- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java
+++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java
@@ -1,6 +1,6 @@
 package cn.iocoder.mall.product.dao;
 
-import cn.iocoder.mall.user.biz.dataobject.UserProductSpuCollectionsDO;
+import cn.iocoder.mall.product.dataobject.UserProductSpuCollectionsDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -24,7 +24,7 @@ public interface UserProductSpuCollectionsMapper extends BaseMapper<UserProductS
      * @return
      */
     default UserProductSpuCollectionsDO getUserSpuCollectionsByUserIdAndSpuId(final Integer userId,
-            final Integer spuId) {
+                                                                              final Integer spuId) {
         QueryWrapper<UserProductSpuCollectionsDO> query = new QueryWrapper<UserProductSpuCollectionsDO>()
                 .eq("user_id", userId).eq("spu_id", spuId);
         return selectOne(query);
diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java
index 70243dceb..664ca2e3a 100644
--- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java
+++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java
@@ -2,16 +2,17 @@ package cn.iocoder.mall.product.message;
 
 import cn.iocoder.common.framework.constant.DeletedStatusEnum;
 import cn.iocoder.common.framework.util.ServiceExceptionUtil;
+import cn.iocoder.mall.product.api.UserProductSpuCollectionsService;
+import cn.iocoder.mall.product.api.bo.UserProductSpuCollectionsBO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsAddDTO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsUpdateDTO;
 import cn.iocoder.mall.product.api.message.ProductSpuCollectionMessage;
-import cn.iocoder.mall.user.api.UserProductSpuCollectionsService;
+import cn.iocoder.mall.product.convert.UserProductSpuCollectionsConvert;
 import cn.iocoder.mall.user.api.UserService;
 import cn.iocoder.mall.user.api.bo.UserBO;
-import cn.iocoder.mall.user.api.bo.UserProductSpuCollectionsBO;
 import cn.iocoder.mall.user.api.constant.UserErrorCodeEnum;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsAddDTO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsUpdateDTO;
-import cn.iocoder.mall.user.biz.convert.UserProductSpuCollectionsConvert;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.dubbo.config.annotation.Reference;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +34,7 @@ public class UserProductSpuCollectionsConsumer implements RocketMQListener<Produ
     @Autowired
     private UserProductSpuCollectionsService userProductSpuCollectionsService;
 
-    @Autowired
+    @Reference(validation = "true", version = "${dubbo.consumer.UserService.version}")
     private UserService userService;
 
     @Override
@@ -115,7 +116,7 @@ public class UserProductSpuCollectionsConsumer implements RocketMQListener<Produ
      * @return
      */
     private UserProductSpuCollectionsUpdateDTO setUserProductSpuCollectionsUpdateDTO(final Integer id,
-            final DeletedStatusEnum deletedStatusEnum) {
+                                                                                     final DeletedStatusEnum deletedStatusEnum) {
         return new UserProductSpuCollectionsUpdateDTO().setId(id).setUpdateTime(new Date())
                 .setDeleted(deletedStatusEnum.getValue());
     }
diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java
index be9f1970e..2794e3331 100644
--- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java
+++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java
@@ -2,15 +2,15 @@ package cn.iocoder.mall.product.service;
 
 import cn.iocoder.common.framework.constant.DeletedStatusEnum;
 import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.user.api.UserProductSpuCollectionsService;
-import cn.iocoder.mall.user.api.bo.UserProductSpuCollectionsBO;
-import cn.iocoder.mall.user.api.bo.UserProductSpuCollectionsPageBO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsAddDTO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsPageDTO;
-import cn.iocoder.mall.user.api.dto.UserProductSpuCollectionsUpdateDTO;
-import cn.iocoder.mall.user.biz.convert.UserProductSpuCollectionsConvert;
-import cn.iocoder.mall.user.biz.dao.UserProductSpuCollectionsMapper;
-import cn.iocoder.mall.user.biz.dataobject.UserProductSpuCollectionsDO;
+import cn.iocoder.mall.product.api.UserProductSpuCollectionsService;
+import cn.iocoder.mall.product.api.bo.UserProductSpuCollectionsBO;
+import cn.iocoder.mall.product.api.bo.UserProductSpuCollectionsPageBO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsAddDTO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsPageDTO;
+import cn.iocoder.mall.product.api.dto.UserProductSpuCollectionsUpdateDTO;
+import cn.iocoder.mall.product.convert.UserProductSpuCollectionsConvert;
+import cn.iocoder.mall.product.dao.UserProductSpuCollectionsMapper;
+import cn.iocoder.mall.product.dataobject.UserProductSpuCollectionsDO;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/product/product-service-impl/src/main/resources/config/application.yaml b/product/product-service-impl/src/main/resources/config/application.yaml
index 1d0ebc735..c0fadbd11 100644
--- a/product/product-service-impl/src/main/resources/config/application.yaml
+++ b/product/product-service-impl/src/main/resources/config/application.yaml
@@ -44,7 +44,7 @@ dubbo:
     address: spring-cloud://s1.iocoder.cn:8848 # 指定 Dubbo 服务注册中心的地址
   # Spring Cloud Alibaba Dubbo 专属配置
   cloud:
-    subscribed-services: admin-application # 设置订阅的应用列表，默认为 * 订阅所有应用
+    subscribed-services: admin-application, user-application # 设置订阅的应用列表，默认为 * 订阅所有应用
   # Dubbo 提供者的协议
   protocol:
     name: dubbo
@@ -69,6 +69,9 @@ dubbo:
       version: 1.0.0
     UserProductSpuCollectionsService:
       version: 1.0.0
+  consumer:
+    UserService:
+      version: 1.0.0
 
 # Seata 配置项
 seata:
diff --git a/product/product-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml b/product/product-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
index ec77f1fe0..695710fa2 100644
--- a/product/product-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
+++ b/product/product-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.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.biz.dao.UserProductSpuCollectionsMapper">
+<mapper namespace="cn.iocoder.mall.product.dao.UserProductSpuCollectionsMapper">
 
     <sql id="FIELDS">
         id, user_id, nickname, spu_id, spu_name,
@@ -8,7 +8,7 @@
         deleted
     </sql>
 
-    <select id="selectById" parameterType="Integer" resultType="cn.iocoder.mall.user.biz.dataobject.UserProductSpuCollectionsDO">
+    <select id="selectById" parameterType="Integer" resultType="UserProductSpuCollectionsDO">
         SELECT
             <include refid="FIELDS" />
         FROM user_spu_collections
@@ -17,7 +17,7 @@
     </select>
 
 
-    <select id="selectListByUser" resultType="cn.iocoder.mall.user.biz.dataobject.UserProductSpuCollectionsDO">
+    <select id="selectListByUser" resultType="UserProductSpuCollectionsDO">
         SELECT
             <include refid="FIELDS" />
         FROM user_spu_collections