From a2735382e853f89465e328dce2df9f3f465bcda9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 20 九月 2023 17:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 1 -
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 3 ++-
server/platform/src/main/resources/application.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/GoodsController.java b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
index 800d123..08ef511 100644
--- a/server/company/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
@@ -163,7 +163,6 @@
return ApiResponse.success(goodsService.batchUpdateDisableById(batchDisableDTO));
}
-
@ApiOperation("鍒楄〃 - H5")
@PostMapping("/list")
public ApiResponse<List<Goods>> findList (@RequestBody Goods goods) {
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index bf924e8..91e823b 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
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 8c26bba..aceab32 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
@@ -461,10 +461,11 @@
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/");
// String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
String img = getOssImgurlFile(ossModel.getGoodsFolder(), bgImg, null,Constants.TWO,fileRecords);
if(StringUtils.isNotBlank(img)){
- img = img.replace("/n1/jfs/", "/n0/jfs/");
+
Multifile f = new Multifile();
f.setFileurl(img);
f.setObjType(Constants.ONE);
--
Gitblit v1.9.3