nhanvubk/ger-market-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into 'develop'

Browse Source 
# Conflicts:
#   docker-entrypoint.sh
This commit is contained in:
william
2024-05-06 12:33:09 +00:00
parent 5fe3200ea1 b2e93f646c
commit 59a0480be0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-entrypoint.sh
View File

@@ -5,12 +5,12 @@ export JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow \
-Dspring.redis.password=$REDIS_PASS \ -Dspring.redis.password=$REDIS_PASS \
-Dmarket.domain=$MARKET_HOST \ -Dmarket.domain=$MARKET_HOST \
-Dspring.redis.port=$REDIS_PORT \ -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.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.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.username=$MYSQL_USER \
-Dspring.datasource.stock.password=$MYSQL_PASS" -Dspring.datasource.stock.password=$MYSQL_PASSWORD"
echo 'param:'$@ echo 'param:'$@

1
src/main/java/cn/stock/market/web/InfoController.java
View File

@@ -40,6 +40,7 @@ public class InfoController {
public Map<String, Object> test(@RequestParam(required = false) String key) { public Map<String, Object> test(@RequestParam(required = false) String key) {
Map<String, Object> map = Maps.newHashMap(); Map<String, Object> map = Maps.newHashMap();
map.put("stockMarketDbUrl", stockMarketDbUrl); map.put("stockMarketDbUrl", stockMarketDbUrl);
map.put("stockMarketDbUrl1", stockMarketDbUrl);
if(StringUtils.isNotBlank(key)) { if(StringUtils.isNotBlank(key)) {
map.put("key", PropertiesUtil.getProperty(key)); map.put("key", PropertiesUtil.getProperty(key));
} }