From 2193f1e8240e2a0ed5900dddc6347a1d9db081cf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 21 九月 2023 14:38:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index 118f433..7a8c622 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -300,7 +300,7 @@
for(BaseData data :result.getRecords()){
//澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
if(StringUtils.isNotBlank(data.getBgImg())){
- String tImg = data.getBgImg().replace("锛�", ",").replace(".avif", "").replace("/n1/jfs/", "/n0/jfs/");
+ String tImg = data.getBgImg().replace("锛�", ",").replace(".avif", "").replace("/n1/jfs/", "/imgzone/jfs/");
String[] imgs =tImg.split(",");
data.setBgImgs(imgs);
@@ -462,7 +462,7 @@
private int addImg(int i,OssModel ossModel, Integer id,String bgImg,List<Multifile> fileList,List<FileRecord> fileRecords) {
if(StringUtils.isNotBlank(bgImg)){
- bgImg = bgImg.replace("/n1/jfs/", "/n0/jfs/");
+ bgImg = bgImg.replace("/n1/jfs/", "/imgzone/jfs/");
// String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
String img = getOssImgurlFile(ossModel.getGoodsFolder(), bgImg, null,Constants.TWO,fileRecords);
if(StringUtils.isNotBlank(img)){
@@ -525,7 +525,10 @@
return;
}
String attrName = attr.substring(0,index);
- if(StringUtils.isBlank(attrName) || StringUtils.equals(attrName, "鍟嗗搧鍚嶇О") || StringUtils.equals(attrName, "鍟嗗搧缂栧彿")){
+ if(StringUtils.isBlank(attrName)
+ || StringUtils.equals(attrName, "鍟嗗搧鍚嶇О")
+ || StringUtils.equals(attrName, "鍟嗗搧缂栧彿")
+ || StringUtils.equals(attrName, "搴楅摵")){
return;
}
String val = attr.substring(index+1);
--
Gitblit v1.9.3