OpenGitLink
/
yudao-cloud
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

重新调整结构的测试

This commit is contained in:
YunaiV 2020-07-02 23:06:17 +08:00
parent 8121aee460
commit ee7cf3e871
24 changed files with 56 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -14,20 +14,20 @@
<artifactId>onemall</artifactId>
<version>1.0-SNAPSHOT</version>
<modules>
<module>product</module>
<module>order</module>
<!-- <module>product</module>-->
<!-- <module>order</module>-->
<module>user</module>
<module>common</module>
<module>system</module>
<!-- <module>ops</module>-->
<!-- <module>pay</module>-->
<module>promotion</module>
<!-- <module>promotion</module>-->
<!-- <module>search</module>-->
<!-- <module>demo</module>-->
<module>mall-dependencies</module>
<!-- <module>mall-spring-boot-starter-cache</module>-->
<module>user-service-project</module>
<module>user-application-project</module>
<module>user-web-app</module>
</modules>
<packaging>pom</packaging>

48
user-application-project/pom.xml
View File

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>onemall</artifactId>
<groupId>cn.iocoder.mall</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>user-application-project</artifactId>
<packaging>pom</packaging>
<modules>
<module>user-application-rest</module>
</modules>
<dependencyManagement>
<dependencies>
<!-- onemall 基础 bom 文件 -->
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>mall-dependencies</artifactId>
<version>1.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Web 相关 -->
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>mall-spring-boot-starter-web</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>mall-spring-boot-starter-security</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>mall-spring-boot-starter-swagger</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

13
user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/UserApplication.java
View File

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

4
user-application-project/user-application-rest/src/main/java/cn/iocoder/mall/userapplication/controller/user/UsersPassportController.java
View File

@ -1,4 +0,0 @@
package cn.iocoder.mall.userapplication.controller.user;
public class UsersPassportController {
}

14
user-application-project/user-application-rest/src/main/resources/application-dev.yaml
View File

@ -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 服务注册中心的地址

14
user-application-project/user-application-rest/src/main/resources/application-local.yaml
View File

@ -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 服务注册中心的地址

19
user-application-project/user-application-rest/src/main/resources/application.yaml
View File

@ -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' # 设置订阅的应用列表，默认为 * 订阅所有应用

30
user-service-project/pom.xml
View File

@ -13,11 +13,8 @@
<packaging>pom</packaging>
<description>用户服务</description>
<modules>
<module>user-service-dal</module>
<module>user-service-biz</module>
<module>user-service-rpc</module>
<module>user-service-rpc-api</module>
<module>user-service-common</module>
<module>user-service-api</module>
<module>user-service-app</module>
</modules>
<dependencyManagement>
@ -31,25 +28,16 @@
<scope>import</scope>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>common-framework</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- 自身项目 -->
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-rpc-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-biz</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-dal</artifactId>
<artifactId>user-service-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>

4
user-service-project/user-service-api/pom.xml
View File

@ -9,12 +9,12 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>user-service-rpc-api</artifactId>
<artifactId>user-service-api</artifactId>
<dependencies>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-common</artifactId>
<artifactId>common-framework</artifactId>
</dependency>
</dependencies>

13
user-service-project/user-service-app/pom.xml
View File

@ -9,12 +9,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>user-service-rpc</artifactId>
<artifactId>user-service-app</artifactId>
<dependencies>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-rpc-api</artifactId>
</dependency>
<!-- RPC 相关 -->
<dependency>
@ -22,6 +19,12 @@
<artifactId>spring-cloud-starter-dubbo</artifactId>
</dependency>
<dependency>
<!-- 用户服务 -->
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-api</artifactId>
</dependency>
<!-- Registry 和 Config 相关 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>

2
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/UserServiceApplication.java → user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/UserServiceApplication.java
View File

@ -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;

1
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/mapper/package-info.java
View File

@ -1 +0,0 @@
package cn.iocoder.mall.userservice.app.dal.mysql.mapper;

4
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/service/user/bo/UserBO.java
View File

@ -1,4 +0,0 @@
package cn.iocoder.mall.userservice.app.service.user.bo;
public class UserBO {
}

2
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/config/DatabaseConfiguration.java → user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/config/DatabaseConfiguration.java
View File

@ -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;

6
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/convert/user/UserConvert.java → user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/convert/user/UserConvert.java
View File

@ -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;

2
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/dataobject/user/UserDO.java → user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/dataobject/user/UserDO.java
View File

@ -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;

1
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/package-info.java Normal file
View File

@ -0,0 +1 @@
package cn.iocoder.mall.userservice.dal.mysql.mapper;

4
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/dal/mysql/mapper/user/UserMapper.java → user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/user/UserMapper.java
View File

@ -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;

8
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/manager/user/UserManager.java → user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/manager/user/UserManager.java
View File

@ -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;

5
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/rpc/user/UserRpcImpl.java → user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/rpc/user/UserRpcImpl.java
View File

@ -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;

10
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/app/service/user/UserService.java → user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/user/UserService.java
View File

@ -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;

4
user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/user/bo/UserBO.java Normal file
View File

@ -0,0 +1,4 @@
package cn.iocoder.mall.userservice.service.user.bo;
public class UserBO {
}

2
user-service-project/user-service-app/src/main/resources/application.yaml
View File

@ -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

12
user-application-project/user-application-rest/pom.xml → user-web-app/pom.xml
View File

@ -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">
<parent>
<artifactId>user-application-project</artifactId>
<artifactId>onemall</artifactId>
<groupId>cn.iocoder.mall</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>user-application-rest</artifactId>
<artifactId>user-web-app</artifactId>
<dependencies>
<!-- onemall 基础 bom 文件 -->
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-rpc-api</artifactId>
<artifactId>mall-dependencies</artifactId>
<version>1.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Web 相关 -->
@ -32,7 +36,7 @@
<dependency>
<!-- 用户服务 -->
<groupId>cn.iocoder.mall</groupId>
<artifactId>user-service-rpc-api</artifactId>
<artifactId>user-service-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>