lostecho/mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加docker容器化部署，配置区分dev和prod环境

Browse Source
This commit is contained in:
zhh
2018-08-20 17:06:18 +08:00
parent 7ece991396
commit 8cb20508e8
22 changed files with 397 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mall-portal/src/main/java/com/macro/mall/portal/MallPortalApplication.java
View File

@@ -1,35 +1,15 @@
package com.macro.mall.portal;
import org.apache.catalina.connector.Connector;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import org.springframework.context.annotation.Bean;
@SpringBootApplication
@MapperScan({"com.macro.mall.mapper","com.macro.mall.portal.dao"})
public class MallPortalApplication {
@Value("${http.port}")
private Integer port;
public static void main(String[] args) {
SpringApplication.run(MallPortalApplication.class, args);
}
@Bean
public EmbeddedServletContainerFactory servletContainer() {
TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory();
tomcat.addAdditionalTomcatConnectors(createStandardConnector()); // 添加http
return tomcat;
}
//配置http
private Connector createStandardConnector() {
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
connector.setPort(port);
return connector;
}
}

3
mall-portal/src/main/java/com/macro/mall/portal/config/TomcatConfig.java
View File

@@ -6,16 +6,17 @@ import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory
import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
/**
* tomcat相关配置
* Created by macro on 2018/8/7.
*/
@Profile("dev")
@Configuration
public class TomcatConfig {
@Value("${http.port}")
private Integer port;
@Bean
public EmbeddedServletContainerFactory servletContainer() {
TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory();

48
mall-portal/src/main/resources/application-dev.properties Normal file
View File

@@ -0,0 +1,48 @@
#===https start===
#<23><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ὺ<EFBFBD><E1BFAA>https
server.port=8443
server.ssl.key-store=keystore.p12
server.ssl.key-alias=tomcat
server.ssl.key-store-password=123456
server.ssl.key-store-type=PKCS12
#===https end===
#===logging start===
logging.level.org.springframework.data.mongodb.core=debug
logging.level.com.macro.mall.mapper=debug
logging.level.com.macro.mall.portal.dao=debug
#===logging end===
#===datasource start===
spring.datasource.url=jdbc:mysql://localhost:3306/mall
spring.datasource.username=root
spring.datasource.password=root
#===datasource end===
#===mongodb start===
spring.data.mongodb.host=localhost
spring.data.mongodb.port=27017
spring.data.mongodb.database=mall-port
#===mongodb end===
#===redis start===
# Redis<69><73><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ0<CEAA><30>
spring.redis.database=0
# Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ
spring.redis.host=localhost
# Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӷ˿<D3B6>
spring.redis.port=6379
# Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>루Ĭ<EBA3A8><C4AC>Ϊ<EFBFBD>գ<EFBFBD>
spring.redis.password=
# <20><><EFBFBD>ӳ<EFBFBD><D3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD>ø<EFBFBD>ֵ<EFBFBD><D6B5>ʾû<CABE><C3BB><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD>
spring.redis.pool.max-active=8
# <20><><EFBFBD>ӳ<EFBFBD><D3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȴ<EFBFBD>ʱ<EFBFBD>䣨ʹ<E4A3A8>ø<EFBFBD>ֵ<EFBFBD><D6B5>ʾû<CABE><C3BB><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD>
spring.redis.pool.max-wait=-1
# <20><><EFBFBD>ӳ<EFBFBD><D3B3>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
spring.redis.pool.max-idle=8
# <20><><EFBFBD>ӳ<EFBFBD><D3B3>е<EFBFBD><D0B5><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
spring.redis.pool.min-idle=0
# <20><><EFBFBD>ӳ<EFBFBD>ʱʱ<CAB1>䣨<EFBFBD><E4A3A8><EFBFBD>룩
spring.redis.timeout=0
#===redis end===

37
mall-portal/src/main/resources/application-prod.properties Normal file
View File

@@ -0,0 +1,37 @@
#===server start===
server.port=8085
#===server end===
#===datasource start===
spring.datasource.url=jdbc:mysql://db:3306/mall
spring.datasource.username=root
spring.datasource.password=root
#===datasource end===
#===mongodb start===
spring.data.mongodb.host=mongo
spring.data.mongodb.port=27017
spring.data.mongodb.database=mall-port
#===mongodb end===
#===redis start===
# Redis<69><73><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ0<CEAA><30>
spring.redis.database=0
# Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ
spring.redis.host=redis
# Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӷ˿<D3B6>
spring.redis.port=6379
# Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>루Ĭ<EBA3A8><C4AC>Ϊ<EFBFBD>գ<EFBFBD>
spring.redis.password=
# <20><><EFBFBD>ӳ<EFBFBD><D3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD>ø<EFBFBD>ֵ<EFBFBD><D6B5>ʾû<CABE><C3BB><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD>
spring.redis.pool.max-active=8
# <20><><EFBFBD>ӳ<EFBFBD><D3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȴ<EFBFBD>ʱ<EFBFBD>䣨ʹ<E4A3A8>ø<EFBFBD>ֵ<EFBFBD><D6B5>ʾû<CABE><C3BB><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD>
spring.redis.pool.max-wait=-1
# <20><><EFBFBD>ӳ<EFBFBD><D3B3>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
spring.redis.pool.max-idle=8
# <20><><EFBFBD>ӳ<EFBFBD><D3B3>е<EFBFBD><D0B5><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
spring.redis.pool.min-idle=0
# <20><><EFBFBD>ӳ<EFBFBD>ʱʱ<CAB1>䣨<EFBFBD><E4A3A8><EFBFBD>룩
spring.redis.timeout=0
#===redis end===

49
mall-portal/src/main/resources/application.properties
View File

@@ -1,57 +1,14 @@
#Ĭ<><C4AC>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
spring.profiles.active=dev
#===server start===
http.port=8085
server.port=8443
server.ssl.key-store=keystore.p12
server.ssl.key-alias=tomcat
server.ssl.key-store-password=123456
server.ssl.key-store-type=PKCS12
#===server end===
#===logging start===
logging.level.org.springframework.data.mongodb.core=debug
logging.level.com.macro.mall.mapper=debug
logging.level.com.macro.mall.portal.dao=debug
#===logging end===
#===datasource start===
spring.datasource.url=jdbc:mysql://localhost:3306/mall
spring.datasource.username=root
spring.datasource.password=root
#===datasource end===
#===mybatis start===
mybatis.mapper-locations=classpath:dao/*.xml,classpath*:com/**/mapper/*.xml
#===mybatis end===
#===mongodb start===
spring.data.mongodb.host=localhost
#spring.data.mongodb.host=192.168.1.66
spring.data.mongodb.port=27017
spring.data.mongodb.database=mall-port
#===mongodb end===
#===redis start===
# Redis<69><73><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD><C4AC>Ϊ0<CEAA><30>
spring.redis.database=0
# Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ
spring.redis.host=localhost
#spring.redis.host=192.168.1.66
# Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӷ˿<D3B6>
spring.redis.port=6379
# Redis<69><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>루Ĭ<EBA3A8><C4AC>Ϊ<EFBFBD>գ<EFBFBD>
spring.redis.password=
# <20><><EFBFBD>ӳ<EFBFBD><D3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD>ø<EFBFBD>ֵ<EFBFBD><D6B5>ʾû<CABE><C3BB><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD>
spring.redis.pool.max-active=8
# <20><><EFBFBD>ӳ<EFBFBD><D3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȴ<EFBFBD>ʱ<EFBFBD>䣨ʹ<E4A3A8>ø<EFBFBD>ֵ<EFBFBD><D6B5>ʾû<CABE><C3BB><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD>
spring.redis.pool.max-wait=-1
# <20><><EFBFBD>ӳ<EFBFBD><D3B3>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
spring.redis.pool.max-idle=8
# <20><><EFBFBD>ӳ<EFBFBD><D3B3>е<EFBFBD><D0B5><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
spring.redis.pool.min-idle=0
# <20><><EFBFBD>ӳ<EFBFBD>ʱʱ<CAB1>䣨<EFBFBD><E4A3A8><EFBFBD>룩
spring.redis.timeout=0
#===redis end===
#===redis custom key start===
redis.key.prefix.authCode=portal:authCode:
authCode.expire.seconds=90