From 4046f94a57f0c10e9509a49ad0d37d701aeb8186 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Tue, 02 Apr 2024 23:47:51 +0800
Subject: [PATCH] 修复自选bug 和 增加流水日志

---
 src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
index cad7d0e..b24f843 100644
--- a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
@@ -3,11 +3,12 @@
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.nq.common.ServerResponse;
-import com.nq.constant.StockConstant;
 import com.nq.dao.SiteNewsMapper;
+import com.nq.enums.EStockType;
 import com.nq.pojo.SiteNews;
 import com.nq.service.ISiteNewsService;
 import com.nq.utils.*;
+import com.nq.utils.http.HttpRequest;
 import com.nq.utils.translate.GoogleTranslateUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -139,10 +140,10 @@
     @Override
     public int grabNews() {
         int ret = 0;
-        //新闻类型:1、财经要闻,2、经济数据,3、全球股市,4、7*24全球,5、商品资讯,6、上市公司,7、全球央行
-         addNews(1, StockConstant.HTTP_API +"stock-markets?key="+ StockConstant.KEY +"&type=4");
-         addNews(2, StockConstant.HTTP_API+"stock-markets?key="+ StockConstant.KEY +"&type=5");
-         addNews(4, StockConstant.HTTP_API+"stock-markets?key="+ StockConstant.KEY +"&type=6");
+         addNews(1, EStockType.HG.getStockUrl() +"stock-markets?key="+ EStockType.HG.getStockKey() +"&type=1");
+//         addNews(2, EStockType.US.getStockUrl() +"stock-markets?key="+ EStockType.US.getStockKey() +"&type=4");
+//         addNews(3, EStockType.TH.getStockUrl() +"stock-markets?key="+ EStockType.TH.getStockKey() +"&type=4");
+//         addNews(4, EStockType.MAS.getStockUrl() +"stock-markets?key="+ EStockType.MAS.getStockKey() +"&type=4");
         return ret;
     }
 
@@ -168,7 +169,7 @@
                         siteNews.setShowTime(new Date(showTime));
                         if(jsonObject.has("img")){
                             String imgBase = convertBase64ToImage(jsonObject.getString("img"),"/www/wwwroot/dabao/"+newsId+".jpg");
-                            siteNews.setImgurl("https://img.jumptalk.net/"+newsId+".jpg");
+                            siteNews.setImgurl(PropertiesUtil.getProperty("ftp.server.http.prefix")+newsId+".jpg");
                         }
                         siteNews.setDescription(jsonObject.getString("content"));
                         siteNews.setContent(jsonObject.getString("content"));

--
Gitblit v1.9.3