From b7f0793d88994b6990cb3bbdff65c3ac4cc1a87a Mon Sep 17 00:00:00 2001 From: william Date: Wed, 1 May 2024 01:30:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 90a2a85..c2f143c 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -10,7 +10,7 @@ export JAVA_OPTS="$JAVA_OPTS -XX:-OmitStackTraceInFastThrow \ -Dspring.datasource.stock-market.password=$MYSQL_PASS \ -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_PASS" echo 'param:'$@ From 8660354dc1c34fc7bced25651a3e00b1c468c9dd Mon Sep 17 00:00:00 2001 From: william Date: Wed, 1 May 2024 01:35:02 +0800 Subject: [PATCH 2/4] fix bug --- docker-entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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:'$@ From 9af156cd4ae19ed862bf45e683dd67110b2ac71b Mon Sep 17 00:00:00 2001 From: william Date: Wed, 1 May 2024 11:53:13 +0800 Subject: [PATCH 3/4] 1 --- src/main/java/cn/stock/market/web/StockApiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index eb697ab..c1016c4 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -56,7 +56,7 @@ import springfox.documentation.annotations.ApiIgnore; @Controller @Api(value = "/StockApiController", tags = "股票行情") -@RequestMapping({"/market/api/market/stock/", "/market/api/hq/stock/","/api/market/stock/", "/api/hq/stock/"}) +@RequestMapping({"/market/api/market/stock", "/market/api/hq/stock","/api/market/stock", "/api/hq/stock"}) public class StockApiController { private static final Logger log = LoggerFactory.getLogger(StockApiController.class); From b2e93f646c8d6e3083b4bc8b14614890dbbe6668 Mon Sep 17 00:00:00 2001 From: william Date: Wed, 1 May 2024 11:57:12 +0800 Subject: [PATCH 4/4] 1 --- src/main/java/cn/stock/market/web/InfoController.java | 1 + src/main/java/cn/stock/market/web/StockApiController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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)); } diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index c1016c4..eb697ab 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -56,7 +56,7 @@ import springfox.documentation.annotations.ApiIgnore; @Controller @Api(value = "/StockApiController", tags = "股票行情") -@RequestMapping({"/market/api/market/stock", "/market/api/hq/stock","/api/market/stock", "/api/hq/stock"}) +@RequestMapping({"/market/api/market/stock/", "/market/api/hq/stock/","/api/market/stock/", "/api/hq/stock/"}) public class StockApiController { private static final Logger log = LoggerFactory.getLogger(StockApiController.class);