111

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/LogFormatConstant.java

@@ -0,0 +1,24 @@
+package com.fdkankan.common.constant;
+
+/**
+ * <p>
+ * 日志格式定义
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/26
+ **/
+public class LogFormatConstant {
+
+    /**
+     * feign接口日志格式
+     */
+    public static String FEIGN_LOG_START =  "Feign调用开始 - Class[{}] - Method[{}] - Params[{}]";
+
+    public static String FEIGN_LOG_END=  "Feign调用结束 - Class[{}] - Method[{}] - Result[{}]";
+
+    public static String REQUEST_LOG_START = "Controller请求开始 - ip[{}] - url[{}] - Class[{}] - Method[{}] - Params[{}] - header[{}]";
+
+    public static String REQUEST_LOG_END = "Controller请求结束 - url[{}] - Class[{}] - Method[{}] - Result[{}] - consumeTime[{}]";
+
+}

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/SceneDownloadProgressStatus.java

@@ -0,0 +1,41 @@
+package com.fdkankan.common.constant;
+
+/**
+ * 场景下载进度码
+ */
+public enum SceneDownloadProgressStatus {
+
+    DOWNLOADING(1000, "文件正在下载"),
+    DOWNLOAD_COMPRESSING(1001, "文件正在压缩"),
+    DOWNLOAD_SUCCESS(1002, "文件压缩成功/下载处理成功"),
+    DOWNLOAD_FAILED(1003, "下载处理失败");
+
+    private Integer code;
+    private String message;
+
+    private SceneDownloadProgressStatus(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+
+    public static SceneDownloadProgressStatus get(Integer code){
+        SceneDownloadProgressStatus[] values = SceneDownloadProgressStatus.values();
+        Integer enumValue = null;
+        for(SceneDownloadProgressStatus eachValue : values){
+            enumValue = eachValue.code();
+            if(enumValue.equals(code)){
+                return eachValue;
+            }
+        }
+        return null;
+    }
+
+}

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/UploadFilePath.java

@@ -32,6 +32,12 @@ public class UploadFilePath {
     public static final String VIDEOS_EDIT_PATH =  "scene_edit_data/%s/videos/";
     public static final String VIDEOS_VIEW_PATH =  "scene_view_data/%s/videos/";
 
+    /**
+     * 场景音频
+     */
+    public static final String VOICE_EDIT_PATH =  "scene_edit_data/%s/voice/";
+    public static final String VOICE_VIEW_PATH =  "scene_view_data/%s/voice/";
+
     public static final String SCENE_NUM_PATH = "scene/%s";
     public static final String IMG_CACHES_PATH =  "scene/%s/caches/images/";
     public static final String VIDEOS_CACHES_PATH =  "scene/%s/caches/videos/";

4dkankan-utils-fyun/src/main/java/com/fdkankan/fyun/oss/UploadToOssUtil.java

@@ -734,8 +734,29 @@ public class UploadToOssUtil {
 	 * @param sourcePath
 	 * @param targetPath
 	 **/
-	public void copyFilesFromAws(String sourcePath, String targetPath) throws IOException {
-		// TODO: 2022/1/21
+	public void copyFilesFromAws(String sourcePath, String targetPath){
+
+		try {
+			List<String> sourceKeyList = this.listKeysFromAws(sourcePath);
+			/**
+			 * 创建s3对象
+			 */
+			BasicAWSCredentials awsCreds = new BasicAWSCredentials(s3key, s3secrey);
+			AmazonS3 s3 = AmazonS3ClientBuilder.standard()
+				.withCredentials(new AWSStaticCredentialsProvider(awsCreds))
+				.withRegion(Regions.EU_WEST_2)//s3 地区位置
+				.build();
+
+			// 复制文件
+			sourceKeyList.parallelStream().forEach(key -> {
+				log.info("开始复制：" + key);
+				s3.copyObject(this.bucket, key, this.bucket, key.replace(sourcePath, targetPath));
+				log.info("复制成功：" + key);
+			});
+			s3.shutdown();
+		} catch (Exception ase) {
+			log.error("amazonS拷贝异常 " + ase.getMessage(), ase);
+		}
 	}
 
 	/**

4dkankan-utils-redis/src/main/java/com/fdkankan/redis/constant/RedisKey.java

@@ -66,9 +66,15 @@ public class RedisKey {
     /**
      * 场景下载进度
      */
+    // TODO: 2022/3/29  这个是V3版本使用的key，V4版本稳定后，这个要删除
     public static final String PREFIX_DOWNLOAD_PROGRESS="downloads:progress:%s";
 
     /**
+     * 场景下载进度
+     */
+    public static final String PREFIX_DOWNLOAD_PROGRESS_V4="downloads:progress:v4:%s";
+
+    /**
      * 即将要下载场景的场景码列表
      */
     public static final String DOWNLOAD_TASK="downloads:task";
@@ -93,6 +99,11 @@ public class RedisKey {
      */
     public static final String SCENE_HOT_ICONS = "scene:hoticons:num:%s";
 
+    /**
+     * 场景下载任务列表
+     */
+    public static final String SCENE_DOWNLOADS_TASK_V4 = "scene:downloads:task:v4";
+
 
 
 

4dkankan-utils-redis/src/main/java/com/fdkankan/redis/constant/RedisLockKey.java

@@ -78,6 +78,16 @@ public class RedisLockKey {
      */
     public static String LOCK_HOT_JSON = "lock:hot:json:num:%s";
 
+    /**
+     * 批量生成场景码锁
+     */
+    public static String LOCK_BATCH_CREATE_NUM = "lock:batch:create:num";
+
+    /**
+     * 加载场景中断下载列表锁
+     */
+    public static String LOCK_SCENE_DOWNLOAD_ING = "lock:scene:downloads:ing";
+
 
 
 }