diff --git a/yami-shop-admin/src/main/resources/application-docker.yml b/yami-shop-admin/src/main/resources/application-docker.yml index b60c967..fb45913 100644 --- a/yami-shop-admin/src/main/resources/application-docker.yml +++ b/yami-shop-admin/src/main/resources/application-docker.yml @@ -1,10 +1,10 @@ server: - port: 8085 + port: 8111 spring: datasource: - url: jdbc:mysql://mall4j-mysql:3306/yami_shops?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true - username: root - password: root + url: jdbc:mysql://${MYSQL_HOST:mall4j-mysql}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:yami_shops}?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true + username: ${MYSQL_USERNAME:root} + password: ${MYSQL_PASSWORD:root} driver-class-name: com.mysql.cj.jdbc.Driver type: com.zaxxer.hikari.HikariDataSource hikari: diff --git a/yami-shop-admin/src/main/resources/redisson-docker.yml b/yami-shop-admin/src/main/resources/redisson-docker.yml index e4b470a..4ba23b7 100644 --- a/yami-shop-admin/src/main/resources/redisson-docker.yml +++ b/yami-shop-admin/src/main/resources/redisson-docker.yml @@ -1,8 +1,8 @@ # 单节点设置 singleServerConfig: - address: redis://mall4j-redis:6379 - database: 0 - password: null + address: redis://${REDIS_HOST}:${REDIS_PORT} + database: ${REDIS_DATABASE} + password: ${REDIS_PASSWORD} idleConnectionTimeout: 10000 pingTimeout: 1000 connectTimeout: 10000 diff --git a/yami-shop-api/src/main/resources/application-docker.yml b/yami-shop-api/src/main/resources/application-docker.yml index fb45913..46e4866 100644 --- a/yami-shop-api/src/main/resources/application-docker.yml +++ b/yami-shop-api/src/main/resources/application-docker.yml @@ -1,18 +1,19 @@ server: - port: 8111 + port: 8086 + undertow: + worker-threads: 200 + spring: datasource: - url: jdbc:mysql://${MYSQL_HOST:mall4j-mysql}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:yami_shops}?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true - username: ${MYSQL_USERNAME:root} - password: ${MYSQL_PASSWORD:root} + url: jdbc:mysql://mall4j-mysql:3306/yami_shops?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true + username: root + password: root driver-class-name: com.mysql.cj.jdbc.Driver type: com.zaxxer.hikari.HikariDataSource hikari: minimum-idle: 0 maximum-pool-size: 20 - idle-timeout: 25000 - auto-commit: true - connection-test-query: SELECT 1 + connection-test-query: select 1 redis: redisson: config: classpath:redisson-docker.yml diff --git a/yami-shop-api/src/main/resources/redisson-docker.yml b/yami-shop-api/src/main/resources/redisson-docker.yml index 4ba23b7..e4b470a 100644 --- a/yami-shop-api/src/main/resources/redisson-docker.yml +++ b/yami-shop-api/src/main/resources/redisson-docker.yml @@ -1,8 +1,8 @@ # 单节点设置 singleServerConfig: - address: redis://${REDIS_HOST}:${REDIS_PORT} - database: ${REDIS_DATABASE} - password: ${REDIS_PASSWORD} + address: redis://mall4j-redis:6379 + database: 0 + password: null idleConnectionTimeout: 10000 pingTimeout: 1000 connectTimeout: 10000