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 |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a4bcdc7..fef9a81 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,11 +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.address =/www/wwwroot/ftp_stock/
-ftp.server.http.prefix=https://img.3falcon.com/
+ftp.server.http.prefix=https://img.barcblays.cyou/
 
 
 redis1.ip=localhost
@@ -37,6 +37,9 @@
 IN_HTTP_API = https://data.is4vc.com/
 IN_WS_URL = ws://ws.is4vc.com:8001/websocket-server
 IN_KEY = r3ZAgtcYzuBizmqge2hK
+
+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
@@ -169,24 +172,19 @@
 
 
 
-#?????
-news.main.url=http://eminfo.eastmoney.com
-spring.main.allow-circular-references=true
-
 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.smtp.ssl.enable=true
 spring.mail.properties.mail.transport.protocol=smtp
-spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-spring.mail.properties.mail.smtp.socketFactory.port=465
 
-
+properties.mail.smtp.socketFactory.class: javax.net.ssl.SSLSocketFactory
 

--
Gitblit v1.9.3