From ee7cf3e871559cd5d10dcec6341631c5f61288eb Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Thu, 2 Jul 2020 23:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=B0=83=E6=95=B4=E7=BB=93?=
=?UTF-8?q?=E6=9E=84=E7=9A=84=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 8 ++--
user-application-project/pom.xml | 48 -------------------
.../mall/userapplication/UserApplication.java | 13 -----
.../user/UsersPassportController.java | 4 --
.../src/main/resources/application-dev.yaml | 14 ------
.../src/main/resources/application-local.yaml | 14 ------
.../src/main/resources/application.yaml | 19 --------
user-service-project/pom.xml | 30 ++++--------
user-service-project/user-service-api/pom.xml | 4 +-
user-service-project/user-service-app/pom.xml | 13 +++--
.../{app => }/UserServiceApplication.java | 2 +-
.../app/dal/mysql/mapper/package-info.java | 1 -
.../app/service/user/bo/UserBO.java | 4 --
.../config/DatabaseConfiguration.java | 2 +-
.../{app => }/convert/user/UserConvert.java | 6 +--
.../dal/mysql/dataobject/user/UserDO.java | 2 +-
.../dal/mysql/mapper/package-info.java | 1 +
.../dal/mysql/mapper/user/UserMapper.java | 4 +-
.../{app => }/manager/user/UserManager.java | 8 ++--
.../{app => }/rpc/user/UserRpcImpl.java | 5 +-
.../{app => }/service/user/UserService.java | 10 ++--
.../userservice/service/user/bo/UserBO.java | 4 ++
.../src/main/resources/application.yaml | 2 +-
.../pom.xml | 12 +++--
24 files changed, 56 insertions(+), 174 deletions(-)
delete mode 100644 user-application-project/pom.xml
delete mode 100644 user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/UserApplication.java
delete mode 100644 user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/controller/user/UsersPassportController.java
delete mode 100644 user-application-project/user-application-rest/src/main/resources/application-dev.yaml
delete mode 100644 user-application-project/user-application-rest/src/main/resources/application-local.yaml
delete mode 100644 user-application-project/user-application-rest/src/main/resources/application.yaml
rename user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/{app => }/UserServiceApplication.java (89%)
delete mode 100644 user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/mapper/package-info.java
delete mode 100644 user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/service/user/bo/UserBO.java
rename user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/{app => }/config/DatabaseConfiguration.java (95%)
rename user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/{app => }/convert/user/UserConvert.java (61%)
rename user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/{app => }/dal/mysql/dataobject/user/UserDO.java (93%)
create mode 100644 user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/package-info.java
rename user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/{app => }/dal/mysql/mapper/user/UserMapper.java (57%)
rename user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/{app => }/manager/user/UserManager.java (62%)
rename user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/{app => }/rpc/user/UserRpcImpl.java (77%)
rename user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/{app => }/service/user/UserService.java (51%)
create mode 100644 user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/user/bo/UserBO.java
rename {user-application-project/user-application-rest => user-web-app}/pom.xml (79%)
diff --git a/pom.xml b/pom.xml
index f0f523c59..96eaf43d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,20 +14,20 @@
onemall
1.0-SNAPSHOT
- product
- order
+
+
user
common
system
- promotion
+
mall-dependencies
user-service-project
- user-application-project
+ user-web-app
pom
diff --git a/user-application-project/pom.xml b/user-application-project/pom.xml
deleted file mode 100644
index 49d254da9..000000000
--- a/user-application-project/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- onemall
- cn.iocoder.mall
- 1.0-SNAPSHOT
-
- 4.0.0
-
- user-application-project
- pom
-
- user-application-rest
-
-
-
-
-
-
- cn.iocoder.mall
- mall-dependencies
- 1.0-SNAPSHOT
- pom
- import
-
-
-
-
- cn.iocoder.mall
- mall-spring-boot-starter-web
- 1.0-SNAPSHOT
-
-
- cn.iocoder.mall
- mall-spring-boot-starter-security
- 1.0-SNAPSHOT
-
-
- cn.iocoder.mall
- mall-spring-boot-starter-swagger
- 1.0-SNAPSHOT
-
-
-
-
-
diff --git a/user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/UserApplication.java b/user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/UserApplication.java
deleted file mode 100644
index 48f45d95a..000000000
--- a/user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/UserApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.iocoder.mall.userapplication;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication(scanBasePackages = {"cn.iocoder.mall.userapplication"})
-public class UserApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(UserApplication.class, args);
- }
-
-}
diff --git a/user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/controller/user/UsersPassportController.java b/user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/controller/user/UsersPassportController.java
deleted file mode 100644
index 9e36ae792..000000000
--- a/user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/controller/user/UsersPassportController.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package cn.iocoder.mall.userapplication.controller.user;
-
-public class UsersPassportController {
-}
diff --git a/user-application-project/user-application-rest/src/main/resources/application-dev.yaml b/user-application-project/user-application-rest/src/main/resources/application-dev.yaml
deleted file mode 100644
index 4cfe1567c..000000000
--- a/user-application-project/user-application-rest/src/main/resources/application-dev.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- # Spring Cloud 配置项
- cloud:
- nacos:
- # Spring Cloud Nacos Discovery 配置项
- discovery:
- server-addr: 400-infra.server.iocoder.cn:8848 # Nacos 服务器地址
- namespace: dev # Nacos 命名空间
-
-# Dubbo 配置项
-dubbo:
- # Dubbo 注册中心
- registry:
- address: spring-cloud://400-infra.server.iocoder.cn:8848 # 指定 Dubbo 服务注册中心的地址
diff --git a/user-application-project/user-application-rest/src/main/resources/application-local.yaml b/user-application-project/user-application-rest/src/main/resources/application-local.yaml
deleted file mode 100644
index 2e9e99973..000000000
--- a/user-application-project/user-application-rest/src/main/resources/application-local.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- # Spring Cloud 配置项
- cloud:
- nacos:
- # Spring Cloud Nacos Discovery 配置项
- discovery:
- server-addr: 400-infra.server.iocoder.cn:8848 # Nacos 服务器地址
- namespace: local # Nacos 命名空间
-
-# Dubbo 配置项
-dubbo:
- # Dubbo 注册中心
- registry:
- address: spring-cloud://400-infra.server.iocoder.cn:8848 # 指定 Dubbo 服务注册中心的地址
diff --git a/user-application-project/user-application-rest/src/main/resources/application.yaml b/user-application-project/user-application-rest/src/main/resources/application.yaml
deleted file mode 100644
index 90f550924..000000000
--- a/user-application-project/user-application-rest/src/main/resources/application.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# 服务器的配置项
-server:
- port: 18082
- servlet:
- context-path: /user-api/
-
-spring:
- # Application 的配置项
- application:
- name: user-application
- # Profile 的配置项
- profiles:
- active: local
-
-# Dubbo 配置项
-dubbo:
- # Spring Cloud Alibaba Dubbo 专属配置
- cloud:
- subscribed-services: 'user-service' # 设置订阅的应用列表,默认为 * 订阅所有应用
diff --git a/user-service-project/pom.xml b/user-service-project/pom.xml
index 76910f336..e963aa24a 100644
--- a/user-service-project/pom.xml
+++ b/user-service-project/pom.xml
@@ -13,11 +13,8 @@
pom
用户服务
- user-service-dal
- user-service-biz
- user-service-rpc
- user-service-rpc-api
- user-service-common
+ user-service-api
+ user-service-app
@@ -31,25 +28,16 @@
import
+
+ cn.iocoder.mall
+ common-framework
+ 1.0-SNAPSHOT
+
+
cn.iocoder.mall
- user-service-common
- 1.0-SNAPSHOT
-
-
- cn.iocoder.mall
- user-service-rpc-api
- 1.0-SNAPSHOT
-
-
- cn.iocoder.mall
- user-service-biz
- 1.0-SNAPSHOT
-
-
- cn.iocoder.mall
- user-service-dal
+ user-service-api
1.0-SNAPSHOT
diff --git a/user-service-project/user-service-api/pom.xml b/user-service-project/user-service-api/pom.xml
index f3e896b20..fb24cb58b 100644
--- a/user-service-project/user-service-api/pom.xml
+++ b/user-service-project/user-service-api/pom.xml
@@ -9,12 +9,12 @@
4.0.0
- user-service-rpc-api
+ user-service-api
cn.iocoder.mall
- user-service-common
+ common-framework
diff --git a/user-service-project/user-service-app/pom.xml b/user-service-project/user-service-app/pom.xml
index a7a012c4f..cd0e0de2c 100644
--- a/user-service-project/user-service-app/pom.xml
+++ b/user-service-project/user-service-app/pom.xml
@@ -9,12 +9,9 @@
4.0.0
- user-service-rpc
+ user-service-app
-
- cn.iocoder.mall
- user-service-rpc-api
-
+
@@ -22,6 +19,12 @@
spring-cloud-starter-dubbo
+
+
+ cn.iocoder.mall
+ user-service-api
+
+
com.alibaba.cloud
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/UserServiceApplication.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/UserServiceApplication.java
similarity index 89%
rename from user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/UserServiceApplication.java
rename to user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/UserServiceApplication.java
index d2fe886cd..19604c82f 100644
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/UserServiceApplication.java
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/UserServiceApplication.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.userservice.app;
+package cn.iocoder.mall.userservice;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/mapper/package-info.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/mapper/package-info.java
deleted file mode 100644
index e3ec578c4..000000000
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/mapper/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package cn.iocoder.mall.userservice.app.dal.mysql.mapper;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/service/user/bo/UserBO.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/service/user/bo/UserBO.java
deleted file mode 100644
index 522bbc472..000000000
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/service/user/bo/UserBO.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package cn.iocoder.mall.userservice.app.service.user.bo;
-
-public class UserBO {
-}
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/config/DatabaseConfiguration.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/config/DatabaseConfiguration.java
similarity index 95%
rename from user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/config/DatabaseConfiguration.java
rename to user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/config/DatabaseConfiguration.java
index a57ddc4ac..3e70da644 100644
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/config/DatabaseConfiguration.java
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/config/DatabaseConfiguration.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.userservice.app.config;
+package cn.iocoder.mall.userservice.config;
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/convert/user/UserConvert.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/convert/user/UserConvert.java
similarity index 61%
rename from user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/convert/user/UserConvert.java
rename to user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/convert/user/UserConvert.java
index 2f5a138f9..dbf26f3b6 100644
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/convert/user/UserConvert.java
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/convert/user/UserConvert.java
@@ -1,7 +1,7 @@
-package cn.iocoder.mall.userservice.app.convert.user;
+package cn.iocoder.mall.userservice.convert.user;
-import cn.iocoder.mall.userservice.app.service.user.bo.UserBO;
-import cn.iocoder.mall.userservice.app.dal.mysql.dataobject.user.UserDO;
+import cn.iocoder.mall.userservice.service.user.bo.UserBO;
+import cn.iocoder.mall.userservice.dal.mysql.dataobject.user.UserDO;
import cn.iocoder.mall.userservice.rpc.user.vo.UserVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/dataobject/user/UserDO.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/dataobject/user/UserDO.java
similarity index 93%
rename from user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/dataobject/user/UserDO.java
rename to user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/dataobject/user/UserDO.java
index 9eee3276a..1d074a238 100644
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/dataobject/user/UserDO.java
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/dataobject/user/UserDO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.mall.userservice.app.dal.mysql.dataobject.user;
+package cn.iocoder.mall.userservice.dal.mysql.dataobject.user;
import cn.iocoder.common.framework.constant.CommonStatusEnum;
import cn.iocoder.mall.mybatis.dataobject.DeletableDO;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/package-info.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/package-info.java
new file mode 100644
index 000000000..2fcffaf35
--- /dev/null
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/package-info.java
@@ -0,0 +1 @@
+package cn.iocoder.mall.userservice.dal.mysql.mapper;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/mapper/user/UserMapper.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/user/UserMapper.java
similarity index 57%
rename from user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/mapper/user/UserMapper.java
rename to user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/user/UserMapper.java
index 1f6f53e82..f4c414b68 100644
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/mapper/user/UserMapper.java
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/user/UserMapper.java
@@ -1,6 +1,6 @@
-package cn.iocoder.mall.userservice.app.dal.mysql.mapper.user;
+package cn.iocoder.mall.userservice.dal.mysql.mapper.user;
-import cn.iocoder.mall.userservice.app.dal.mysql.dataobject.user.UserDO;
+import cn.iocoder.mall.userservice.dal.mysql.dataobject.user.UserDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/manager/user/UserManager.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/manager/user/UserManager.java
similarity index 62%
rename from user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/manager/user/UserManager.java
rename to user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/manager/user/UserManager.java
index 99796622c..5965853d9 100644
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/manager/user/UserManager.java
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/manager/user/UserManager.java
@@ -1,8 +1,8 @@
-package cn.iocoder.mall.userservice.app.manager.user;
+package cn.iocoder.mall.userservice.manager.user;
-import cn.iocoder.mall.userservice.app.service.user.bo.UserBO;
-import cn.iocoder.mall.userservice.app.service.user.UserService;
-import cn.iocoder.mall.userservice.app.convert.user.UserConvert;
+import cn.iocoder.mall.userservice.service.user.bo.UserBO;
+import cn.iocoder.mall.userservice.service.user.UserService;
+import cn.iocoder.mall.userservice.convert.user.UserConvert;
import cn.iocoder.mall.userservice.rpc.user.vo.UserVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/rpc/user/UserRpcImpl.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/rpc/user/UserRpcImpl.java
similarity index 77%
rename from user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/rpc/user/UserRpcImpl.java
rename to user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/rpc/user/UserRpcImpl.java
index 5bc5dae67..c00858f8f 100644
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/rpc/user/UserRpcImpl.java
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/rpc/user/UserRpcImpl.java
@@ -1,8 +1,7 @@
-package cn.iocoder.mall.userservice.app.rpc.user;
+package cn.iocoder.mall.userservice.rpc.user;
import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.userservice.app.manager.user.UserManager;
-import cn.iocoder.mall.userservice.rpc.user.UserRpc;
+import cn.iocoder.mall.userservice.manager.user.UserManager;
import cn.iocoder.mall.userservice.rpc.user.vo.UserVO;
import org.apache.dubbo.config.annotation.Service;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/service/user/UserService.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/user/UserService.java
similarity index 51%
rename from user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/service/user/UserService.java
rename to user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/user/UserService.java
index ee7792c6b..a95b640a8 100644
--- a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/service/user/UserService.java
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/user/UserService.java
@@ -1,9 +1,9 @@
-package cn.iocoder.mall.userservice.app.service.user;
+package cn.iocoder.mall.userservice.service.user;
-import cn.iocoder.mall.userservice.app.dal.mysql.dataobject.user.UserDO;
-import cn.iocoder.mall.userservice.app.dal.mysql.mapper.user.UserMapper;
-import cn.iocoder.mall.userservice.app.service.user.bo.UserBO;
-import cn.iocoder.mall.userservice.biz.convert.user.UserConvert;
+import cn.iocoder.mall.userservice.convert.user.UserConvert;
+import cn.iocoder.mall.userservice.dal.mysql.dataobject.user.UserDO;
+import cn.iocoder.mall.userservice.dal.mysql.mapper.user.UserMapper;
+import cn.iocoder.mall.userservice.service.user.bo.UserBO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/user/bo/UserBO.java b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/user/bo/UserBO.java
new file mode 100644
index 000000000..f027876c1
--- /dev/null
+++ b/user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/user/bo/UserBO.java
@@ -0,0 +1,4 @@
+package cn.iocoder.mall.userservice.service.user.bo;
+
+public class UserBO {
+}
diff --git a/user-service-project/user-service-app/src/main/resources/application.yaml b/user-service-project/user-service-app/src/main/resources/application.yaml
index 1801877e5..831ab6dca 100644
--- a/user-service-project/user-service-app/src/main/resources/application.yaml
+++ b/user-service-project/user-service-app/src/main/resources/application.yaml
@@ -29,7 +29,7 @@ dubbo:
port: -1
# Dubbo 提供服务的扫描基础包
scan:
- base-packages: cn.iocoder.mall.userservice.rpc.rpc
+ base-packages: cn.iocoder.mall.userservice.rpc
# Dubbo 服务提供者的配置
provider:
filter: -exception
diff --git a/user-application-project/user-application-rest/pom.xml b/user-web-app/pom.xml
similarity index 79%
rename from user-application-project/user-application-rest/pom.xml
rename to user-web-app/pom.xml
index a10f03496..3fabce8c2 100644
--- a/user-application-project/user-application-rest/pom.xml
+++ b/user-web-app/pom.xml
@@ -3,18 +3,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- user-application-project
+ onemall
cn.iocoder.mall
1.0-SNAPSHOT
4.0.0
- user-application-rest
+ user-web-app
+
cn.iocoder.mall
- user-service-rpc-api
+ mall-dependencies
+ 1.0-SNAPSHOT
+ pom
+ import
@@ -32,7 +36,7 @@
cn.iocoder.mall
- user-service-rpc-api
+ user-service-api
1.0-SNAPSHOT