Skip to content

Commit e3a3d8f

Browse files
AlgerFanAlgerFan
committed
订单服务拆分为多模块
1 parent 5e6cdd0 commit e3a3d8f

31 files changed

+176
-215
lines changed

‎order/order-client/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>order</artifactId>
7+
<groupId>cn.algerfan</groupId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>order-client</artifactId>
13+
14+
15+
</project>

‎order/order-common/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>order</artifactId>
7+
<groupId>cn.algerfan</groupId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>order-common</artifactId>
13+
14+
15+
</project>

‎order/order-server/pom.xml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>order</artifactId>
7+
<groupId>cn.algerfan</groupId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>order-server</artifactId>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.cloud</groupId>
17+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
18+
</dependency>
19+
<!-- TODO spring-cloud-starter-feign ——> spring-cloud-starter-openfeign-->
20+
<dependency>
21+
<groupId>org.springframework.cloud</groupId>
22+
<artifactId>spring-cloud-starter-openfeign</artifactId>
23+
</dependency>
24+
<!-- TODO spring-cloud-starter-hystrix ——> spring-cloud-starter-netflix-hystrix-->
25+
<!-- TODO 2.0.2.RELEASE需要引入-->
26+
<dependency>
27+
<groupId>org.springframework.boot</groupId>
28+
<artifactId>spring-boot-starter-web</artifactId>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.springframework.boot</groupId>
32+
<artifactId>spring-boot-starter-data-jpa</artifactId>
33+
</dependency>
34+
<dependency>
35+
<groupId>mysql</groupId>
36+
<artifactId>mysql-connector-java</artifactId>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.projectlombok</groupId>
40+
<artifactId>lombok</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>com.google.code.gson</groupId>
44+
<artifactId>gson</artifactId>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.springframework.cloud</groupId>
48+
<artifactId>spring-cloud-config-client</artifactId>
49+
</dependency>
50+
<dependency>
51+
<groupId>cn.algerfan</groupId>
52+
<artifactId>product-client</artifactId>
53+
<version>${product-client.version}</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>cn.algerfan</groupId>
57+
<artifactId>product-common</artifactId>
58+
<version>${product-common.version}</version>
59+
</dependency>
60+
61+
<dependency>
62+
<groupId>org.springframework.boot</groupId>
63+
<artifactId>spring-boot-starter-test</artifactId>
64+
<scope>test</scope>
65+
</dependency>
66+
</dependencies>
67+
68+
<build>
69+
<plugins>
70+
<plugin>
71+
<groupId>org.springframework.boot</groupId>
72+
<artifactId>spring-boot-maven-plugin</artifactId>
73+
</plugin>
74+
</plugins>
75+
</build>
76+
77+
</project>

‎order/src/main/java/cn/algerfan/order/OrderApplication.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/OrderApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order;
1+
package cn.algerfan.order.server;
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;

‎order/src/main/java/cn/algerfan/order/config/RestTemplateConfig.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/config/RestTemplateConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order.config;
1+
package cn.algerfan.order.server.config;
22

33
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
44
import org.springframework.context.annotation.Bean;

‎order/src/main/java/cn/algerfan/order/controller/ClientController.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/controller/ClientController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package cn.algerfan.order.controller;
1+
package cn.algerfan.order.server.controller;
22

3-
import cn.algerfan.order.client.ProductClient;
4-
import cn.algerfan.order.common.DecreaseStockOutput;
5-
import cn.algerfan.order.common.ProductInfoOutput;
3+
import cn.algerfan.product.client.ProductClient;
4+
import cn.algerfan.product.common.DecreaseStockOutput;
5+
import cn.algerfan.product.common.ProductInfoOutput;
66
import lombok.extern.slf4j.Slf4j;
77
import org.springframework.beans.factory.annotation.Autowired;
88
import org.springframework.cloud.client.ServiceInstance;

‎order/src/main/java/cn/algerfan/order/controller/OrderController.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/controller/OrderController.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package cn.algerfan.order.controller;
1+
package cn.algerfan.order.server.controller;
22

3-
import cn.algerfan.order.form.OrderForm;
4-
import cn.algerfan.order.converter.OrderFormToOrderDto;
5-
import cn.algerfan.order.dto.OrderDto;
6-
import cn.algerfan.order.enums.Result;
7-
import cn.algerfan.order.exception.OrderException;
8-
import cn.algerfan.order.service.OrderService;
9-
import cn.algerfan.order.util.ResultVoUtil;
10-
import cn.algerfan.order.vo.ResultVo;
3+
import cn.algerfan.order.server.converter.OrderFormToOrderDto;
4+
import cn.algerfan.order.server.dto.OrderDto;
5+
import cn.algerfan.order.server.enums.Result;
6+
import cn.algerfan.order.server.exception.OrderException;
7+
import cn.algerfan.order.server.form.OrderForm;
8+
import cn.algerfan.order.server.service.OrderService;
9+
import cn.algerfan.order.server.util.ResultVoUtil;
10+
import cn.algerfan.order.server.vo.ResultVo;
1111
import lombok.extern.slf4j.Slf4j;
1212
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.util.CollectionUtils;

