common

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

@@ -111,6 +111,8 @@ public class ConstantFilePath {
      */
     public static final String SCENE_VIEW_DATA_DATA_SCENEJSON= SCENE_VIEW_DATA + "%s/data/scene.json";
 
+    public static final String DATA_PATH_FORMAT = "data/data%s/";
+
 
 
     public static void main(String[] args) {

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

@@ -6,7 +6,8 @@ package com.fdkankan.common.constant;
 public enum FileBizType {
 
     FLOOR_LOGO("floorLogo", "地板logo"),
-    MUSIC("music", "背景音乐");
+    MUSIC("music", "背景音乐"),
+    FLOOR_PLAN("floorPlan", "户型图");
 
     private String code;
     private String message;

4dkankan-utils-db/src/main/java/com/fdkankan/db/config/DruidConfiguration.java

@@ -2,11 +2,13 @@ package com.fdkankan.db.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
 import javax.sql.DataSource;
+import java.sql.SQLException;
 
 /**
  * druid连接池配置
@@ -37,7 +39,7 @@ public class DruidConfiguration {
 
     @Value("${spring.druid.maxWait}")
     private int maxWait;
-
+//
     @Value("${spring.druid.timeBetweenEvictionRunsMillis}")
     private int timeBetweenEvictionRunsMillis;
 
@@ -68,9 +70,9 @@ public class DruidConfiguration {
 //    @Value("{spring.druid.connectionProperties}")
 //    private String connectionProperties;
 
-    @Bean
+    @Bean(name = "dataSource")
     @Primary
-    public DataSource dataSource() {
+    public DataSource dataSource() throws SQLException {
         DruidDataSource datasource = new DruidDataSource();
 
         datasource.setUrl(url);
@@ -101,6 +103,7 @@ public class DruidConfiguration {
 //
 //        }
 //        datasource.setConnectionProperties(connectionProperties);
+        datasource.init();
 
         return datasource;
     }

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

@@ -195,6 +195,7 @@ public class UploadToOssUtil {
 			File file = new File(filePath);
 			if (!file.exists()) {
 				log.error("要上传的文件不存在：" + filePath);
+				return;
 			}
 			ObjectMetadata metadata = new ObjectMetadata();
 			if(filePath.contains(".jpg")){
@@ -230,6 +231,7 @@ public class UploadToOssUtil {
 			File file = new File(filePath);
 			if (!file.exists()) {
 				log.error("要上传的文件不存在：" + filePath);
+				return;
 			}
 			ObjectMetadata metadata = new ObjectMetadata();
 			if(filePath.contains(".jpg")){