修改储存桶为广州桶

src/main/java/com/backendsys/modules/material/service/impl/MaterialServiceImpl.java

@@ -13,6 +13,7 @@ import com.backendsys.modules.material.service.MaterialService;
 import com.backendsys.modules.upload.service.SysFileService;
 import com.backendsys.modules.upload.utils.ObjectKey.ObjectKeyEntity;
 import com.backendsys.modules.upload.utils.ObjectKey.ObjectKeyUtil;
+import com.backendsys.modules.upload.utils.UploadUtil;
 import com.backendsys.utils.response.PageEntity;
 import com.backendsys.utils.response.PageInfoResult;
 import com.backendsys.utils.v2.PageUtils;
@@ -29,6 +30,9 @@ import java.util.stream.Collectors;
 @Service
 public class MaterialServiceImpl implements MaterialService {
 
+    @Autowired
+    private ObjectKeyUtil objectKeyUtil;
+
     @Autowired
     private MaterialDao materialDao;
     @Autowired
@@ -38,9 +42,6 @@ public class MaterialServiceImpl implements MaterialService {
     @Autowired
     private SysFileService sysFileService;
 
-    @Autowired
-    private ObjectKeyUtil objectKeyUtil;
-
     private List<MaterialTag> getMaterialTagByIds(String tag_ids) {
         if (StrUtil.isEmpty(tag_ids)) return null;
         LambdaQueryWrapper<MaterialTag> wrapper = new LambdaQueryWrapper<>();
@@ -105,6 +106,13 @@ public class MaterialServiceImpl implements MaterialService {
         MaterialCategory materialCategory = materialCategoryDao.selectById(material.getCategory_id());
         if (materialCategory == null) throw new CustException("素材分类不存在");
 
+        // 生成缩略图，并填充缩略图地址
+        if (StrUtil.isNotEmpty(material.getImage_url())) {
+            ObjectKeyEntity objectKeyEntity = objectKeyUtil.urlToObjectKey(material.getImage_url());
+            String image_thumb_url = UploadUtil.getImageThumbUrl(material.getImage_url(), objectKeyEntity.getTarget(), 315, 180);
+            material.setImage_thumb_url(image_thumb_url);
+        }
+
         materialDao.insertMaterial(material);
 
         return Map.of("material_id", material.getMaterial_id());
@@ -127,6 +135,13 @@ public class MaterialServiceImpl implements MaterialService {
 
         // 编辑的时候，如果素材图片有修改，需要删除之前的图片
 
+        // 生成缩略图，并填充缩略图地址
+        if (StrUtil.isNotEmpty(material.getImage_url())) {
+            ObjectKeyEntity objectKeyEntity = objectKeyUtil.urlToObjectKey(material.getImage_url());
+            String image_thumb_url = UploadUtil.getImageThumbUrl(material.getImage_url(), objectKeyEntity.getTarget(), 315, 180);
+            material.setImage_thumb_url(image_thumb_url);
+        }
+
         materialDao.updateMaterial(material);
         return Map.of("material_id", material.getMaterial_id());
     };

src/main/java/com/backendsys/modules/upload/utils/UploadUtil.java

@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
 import com.backendsys.exception.CustException;
 import com.backendsys.modules.common.utils.CommonUtil;
 import com.backendsys.modules.upload.entity.SysFileResult;
+import com.backendsys.modules.upload.enums.StyleEnums;
 import com.backendsys.utils.response.Result;
 import com.backendsys.utils.response.ResultEnum;
 import net.coobird.thumbnailator.Thumbnails;
@@ -108,11 +109,17 @@ public class UploadUtil {
         }
     }
 
-    // 不同的云环境 (target)，缩略图配置也不一样
-    //   -1:本地:
-    //   1:腾讯云: https://cloud.tencent.com/document/product/436/113295
-    //   2:阿里云:
-    //   3:抖音云: https://www.volcengine.com/docs/6349/153626
+    /**
+        获取缩略图 URL
+        不同的云环境 (target)，缩略图配置也不一样
+        -1:本地:
+        1:腾讯云: https://cloud.tencent.com/document/product/436/113295
+        2:阿里云:
+        3:抖音云: https://www.volcengine.com/docs/6349/153626
+     */
+    public static String getImageThumbUrl(String url, Integer target, Integer width, Integer height) {
+        return getImageThumbUrl(url, target, width, height, StyleEnums.THUMB_BACKGROUND.getValue());
+    }
     public static String getImageThumbUrl(String url, Integer target, Integer width, Integer height, String backgroundColor) {
         if (target == -1) {
             UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(url);

src/main/java/com/backendsys/service/SDKService/SDKTencent/SDKTencentCOSServiceImpl.java

@@ -61,11 +61,6 @@ public class SDKTencentCOSServiceImpl implements SDKTencentCOSService {
     @Autowired
     private HttpRequestAspect httpRequestAspect;
 
-    @Value("${tencent.cos.secret-id-temp}")
-    private String secretIdTemp;
-    @Value("${tencent.cos.secret-key}-temp")
-    private String secretKeyTemp;
-
     @Value("${tencent.cos.secret-id}")
     private String secretId;
     @Value("${tencent.cos.secret-key}")

src/main/resources/application-dev.yml

@@ -140,16 +140,17 @@ tencent:
     # 上传的最大大小限制 (5MB = 5242880) (1GB = 1073741824)
     max-size: 5242880 # (即将删除)
     # ------------------------------------------------------
-    secret-id: AKID3zlNxRjstjnohWFnDUfeVBj3CJH7mFaK
-    secret-key: IXgzFKB71rXOCxlS4BTdtCYuJbP8h7Xr
+    secret-id: AKIDhMtEWrCNK9yb2NWRBiBTajjW5SddR2aA
+    secret-key: c4mUFqFRSHsELEsHRPBD6rRmsjLjsulO
     # ------------------------------------------------------
-    secret-id-temp: AKIDVuCIAoKiuzyqV1hIo8HEJtKcm8NWXkx4
-    secret-key-temp: 763nQwV0JPQDsLYeeaWL4atMhvynaGjy
-    # ------------------------------------------------------
-    region: ap-hongkong
-    bucket-name: storage-1320301544
-    # accessible-domain: https://storage-1320301544.cos.ap-hongkong.myqcloud.com
-    accessible-domain: https://cos.daogu.ai
+    #    # 香港
+    #    region: ap-hongkong
+    #    bucket-name: storage-1320301544
+    #    accessible-domain: https://cos.daogu.ai
+    # 广州
+    region: ap-guangzhou
+    bucket-name: daoguai-1320301544
+    accessible-domain: https://cos.daoguyujiamcn.com
   ivh:
     empty-app-key: 283ca6dc9d4147debc60bf9fc3fbbe03         # 空数据账号 (我自己的子账号)
     empty-access-token: eea44503a2f64c119fb0acd2006dacb0

src/main/resources/application-local.yml

@@ -144,21 +144,17 @@ tencent:
     # 上传的最大大小限制 (5MB = 5242880) (1GB = 1073741824)
     max-size: 5242880 # (即将删除)
     # ------------------------------------------------------
-    secret-id: AKID3zlNxRjstjnohWFnDUfeVBj3CJH7mFaK
-    secret-key: IXgzFKB71rXOCxlS4BTdtCYuJbP8h7Xr
-    # ------------------------------------------------------
-    secret-id-temp: AKIDVuCIAoKiuzyqV1hIo8HEJtKcm8NWXkx4
-    secret-key-temp: 763nQwV0JPQDsLYeeaWL4atMhvynaGjy
+    secret-id: AKIDhMtEWrCNK9yb2NWRBiBTajjW5SddR2aA
+    secret-key: c4mUFqFRSHsELEsHRPBD6rRmsjLjsulO
     # ------------------------------------------------------
-    # 香港
-    region: ap-hongkong
-    bucket-name: storage-1320301544
-    accessible-domain: https://cos.daogu.ai
-#    # 广州
-#    region: ap-guangzhou
-#    bucket-name: duanju3-1320301544
-#    accessible-domain: https://duanju3-1320301544.cos.ap-hongkong.myqcloud.com
-
+#    # 香港
+#    region: ap-hongkong
+#    bucket-name: storage-1320301544
+#    accessible-domain: https://cos.daogu.ai
+    # 广州
+    region: ap-guangzhou
+    bucket-name: daoguai-1320301544
+    accessible-domain: https://cos.daoguyujiamcn.com
   ivh:
     empty-app-key: 283ca6dc9d4147debc60bf9fc3fbbe03         # 空数据账号 (我自己的子账号)
     empty-access-token: eea44503a2f64c119fb0acd2006dacb0

src/main/resources/application-prod.yml

@@ -141,16 +141,17 @@ tencent:
     # 上传的最大大小限制 (5MB = 5242880) (1GB = 1073741824)
     max-size: 5242880 # (即将删除)
     # ------------------------------------------------------
-    secret-id: AKID3zlNxRjstjnohWFnDUfeVBj3CJH7mFaK
-    secret-key: IXgzFKB71rXOCxlS4BTdtCYuJbP8h7Xr
+    secret-id: AKIDhMtEWrCNK9yb2NWRBiBTajjW5SddR2aA
+    secret-key: c4mUFqFRSHsELEsHRPBD6rRmsjLjsulO
     # ------------------------------------------------------
-    secret-id-temp: AKIDVuCIAoKiuzyqV1hIo8HEJtKcm8NWXkx4
-    secret-key-temp: 763nQwV0JPQDsLYeeaWL4atMhvynaGjy
-    # ------------------------------------------------------
-    region: ap-hongkong
-    bucket-name: storage-1320301544
-    # accessible-domain: https://storage-1320301544.cos.ap-hongkong.myqcloud.com
-    accessible-domain: https://cos.daogu.ai
+    #    # 香港
+    #    region: ap-hongkong
+    #    bucket-name: storage-1320301544
+    #    accessible-domain: https://cos.daogu.ai
+    # 广州
+    region: ap-guangzhou
+    bucket-name: daoguai-1320301544
+    accessible-domain: https://cos.daoguyujiamcn.com
   ivh:
     empty-app-key: 283ca6dc9d4147debc60bf9fc3fbbe03         # 空数据账号 (我自己的子账号)
     empty-access-token: eea44503a2f64c119fb0acd2006dacb0