修改了允许中文名称

README.md

@@ -51,3 +51,9 @@ http://map.4dage.com/3dmap/
   1.上传文件 -> 数据切片 -> 发布服务
   2.多文件上传
   
+
+## 江门uat
+    数据管理平台访问url: http://19.121.251.13:8080/back
+    后台api: http://19.121.251.13:8080/test/test
+    后台api: http://19.121.251.13:8080/doc.html
+ 

src/main/java/com/fd/config/CommonInterceptor.java

@@ -24,6 +24,7 @@ public class CommonInterceptor implements HandlerInterceptor {
                 && !request.getRequestURI().contains(".json")
                 && !request.getRequestURI().contains(".png")
                 && !request.getRequestURI().contains(".html")
+                && !request.getRequestURI().contains(".pbf")
                 && !request.getRequestURI().contains(".mp3")
                 ){
             log.warn("start ： {}", request.getRequestURI());
@@ -31,10 +32,10 @@ public class CommonInterceptor implements HandlerInterceptor {
 
 
         // uat环境禁止访问api文档
-        if (active.equals("uat")) {
-            log.info("访问api文档拦截");
-            return !request.getRequestURI().contains("doc.html");
-        }
+//        if (active.equals("uat")) {
+//            log.info("访问api文档拦截");
+//            return !request.getRequestURI().contains("doc.html");
+//        }
 
         return true;
     }
@@ -50,9 +51,13 @@ public class CommonInterceptor implements HandlerInterceptor {
     public void afterCompletion(HttpServletRequest request,
                                 HttpServletResponse response, Object handler, Exception ex)
             throws Exception {
-        if(!request.getRequestURI().contains("/static/") && !request.getRequestURI().contains("/sendUserInfo")
-                && !request.getRequestURI().contains(".json") && !request.getRequestURI().contains(".png")
-                && !request.getRequestURI().contains(".html") && !request.getRequestURI().contains(".mp3")){
+        if(!request.getRequestURI().contains("/static/")
+                && !request.getRequestURI().contains("/sendUserInfo")
+                && !request.getRequestURI().contains(".json")
+                && !request.getRequestURI().contains(".png")
+                && !request.getRequestURI().contains(".html")
+                && !request.getRequestURI().contains(".pbf")
+                && !request.getRequestURI().contains(".mp3")){
             log.warn("end ： {}", request.getRequestURI());
         }
     }

src/main/java/com/fd/controller/DemController.java

@@ -36,6 +36,7 @@ public class DemController {
 
     /**
      * 不需要校验文件名，会创建唯一目录
+     * 可上传一个或多个文件
      * @param file
      * @param req
      * @return

src/main/java/com/fd/controller/ModelController.java

@@ -79,9 +79,9 @@ public class ModelController {
 
 
         // 文件是否包含中文字符
-        if (RegexUtils.regexChinese(fileName)) {
-            return new R(51005, MsgCode.E51005);
-        }
+//        if (RegexUtils.regexChinese(fileName)) {
+//            return new R(51005, MsgCode.E51005);
+//        }
 
         String s = StringUtils.substringAfterLast(fileName, ".");
         if (!"zip".equals(s)) {
@@ -106,9 +106,9 @@ public class ModelController {
         String fileName = file.getOriginalFilename();
 
         // 文件是否包含中文字符
-        if (RegexUtils.regexChinese(fileName)) {
-            return new R(51005, MsgCode.E51005);
-        }
+//        if (RegexUtils.regexChinese(fileName)) {
+//            return new R(51005, MsgCode.E51005);
+//        }
 
         String s = StringUtils.substringAfterLast(fileName, ".");
         if (!"zip".equals(s)) {

src/main/java/com/fd/controller/RasterController.java

@@ -78,10 +78,10 @@ public class RasterController {
 
 
         // 文件是否包含中文字符
-        if (RegexUtils.regexChinese(fileName)) {
-            log.info(MsgCode.E51005);
-            return new R(51005, MsgCode.E51005);
-        }
+//        if (RegexUtils.regexChinese(fileName)) {
+//            log.info(MsgCode.E51005);
+//            return new R(51005, MsgCode.E51005);
+//        }
 
         String s = StringUtils.substringAfterLast(fileName, ".");
         if (!"tif".equals(s)) {
@@ -89,11 +89,11 @@ public class RasterController {
             return new R(50008, MsgCode.E50008);
         }
 
-        List<FileEntity> list = rasterServer.findByFileName(fileName);
-        if (list.size() > 0) {
-            log.info(MsgCode.E51006);
-            return new R(51006, MsgCode.E51006);
-        }
+//        List<FileEntity> list = rasterServer.findByFileName(fileName);
+//        if (list.size() > 0) {
+//            log.info(MsgCode.E51006);
+//            return new R(51006, MsgCode.E51006);
+//        }
         return new R(200, MsgCode.SUCCESS);
     }
 
@@ -115,19 +115,19 @@ public class RasterController {
         String fileName = file.getOriginalFilename();
 
         // 文件是否包含中文字符
-        if (RegexUtils.regexChinese(fileName)) {
-            return new R(51005, MsgCode.E51005);
-        }
+//        if (RegexUtils.regexChinese(fileName)) {
+//            return new R(51005, MsgCode.E51005);
+//        }
 
         String s = StringUtils.substringAfterLast(fileName, ".");
         if (!"tif".equals(s)) {
             return new R(50008, MsgCode.E50008);
         }
 
-        List<FileEntity> list = rasterServer.findByFileName(fileName);
-        if (list.size() > 0) {
-            return new R(51006, MsgCode.E51006);
-        }
+//        List<FileEntity> list = rasterServer.findByFileName(fileName);
+//        if (list.size() > 0) {
+//            return new R(51006, MsgCode.E51006);
+//        }
 
 
         R r = rasterServer.uploadBigFile(file, strCoord, token);

src/main/java/com/fd/controller/VectorController.java

@@ -113,13 +113,14 @@ public class VectorController {
         String token = req.getHeader("Authorization");
 
         // 文件是否包含中文字符
-        if (RegexUtils.regexChinese(directoryName)) {
-            return new R(51005, MsgCode.E51005);
-        }
-        List<FileEntity> directory = vectorServer.findByDirectory(directoryName);
-        if (directory.size() > 0) {
-            return new R(51006, MsgCode.E51006);
-        }
+//        if (RegexUtils.regexChinese(directoryName)) {
+//            return new R(51005, MsgCode.E51005);
+//        }
+
+//        List<FileEntity> directory = vectorServer.findByDirectory(directoryName);
+//        if (directory.size() > 0) {
+//            return new R(51006, MsgCode.E51006);
+//        }
 
         String strCoord = Arrays.toString(coord);
 

src/main/java/com/fd/entity/FileEntity.java

@@ -18,7 +18,9 @@ import java.io.Serializable;
 public class FileEntity extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 3663614649370191338L;
 
-
+    /** 原文件名*/
+    @Column
+    private String originalName;
 
     @Column
     private String fileName; // 文件名称

src/main/java/com/fd/entity/OutputFileEntity.java

@@ -21,6 +21,10 @@ public class OutputFileEntity extends BaseEntity implements Serializable {
     @Column
     private Long uploadId; // 上传文件ID
 
+    /** 原文件名*/
+    @Column
+    private String originalName;
+
     @Column
     private String fileName; // 文件名称
 

src/main/java/com/fd/server/impl/ConvertServerImpl.java

@@ -77,13 +77,14 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
         if (files != null && files.length > 0) {
 
             // 创建目录
-            String time = DateUtil.format(new DateTime(), "yyyyMMdd_HHmmss");
+            String time = DateUtil.format(new DateTime(), "yyyyMMdd_HHmmssSSS");
             String filePath = INPUT_PATH + time;
             FileUtils.createDir(filePath);
             log.info("filePath: {}", filePath);
 
             // 存储多个文件名
             StringBuilder sb = new StringBuilder();
+            StringBuilder sbTime = new StringBuilder();
 
             // 数据开关
             boolean flag = true;
@@ -95,22 +96,25 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
             // 记录shp 信息
             boolean shpFlag = false;
             String shpName = "";
+            String shpTimeName = "";
             String filename = "";
+            String timeName = "";
 
             for (MultipartFile f : files) {
                 filename = f.getOriginalFilename();
 
                 // 文件是否包含中文字符
-                if (RegexUtils.regexChinese(filename)) {
-                    return new R(51005, MsgCode.E51005);
-                }
+//                if (RegexUtils.regexChinese(filename)) {
+//                    return new R(51005, MsgCode.E51005);
+//                }
 
+                String suffix = StringUtils.substringAfterLast(filename, ".");
+                timeName = time + "." + suffix;
                 if (TypeCode.FILE_TYPE_VECTOR.equals(type)) {
                     log.info("fileName : {}", filename);
-                    String s = StringUtils.substringAfterLast(filename, ".");
                     // 判断后缀名，需要包含这以下四个
                     String [] suffixCheck = {"dbf","shp","shx","prj"};
-                    if (Arrays.asList(suffixCheck).contains(s)) {
+                    if (Arrays.asList(suffixCheck).contains(suffix)) {
                         suffixCheckInt += 1;
 
                         // 判断前缀名字是否一致
@@ -121,12 +125,14 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
                     }
 
 
-                    if ("shp".equals(s)) {
+                    if ("shp".equals(suffix)) {
                         shpFlag = true;
                         shpName = filename;
+                        shpTimeName = timeName;
                     }
 
                     sb.append(filename).append(",");
+                    sbTime.append(timeName).append(",");
 
                 } else {
                     String s = StringUtils.substringAfterLast(filename, ".");
@@ -134,13 +140,14 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
                         return new R(50008,MsgCode.E50008);
                     }
                     sb.append(filename);
+                    sbTime.append(timeName);
                 }
 
 
 
 
                 try {
-                    FileUtils.bigFileWrite(f.getInputStream(), filePath + "/" + filename);
+                    FileUtils.bigFileWrite(f.getInputStream(), filePath + "/" + timeName);
 
                 } catch (IOException e) {
                     flag = false;
@@ -164,12 +171,12 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
                     return new R(51008, MsgCode.E51008);
                 }
 
-                filePath = filePath + "/" + shpName;
-                filename = shpName;
+                filePath = filePath + "/" + timeName;
+//                filename = shpName;
 
             } else {
 
-                filePath = filePath + "/" + filename;
+                filePath = filePath + "/" + timeName;
             }
 
 
@@ -181,7 +188,8 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
             if (flag) {
                 FileEntity entity = new FileEntity();
                 entity.setDirectory(time);
-                entity.setFileName(sb.toString());
+                entity.setFileName(sbTime.toString());
+                entity.setOriginalName(sb.toString());
                 // 只存目录，没有存完整路径
                 entity.setFileUrl(filePath);
                 entity.setCreateTime(new Date());
@@ -194,7 +202,8 @@ public class ConvertServerImpl extends BaseServerImpl implements ConvertServer {
                 outputFile.setUploadId(entity.getId());
                 outputFile.setUploadPath(entity.getFileUrl());
                 outputFile.setDirectory(entity.getDirectory());
-                outputFile.setFileName(filename);
+                outputFile.setFileName(shpTimeName);
+                outputFile.setOriginalName(shpName);
                 // 2：未转坐标
                 outputFile.setStatus(2);
                 outputFile.setType(entity.getType());

src/main/java/com/fd/server/impl/DemServerImpl.java

@@ -22,6 +22,7 @@ import com.fd.shiro.JWTUtil;
 import com.fd.thread.AsyncTask;
 import com.fd.util.*;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -99,26 +100,30 @@ public class DemServerImpl extends BaseServerImpl implements DemServer {
         if (files != null && files.length > 0) {
 
             // 创建目录
-            String time = DateUtil.format(new DateTime(), "yyyyMMdd_HHmmss");
+            String time = DateUtil.format(new DateTime(), "yyyyMMdd_HHmmssSSS");
             String filePath = INPUT_PATH + time;
             FileUtils.createDir(filePath);
             log.info("filePath: {}", filePath);
 
             // 存储多个文件名
             StringBuilder sb = new StringBuilder();
+            StringBuilder sbTimeName = new StringBuilder();
 
             for (MultipartFile f : files) {
                 String filename = f.getOriginalFilename();
+                String suffix = StringUtils.substringAfterLast(filename, ".");
+                String timeName = time + "." + suffix;
 
                 // 文件是否包含中文字符
-                if (RegexUtils.regexChinese(filename)) {
-                    return new R(51005, MsgCode.E51005);
-                }
+//                if (RegexUtils.regexChinese(filename)) {
+//                    return new R(51005, MsgCode.E51005);
+//                }
 
                 sb.append(filename).append(",");
+                sbTimeName.append(timeName).append(",");
 
                 try {
-                    FileUtils.bigFileWrite(f.getInputStream(), filePath + "/" + filename);
+                    FileUtils.bigFileWrite(f.getInputStream(), filePath + "/" + timeName);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -147,7 +152,8 @@ public class DemServerImpl extends BaseServerImpl implements DemServer {
             if (integer == 0) {
                 FileEntity entity = new FileEntity();
                 entity.setDirectory(time);
-                entity.setFileName(sb.toString());
+                entity.setFileName(sbTimeName.toString());
+                entity.setOriginalName(sb.toString());
                 // 只存目录，没有存完整路径
                 entity.setFileUrl(filePath);
                 entity.setCreateTime(new Date());
@@ -160,6 +166,7 @@ public class DemServerImpl extends BaseServerImpl implements DemServer {
                 outputFile.setUploadPath(entity.getFileUrl());
                 outputFile.setDirectory(entity.getDirectory());
                 outputFile.setFileName(entity.getFileName());
+                outputFile.setOriginalName(entity.getOriginalName());
                 // 4:未切片
                 outputFile.setStatus(4);
                 outputFile.setType(TypeCode.FILE_TYPE_DEM);

src/main/java/com/fd/server/impl/ModelServerImpl.java

@@ -1,5 +1,7 @@
 package com.fd.server.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -278,8 +280,8 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
         FileUtils.createDir(INPUT_FILE_PATH);
 
         // 拼接唯一文件名
-        long timeMillis = System.currentTimeMillis();
-//        String fileName = timeMillis + "_" + fullFileName;
+//        String time = DateUtil.format(new DateTime(), "yyyyMMdd_HHmmssSSS");
+//        String fileName = time+".zip";
         String fileName = fullFileName;
 
         // 文件保存路径
@@ -301,6 +303,7 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
 
         // 保存信息到db
         FileEntity entity = new FileEntity();
+        entity.setOriginalName(fullFileName);
         entity.setFileName(fileName);
         entity.setFileUrl(filePath);
         entity.setCreateTime(new Date());
@@ -313,6 +316,7 @@ public class ModelServerImpl extends BaseServerImpl implements ModelServer  {
 
 
         OutputFileEntity outputFile = new OutputFileEntity();
+        outputFile.setOriginalName(entity.getOriginalName());
         outputFile.setUploadId(entity.getId());
         outputFile.setUploadPath(entity.getFileUrl());
         outputFile.setFileName(entity.getFileName());

src/main/java/com/fd/server/impl/RasterServerImpl.java

@@ -1,5 +1,7 @@
 package com.fd.server.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -219,9 +221,10 @@ public class RasterServerImpl extends BaseServerImpl implements RasterServer {
         FileUtils.createDir(INPUT_FILE_PATH);
 
         // 拼接唯一文件名
-        long timeMillis = System.currentTimeMillis();
+//        long timeMillis = System.currentTimeMillis();
+        String time = DateUtil.format(new DateTime(), "yyyyMMdd_HHmmssSSS");
 //        String fileName = timeMillis + "_" + fullFileName;
-        String fileName = fullFileName;
+        String fileName = time+".tif";
 
         // 文件保存路径
         String filePath = INPUT_FILE_PATH + fileName;
@@ -242,6 +245,7 @@ public class RasterServerImpl extends BaseServerImpl implements RasterServer {
 
         // 保存信息到db
         FileEntity entity = new FileEntity();
+        entity.setOriginalName(fullFileName);
         entity.setFileName(fileName);
         entity.setFileUrl(filePath);
         entity.setCreateTime(new Date());
@@ -253,6 +257,7 @@ public class RasterServerImpl extends BaseServerImpl implements RasterServer {
         fileRepository.save(entity);
 
         OutputFileEntity outputFile = new OutputFileEntity();
+        outputFile.setOriginalName(entity.getOriginalName());
         outputFile.setUploadId(entity.getId());
         outputFile.setUploadPath(entity.getFileUrl());
         outputFile.setFileName(entity.getFileName());

src/main/java/com/fd/server/impl/VectorServerImpl.java

@@ -1,5 +1,7 @@
 package com.fd.server.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -196,19 +198,24 @@ public class VectorServerImpl extends BaseServerImpl implements VectorServer {
 
 
         // 判断目录重名
-        List<FileEntity> en = fileRepository.findByDirectoryAndResStatus(directoryName, 0);
+//        List<FileEntity> en = fileRepository.findByDirectoryAndResStatus(directoryName, 0);
+//
+//        if (en.size() > 0) {
+//            return new R(51007, MsgCode.E51007);
+//        }
 
-        if (en.size() > 0) {
-            return new R(51007, MsgCode.E51007);
-        }
+        // 拼接唯一文件名
+//        long timeMillis = System.currentTimeMillis();
+        String time = DateUtil.format(new DateTime(), "yyyyMMdd_HHmmssSSS");
 
         // 创建目录路径
-        String filePath = INPUT_FILE_PATH + directoryName + File.separator;
+        String filePath = INPUT_FILE_PATH + time + File.separator;
         FileUtils.createDir(filePath);
 
         FileEntity entity = new FileEntity();
 
         StringBuilder sb = new StringBuilder();
+        StringBuilder sbTimeName = new StringBuilder();
 
 
 
@@ -219,22 +226,25 @@ public class VectorServerImpl extends BaseServerImpl implements VectorServer {
         // 记录shp 信息
         boolean shpFlag = false;
         String shpName = "";
+        String shpTimeName = "";
+
+        String timeName = null;
 
         if (files != null && files.length > 0) {
             for (MultipartFile f : files) {
                 String filename = f.getOriginalFilename();
-
                 // 文件是否包含中文字符
-                if (RegexUtils.regexChinese(filename)) {
-                    return new R(51005, MsgCode.E51005);
-                }
+//                if (RegexUtils.regexChinese(filename)) {
+//                    return new R(51005, MsgCode.E51005);
+//                }
 
                 log.info("fileName : {}", filename);
-                String s = StringUtils.substringAfterLast(filename, ".");
+                // 后缀名
+                String suffix = StringUtils.substringAfterLast(filename, ".");
 
                 // 判断后缀名，需要包含这以下四个
                 String [] suffixCheck = {"dbf","shp","shx","prj"};
-                if (Arrays.asList(suffixCheck).contains(s)) {
+                if (Arrays.asList(suffixCheck).contains(suffix)) {
                     suffixCheckInt += 1;
 
                     // 判断前缀名字是否一致
@@ -244,17 +254,19 @@ public class VectorServerImpl extends BaseServerImpl implements VectorServer {
 
 
 
-                if ("shp".equals(s)) {
+                timeName = time + "." + suffix;
+                if ("shp".equals(suffix)) {
                     shpFlag = true;
                     shpName = filename;
+                    shpTimeName = timeName;
                 }
-
                 try {
-                    FileUtils.bigFileWrite(f.getInputStream(), filePath + filename);
+                    FileUtils.bigFileWrite(f.getInputStream(), filePath + timeName);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
                 sb.append(filename).append(",");
+                sbTimeName.append(timeName).append(",");
             }
         }
 
@@ -278,9 +290,10 @@ public class VectorServerImpl extends BaseServerImpl implements VectorServer {
 
         OutputFileEntity outputFile = new OutputFileEntity();
         if (shpFlag) {
-            entity.setDirectory(directoryName);
-            entity.setFileName(sb.toString());
-            entity.setFileUrl(filePath + shpName);
+            entity.setDirectory(time);
+            entity.setOriginalName(sb.toString());
+            entity.setFileName(sbTimeName.toString());
+            entity.setFileUrl(filePath + shpTimeName);
             entity.setCreateTime(new Date());
             entity.setUpdateTime(new Date());
             entity.setType(TypeCode.FILE_TYPE_VECTOR);
@@ -291,7 +304,8 @@ public class VectorServerImpl extends BaseServerImpl implements VectorServer {
             outputFile.setUploadId(entity.getId());
             outputFile.setUploadPath(entity.getFileUrl());
             outputFile.setDirectory(entity.getDirectory());
-            outputFile.setFileName(shpName);
+            outputFile.setFileName(shpTimeName);
+            outputFile.setOriginalName(shpName);
             outputFile.setStatus(2);
             outputFile.setType(TypeCode.FILE_TYPE_VECTOR);
             outputFile.setCoord(entity.getCoord());

src/main/resources/application-pro.properties

@@ -1,15 +1,15 @@
 
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://192.168.0.248:3306/gis_cesium?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.url=jdbc:mysql://47.107.252.54:3306/gis_cesium?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 #spring.datasource.username=root
-#spring.datasource.password=4dage
+#spring.datasource.password=4dkankan4dage
 
 # \u6570\u636E\u6E90\u914D\u7F6E
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://192.168.0.248:3306/gis_cesium?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.url=jdbc:mysql://47.107.252.54:3306/gis_cesium?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.druid.username=root
-spring.datasource.druid.password=4dage
+spring.datasource.druid.password=4dkankan4dage
 
 # \u521D\u59CB\u8FDE\u63A5\u6570
 spring.datasource.druid.initial-size=5
@@ -36,9 +36,10 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
 spring.redis.database=0
-spring.redis.host=127.0.0.1
+#spring.redis.host=127.0.0.1
+spring.redis.host=47.107.252.54
 spring.redis.port=6379
-spring.redis.password=
+spring.redis.password=4dage
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=3000ms
 # \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
@@ -50,17 +51,18 @@ spring.redis.jedis.pool.max-active=8
 # \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
 spring.redis.jedis.pool.max-wait=-1ms
 
-logging.file=/root/java/tomcat_8082_cesium/log/cesium.log
+logging.file=/data/tomcat_cesium_8082/log/cesium.log
 
-# \u6587\u4EF6\u5B58\u653E\u8DEF\u5F84
-input.file.path.model=/root/gis/cesium/input/model/
-output.file.path.model=/root/gis/cesium/output/model/
+base.path=/root/gis/data
 
-input.file.path.vector=/root/gis/cesium/input/vector/
-output.file.path.vector=/root/gis/cesium/output/vector/
+input.file.path.model=${base.path}/input/model/
+output.file.path.model=${base.path}/output/model/
 
-input.file.path.raster=/root/gis/cesium/input/raster/
-output.file.path.raster=/root/gis/cesium/output/raster/
+input.file.path.vector=${base.path}/input/vector/
+output.file.path.vector=${base.path}/output/vector/
+
+input.file.path.raster=${base.path}/input/raster/
+output.file.path.raster=${base.path}/output/raster/
 
 
 #\u53D1\u5E03\u670D\u52A1\u5730\u5740
@@ -73,3 +75,4 @@ config.path=/var/www/html/3dmap/config.json
 
 #config.json\u7684 teileset \u7684\u76F8\u5BF9\u8DEF\u5F84
 #config.tileset=../data/wuyidaxue/tileset.json
+

src/main/resources/application-uat.properties

@@ -1,15 +1,11 @@
-
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://47.107.252.54:3306/gis_cesium?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.username=root
-#spring.datasource.password=4dkankan4dage
+# \u6C5F\u95E8\u670D\u52A1\u5668
 
 # \u6570\u636E\u6E90\u914D\u7F6E
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://47.107.252.54:3306/gis_cesium?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.url=jdbc:mysql://localhost:3306/gis_cesium?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.druid.username=root
-spring.datasource.druid.password=4dkankan4dage
+spring.datasource.druid.password=gis4dkk%
 
 # \u521D\u59CB\u8FDE\u63A5\u6570
 spring.datasource.druid.initial-size=5
@@ -36,10 +32,10 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
 spring.redis.database=0
-#spring.redis.host=127.0.0.1
-spring.redis.host=47.107.252.54
+spring.redis.host=127.0.0.1
+#spring.redis.host=47.107.252.54
 spring.redis.port=6379
-spring.redis.password=4dage
+spring.redis.password=
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=3000ms
 # \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
@@ -51,10 +47,10 @@ spring.redis.jedis.pool.max-active=8
 # \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
 spring.redis.jedis.pool.max-wait=-1ms
 
-logging.file=/data/tomcat_cesium_8082/log/cesium.log
-
 base.path=/root/gis/data
 
+logging.file=/root/gis/log/cesium.log
+
 input.file.path.model=${base.path}/input/model/
 output.file.path.model=${base.path}/output/model/