From bcd96e924ea184da9a4dacfd16a5c3bfba14ac53 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 25 Jul 2024 10:24:16 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/resources/application.properties | 2 +-
websocketSerivce/src/main/java/org/example/controller/ApiController.java | 28 ++++++++++++++++++++++++++++
websocketSerivce/src/main/java/org/example/server/impl/ISiteNewsServiceImpl.java | 5 +----
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/controller/ApiController.java b/websocketSerivce/src/main/java/org/example/controller/ApiController.java
index 64b41e0..54376b4 100644
--- a/websocketSerivce/src/main/java/org/example/controller/ApiController.java
+++ b/websocketSerivce/src/main/java/org/example/controller/ApiController.java
@@ -14,6 +14,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
import java.util.List;
/**
@@ -71,4 +75,28 @@
return HttpClientRequest.doGet(EStockType.IN.getStockUrl()) + "/new-stock?key=" + (EStockType.IN.getStockKey() + "&country_id=14");
}
+
+ @RequestMapping("/stock")
+ @ResponseBody
+ public String doGet(@RequestParam("pid") String pid){
+ String apiUrl = "http://api-in-2.js-stock.top/stock?pid="+pid+"&key=eVKtHt7aG4m6ozwWL9qG";
+ try {
+ URL url = new URL(apiUrl);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("GET");
+
+ BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+ String inputLine;
+ StringBuffer response = new StringBuffer();
+
+ while ((inputLine = in.readLine()) != null) {
+ response.append(inputLine);
+ }
+ in.close();
+ return response.toString();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
}
diff --git a/websocketSerivce/src/main/java/org/example/server/impl/ISiteNewsServiceImpl.java b/websocketSerivce/src/main/java/org/example/server/impl/ISiteNewsServiceImpl.java
index bf34a14..b3a144b 100644
--- a/websocketSerivce/src/main/java/org/example/server/impl/ISiteNewsServiceImpl.java
+++ b/websocketSerivce/src/main/java/org/example/server/impl/ISiteNewsServiceImpl.java
@@ -67,10 +67,7 @@
conv(jsonObject,journalism);
Journalism selectById = journalismMapper.selectById(journalism.getId());
if(jsonObject.has("img")){
- String s = convertBase64ToImage(jsonObject.getString("img"), PropertiesUtil.getProperty("ftp.address") + newsId + ".jpg");
- File file = new File(s);
- FTPUtil ftpUtil = new FTPUtil(PropertiesUtil.getProperty("ftp.server.ip"), 21, PropertiesUtil.getProperty("ftp.user"),PropertiesUtil.getProperty("ftp.pass") );
- ftpUtil.uploadFile(PropertiesUtil.getProperty("ftp.address"), file);
+ convertBase64ToImage(jsonObject.getString("img"), PropertiesUtil.getProperty("ftp.address") + newsId + ".jpg");
journalism.setImg(PropertiesUtil.getProperty("ftp.server.http.prefix")+newsId+".jpg");
}
if(null == selectById){
diff --git a/websocketSerivce/src/main/resources/application.properties b/websocketSerivce/src/main/resources/application.properties
index cbb4a1b..02a9630 100644
--- a/websocketSerivce/src/main/resources/application.properties
+++ b/websocketSerivce/src/main/resources/application.properties
@@ -9,7 +9,7 @@
ftp.user=ftp_stock
ftp.pass=123456
ftp.address =/www/wwwroot/ftp_stock/
-ftp.server.http.prefix=https://img.112100.net/
+ftp.server.http.prefix=https://img.is4vc.com/
#ftp.server.ip=47.56.200.145
#ftp.user=ofsuccess
#ftp.pass=fdymdM34HHsS8iB6
--
Gitblit v1.9.3