‎order/src/main/java/cn/algerfan/order/converter/OrderFormToOrderDto.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/converter/OrderFormToOrderDto.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package cn.algerfan.order.converter;
1+
package cn.algerfan.order.server.converter;
22

3-
import cn.algerfan.order.exception.OrderException;
4-
import cn.algerfan.order.form.OrderForm;
5-
import cn.algerfan.order.domain.OrderDetail;
6-
import cn.algerfan.order.dto.OrderDto;
7-
import cn.algerfan.order.enums.Result;
3+
import cn.algerfan.order.server.dto.OrderDto;
4+
import cn.algerfan.order.server.enums.Result;
5+
import cn.algerfan.order.server.exception.OrderException;
6+
import cn.algerfan.order.server.form.OrderForm;
7+
import cn.algerfan.order.server.domain.OrderDetail;
88
import com.google.gson.Gson;
99
import com.google.gson.reflect.TypeToken;
1010
import lombok.extern.slf4j.Slf4j;

‎order/src/main/java/cn/algerfan/order/domain/OrderDetail.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/domain/OrderDetail.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order.domain;
1+
package cn.algerfan.order.server.domain;
22

33
import lombok.Data;
44

‎order/src/main/java/cn/algerfan/order/domain/OrderMaster.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/domain/OrderMaster.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order.domain;
1+
package cn.algerfan.order.server.domain;
22

33
import lombok.Data;
44

‎order/src/main/java/cn/algerfan/order/dto/OrderDto.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/dto/OrderDto.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cn.algerfan.order.dto;
1+
package cn.algerfan.order.server.dto;
22

3-
import cn.algerfan.order.domain.OrderDetail;
3+
import cn.algerfan.order.server.domain.OrderDetail;
44
import lombok.Data;
55

66
import java.math.BigDecimal;

‎order/src/main/java/cn/algerfan/order/enums/OrderStatus.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/enums/OrderStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order.enums;
1+
package cn.algerfan.order.server.enums;
22

33
import lombok.Getter;
44

‎order/src/main/java/cn/algerfan/order/enums/PayStatus.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/enums/PayStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order.enums;
1+
package cn.algerfan.order.server.enums;
22

33
import lombok.Getter;
44

‎order/src/main/java/cn/algerfan/order/enums/Result.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/enums/Result.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order.enums;
1+
package cn.algerfan.order.server.enums;
22

33
import lombok.Getter;
44

‎order/src/main/java/cn/algerfan/order/exception/OrderException.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/exception/OrderException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cn.algerfan.order.exception;
1+
package cn.algerfan.order.server.exception;
22

3-
import cn.algerfan.order.enums.Result;
3+
import cn.algerfan.order.server.enums.Result;
44

