diff --git a/README.md b/README.md index 1dc063f..59f87f3 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ mall ├── mall-common -- 工具类及通用代码模块 ├── mall-mbg -- MyBatisGenerator生成的数据库操作代码模块 ├── mall-security -- 封装SpringSecurity+JWT的安全认证的模块 -├── mall-registery -- 基于Eureka的微服务注册中心 +├── mall-registry -- 基于Eureka的微服务注册中心 ├── mall-config -- 基于Spring Cloud Config的微服务配置中心 ├── mall-gateway -- 基于Spring Cloud Gateway的微服务API网关服务 ├── mall-monitor -- 基于Spring Boot Admin的微服务监控中心 diff --git a/document/reference/deploy_linux.md b/document/reference/deploy_linux.md new file mode 100644 index 0000000..e358be3 --- /dev/null +++ b/document/reference/deploy_linux.md @@ -0,0 +1,84 @@ +# mall-swarm 在Linux环境下的部署 + +## 部署mall-registry + +```bash +docker run -p 8001:8001 --name mall-registry \ +-v /etc/localtime:/etc/localtime \ +-v /mydata/app/mall-registry/logs:/var/logs \ +-d mall/mall-registry:1.0-SNAPSHOT +``` + +## 部署mall-config + +```bash +docker run -p 8301:8301 --name mall-config \ +--link mall-registry:mall-registry \ +-v /etc/localtime:/etc/localtime \ +-v /mydata/app/mall-config/logs:/var/logs \ +-d mall/mall-config:1.0-SNAPSHOT +``` + +## 部署mall-monitor + +```bash +docker run -p 8101:8101 --name mall-monitor \ +--link mall-registry:mall-registry \ +-v /etc/localtime:/etc/localtime \ +-v /mydata/app/mall-monitor/logs:/var/logs \ +-d mall/mall-monitor:1.0-SNAPSHOT +``` + +## 部署mall-gateway + +```bash +docker run -p 8201:8201 --name mall-gateway \ +--link mall-registry:mall-registry \ +-v /etc/localtime:/etc/localtime \ +-v /mydata/app/mall-gateway/logs:/var/logs \ +-d mall/mall-gateway:1.0-SNAPSHOT +``` + +## 部署mall-admin + +```bash +docker run -p 8180:8180 --name mall-admin \ +--link mysql:db \ +--link mall-registry:mall-registry \ +-v /etc/localtime:/etc/localtime \ +-v /mydata/app/mall-admin/logs:/var/logs \ +-d mall/mall-admin:1.0-SNAPSHOT +``` + +## 部署mall-portal + +```bash +docker run -p 8180:8180 --name mall-portal \ +--link mysql:db \ +--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 + +```bash +docker run -p 8180:8180 --name mall-search \ +--link mysql:db \ +--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 + +```bash +docker run -p 8082:8082 --name mall-demo \ +--link mysql:db \ +--link mall-registry:mall-registry \ +-v /etc/localtime:/etc/localtime \ +-v /mydata/app/mall-demo/logs:/var/logs \ +-d mall/mall-demo:1.0-SNAPSHOT +``` \ No newline at end of file diff --git a/mall-admin/pom.xml b/mall-admin/pom.xml index 1d8822d..8209fe7 100644 --- a/mall-admin/pom.xml +++ b/mall-admin/pom.xml @@ -14,7 +14,6 @@ UTF-8 UTF-8 1.8 - true @@ -55,33 +54,33 @@ org.springframework.boot spring-boot-maven-plugin - - - - - - - - - - - - - - - - - - - - - - - - - - - + + com.spotify + docker-maven-plugin + 1.1.0 + + + build-image + package + + build + + + + + mall/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/mall-admin/src/main/resources/bootstrap-prod.yml b/mall-admin/src/main/resources/bootstrap-prod.yml index a2fedae..14e897e 100644 --- a/mall-admin/src/main/resources/bootstrap-prod.yml +++ b/mall-admin/src/main/resources/bootstrap-prod.yml @@ -10,4 +10,6 @@ spring: eureka: client: service-url: - defaultZone: http://localhost: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/pom.xml b/mall-config/pom.xml index d263918..c231ce6 100644 --- a/mall-config/pom.xml +++ b/mall-config/pom.xml @@ -5,7 +5,7 @@ com.macro.mall mall-config - 0.0.1-SNAPSHOT + 1.0-SNAPSHOT mall-config mall-config project for mall @@ -32,6 +32,33 @@ org.springframework.boot spring-boot-maven-plugin + + com.spotify + docker-maven-plugin + 1.1.0 + + + build-image + package + + build + + + + + mall/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/mall-config/src/main/resources/application-dev.yml b/mall-config/src/main/resources/application-dev.yml new file mode 100644 index 0000000..5c884f5 --- /dev/null +++ b/mall-config/src/main/resources/application-dev.yml @@ -0,0 +1,4 @@ +eureka: + client: + service-url: + defaultZone: http://localhost:8001/eureka/ \ 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 new file mode 100644 index 0000000..0f9b8b9 --- /dev/null +++ b/mall-config/src/main/resources/application-prod.yml @@ -0,0 +1,4 @@ +eureka: + client: + service-url: + defaultZone: http://mall-registry:8001/eureka/ \ No newline at end of file diff --git a/mall-config/src/main/resources/application.yml b/mall-config/src/main/resources/application.yml index 2d0819a..5b4c008 100644 --- a/mall-config/src/main/resources/application.yml +++ b/mall-config/src/main/resources/application.yml @@ -16,7 +16,3 @@ spring: password: 123456 clone-on-start: true search-paths: '{application}' -eureka: - client: - service-url: - defaultZone: http://localhost:8001/eureka/ diff --git a/mall-demo/pom.xml b/mall-demo/pom.xml index 54e1387..9e0493f 100644 --- a/mall-demo/pom.xml +++ b/mall-demo/pom.xml @@ -50,8 +50,34 @@ org.springframework.boot spring-boot-maven-plugin + + com.spotify + docker-maven-plugin + 1.1.0 + + + build-image + package + + build + + + + + mall/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + - diff --git a/mall-demo/src/main/resources/bootstrap-prod.yml b/mall-demo/src/main/resources/bootstrap-prod.yml index a8a2ef5..77ba38c 100644 --- a/mall-demo/src/main/resources/bootstrap-prod.yml +++ b/mall-demo/src/main/resources/bootstrap-prod.yml @@ -10,4 +10,6 @@ spring: eureka: client: service-url: - defaultZone: http://localhost: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-gateway/pom.xml b/mall-gateway/pom.xml index 1084506..6a5c6a9 100644 --- a/mall-gateway/pom.xml +++ b/mall-gateway/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.macro.mall mall-gateway - 0.0.1-SNAPSHOT + 1.0-SNAPSHOT mall-gateway mall-gateway project for mall @@ -31,6 +31,33 @@ org.springframework.boot spring-boot-maven-plugin + + com.spotify + docker-maven-plugin + 1.1.0 + + + build-image + package + + build + + + + + mall/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/mall-gateway/src/main/resources/application-dev.yml b/mall-gateway/src/main/resources/application-dev.yml new file mode 100644 index 0000000..ee639c8 --- /dev/null +++ b/mall-gateway/src/main/resources/application-dev.yml @@ -0,0 +1,5 @@ +eureka: + client: + service-url: + defaultZone: http://localhost:8001/eureka/ + registry-fetch-interval-seconds: 10 diff --git a/mall-gateway/src/main/resources/application-prod.yml b/mall-gateway/src/main/resources/application-prod.yml new file mode 100644 index 0000000..2950ce4 --- /dev/null +++ b/mall-gateway/src/main/resources/application-prod.yml @@ -0,0 +1,7 @@ +eureka: + client: + service-url: + defaultZone: http://mall-registry:8001/eureka/ + registry-fetch-interval-seconds: 10 + instance: + prefer-ip-address: true diff --git a/mall-gateway/src/main/resources/application.yml b/mall-gateway/src/main/resources/application.yml index 38ccf36..a1b6650 100644 --- a/mall-gateway/src/main/resources/application.yml +++ b/mall-gateway/src/main/resources/application.yml @@ -9,11 +9,6 @@ spring: locator: enabled: true lower-case-service-id: true #使用小写service-id -eureka: - client: - service-url: - defaultZone: http://localhost:8001/eureka/ - registry-fetch-interval-seconds: 10 management: #开启SpringBoot Admin的监控 endpoints: web: diff --git a/mall-monitor/pom.xml b/mall-monitor/pom.xml index 580cab0..ddfe96a 100644 --- a/mall-monitor/pom.xml +++ b/mall-monitor/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.macro.mall mall-monitor - 0.0.1-SNAPSHOT + 1.0-SNAPSHOT mall-monitor mall-monitor project for mall diff --git a/mall-monitor/src/main/resources/application-dev.yml b/mall-monitor/src/main/resources/application-dev.yml new file mode 100644 index 0000000..0cdc0aa --- /dev/null +++ b/mall-monitor/src/main/resources/application-dev.yml @@ -0,0 +1,4 @@ +eureka: + client: + service-url: + defaultZone: http://localhost:8001/eureka/ diff --git a/mall-monitor/src/main/resources/application-prod.yml b/mall-monitor/src/main/resources/application-prod.yml new file mode 100644 index 0000000..321524e --- /dev/null +++ b/mall-monitor/src/main/resources/application-prod.yml @@ -0,0 +1,6 @@ +eureka: + client: + service-url: + defaultZone: http://mall-registry:8001/eureka/ + instance: + prefer-ip-address: true diff --git a/mall-portal/pom.xml b/mall-portal/pom.xml index bbd7ee5..f405c4d 100644 --- a/mall-portal/pom.xml +++ b/mall-portal/pom.xml @@ -64,35 +64,34 @@ org.springframework.boot spring-boot-maven-plugin - - - - - - - - - - - - - - - - - - - - - - - - - - - + + com.spotify + docker-maven-plugin + 1.1.0 + + + build-image + package + + build + + + + + mall/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + - diff --git a/mall-portal/src/main/resources/bootstrap-prod.yml b/mall-portal/src/main/resources/bootstrap-prod.yml index 2e02087..9ef2dde 100644 --- a/mall-portal/src/main/resources/bootstrap-prod.yml +++ b/mall-portal/src/main/resources/bootstrap-prod.yml @@ -10,4 +10,6 @@ spring: eureka: client: service-url: - defaultZone: http://localhost: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-search/pom.xml b/mall-search/pom.xml index 496c773..ca3db6b 100644 --- a/mall-search/pom.xml +++ b/mall-search/pom.xml @@ -53,33 +53,33 @@ org.springframework.boot spring-boot-maven-plugin - - - - - - - - - - - - - - - - - - - - - - - - - - - + + com.spotify + docker-maven-plugin + 1.1.0 + + + build-image + package + + build + + + + + mall/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/mall-search/src/main/resources/bootstrap-prod.yml b/mall-search/src/main/resources/bootstrap-prod.yml index d917ec3..3ddb957 100644 --- a/mall-search/src/main/resources/bootstrap-prod.yml +++ b/mall-search/src/main/resources/bootstrap-prod.yml @@ -10,4 +10,6 @@ spring: eureka: client: service-url: - defaultZone: http://localhost: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/pom.xml b/pom.xml index a83cf90..b4d6207 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,8 @@ + true + http://192.168.6.132:2375 1.8 Greenwich.SR2 1.2.10 @@ -181,4 +183,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file