From 2acf043f0518d89b8bb35a5e1044219940b7810a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Sep 2025 17:59:48 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
index 321698f..02ef6cb 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yami.trading.bean.cms.News;
+import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.DateUtils;
@@ -54,7 +55,7 @@
}
if (StringUtils.isNotEmpty(news.getImgUrl())) {
- news.setImgUrl(awsS3OSSFileService.getUrl(news.getImgUrl()));
+ news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
}
return Result.succeed(news);
@@ -79,7 +80,11 @@
}
int page_no_int = Integer.valueOf(page_no).intValue();
Page<News> page = new Page<>(1, 1000000);
-// List<News> list = this.newsService.cachePagedQuery(page_no_int, 20, language).getElements();
+ if(language.equals("cht")){
+ language = "CN";
+ }else if(language.equals("jp")){
+ language = "Japanese";
+ }
LambdaQueryWrapper<News> lambdaQueryWrapper = Wrappers.<News>query().lambda().eq(News::getLanguage, language)
.eq(News::isPopUp,false);
lambdaQueryWrapper.orderByDesc(News::getCreateTime);
@@ -101,7 +106,7 @@
news.setShow(news.getUserId().equals(SecurityUtils.getCurrentUserId()));
}
if (StringUtils.isNotEmpty(news.getImgUrl())) {
- news.setImgUrl(awsS3OSSFileService.getUrl(news.getImgUrl()));
+ news.setImgUrl(news.getImgUrl());
}
}
@@ -148,7 +153,7 @@
list.get(i).setCreateTimeStr(DateUtils.format(list.get(i).getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
News news = list.get(i);
if (StringUtils.isNotEmpty(news.getImgUrl())) {
- news.setImgUrl(awsS3OSSFileService.getUrl(news.getImgUrl()));
+ news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
}
}
@@ -195,7 +200,7 @@
list.get(i).setCreateTimeStr(DateUtils.format(list.get(i).getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
News news = list.get(i);
if (StringUtils.isNotEmpty(news.getImgUrl())) {
- news.setImgUrl(awsS3OSSFileService.getUrl(news.getImgUrl()));
+ news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
}
}
--
Gitblit v1.9.3