From 4dc0e6aeadcd54138bfea791db004fb3dd83296f Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 13 Apr 2020 23:01:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=20user=20=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=20product=20=E6=9C=8D=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E3=80=82=20=E7=9B=AE=E5=89=8D=20product=20?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BC=9A=E6=8A=A5=E9=94=99=EF=BC=8C=E7=A8=8D?= =?UTF-8?q?=E5=90=8E=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/users/UserFavoriteController.java | 4 ++-- .../mall/product}/api/UserProductSpuCollectionsService.java | 2 +- .../product}/convert/UserProductSpuCollectionsConvert.java | 2 +- .../mall/product}/dao/UserProductSpuCollectionsMapper.java | 4 +++- .../product}/dataobject/UserProductSpuCollectionsDO.java | 2 +- .../product/message}/UserProductSpuCollectionsConsumer.java | 2 +- .../service/UserProductSpuCollectionsServiceImpl.java | 2 +- .../src/main/resources/config/application.yaml | 2 ++ .../resources/mapper/UserProductSpuCollectionsMapper.xml | 0 user/user-service-impl/pom.xml | 6 ------ .../src/main/resources/config/application.yaml | 4 +--- 11 files changed, 13 insertions(+), 17 deletions(-) rename {user/user-application/src/main/java/cn/iocoder/mall/user => product/product-application/src/main/java/cn/iocoder/mall/product}/application/controller/users/UserFavoriteController.java (94%) rename {user/user-service-api/src/main/java/cn/iocoder/mall/user => product/product-service-api/src/main/java/cn/iocoder/mall/product}/api/UserProductSpuCollectionsService.java (98%) rename {user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz => product/product-service-impl/src/main/java/cn/iocoder/mall/product}/convert/UserProductSpuCollectionsConvert.java (97%) rename {user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz => product/product-service-impl/src/main/java/cn/iocoder/mall/product}/dao/UserProductSpuCollectionsMapper.java (93%) rename {user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz => product/product-service-impl/src/main/java/cn/iocoder/mall/product}/dataobject/UserProductSpuCollectionsDO.java (96%) rename {user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/mq => product/product-service-impl/src/main/java/cn/iocoder/mall/product/message}/UserProductSpuCollectionsConsumer.java (99%) rename {user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz => product/product-service-impl/src/main/java/cn/iocoder/mall/product}/service/UserProductSpuCollectionsServiceImpl.java (99%) rename {user/user-service-impl => product/product-service-impl}/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml (100%) diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserFavoriteController.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java similarity index 94% rename from user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserFavoriteController.java rename to product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java index 6fdca2a20..97642ad73 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/controller/users/UserFavoriteController.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java @@ -1,7 +1,7 @@ -package cn.iocoder.mall.user.application.controller.users; +package cn.iocoder.mall.product.application.controller.users; import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.user.api.UserProductSpuCollectionsService; +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.user.sdk.annotation.RequiresLogin; diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserProductSpuCollectionsService.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java similarity index 98% rename from user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserProductSpuCollectionsService.java rename to product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java index 762288896..82be4816f 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/UserProductSpuCollectionsService.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.api; +package cn.iocoder.mall.product.api; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.user.api.bo.UserProductSpuCollectionsBO; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserProductSpuCollectionsConvert.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java similarity index 97% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserProductSpuCollectionsConvert.java rename to product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java index fbbafbd89..fa89d2d2e 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/convert/UserProductSpuCollectionsConvert.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.biz.convert; +package cn.iocoder.mall.product.convert; import cn.iocoder.mall.product.api.message.ProductSpuCollectionMessage; import cn.iocoder.mall.user.api.bo.UserProductSpuCollectionsBO; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserProductSpuCollectionsMapper.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java similarity index 93% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserProductSpuCollectionsMapper.java rename to product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java index 411a01bc6..eba1f7aed 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dao/UserProductSpuCollectionsMapper.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java @@ -1,9 +1,10 @@ -package cn.iocoder.mall.user.biz.dao; +package cn.iocoder.mall.product.dao; import cn.iocoder.mall.user.biz.dataobject.UserProductSpuCollectionsDO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; @@ -13,6 +14,7 @@ import java.util.List; * @author xiaofeng * @date 2019-07-01 20:23:30 */ +@Repository public interface UserProductSpuCollectionsMapper extends BaseMapper { /** diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserProductSpuCollectionsDO.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/UserProductSpuCollectionsDO.java similarity index 96% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserProductSpuCollectionsDO.java rename to product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/UserProductSpuCollectionsDO.java index 9d532b9d5..d72fc5a79 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserProductSpuCollectionsDO.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/UserProductSpuCollectionsDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.biz.dataobject; +package cn.iocoder.mall.product.dataobject; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/mq/UserProductSpuCollectionsConsumer.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java similarity index 99% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/mq/UserProductSpuCollectionsConsumer.java rename to product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java index 967bae562..70243dceb 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/mq/UserProductSpuCollectionsConsumer.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.biz.mq; +package cn.iocoder.mall.product.message; import cn.iocoder.common.framework.constant.DeletedStatusEnum; import cn.iocoder.common.framework.util.ServiceExceptionUtil; diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserProductSpuCollectionsServiceImpl.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java similarity index 99% rename from user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserProductSpuCollectionsServiceImpl.java rename to product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java index 55e1858a6..be9f1970e 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserProductSpuCollectionsServiceImpl.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.user.biz.service; +package cn.iocoder.mall.product.service; import cn.iocoder.common.framework.constant.DeletedStatusEnum; import cn.iocoder.common.framework.vo.CommonResult; 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 457345fec..1d0ebc735 100644 --- a/product/product-service-impl/src/main/resources/config/application.yaml +++ b/product/product-service-impl/src/main/resources/config/application.yaml @@ -67,6 +67,8 @@ dubbo: version: 1.0.0 ProductSpuCollectionService: version: 1.0.0 + UserProductSpuCollectionsService: + version: 1.0.0 # Seata 配置项 seata: diff --git a/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml b/product/product-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml similarity index 100% rename from user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml rename to product/product-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml diff --git a/user/user-service-impl/pom.xml b/user/user-service-impl/pom.xml index 3a29ccc64..35721d9a6 100644 --- a/user/user-service-impl/pom.xml +++ b/user/user-service-impl/pom.xml @@ -17,12 +17,6 @@ 1.0-SNAPSHOT - - cn.iocoder.mall - product-service-api - 1.0-SNAPSHOT - - mysql 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 b1020c9db..51cd7b426 100644 --- a/user/user-service-impl/src/main/resources/config/application.yaml +++ b/user/user-service-impl/src/main/resources/config/application.yaml @@ -32,7 +32,7 @@ dubbo: address: spring-cloud://s1.iocoder.cn:8848 # 指定 Dubbo 服务注册中心的地址 # Spring Cloud Alibaba Dubbo 专属配置 cloud: - subscribed-services: admin-application, product-application # 设置订阅的应用列表，默认为 * 订阅所有应用 + subscribed-services: admin-application # 设置订阅的应用列表，默认为 * 订阅所有应用 # Dubbo 提供者的协议 protocol: name: dubbo @@ -51,8 +51,6 @@ dubbo: version: 1.0.0 UserService: version: 1.0.0 - UserProductSpuCollectionsService: - version: 1.0.0 consumer: OAuth2Service: version: 1.0.0