55
/**
66
* @author algerfan

‎order/src/main/java/cn/algerfan/order/form/OrderForm.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/form/OrderForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order.form;
1+
package cn.algerfan.order.server.form;
22

33
import lombok.Data;
44
import org.hibernate.validator.constraints.NotEmpty;

‎order/src/main/java/cn/algerfan/order/repository/OrderDetailRepository.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/repository/OrderDetailRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cn.algerfan.order.repository;
1+
package cn.algerfan.order.server.repository;
22

3-
import cn.algerfan.order.domain.OrderDetail;
3+
import cn.algerfan.order.server.domain.OrderDetail;
44
import org.springframework.data.jpa.repository.JpaRepository;
55

66
/**

‎order/src/main/java/cn/algerfan/order/repository/OrderMasterRepository.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/repository/OrderMasterRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cn.algerfan.order.repository;
1+
package cn.algerfan.order.server.repository;
22

3-
import cn.algerfan.order.domain.OrderMaster;
3+
import cn.algerfan.order.server.domain.OrderMaster;
44
import org.springframework.data.jpa.repository.JpaRepository;
55

66
/**

‎order/src/main/java/cn/algerfan/order/service/OrderService.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/service/OrderService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cn.algerfan.order.service;
1+
package cn.algerfan.order.server.service;
22

3-
import cn.algerfan.order.dto.OrderDto;
3+
import cn.algerfan.order.server.dto.OrderDto;
44

55
/**
66
* @author algerfan

‎order/src/main/java/cn/algerfan/order/service/impl/OrderServiceImpl.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/service/impl/OrderServiceImpl.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package cn.algerfan.order.service.impl;
1+
package cn.algerfan.order.server.service.impl;
22

3-
import cn.algerfan.order.client.ProductClient;
4-
import cn.algerfan.order.common.DecreaseStockOutput;
5-
import cn.algerfan.order.common.ProductInfoOutput;
6-
import cn.algerfan.order.repository.OrderDetailRepository;
7-
import cn.algerfan.order.repository.OrderMasterRepository;
8-
import cn.algerfan.order.domain.OrderDetail;
9-
import cn.algerfan.order.domain.OrderMaster;
10-
import cn.algerfan.order.dto.OrderDto;
11-
import cn.algerfan.order.enums.OrderStatus;
12-
import cn.algerfan.order.enums.PayStatus;
13-
import cn.algerfan.order.service.OrderService;
14-
import cn.algerfan.order.util.KeyUtil;
3+
import cn.algerfan.order.server.repository.OrderDetailRepository;
4+
import cn.algerfan.order.server.repository.OrderMasterRepository;
5+
import cn.algerfan.order.server.domain.OrderDetail;
6+
import cn.algerfan.order.server.domain.OrderMaster;
7+
import cn.algerfan.order.server.dto.OrderDto;
8+
import cn.algerfan.order.server.enums.OrderStatus;
9+
import cn.algerfan.order.server.enums.PayStatus;
10+
import cn.algerfan.order.server.service.OrderService;
11+
import cn.algerfan.order.server.util.KeyUtil;
12+
import cn.algerfan.product.client.ProductClient;
13+
import cn.algerfan.product.common.DecreaseStockOutput;
14+
import cn.algerfan.product.common.ProductInfoOutput;
1515
import org.springframework.beans.BeanUtils;
1616
import org.springframework.beans.factory.annotation.Autowired;
1717
import org.springframework.stereotype.Service;

‎order/src/main/java/cn/algerfan/order/util/KeyUtil.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/util/KeyUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order.util;
1+
package cn.algerfan.order.server.util;
22

33
import java.util.Random;
44

‎order/src/main/java/cn/algerfan/order/util/ResultVoUtil.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/util/ResultVoUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cn.algerfan.order.util;
1+
package cn.algerfan.order.server.util;
22

3-
import cn.algerfan.order.vo.ResultVo;
3+
import cn.algerfan.order.server.vo.ResultVo;
44

55
/**
66
* @author algerfan

‎order/src/main/java/cn/algerfan/order/vo/ResultVo.java renamed to ‎order/order-server/src/main/java/cn/algerfan/order/server/vo/ResultVo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order.vo;
1+
package cn.algerfan.order.server.vo;
22

33
import lombok.Data;
44

‎order/src/main/resources/application.yml renamed to ‎order/order-server/src/main/resources/application.yml

File renamed without changes.

‎order/src/test/java/cn/algerfan/order/OrderApplicationTests.java renamed to ‎order/order-server/src/test/java/cn/algerfan/order/server/OrderApplicationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.algerfan.order;
1+
package cn.algerfan.order.server;
22

33
import org.junit.Test;
44
import org.junit.runner.RunWith;

‎order/src/test/java/cn/algerfan/order/repository/OrderDetailRepositoryTest.java renamed to ‎order/order-server/src/test/java/cn/algerfan/order/server/repository/OrderDetailRepositoryTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package cn.algerfan.order.repository;
1+
package cn.algerfan.order.server.repository;
22

3-
import cn.algerfan.order.OrderApplicationTests;
3+
import cn.algerfan.order.server.OrderApplicationTests;
44

5-
import cn.algerfan.order.domain.OrderDetail;
5+
import cn.algerfan.order.server.domain.OrderDetail;
66
import org.junit.Assert;
77
import org.junit.Test;
88
import org.springframework.beans.factory.annotation.Autowired;

‎order/src/test/java/cn/algerfan/order/repository/OrderMasterRepositoryTest.java renamed to ‎order/order-server/src/test/java/cn/algerfan/order/server/repository/OrderMasterRepositoryTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package cn.algerfan.order.repository;
1+
package cn.algerfan.order.server.repository;
22

3-
import cn.algerfan.order.OrderApplicationTests;
4-
import cn.algerfan.order.domain.OrderMaster;
5-
import cn.algerfan.order.enums.OrderStatus;
6-
import cn.algerfan.order.enums.PayStatus;
3+
import cn.algerfan.order.server.OrderApplicationTests;
4+
import cn.algerfan.order.server.domain.OrderMaster;
5+
import cn.algerfan.order.server.enums.OrderStatus;
6+
import cn.algerfan.order.server.enums.PayStatus;
77
import org.junit.Assert;
88
import org.junit.Test;
99
import org.springframework.beans.factory.annotation.Autowired;

0 commit comments

Comments
 (0)