From b864ea85f84cee2df8616f4eb5757f5f3f1a5c43 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 15:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.11rg' into 1.11rg

---
 src/main/resources/application.properties |   71 ++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index db627b9..88c6b65 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,10 +17,10 @@
 ftp.user=ftp_stock
 ftp.pass=123456
 ftp.address =/www/wwwroot/ftp_stock/
-ftp.server.http.prefix=https://img.durocaspitall.com/
+ftp.server.http.prefix=https://imgtt.jafco1.cc/
 
 redis1.ip=localhost
-redis1.port=6379
+redis1.port=6380
 redis1.pwd=
 redis1.timeout=10000
 redis.max.total=50
@@ -40,49 +40,52 @@
 admin.super.name=18916320007
 
 
-#股票key的地址
+#股票key的地址
 #IN_HTTP_API = https://data.is4vc.com/v1
 #IN_WS_URL =ws://ws.is4vc.com:8001/websocket-server/v1
 #IN_KEY = r3ZAgtcYzuBizmqge2hK
 #IN_NEW_HTTP_API = http://api-in-2.js-stock.top/
 #IN_NEW_KEY = eVKtHt7aG4m6ozwWL9qG
 
-JS_IN_HTTP_API = http://api-in-3-socket.js-stock.top
-JS_IN_HTTP_URL = http://api-in-pro.js-stock.top/
-JS_IN_WS_URL = ws://api-in-pro-ws.js-stock.top
-JS_IN_KEY = zQfyHCpDgHeAwZsNWqgA
-
-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://test-ws.js-stock.top
-HK_KEY = mG8QQDdjGuLjLnrryd0B
+#JS_IN_HTTP_API = http://api-in-3-socket.js-stock.top
+#JS_IN_HTTP_URL = http://api-in-pro.js-stock.top/
+#JS_IN_WS_URL = ws://api-in-pro-ws.js-stock.top
+#JS_IN_KEY = xKChgi47AP1NMwMeYI3c
+#
+#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://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
+JP_HTTP_API = http://api-jp.js-stock.top/
+JP_WS_URL = ws://api-jp-ws.js-stock.top
+JP_KEY = P7DIpQlksiV036nRBFjc
 
 
-HG_HTTP_API = http://test.js-stock.top/
-HG_WS_URL = ws://test-ws.js-stock.top
-HG_KEY = mG8QQDdjGuLjLnrryd0B
-
-
-
-TH_HTTP_API = http://test.js-stock.top/
-TH_WS_URL = ws://api-in-ws.js-stock.top
-TH_KEY = GBZAcUPLKZzDMDjvV9Ea
-
-MAS_HTTP_API = http://api-ms.js-stock.top/
-MAS_WS_URL = ws://api-ms-ws.js-stock.top
-MAS_KEY = PQWyZGrw7wRqdoWrvnY9
-
-SZHB_HTTP_API = https://api.huobi.pro/
-SZHB_WS_URL = ws://api-in-ws.js-stock.top
-SZHB_KEY = GBZAcUPLKZzDMDjvV9Ea
+#HG_HTTP_API = http://test.js-stock.top/
+#HG_WS_URL = ws://test-ws.js-stock.top
+#HG_KEY = mG8QQDdjGuLjLnrryd0B
+#
+#
+#
+#TH_HTTP_API = http://test.js-stock.top/
+#TH_WS_URL = ws://api-in-ws.js-stock.top
+#TH_KEY = GBZAcUPLKZzDMDjvV9Ea
+#
+#MAS_HTTP_API = http://api-ms.js-stock.top/
+#MAS_WS_URL = ws://api-ms-ws.js-stock.top
+#MAS_KEY = PQWyZGrw7wRqdoWrvnY9
+#
+#SZHB_HTTP_API = https://api.huobi.pro/
+#SZHB_WS_URL = ws://api-in-ws.js-stock.top
+#SZHB_KEY = GBZAcUPLKZzDMDjvV9Ea
 
 
 
@@ -135,11 +138,11 @@
 us.stock.buy.url = https://push2.eastmoney.com/api/qt/stock/details/get?fields1=f1,f2,f3,f4&fields2=f51,f52,f53,f54,f55&fltt=2&pos=-14&secid=
 us.index.url = https://56.push2.eastmoney.com/api/qt/clist/get?pn=1&pz=999&po=1&np=1&ut=bd1d9ddb04089700cf9c27f6f7426281&fltt=2&invt=2&wbp2u=%7C0%7C0%7C0%7Cweb&fid=f3&fs=i:100.NDX,i:100.DJIA,i:100.SPX&fields=f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24,f25,f26,f22,f33,f11,f62,f128,f136,f115,f152,f124,f107&_=
 
-#涨停板
+#涨停板
 ztb.url =https://push2ex.eastmoney.com/getTopicZTPool?&ut=7eea3edcaed734bea9cbfc24409ed989&dpt=wz.ztzt&Pageindex=0&pagesize=999&sort=fbt%3Aasc&date=20221202&_=
 
 
-#改变现价
+#改变现价
 #changePrice.url =http://116.124.132.181/stock/base/cx_gp
 #????
 home.index.recommend.url=https://guba.sina.cn/api/?s=community&a=get_hot_stock_list&type=cn&num=20&page=1&platform=ios&version=6.10.0

--
Gitblit v1.9.3