合并新疆代码

pom.xml

@@ -161,11 +161,6 @@
         </dependency>
 
         <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>8.5.7</version>
-        </dependency>
-        <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
             <version>4.3.1</version>

src/main/java/com/fdkankan/fusion/common/ResultCode.java

@@ -65,17 +65,15 @@ public enum ResultCode {
 
     SS_SCENE_DOWN_ERROR(7020,"深时点云场景下载失败"),
     FILE_NOT_EXIST(7021,"文件不存在，或已被刪除"),
-
-    FILE_NOT_EXIST(7021,"文件不存在，或已被刪除"),
     HOST_ICON_LIMIT(7022,"案件图标超过上限"),
     CASE_REMOVE_SCENE(7023,"场景被移除"),
 
-    CAMERA_SPACE_ERROR(7022, "相机容量不足"),
-    INQUEST_ERROR(7023, "该案件已有勘验笔录"),
-    INQUEST_ERROR2(7024, "该案件未有勘验笔录"),
-    CAMERA_VERSION_EXIT(7025, "相机版本号已存在"),
-    CAMERA_VERSION_NOTEXIT(7026, "相机版本号不存在"),
-    CAMERA_VERSION_STATUS_ERROR(7027, "相机版本状态错误"),
+    CAMERA_SPACE_ERROR(8022, "相机容量不足"),
+    INQUEST_ERROR(8023, "该案件已有勘验笔录"),
+    INQUEST_ERROR2(8024, "该案件未有勘验笔录"),
+    CAMERA_VERSION_EXIT(8025, "相机版本号已存在"),
+    CAMERA_VERSION_NOTEXIT(8026, "相机版本号不存在"),
+    CAMERA_VERSION_STATUS_ERROR(8027, "相机版本状态错误"),
 
 
     ;

src/main/java/com/fdkankan/fusion/common/util/MinIoUploadService.java

@@ -1,250 +0,0 @@
-package com.fdkankan.fusion.common.util;
-
-import com.aliyun.oss.OSSClient;
-import com.aliyun.oss.model.GetObjectRequest;
-import com.fdkankan.fusion.config.MinIOConfig;
-import com.fdkankan.fusion.response.FileInfoVo;
-import io.minio.*;
-import io.minio.messages.Item;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import java.io.InputStream;
-import java.time.ZonedDateTime;
-import java.util.Date;
-import java.util.List;
-
-@Slf4j
-@Service
-public class MinIoUploadService {
-    @Resource
-    private MinIOConfig minIOConfig;
-
-    private MinioClient minioClient;
-
-    private String endpoint;
-    private String bucketName;
-    private String accessKey;
-    private String secretKey;
-    private Integer imgSize;
-    private Integer fileSize;
-
-
-    private final String SEPARATOR = "/";
-
-    @PostConstruct
-    public void init() {
-        this.endpoint = minIOConfig.getEndpoint();
-        this.bucketName = minIOConfig.getBucketName();
-        this.accessKey = minIOConfig.getAccessKey();
-        this.secretKey = minIOConfig.getSecretKey();
-        createMinioClient();
-    }
-
-    /**
-     * 创建基于Java端的MinioClient
-     */
-    public void createMinioClient() {
-        try {
-            if (null == minioClient) {
-                log.info("开始创建 MinioClient...");
-                minioClient = MinioClient
-                        .builder()
-                        .endpoint(endpoint)
-                        .credentials(accessKey, secretKey)
-                        .build();
-                createBucket(bucketName);
-                log.info("创建完毕 MinioClient...");
-            }
-        } catch (Exception e) {
-            log.error("MinIO服务器异常：{}", e);
-        }
-    }
-
-    /**
-     * 启动SpringBoot容器的时候初始化Bucket
-     * 如果没有Bucket则创建
-     *
-     * @throws Exception
-     */
-    private void createBucket(String bucketName) throws Exception {
-        if (!bucketExists(bucketName)) {
-            minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());
-        }
-    }
-
-    /**
-     * 判断Bucket是否存在，true：存在，false：不存在
-     *
-     * @return
-     * @throws Exception
-     */
-    public boolean bucketExists(String bucketName) throws Exception {
-        return minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
-    }
-
-    /**
-     * 获得Bucket的策略
-     *
-     * @param bucketName
-     * @return
-     * @throws Exception
-     */
-    public String getBucketPolicy(String bucketName) throws Exception {
-        String bucketPolicy = minioClient
-                .getBucketPolicy(
-                        GetBucketPolicyArgs
-                                .builder()
-                                .bucket(bucketName)
-                                .build()
-                );
-        return bucketPolicy;
-    }
-
-    /**
-     * 判断文件是否存在
-     *
-     * @param bucketName 存储桶
-     * @param objectName 文件名
-     * @return
-     */
-    public boolean isObjectExist(String bucketName, String objectName) {
-        boolean exist = true;
-        try {
-            minioClient.statObject(StatObjectArgs.builder().bucket(bucketName).object(objectName).build());
-        } catch (Exception e) {
-            exist = false;
-        }
-        return exist;
-    }
-
-    public boolean isObjectExist(String objectName) {
-        return isObjectExist(bucketName,objectName);
-    }
-
-
-    /**
-     * 判断文件夹是否存在
-     *
-     * @param bucketName 存储桶
-     * @param objectName 文件夹名称
-     * @return
-     */
-    public boolean isFolderExist(String bucketName, String objectName) {
-        boolean exist = false;
-        try {
-            Iterable<Result<Item>> results = minioClient.listObjects(
-                    ListObjectsArgs.builder().bucket(bucketName).prefix(objectName).recursive(false).build());
-            for (Result<Item> result : results) {
-                Item item = result.get();
-                if (item.isDir() && objectName.equals(item.objectName())) {
-                    exist = true;
-                }
-            }
-        } catch (Exception e) {
-            exist = false;
-        }
-        return exist;
-    }
-
-    public boolean isFolderExist( String objectName) {
-        return isFolderExist(bucketName,objectName);
-    }
-
-    /**
-     * 获取路径下文件列表
-     *
-     * @param bucketName 存储桶
-     * @param prefix     文件名称
-     * @param recursive  是否递归查找，false：模拟文件夹结构查找
-     * @return 二进制流
-     */
-    public Iterable<Result<Item>> listObjects(String bucketName, String prefix,
-                                              boolean recursive) {
-        return minioClient.listObjects(
-                ListObjectsArgs.builder()
-                        .bucket(bucketName)
-                        .prefix(prefix)
-                        .recursive(recursive)
-                        .build());
-    }
-
-    /**
-     * 获取文件流
-     *
-     * @param bucketName 存储桶
-     * @param objectName 文件名
-     * @return 二进制流
-     */
-    public InputStream getObject(String bucketName, String objectName) throws Exception {
-        return minioClient.getObject(GetObjectArgs.builder().bucket(bucketName).object(objectName).build());
-    }
-
-    public InputStream getObject( String objectName)  {
-        try {
-            return minioClient.getObject(GetObjectArgs.builder().bucket(bucketName).object(objectName).build());
-        }catch (Exception e){
-            log.info("minio获取文件失败：{}",objectName,e);
-        }
-        return null;
-    }
-
-
-
-    /**
-     * 获取文件信息, 如果抛出异常则说明文件不存在
-     *
-     * @param bucketName 存储桶
-     * @param objectName 文件名称
-     */
-    public FileInfoVo getFileStatusInfo(String bucketName, String objectName) throws Exception {
-
-        StatObjectResponse statObjectResponse = minioClient.statObject(
-                StatObjectArgs.builder()
-                        .bucket(bucketName)
-                        .object(objectName)
-                        .build());
-        String md5 = statObjectResponse.etag().toUpperCase();
-        ZonedDateTime zonedDateTime = statObjectResponse.lastModified();
-        Date LastMo = Date.from(zonedDateTime.toInstant());
-        Long size = statObjectResponse.size();
-
-        InputStream inputStream = getObject(bucketName, objectName);
-        String sha1 = MD5Checksum.getSHA1(inputStream);
-        return new FileInfoVo(md5,sha1.toUpperCase(),LastMo.getTime(),size);
-
-    }
-    public FileInfoVo getFileStatusInfo( String objectName)  {
-        try {
-            return getFileStatusInfo(bucketName,objectName);
-        }catch (Exception e){
-            log.info("获取文件失败或文件不存在:{},{}",bucketName,objectName,e);
-        }
-         return null;
-    }
-
-
-    public Long getSize(String filePath){
-        Long total = 0L;
-        try {
-            Iterable<Result<Item>> results = listObjects(bucketName, filePath, true);
-            if (ObjectUtils.isEmpty(results)) {
-                return 0L;
-            }
-            for (Result<Item> result : results) {
-                Item item = result.get();
-                long size = item.size();
-                total += size;
-            }
-
-        }catch (Exception e){
-            log.info("oss-getFileInfo-error:{}",e);
-        }
-        return total;
-    }
-
-
-}

