oss

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

@@ -0,0 +1,23 @@
+package com.fdkankan.common.constant;
+
+public enum ExpiredStatus {
+    NOT_EXPIRED(0, "未过期"),
+    Expired(1, "已过期");
+
+    private Integer code;
+    private String message;
+
+    private ExpiredStatus(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+
+}

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

@@ -14,11 +14,13 @@ public class UploadFilePath {
     /**
      * 场景图片
      */
-    public static final String IMG_EDIT_PATH =  "scene_edit_data/%s/img/";
-    public static final String IMG_VIEW_PATH =  "scene_view_data/%s/img/";
+    public static final String IMG_EDIT_PATH =  "scene_edit_data/%s/images/";
+    public static final String IMG_VIEW_PATH =  "scene_view_data/%s/images/";
     /**
      * 场景视频
      */
     public static final String VIDEOS_EDIT_PATH =  "scene_edit_data/%s/videos/";
     public static final String VIDEOS_VIEW_PATH =  "scene_view_data/%s/videos/";
+
+
 }

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/ComputerUtil.java

@@ -41,7 +41,9 @@ public class ComputerUtil {
 
         boolean vision2 = false;
         //读取upload文件，检验需要上传的文件是否存在
-        String uploadData = FileUtils.readFile(path + File.separator + "results" +File.separator+"upload.json");
+        String uploadJsonPath = path + File.separator + "results" +File.separator+"upload.json";
+        String uploadData = FileUtils.readFile(uploadJsonPath);
+        log.info("upload.json 文件路径：{}, 内容：{}" , uploadJsonPath, uploadData);
         JSONObject uploadJson = null;
         JSONArray array = null;
         if(uploadData!=null) {

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

@@ -80,7 +80,7 @@ public class UploadToOssUtil {
 
 	//上传的数据是byte[]，key是上传后的文件名
 	public void upload(byte[] data,String key1) throws IOException{
-		log.info("开始上传文件 源路径：{},目标路径：{},type:{}" , data,key1,type);
+		log.info("开始上传文件 源路径：{},目标路径：{},type:{}" , new String(data, "UTF-8"),key1,type);
 		switch (type){
 			case "oss":uploadOss(data,key1); break;
 			case "aws": uploadAws(data,key1); break;
@@ -704,12 +704,11 @@ public class UploadToOssUtil {
 		//创建oss客户端
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		InputStream objectContent = null;
-		StringBuilder contentJson = null;
+		StringBuilder contentJson = new StringBuilder();
 		try {
 			// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
 			OSSObject ossObject = ossClient.getObject(bucketName, objectName);
 			objectContent = ossObject.getObjectContent();
-			contentJson = new StringBuilder();
 			try(BufferedReader reader = new BufferedReader(new InputStreamReader(objectContent))){
 				while (true) {
 					String line = reader.readLine();

4dkankan-utils-mongodb/pom.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <packaging>jar</packaging>
+    <parent>
+        <artifactId>4dkankan-utils</artifactId>
+        <groupId>com.fdkankan</groupId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>4dkankan-utils-mongodb</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+            <version>2.3.12.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

4dkankan-utils-mq/src/main/java/com/fdkankan/mq/util/RocketMQProducer.java

@@ -173,15 +173,7 @@ public class RocketMQProducer {
         rocketMQTemplate.sendOneWay(topic, message);
         log.info("MQ推送成功---topic:{},tag:{},key:{},msg:{}",topic,tag,key, JSONObject.toJSONString(body));
     }
-    /**
-     * 顺序消费 （计算场景使用）
-     * @param topic 主题名
-     * @param body 消息体
-     * hashKey 1 为计算推送消息
-     */
-    public void sendInOrder(String topic, Object body){
-        this.sendInOrder(topic,"1",body);
-    }
+
     /**
      * 顺序消费 计算场景使用）
      * @param topic 主题名

pom.xml

@@ -12,6 +12,7 @@
         <module>4dkankan-utils-sms</module>
         <module>4dkankan-utils-app-push</module>
         <module>4dkankan-utils-dingtalk</module>
+        <module>4dkankan-utils-mongodb</module>
     </modules>
 
     <groupId>com.fdkankan</groupId>