diff --git a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java index 1b761fb..e93d0da 100644 --- a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java +++ b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java @@ -7,6 +7,7 @@ import cn.stock.market.domain.basic.repository.StockRepository; import cn.stock.market.domain.basic.service.StockService; import cn.stock.market.infrastructure.api.investing.InvestingInvokerApis; import cn.stock.market.infrastructure.db.po.QSiteNewsPO; +import cn.stock.market.utils.DateTimeUtil; import cn.stock.market.utils.Utils; import com.ag.utils.CollectionUtils; import com.alibaba.fastjson.JSON; @@ -127,7 +128,7 @@ public class InvestingTask { Matcher matcher = pattern.matcher(n); String time = ""; if (matcher.find()) { - time = matcher.group(1).trim(); + time = DateTimeUtil.formatDateTimeFor24H(matcher.group(1).trim(),"dd MMM yyyy | hh:mm a"); } SiteNews siteNews = new SiteNews(); diff --git a/src/main/java/cn/stock/market/utils/DateTimeUtil.java b/src/main/java/cn/stock/market/utils/DateTimeUtil.java index 914ecf1..66e33d2 100644 --- a/src/main/java/cn/stock/market/utils/DateTimeUtil.java +++ b/src/main/java/cn/stock/market/utils/DateTimeUtil.java @@ -5,6 +5,8 @@ import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Calendar; +import java.util.Locale; + import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; @@ -186,6 +188,25 @@ public class DateTimeUtil { } + public static String formatDateTimeFor24H(String inputDateTime,String inputFormatStr){ + String outputDateTime = ""; + // 1. 解析日期时间 + SimpleDateFormat inputFormat = new SimpleDateFormat(inputFormatStr, Locale.ENGLISH); + Date date = null; + try { + date = inputFormat.parse(inputDateTime); + } catch (Exception e) { + e.printStackTrace(); + } + + if (date != null) { + // 2. 转换为24小时制 + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + outputDateTime = outputFormat.format(date); + } + return outputDateTime; + } + public static void main(String[] args) { parseToDateByMinute(10); } diff --git a/src/main/resources/application-base-alpha.yml b/src/main/resources/application-base-alpha.yml index fb4cc6d..6572790 100644 --- a/src/main/resources/application-base-alpha.yml +++ b/src/main/resources/application-base-alpha.yml @@ -3,9 +3,9 @@ spring: show-sql: true # Redis配置 redis: - host: 43.132.212.180 - password: ruTZ9J3gaDhknJ - port: 36379 + host: lb-b6sze686-7db6hgvsx05ef8nz.clb.sg-tencentclb.net + password: a5v8b86P4mVzFlUqJV + port: 56379 database: 1 lettuce: pool: @@ -17,9 +17,9 @@ spring: datasource: stock-market: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://149.88.86.7:33306/india_stock?useUnicode=true&characterEncoding=utf-8 + url: jdbc:mysql://lb-1ju43bvw-p0ecnv4by9ju8six.clb.ap-singapore.tencentclb.com:53306/india_stock?useUnicode=true&characterEncoding=utf-8 username: root - password: 33BsUUcnXRYgwtIND + password: uNejHIFQGJOUtYTmE maxActive: 500 testWhileIdle: true validationQuery: SELECT 1