diff --git a/README.md b/README.md index 0a9b53ff..b8b5d21d 100644 --- a/README.md +++ b/README.md @@ -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 - # 技术 ## 搭建环境 diff --git a/admin-web/config/proxy/proxy.prod.js b/admin-web/config/proxy/proxy.prod.js index 7197b139..a9f62609 100644 --- a/admin-web/config/proxy/proxy.prod.js +++ b/admin-web/config/proxy/proxy.prod.js @@ -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: {}, }, diff --git a/common/common-dependencies/pom.xml b/common/common-dependencies/pom.xml index 8846d9e3..d1c2d5fe 100644 --- a/common/common-dependencies/pom.xml +++ b/common/common-dependencies/pom.xml @@ -24,6 +24,8 @@ 2.7.1 1.1.0 + + 7.0.0 @@ -66,6 +68,12 @@ ${seata.version} + + + org.apache.skywalking + apm-toolkit-trace + ${skywalking.version} + diff --git a/docs/setup/quick-start.md b/docs/setup/quick-start.md index 13bc1be9..400c1662 100644 --- a/docs/setup/quick-start.md +++ b/docs/setup/quick-start.md @@ -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 diff --git a/order/order-application/src/main/resources/application.yaml b/order/order-application/src/main/resources/application.yaml index fe4489a7..a602900a 100644 --- a/order/order-application/src/main/resources/application.yaml +++ b/order/order-application/src/main/resources/application.yaml @@ -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: diff --git a/order/order-service-impl/src/main/resources/config/application.yaml b/order/order-service-impl/src/main/resources/config/application.yaml index 764558b7..c7f713c9 100644 --- a/order/order-service-impl/src/main/resources/config/application.yaml +++ b/order/order-service-impl/src/main/resources/config/application.yaml @@ -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} diff --git a/pay/pay-application/src/main/resources/application.yaml b/pay/pay-application/src/main/resources/application.yaml index 6f58347b..4fce7513 100644 --- a/pay/pay-application/src/main/resources/application.yaml +++ b/pay/pay-application/src/main/resources/application.yaml @@ -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: diff --git a/pay/pay-service-impl/src/main/resources/config/application-test.yaml b/pay/pay-service-impl/src/main/resources/config/application-test.yaml index b8ff1409..a9b76515 100644 --- a/pay/pay-service-impl/src/main/resources/config/application-test.yaml +++ b/pay/pay-service-impl/src/main/resources/config/application-test.yaml @@ -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: diff --git a/pay/pay-service-impl/src/main/resources/config/application.yaml b/pay/pay-service-impl/src/main/resources/config/application.yaml index 712a4fa2..50c9f004 100644 --- a/pay/pay-service-impl/src/main/resources/config/application.yaml +++ b/pay/pay-service-impl/src/main/resources/config/application.yaml @@ -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 diff --git a/pom.xml b/pom.xml index 51f109ef..a117d913 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,6 @@ 1.16.14 7.2.18 - 6.1.0 2.5 @@ -177,12 +176,7 @@ ${qiniu.version} - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - + de.codecentric diff --git a/product/product-application/src/main/resources/application.yaml b/product/product-application/src/main/resources/application.yaml index b94bbc09..a5f4207c 100644 --- a/product/product-application/src/main/resources/application.yaml +++ b/product/product-application/src/main/resources/application.yaml @@ -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: 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 c0fadbd1..3855d9c1 100644 --- a/product/product-service-impl/src/main/resources/config/application.yaml +++ b/product/product-service-impl/src/main/resources/config/application.yaml @@ -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} diff --git a/promotion/promotion-application/src/main/resources/application.yaml b/promotion/promotion-application/src/main/resources/application.yaml index 974f4112..b00b3e56 100644 --- a/promotion/promotion-application/src/main/resources/application.yaml +++ b/promotion/promotion-application/src/main/resources/application.yaml @@ -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: diff --git a/promotion/promotion-service-impl/pom.xml b/promotion/promotion-service-impl/pom.xml index 4efc68b1..f6fb32b5 100644 --- a/promotion/promotion-service-impl/pom.xml +++ b/promotion/promotion-service-impl/pom.xml @@ -72,12 +72,6 @@ spring-cloud-alibaba-seata - - - com.alibaba.cloud - spring-cloud-starter-stream-rocketmq - - com.xuxueli diff --git a/promotion/promotion-service-impl/src/main/resources/config/application.yaml b/promotion/promotion-service-impl/src/main/resources/config/application.yaml index 42442cfe..0c9e1b49 100644 --- a/promotion/promotion-service-impl/src/main/resources/config/application.yaml +++ b/promotion/promotion-service-impl/src/main/resources/config/application.yaml @@ -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} diff --git a/search/search-application/src/main/resources/application.yaml b/search/search-application/src/main/resources/application.yaml index 811a9f8b..c531b15d 100644 --- a/search/search-application/src/main/resources/application.yaml +++ b/search/search-application/src/main/resources/application.yaml @@ -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: diff --git a/search/search-service-impl/pom.xml b/search/search-service-impl/pom.xml index ed048e83..2cf391ae 100644 --- a/search/search-service-impl/pom.xml +++ b/search/search-service-impl/pom.xml @@ -15,12 +15,12 @@ cn.iocoder.mall - search-service-api + mall-spring-boot 1.0-SNAPSHOT cn.iocoder.mall - mall-spring-boot + search-service-api 1.0-SNAPSHOT diff --git a/search/search-service-impl/src/main/resources/config/application.yaml b/search/search-service-impl/src/main/resources/config/application.yaml index 298573b5..236fd500 100644 --- a/search/search-service-impl/src/main/resources/config/application.yaml +++ b/search/search-service-impl/src/main/resources/config/application.yaml @@ -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 diff --git a/search/search-service-impl/src/test/java/cn/iocoder/mall/search/biz/service/ProductSearchServiceImplTest.java b/search/search-service-impl/src/test/java/cn/iocoder/mall/search/biz/service/ProductSearchServiceImplTest.java index 3cb6d38f..44047855 100644 --- a/search/search-service-impl/src/test/java/cn/iocoder/mall/search/biz/service/ProductSearchServiceImplTest.java +++ b/search/search-service-impl/src/test/java/cn/iocoder/mall/search/biz/service/ProductSearchServiceImplTest.java @@ -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(); diff --git a/system/system-application/pom.xml b/system/system-application/pom.xml index 0e55dc43..28ef2e7f 100644 --- a/system/system-application/pom.xml +++ b/system/system-application/pom.xml @@ -84,12 +84,6 @@ test - - - - - - diff --git a/system/system-application/src/main/resources/application.yaml b/system/system-application/src/main/resources/application.yaml index b0bdeb4b..edd2d3eb 100644 --- a/system/system-application/src/main/resources/application.yaml +++ b/system/system-application/src/main/resources/application.yaml @@ -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: diff --git a/user/user-application/pom.xml b/user/user-application/pom.xml index b92d394b..8d03b56d 100644 --- a/user/user-application/pom.xml +++ b/user/user-application/pom.xml @@ -62,6 +62,12 @@ swagger-bootstrap-ui + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + diff --git a/user/user-application/src/main/resources/application.yaml b/user/user-application/src/main/resources/application.yaml index 64d9f1bd..f725f54e 100644 --- a/user/user-application/src/main/resources/application.yaml +++ b/user/user-application/src/main/resources/application.yaml @@ -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: 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 51cd7b42..c23bc30c 100644 --- a/user/user-service-impl/src/main/resources/config/application.yaml +++ b/user/user-service-impl/src/main/resources/config/application.yaml @@ -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}