From b5a9ce44d7a110dc23b493f5f13b25c036ed3134 Mon Sep 17 00:00:00 2001
From: macro <zhenghong1991@126.com>
Date: Wed, 20 Nov 2019 17:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 document/reference/deploy_linux.md            | 47 +++++++++++++++----
 .../src/main/resources/application-prod.yml   |  4 +-
 .../resources/config/portal/portal-prod.yml   | 16 ++-----
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/document/reference/deploy_linux.md b/document/reference/deploy_linux.md
index e358be3..7a3669b 100644
--- a/document/reference/deploy_linux.md
+++ b/document/reference/deploy_linux.md
@@ -1,6 +1,10 @@
 # mall-swarm 在Linux环境下的部署
 
-## 部署mall-registry
+## 环境搭建
+
+## 应用部署
+
+##3 部署mall-registry
 
 ```bash
 docker run -p 8001:8001 --name mall-registry \
@@ -9,7 +13,7 @@ docker run -p 8001:8001 --name mall-registry \
 -d mall/mall-registry:1.0-SNAPSHOT
 ```
 
-## 部署mall-config
+### 部署mall-config
 
 ```bash 
 docker run -p 8301:8301 --name mall-config \
@@ -19,7 +23,7 @@ docker run -p 8301:8301 --name mall-config \
 -d mall/mall-config:1.0-SNAPSHOT
 ```
 
-## 部署mall-monitor
+### 部署mall-monitor
 
 ```bash 
 docker run -p 8101:8101 --name mall-monitor \
@@ -29,7 +33,7 @@ docker run -p 8101:8101 --name mall-monitor \
 -d mall/mall-monitor:1.0-SNAPSHOT
 ```
 
-## 部署mall-gateway
+### 部署mall-gateway
 
 ```bash 
 docker run -p 8201:8201 --name mall-gateway \
@@ -39,7 +43,7 @@ docker run -p 8201:8201 --name mall-gateway \
 -d mall/mall-gateway:1.0-SNAPSHOT
 ```
 
-## 部署mall-admin
+### 部署mall-admin
 
 ```bash 
 docker run -p 8180:8180 --name mall-admin \
@@ -50,29 +54,33 @@ docker run -p 8180:8180 --name mall-admin \
 -d mall/mall-admin:1.0-SNAPSHOT
 ```
 
-## 部署mall-portal
+### 部署mall-portal
 
 ```bash 
-docker run -p 8180:8180 --name mall-portal \
+docker run -p 8085:8085 --name mall-portal \
 --link mysql:db \
+--link redis:redis \
+--link mongo:mongo \
+--link rabbitmq:rabbit \
 --link mall-registry:mall-registry \
 -v /etc/localtime:/etc/localtime \
 -v /mydata/app/mall-portal/logs:/var/logs \
 -d mall/mall-portal:1.0-SNAPSHOT
 ```
 
-## 部署mall-search
+### 部署mall-search
 
 ```bash 
-docker run -p 8180:8180 --name mall-search \
+docker run -p 8081:8081 --name mall-search \
 --link mysql:db \
+--link elasticsearch:es \
 --link mall-registry:mall-registry \
 -v /etc/localtime:/etc/localtime \
 -v /mydata/app/mall-search/logs:/var/logs \
 -d mall/mall-search:1.0-SNAPSHOT
 ```
 
-## 部署mall-demo
+### 部署mall-demo
 
 ```bash 
 docker run -p 8082:8082 --name mall-demo \
@@ -81,4 +89,23 @@ docker run -p 8082:8082 --name mall-demo \
 -v /etc/localtime:/etc/localtime \
 -v /mydata/app/mall-demo/logs:/var/logs \
 -d mall/mall-demo:1.0-SNAPSHOT
+```
+
+## 注意
+
+- 打包时如果遇到找不到`mall-common`、`mall-mbg`或`mall-security`的情况，需要先按顺序将这些模块install到本地maven仓库再进行打包；
+
+- prod环境下从配置中心获取的是存储在git仓库中的配置，如需更改需要将mall-config模块的配置文件application.yml中的git仓库配置改为你自己的；
+
+```yaml
+spring:
+  cloud:
+    config:
+      server:
+        git: #Git仓库存储
+          uri: https://gitee.com/macrozheng/mall-config.git #改为你自己的配置
+          username: macro
+          password: 123456
+          clone-on-start: true
+          search-paths: '{application}'
 ```
\ No newline at end of file
diff --git a/mall-config/src/main/resources/application-prod.yml b/mall-config/src/main/resources/application-prod.yml
index 0f9b8b9..9b788df 100644
--- a/mall-config/src/main/resources/application-prod.yml
+++ b/mall-config/src/main/resources/application-prod.yml
@@ -1,4 +1,6 @@
 eureka:
   client:
     service-url:
-      defaultZone: http://mall-registry:8001/eureka/
\ No newline at end of file
+      defaultZone: http://mall-registry:8001/eureka/
+  instance:
+    prefer-ip-address: true
\ No newline at end of file
diff --git a/mall-config/src/main/resources/config/portal/portal-prod.yml b/mall-config/src/main/resources/config/portal/portal-prod.yml
index 9dd3fe3..accb7f9 100644
--- a/mall-config/src/main/resources/config/portal/portal-prod.yml
+++ b/mall-config/src/main/resources/config/portal/portal-prod.yml
@@ -1,29 +1,23 @@
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
     username: root
     password: root
   data:
     mongodb:
-      host: localhost
+      host: mongo
       port: 27017
       database: mall-port
   redis:
-    host: localhost # Redis服务器地址
+    host: redis # Redis服务器地址
     database: 0 # Redis数据库索引（默认为0）
     port: 6379 # Redis服务器连接端口
-    password: 123456 # Redis服务器连接密码（默认为空）
+    password: #不设置密码
   rabbitmq:
-    host: localhost
+    host: rabbit
     port: 5672
     virtual-host: /mall
     username: mall
     password: mall
     publisher-confirms: true #如果对异步消息需要回调必须设置为true
-# 日志配置
-logging:
-  level:
-    org.springframework.data.mongodb.core: debug
-    com.macro.mall.mapper: debug
-    com.macro.mall.portal.dao: debug