|
@@ -4,6 +4,7 @@ import com.obs.services.ObsClient;
|
|
|
import com.obs.services.model.PutObjectResult;
|
|
|
import com.tourism.common.huaweicloud.obs.config.HuaweicloudObsProperties;
|
|
|
import jakarta.annotation.PostConstruct;
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -205,6 +206,10 @@ public class MergeAvatarsFlexUtils {
|
|
|
* @throws Exception 异常处理
|
|
|
*/
|
|
|
public String mergeAndUploadAvatars(String hostIpPort,List<String> avatarUrls) throws Exception {
|
|
|
+ //设定最多为九张图片的组合
|
|
|
+ if(CollectionUtils.isNotEmpty(avatarUrls) && avatarUrls.size() > 9){
|
|
|
+ avatarUrls = avatarUrls.subList(0,9);
|
|
|
+ }
|
|
|
// 1. 合成图片
|
|
|
BufferedImage mergedImage = mergeAvatars(avatarUrls);
|
|
|
|