Merge remote-tracking branch 'origin/feature-v4-20220801' into feature-v4-20220801

# Conflicts:
#	4dkankan-utils-model/src/main/java/com/fdkankan/model/constants/ConstantCmd.java

4dkankan-utils-model/src/main/java/com/fdkankan/model/constants/ConstantCmd.java

@@ -60,4 +60,8 @@ public class ConstantCmd {
 
 
 
+
+	// 上传文件夹
+	public static final String OSS_UTIL_CP_FOLDER ="bash /opt/ossutil/upload.sh %s %s";
+
 }

4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateObjUtil.java

@@ -631,4 +631,15 @@ public class CreateObjUtil {
 		log.info("matterpro获取阿里云图片方法完成,时间为：" + (System.currentTimeMillis() - start));
 	}
 
+	public static void ossUtilCpFolder(String sourceFolder , String targetFolder){
+		File sourceFile = new File(sourceFolder);
+		if (!sourceFile.exists()) {
+			log.error("oss文件夹上传异常，文件夹不存在{}", sourceFolder);
+		}
+		String command = String.format(ConstantCmd.OSS_UTIL_CP_FOLDER,targetFolder,sourceFolder);
+		Long start = System.currentTimeMillis();
+		log.info("开始上传oss文件夹：" + command);
+		callshell(command);
+		log.info("oss文件夹上传完成,时间为：" + (System.currentTimeMillis() - start));
+	}
 }