From 935b27a40c549f3ebc15e7e9654cdfd01e8eab13 Mon Sep 17 00:00:00 2001 From: zj <1772600164@qq.com> Date: Tue, 04 Jun 2024 11:02:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502 --- src/main/resources/application.properties | 50 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f0179e0..fef9a81 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -5,10 +5,11 @@ #2. ??ifconfig????vsftpd????? #3. ???? ftp://?? -ftp.server.ip=45.204.85.67 +ftp.server.ip=154.19.164.71:21 ftp.user=ftp_stock ftp.pass=123456 -ftp.server.http.prefix=https://img.3falcon.com/ +ftp.address =/www/wwwroot/ftp_stock/ +ftp.server.http.prefix=https://img.barcblays.cyou/ redis1.ip=localhost @@ -25,7 +26,7 @@ #cookie config start user.cookie.name=USERTOKEN -agent.cookie.name=agenttoken +agent.cookie.name=Agenttoken admin.cookie.name=admintoken agent.key.prefix=Mi @@ -33,22 +34,30 @@ #股票key的地址 -IN_HTTP_API = http://api-in.js-stock.top/ -IN_WS_URL = ws://api-in-ws.js-stock.top +IN_HTTP_API = https://data.is4vc.com/ +IN_WS_URL = ws://ws.is4vc.com:8001/websocket-server IN_KEY = r3ZAgtcYzuBizmqge2hK -US_HTTP_API = http://api-1-ws.js-stock.top/ -US_WS_URL = ws://api-1-ws.js-stock.top +IN_NOW_HTTP_API=http://api-in-2.js-stock.top/ +IN_NOW_KEY=eVKtHt7aG4m6ozwWL9qG + +US_HTTP_API = http://api-us.js-stock.top/ +US_WS_URL = ws://ws-us.js-stock.top US_KEY = jZFrku4RGQjP87Hmq5tm HK_HTTP_API = http://test.js-stock.top/ -HK_WS_URL = ws://api-in-ws.js-stock.top -HK_KEY = GBZAcUPLKZzDMDjvV9Ea +HK_WS_URL = ws://test-ws.js-stock.top +HK_KEY = mG8QQDdjGuLjLnrryd0B + + +#HK_HTTP_API = http://api-v1.js-stock.top/ +#HK_WS_URL = ws://api-v1-ws.js-stock.top +#HK_KEY = QgiqrYYZem1WWXWbHeT7 HG_HTTP_API = http://test.js-stock.top/ -HG_WS_URL = ws://api-in-ws.js-stock.top -HG_KEY = GBZAcUPLKZzDMDjvV9Ea +HG_WS_URL = ws://test-ws.js-stock.top +HG_KEY = mG8QQDdjGuLjLnrryd0B @@ -63,6 +72,9 @@ SZHB_HTTP_API = https://api.huobi.pro/ SZHB_WS_URL = ws://api-in-ws.js-stock.top SZHB_KEY = GBZAcUPLKZzDMDjvV9Ea + + + #?? ?? - ???? @@ -160,7 +172,19 @@ +spring.mail.host=smtp.gmail.com +# ???????? +spring.mail.port=587 +# ???????????? +spring.mail.username=barclays5510@gmail.com +# ???????????????????????????? +spring.mail.password=nppwibbarixvbnqk +# ??TLS?? +spring.mail.properties.mail.smtp.starttls.enable=true +# ?????????? +spring.mail.properties.mail.smtp.auth=true +# ?????? +spring.mail.properties.mail.transport.protocol=smtp - - +properties.mail.smtp.socketFactory.class: javax.net.ssl.SSLSocketFactory -- Gitblit v1.9.3