diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index c2f143c..94d0ddc 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -5,12 +5,12 @@ export JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow \ -Dspring.redis.password=$REDIS_PASS \ -Dmarket.domain=$MARKET_HOST \ -Dspring.redis.port=$REDIS_PORT \ - -Dspring.datasource.stock-market.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$MARKET_MYSQL_DB?useUnicode=true&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=true \ + -Dspring.datasource.stock-market.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$MYSQL_DB?useUnicode=true&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=true \ -Dspring.datasource.stock-market.username=$MYSQL_USER \ - -Dspring.datasource.stock-market.password=$MYSQL_PASS \ + -Dspring.datasource.stock-market.password=$MYSQL_PASSWORD \ -Dspring.datasource.stock.url=jdbc:mysql://$MYSQL_HOST:$MYSQL_PORT/$MYSQL_DB?useUnicode=true&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=true \ -Dspring.datasource.stock.username=$MYSQL_USER \ - -Dspring.datasource.stock.password=$MYSQL_PASS" + -Dspring.datasource.stock.password=$MYSQL_PASSWORD" echo 'param:'$@ diff --git a/src/main/java/cn/stock/market/web/InfoController.java b/src/main/java/cn/stock/market/web/InfoController.java index f4f73cc..7c4d53b 100644 --- a/src/main/java/cn/stock/market/web/InfoController.java +++ b/src/main/java/cn/stock/market/web/InfoController.java @@ -40,6 +40,7 @@ public class InfoController { public Map test(@RequestParam(required = false) String key) { Map map = Maps.newHashMap(); map.put("stockMarketDbUrl", stockMarketDbUrl); + map.put("stockMarketDbUrl1", stockMarketDbUrl); if(StringUtils.isNotBlank(key)) { map.put("key", PropertiesUtil.getProperty(key)); }