src/main/java/com/fdkankan/fusion/common/util/UploadToOssUtil.java

@@ -242,29 +242,6 @@ public class UploadToOssUtil {
 			}
 		}
 	}
-	public Long getSize(String filePath){
-		OSSClient ossClient = new OSSClient(point, key, secrey);
-		Long total = 0L;
-		try {
-			List<String> files = listKeysFromAli( filePath);
-			if (ObjectUtils.isEmpty(files)) {
-				return 0L;
-			}
-			for (String file : files) {
-				GetObjectRequest getObjectMetadataRequest = new GetObjectRequest(bucket, file);
-				Long size = ossClient.getObjectMetadata(getObjectMetadataRequest).getContentLength();
-				total += size;
-			}
-
-		}catch (Exception e){
-			log.info("oss-getFileInfo-error:{}",e);
-		}finally {
-			if(ossClient != null){
-				ossClient.shutdown();
-			}
-		}
-		return total;
-	}
 
 	public void copyFile( String sourcePath, String targetPath) {
 		if("local".equals(type)){

src/main/java/com/fdkankan/fusion/config/MinIOConfig.java

@@ -1,22 +0,0 @@
-package com.fdkankan.fusion.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@Data
-public class MinIOConfig {
-
-    @Value("${minio.endpoint}")
-    private String endpoint;
-    @Value("${minio.fileHost}")
-    private String fileHost;
-    @Value("${minio.bucketName}")
-    private String bucketName;
-    @Value("${minio.accessKey}")
-    private String accessKey;
-    @Value("${minio.secretKey}")
-    private String secretKey;
-
-}

src/main/java/com/fdkankan/fusion/controller/SceneController.java

@@ -4,29 +4,23 @@ import cn.hutool.core.io.FileUtil;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
-import com.fdkankan.fusion.common.util.MinIoUploadService;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.request.LaserSceneParam;
 import com.fdkankan.fusion.request.ScenePram;
 import com.fdkankan.fusion.response.FileInfoVo;
-import com.fdkankan.fusion.response.SceneProEntityVo;
 import com.fdkankan.fusion.service.ISceneService;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 
 @RestController
 @RequestMapping("/scene")
@@ -73,8 +67,6 @@ public class SceneController extends BaseController{
 
     @Autowired
     UploadToOssUtil uploadToOssUtil;
-    @Autowired
-    MinIoUploadService minIoUploadService;
 
     @Value("${spring.profiles.active}")
     private String environment;
@@ -95,9 +87,9 @@ public class SceneController extends BaseController{
 
             if(type == 2 || type == 5){  //点云
                 sceneObjPath = String.format(FilePath.LASER_OSS_PATH, num,num)+"/cloud.js" ;
-                fileInfo = minIoUploadService.getFileStatusInfo(sceneObjPath);
+                fileInfo = uploadToOssUtil.getFileInfo(sceneObjPath);
                 String scenePath = String.format(FilePath.LASER_OSS_PATH, num,num);
-                size = minIoUploadService.getSize(scenePath);
+                size = uploadToOssUtil.getSize(scenePath);
             }else {
                 sceneObjPath = String.format(FilePath.OBJ_OSS_PATH,num) + "/images/3dtiles/tileset.json";
                 if(!uploadToOssUtil.existKey(sceneObjPath)){

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.deepoove.poi.XWPFTemplate;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultData;
-import com.fdkankan.fusion.common.util.MinIoUploadService;
 import com.fdkankan.fusion.common.util.ShellUtil;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
 import com.fdkankan.fusion.entity.*;
@@ -347,8 +346,6 @@ public class CaseDownService {
     DownService downService;
    @Autowired
     UploadToOssUtil uploadToOssUtil;
-   @Autowired
-    MinIoUploadService minIoUploadService;
 
    public void downSwkk(Integer caseId,String num,Integer type){
 

src/main/java/com/fdkankan/fusion/entity/TmProject.java

@@ -186,6 +186,8 @@ public class TmProject implements Serializable {
     @TableField(exist = false)
     private Integer caseId;
 
+    @TableField("map_show")
+    private Boolean mapShow ;
 
     @TableField(exist = false)
     private String mapUrl;
@@ -193,6 +195,8 @@ public class TmProject implements Serializable {
     @TableField(exist = false)
     private String latAndLong;
 
+    @TableField(exist = false)
+    private String cover;
 
     public String getStatusDesc() {
         if(status !=null){

src/main/java/com/fdkankan/fusion/service/ITmProjectService.java

@@ -50,7 +50,5 @@ public interface ITmProjectService extends IService<TmProject> {
 
     List<DataGroupVo> groupByReason(DataParam param, List<String> deptIds);
 
-    String setCaseNewName(TmProject tmProject);
-
     List<TmProject> getLikeByProjectSn(String projectSn);
 }

src/main/java/com/fdkankan/fusion/service/impl/CopyCaseService.java

@@ -119,7 +119,7 @@ public class CopyCaseService {
             projectSn += projectSnList.size();
         }
         tmProject.setProjectSn(projectSn);
-        tmProject.setCaseNewName(projectService.setCaseNewName(tmProject));
+        //tmProject.setCaseNewName(projectService.setCaseNewName(tmProject));
         projectService.save(tmProject);
         cpMessage(oldProjectId,newId);
         return  newId;

src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -79,7 +79,6 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
             if(StringUtils.isNotBlank(share) && "1".equals(share)){ //分享请求头
                 deptIds = tmDepartmentService.list().stream().map(TmDepartment::getId).collect(Collectors.toList());
                 wrapper.eq(TmProject::getMapShow,true);
-                wrapper.isNotNull(TmProject::getLatlng);
             }else {
                 deptIds = tmDepartmentService.getDeptIds();
             }

src/main/resources/application-dev.yaml

@@ -0,0 +1,54 @@
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource          # 数据源类型：HikariCP
+    driver-class-name: com.mysql.jdbc.Driver          # mysql驱动
+    url: jdbc:mysql://127.0.0.1:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: root
+    password: 4dkk2020cuikuan%
+    hikari:
+      connection-timeout: 30000         # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 默认:30秒
+      minimum-idle: 5                   # 最小连接数
+      maximum-pool-size: 20             # 最大连接数
+      auto-commit: true                 # 事务自动提交
+      idle-timeout: 600000              # 连接超时的最大时长（毫秒），超时则被释放（retired），默认:10分钟
+      pool-name: DateSourceHikariCP     # 连接池名字
+      max-lifetime: 1800000             # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认:30分钟 1800000ms
+      connection-test-query: SELECT 1   # 连接测试语句
+  redis:
+    host: 120.25.146.52
+    port: 6379
+    timeout: 6000ms
+    password:
+    jedis:
+      pool:
+        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 10 # 连接池中的最大空闲连接
+        min-idle: 5 # 连接池中的最小空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+    lettuce:
+      shutdown-timeout: 0ms
+
+4dkk:
+  laserService:
+    #深时（激光）地址 生产环境：https://laser.4dkankan.com/
+    basePath: http://uat-laser.4dkankan.com
+    port: 80
+    #basePath: http://192.168.0.152:8080
+    #port: 8080
+  fdService:
+    #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
+    basePath: http://test.4dkankan.com
+    port: 80
+    #basePath: http://192.168.0.38/4dkankan_v2
+    #port: 8080
+  newFdService:
+    #官网生产环境：https://www.4dkankan.com
+    basePath: http://v4-test.4dkankan.com
+    port: 80
+  overallService:
+    #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
+    basePath: http://test.4dkankan.com/qjkankan
+    port: 80
+  takeLookService:
+    basePath: https://v4-test.4dkankan.com
+    port: 80

src/main/resources/application-local.yaml

@@ -0,0 +1,56 @@
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    #120.25.146.52
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.jdbc.Driver
+          url: jdbc:mysql://120.25.146.52:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: root
+          password: JK123456%JIK
+        db2:
+          driver-class-name: com.mysql.jdbc.Driver
+          url: jdbc:mysql://120.24.144.164:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: root
+          password: 4Dage@4Dage#@168
+
+  redis:
+    host: 120.24.144.164
+    port: 6379
+    timeout: 6000ms
+    password: bgh0cae240
+    jedis:
+      pool:
+        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 10 # 连接池中的最大空闲连接
+        min-idle: 5 # 连接池中的最小空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+    lettuce:
+      shutdown-timeout: 0ms
+
+4dkk:
+  laserService:
+    #深时（激光）地址 生产环境：https://laser.4dkankan.com/
+    basePath: http://uat-laser.4dkankan.com
+    port: 80
+    #basePath: http://192.168.0.152:8080
+    #port: 8080
+  fdService:
+    #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
+    basePath: http://test.4dkankan.com
+    port: 80
+    #basePath: http://192.168.0.38/4dkankan_v2
+    #port: 8080
+  newFdService:
+    #官网生产环境：https://www.4dkankan.com
+    basePath: http://v4-test.4dkankan.com
+    port: 80
+  overallService:
+    #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
+    basePath: http://test.4dkankan.com/qjkankan
+  takeLookService:
+    basePath: https://v4-test.4dkankan.com
+    port: 80

src/main/resources/application-test.yaml

@@ -0,0 +1,57 @@
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    #120.25.146.52
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.jdbc.Driver
+          #url: jdbc:mysql://120.25.146.52:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          url: jdbc:mysql://127.0.0.1:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: root
+          password: JK123456%JIK
+        db2:
+          driver-class-name: com.mysql.jdbc.Driver
+          url: jdbc:mysql://172.18.156.39:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: root
+          password: 4Dage@4Dage#@168
+
+  redis:
+    host: 172.18.156.39
+    port: 6379
+    timeout: 6000ms
+    password: bgh0cae240
+    jedis:
+      pool:
+        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 10 # 连接池中的最大空闲连接
+        min-idle: 5 # 连接池中的最小空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+    lettuce:
+      shutdown-timeout: 0ms
+
+4dkk:
+  laserService:
+    #深时（激光）地址 生产环境：https://laser.4dkankan.com/
+    basePath: http://uat-laser.4dkankan.com
+    port: 80
+    #basePath: http://192.168.0.152:8080
+    #port: 8080
+  fdService:
+    #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
+    basePath: http://test.4dkankan.com
+    port: 80
+    #basePath: http://192.168.0.38/4dkankan_v2
+    #port: 8080
+  newFdService:
+    #官网生产环境：https://www.4dkankan.com
+    basePath: http://v4-test.4dkankan.com
+    port: 80
+  overallService:
+    #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
+    basePath: http://test.4dkankan.com/qjkankan
+  takeLookService:
+    basePath: https://v4-test.4dkankan.com
+    port: 80

src/main/resources/application.yaml

@@ -1,11 +1,3 @@
-server:
-  port: 8808
-  servlet:
-    context-path: /fusion-xj
-  tomcat:
-    max-http-form-post-size: -1
-
-
 spring:
   profiles:
     active: ${activeProfile:local}
@@ -13,49 +5,13 @@ spring:
     multipart:
       max-file-size: 1000MB
       maxRequestSize: 1000MB
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    #120.25.146.52
-    dynamic:
-      primary: db1
-      strict: false
-      datasource:
-        db1:
-          driver-class-name: com.mysql.jdbc.Driver
-          #url: jdbc:mysql://120.25.146.52:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          #url: jdbc:mysql://192.168.0.25:3306/fd_fusion_xj?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          url: jdbc:mysql://127.0.0.1:3306/fd_fusion_xj?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          username: root
-          password: mysql123!ROOT.
-        db2:
-          driver-class-name: com.mysql.jdbc.Driver
-          #url: jdbc:mysql://192.168.0.25:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          url: jdbc:mysql://127.0.0.1:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          username: root
-          password: mysql123!ROOT.
-
-
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    timeout: 6000ms
-    password: redis123!ROOT.
-    jedis:
-      pool:
-        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
-        max-idle: 10 # 连接池中的最大空闲连接
-        min-idle: 5 # 连接池中的最小空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-    lettuce:
-      shutdown-timeout: 0ms
 
-4dkk:
-  laserService:
-    basePath: http://127.0.0.1:9795
-  fdService:
-    basePath: http://127.0.0.1:8081
-  takeLookService:
-    basePath: http://127.0.0.1:8081
+server:
+  port: 8808
+  servlet:
+    context-path: /fusion
+  tomcat:
+    max-http-form-post-size: -1
 
 
 
@@ -84,16 +40,16 @@ forest:
   connect-timeout: 10000
 
 upload:
-  type: local
-  query-path: /oss/
+  type: oss
+  query-path: https://4dkk.4dage.com/
 oss:
   #point: http://oss-cn-shenzhen-internal.aliyuncs.com
-  point:
-  key:
-  secrey:
+  point: http://oss-cn-shenzhen-internal.aliyuncs.com
+  key: LTAI5tJwboCj3r4vUNkSmbyX
+  secrey: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
   bucket: 4dkankan
-  small:
-  basePath: /oss/
+  small: ?x-oss-process=image/resize,m_fill,h_%s,w_%s
+
 
 # Sa-Token配置
 sa-token:
@@ -116,13 +72,3 @@ sa-token:
 fdkk:
   register:
     validCode: 2a22bac40f44af4d3b5fdc20ea706fc5
-
-# MinIO 配置
-minio:
-  endpoint: http://127.0.0.1:9000      # MinIO服务地址
-  fileHost: http://127.0.0.1:9000      # 文件地址host
-  bucketName: laser-data                      # 存储桶bucket名称
-  accessKey: Ux8mKEBFj4j2N63Kdj5g                         # 用户名
-  secretKey: cPA5XSYcDzTCIHbeBxaSqzt9ZQjLZFbgQe38EiRW      # 密码
-
-