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

1. 引入 Spring Cloud Sentinel，后续做进一步集成 

2. 重新搭建 Elasticsearch 服务，并接入 search 服务
This commit is contained in:
YunaiV 2020-04-14 20:10:40 +08:00
parent 90391664cc
commit 059dbc6c79
24 changed files with 74 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@ -67,9 +67,11 @@
**SkyWalking UI**
* 地址：http://skywalking-ui.shop.iocoder.cn:18099
* 地址：http://skywalking.shop.iocoder.cn
* 管理员账号：admin / admin
> 教程：[《芋道 SkyWalking 安装部署》](http://www.iocoder.cn/SkyWalking/install/?onemall)
**Grafana UI**
* 地址：http://grafana.shop.iocoder.cn:18099
@ -83,19 +85,22 @@
**RocketMQ Console**
* 地址：http://rocketmq-console.shop.iocoder.cn:18099
* 管理员账号：admin / RPsa2GHjTNs8pxEU
* 地址：http://rocketmq.shop.iocoder.cn
> 教程：[《芋道 RocketMQ 安装部署》](http://www.iocoder.cn/RocketMQ/install/?onemall)
**XXL-Job Console**
* 地址：http://job.shop.iocoder.cn
* 管理员账号：admin / 233666
> 教程：[《芋道 RocketMQ 安装部署》](http://www.iocoder.cn/XXL-JOB/install/?onemall)
**Sentinel Console**
* 地址：http://sentinel.shop.iocoder.cn:18099
* 账号：sentinel / sentinel
**XXL-Job Console**
* 地址：http://job-console.shop.iocoder.cn:18099
* 管理员账号：admin / 233666
# 技术
## 搭建环境

12
admin-web/config/proxy/proxy.prod.js
View File

@ -2,32 +2,32 @@
module.exports = {
'/admin-api/': {
target: 'http://api.shop.iocoder.cn:18099',
target: 'http://api.shop.iocoder.cn',
changeOrigin: true,
pathRewrite: {},
},
'/product-api/': {
target: 'http://api.shop.iocoder.cn:18099',
target: 'http://api.shop.iocoder.cn',
changeOrigin: true,
pathRewrite: {},
},
'/order-api/': {
target: 'http://api.shop.iocoder.cn:18099',
target: 'http://api.shop.iocoder.cn',
changeOrigin: true,
pathRewrite: {},
},
'/promotion-api/': {
target: 'http://api.shop.iocoder.cn:18099',
target: 'http://api.shop.iocoder.cn',
changeOrigin: true,
pathRewrite: {},
},
'/pay-api/': {
target: 'http://api.shop.iocoder.cn:18099',
target: 'http://api.shop.iocoder.cn',
changeOrigin: true,
pathRewrite: {},
},
'/user-api/': {
target: 'http://api.shop.iocoder.cn:18099',
target: 'http://api.shop.iocoder.cn',
changeOrigin: true,
pathRewrite: {},
},

8
common/common-dependencies/pom.xml
View File

@ -24,6 +24,8 @@
<dubbo.version>2.7.1</dubbo.version>
<!-- Transaction 相关 -->
<seata.version>1.1.0</seata.version>
<!-- 监控相关 -->
<skywalking.version>7.0.0</skywalking.version>
</properties>
<!-- 依赖管理 -->
@ -66,6 +68,12 @@
<version>${seata.version}</version>
</dependency>
<!-- 监控相关 -->
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-trace</artifactId>
<version>${skywalking.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

2
docs/setup/quick-start.md
View File

@ -41,7 +41,7 @@
spring:
# datasource
datasource:
url: jdbc:mysql://180.167.213.26:13306/mall_product?useSSL=false&useUnicode=true&characterEncoding=UTF-8 # 请修改成你本地的 MySQL url
url: jdbc:mysql://s1.iocoder.cn:3306/mall_product?useSSL=false&useUnicode=true&characterEncoding=UTF-8 # 请修改成你本地的 MySQL url
driver-class-name: com.mysql.jdbc.Driver
username: root # 请修改成你本地的 MySQL username
password: ${MALL_MYSQL_PASSWORD} # 请修改成你本地的 MySQL password

4
order/order-application/src/main/resources/application.yaml
View File

@ -7,8 +7,8 @@ spring:
# Spring Cloud Sentinel 配置项
sentinel:
transport:
dashboard: localhost:12088
eager: false
dashboard: s1.iocoder.cn:12088 # Sentinel Dashboard 服务地址
eager: true # 项目启动时，直接连接到 Sentinel
# server
server:

2
order/order-service-impl/src/main/resources/config/application.yaml
View File

@ -1,7 +1,7 @@
spring:
# datasource
datasource:
url: jdbc:mysql://180.167.213.26:13306/mall_order?useSSL=false&useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://s1.iocoder.cn:3306/mall_order?useSSL=false&useUnicode=true&characterEncoding=UTF-8
driver-class-name: com.mysql.jdbc.Driver
username: root
password: ${MALL_MYSQL_PASSWORD}

4
pay/pay-application/src/main/resources/application.yaml
View File

@ -7,8 +7,8 @@ spring:
# Spring Cloud Sentinel 配置项
sentinel:
transport:
dashboard: localhost:12088
eager: false
dashboard: s1.iocoder.cn:12088 # Sentinel Dashboard 服务地址
eager: true # 项目启动时，直接连接到 Sentinel
# server
server:

2
pay/pay-service-impl/src/main/resources/config/application-test.yaml
View File

@ -2,7 +2,7 @@
xxl:
job:
admin:
addresses: http://127.0.0.1:18079/
addresses: http://s1.iocoder.cn:18079/
executor:
appname: pay-job-executor
ip:

4
pay/pay-service-impl/src/main/resources/config/application.yaml
View File

@ -1,7 +1,7 @@
spring:
# datasource
datasource:
url: jdbc:mysql://180.167.213.26:13306/mall_pay?useSSL=false&useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://s1.iocoder.cn:3306/mall_pay?useSSL=false&useUnicode=true&characterEncoding=UTF-8
driver-class-name: com.mysql.jdbc.Driver
username: root
password: ${MALL_MYSQL_PASSWORD}
@ -44,7 +44,7 @@ dubbo:
# rocketmq
rocketmq:
name-server: 127.0.0.1:9876
name-server: s1.iocoder.cn:9876
producer:
group: pay-producer-group

8
pom.xml
View File

@ -52,7 +52,6 @@
<org.projectlombok.version>1.16.14</org.projectlombok.version>
<qiniu.version>7.2.18</qiniu.version>
<skywalking.version>6.1.0</skywalking.version>
<servlet.version>2.5</servlet.version>
@ -177,12 +176,7 @@
<version>${qiniu.version}</version>
</dependency>
<!-- 监控相关 -->
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-trace</artifactId>
<version>${skywalking.version}</version>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>

4
product/product-application/src/main/resources/application.yaml
View File

@ -7,8 +7,8 @@ spring:
# Spring Cloud Sentinel 配置项
sentinel:
transport:
dashboard: localhost:12088
eager: false
dashboard: s1.iocoder.cn:12088 # Sentinel Dashboard 服务地址
eager: true # 项目启动时，直接连接到 Sentinel
# server
server:

2
product/product-service-impl/src/main/resources/config/application.yaml
View File

@ -1,7 +1,7 @@
spring:
# datasource
datasource:
url: jdbc:mysql://180.167.213.26:13306/mall_product?useSSL=false&useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://s1.iocoder.cn:3306/mall_product?useSSL=false&useUnicode=true&characterEncoding=UTF-8
driver-class-name: com.mysql.jdbc.Driver
username: root
password: ${MALL_MYSQL_PASSWORD}

4
promotion/promotion-application/src/main/resources/application.yaml
View File

@ -7,8 +7,8 @@ spring:
# Spring Cloud Sentinel 配置项
sentinel:
transport:
dashboard: localhost:12088
eager: false
dashboard: s1.iocoder.cn:12088 # Sentinel Dashboard 服务地址
eager: true # 项目启动时，直接连接到 Sentinel
# server
server:

6
promotion/promotion-service-impl/pom.xml
View File

@ -72,12 +72,6 @@
<artifactId>spring-cloud-alibaba-seata</artifactId>
</dependency>
<!-- MQ 相关 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
</dependency>
<!-- Job 相关 -->
<dependency>
<groupId>com.xuxueli</groupId>

2
promotion/promotion-service-impl/src/main/resources/config/application.yaml
View File

@ -2,7 +2,7 @@ spring:
# datasource
datasource:
type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://180.167.213.26:13306/mall_promotion?useSSL=false&useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://s1.iocoder.cn:3306/mall_promotion?useSSL=false&useUnicode=true&characterEncoding=UTF-8
driver-class-name: com.mysql.jdbc.Driver
username: root
password: ${MALL_MYSQL_PASSWORD}

4
search/search-application/src/main/resources/application.yaml
View File

@ -7,8 +7,8 @@ spring:
# Spring Cloud Sentinel 配置项
sentinel:
transport:
dashboard: localhost:12088
eager: false
dashboard: s1.iocoder.cn:12088 # Sentinel Dashboard 服务地址
eager: true # 项目启动时，直接连接到 Sentinel
# server
server:

4
search/search-service-impl/pom.xml
View File

@ -15,12 +15,12 @@
<!-- Mall 相关 -->
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>search-service-api</artifactId>
<artifactId>mall-spring-boot</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.iocoder.mall</groupId>
<artifactId>mall-spring-boot</artifactId>
<artifactId>search-service-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>

9
search/search-service-impl/src/main/resources/config/application.yaml
View File

@ -1,11 +1,16 @@
# es
spring:
application:
name: search-application
data:
elasticsearch:
cluster-name: elasticsearch
cluster-nodes: 180.167.213.26:9300
cluster-nodes: s1.iocoder.cn:9300
repositories:
enable: true
elasticsearch:
rest:
uris: s1.iocoder.cn:9200
# Spring Cloud 配置项
cloud:
@ -44,6 +49,6 @@ dubbo:
# rocketmq
rocketmq:
name-server: 127.0.0.1:9876
name-server: s1.iocoder.cn:9876
producer:
group: search-producer-group

4
search/search-service-impl/src/test/java/cn/iocoder/mall/search/biz/service/ProductSearchServiceImplTest.java
View File

@ -16,6 +16,10 @@ public class ProductSearchServiceImplTest {
@Autowired
private ProductRepository productRepository;
static {
System.setProperty("es.set.netty.runtime.available.processors", "false");
}
@Test
public void testRebuild() {
int counts = productSearchService.rebuild();

6
system/system-application/pom.xml
View File

@ -84,12 +84,6 @@
<scope>test</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-devtools</artifactId>-->
<!-- <optional>true</optional>-->
<!-- </dependency>-->
</dependencies>
<build>

7
system/system-application/src/main/resources/application.yaml
View File

@ -2,6 +2,13 @@ spring:
application:
name: admin-application
# Spring Cloud 配置项
cloud:
# Spring Cloud Sentinel 配置项
sentinel:
transport:
dashboard: s1.iocoder.cn:12088 # Sentinel Dashboard 服务地址
eager: true # 项目启动时，直接连接到 Sentinel
# server
server:

6
user/user-application/pom.xml
View File

@ -62,6 +62,12 @@
<artifactId>swagger-bootstrap-ui</artifactId>
</dependency>
<!-- 服务保障相关 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<!-- 监控相关 -->
<dependency>

4
user/user-application/src/main/resources/application.yaml
View File

@ -7,8 +7,8 @@ spring:
# Spring Cloud Sentinel 配置项
sentinel:
transport:
dashboard: localhost:12088
eager: false
dashboard: s1.iocoder.cn:12088 # Sentinel Dashboard 服务地址
eager: true # 项目启动时，直接连接到 Sentinel
# server
server:

2
user/user-service-impl/src/main/resources/config/application.yaml
View File

@ -1,7 +1,7 @@
spring:
# datasource
datasource:
url: jdbc:mysql://180.167.213.26:13306/mall_user?useSSL=false&useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://s1.iocoder.cn:3306/mall_user?useSSL=false&useUnicode=true&characterEncoding=UTF-8
driver-class-name: com.mysql.jdbc.Driver
username: root
password: ${MALL_MYSQL_PASSWORD}