Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-gateway/src/main/resources/bootstrap.yml

@@ -19,11 +19,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -34,13 +34,13 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 127.0.0.10:8718
+        dashboard: 127.0.0.1:8718
 
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.10:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-onemap-gateway
             groupId: DEFAULT_GROUP
             data-type: json

onemap-modules/onemap-analyse/src/main/resources/bootstrap.yml

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-apply/src/main/resources/bootstrap.yml

@@ -30,11 +30,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-file/src/main/java/com/onemap/file/service/SaveFileService.java

@@ -7,7 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
 public interface SaveFileService {
     String saveShpFile(String shpPath, String zippath, String fromRoute) throws Exception;
 
-    String saveShpFileNew(String shpPath, String zippath, String fromRoute) throws Exception;
+//    String saveShpFileNew(String shpPath, String zippath, String fromRoute) throws Exception;
 
     String saveDraw(String geom, String fromRoute);
 

onemap-modules/onemap-file/src/main/java/com/onemap/file/service/impl/SaveFileImpl.java

@@ -37,25 +37,25 @@ public class SaveFileImpl implements SaveFileService {
         zhxzFileMapper.saveGeom(geomResourceDTO);
         return uuid;
     }
-
-    @Override
-    @Master
-    public String saveShpFile(String shpPath, String zippath, String fromRoute) throws Exception {
-        String ewkt = WktUtils.getShpWkt(shpPath);
-
-        GeomResourceDTO geomResourceDTO = new GeomResourceDTO();
-
-        String uuid = StringUtils.getUUID();
-        geomResourceDTO.setId(uuid);
-        geomResourceDTO.setZippath(zippath);
-        geomResourceDTO.setFilepath(shpPath);
-        geomResourceDTO.setGeom(ewkt);
-        geomResourceDTO.setFromType(2);
-        geomResourceDTO.setFromRoute(fromRoute);
-
-        zhxzFileMapper.saveGeom(geomResourceDTO);
-        return uuid;
-    }
+//
+//    @Override
+//    @Master
+//    public String saveShpFile(String shpPath, String zippath, String fromRoute) throws Exception {
+//        String ewkt = WktUtils.getShpWkt(shpPath);
+//
+//        GeomResourceDTO geomResourceDTO = new GeomResourceDTO();
+//
+//        String uuid = StringUtils.getUUID();
+//        geomResourceDTO.setId(uuid);
+//        geomResourceDTO.setZippath(zippath);
+//        geomResourceDTO.setFilepath(shpPath);
+//        geomResourceDTO.setGeom(ewkt);
+//        geomResourceDTO.setFromType(2);
+//        geomResourceDTO.setFromRoute(fromRoute);
+//
+//        zhxzFileMapper.saveGeom(geomResourceDTO);
+//        return uuid;
+//    }
 
     @Override
     @Master

onemap-modules/onemap-file/src/main/resources/bootstrap.yml

@@ -34,11 +34,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-model/src/main/resources/bootstrap.yml

@@ -31,11 +31,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-spatial/src/main/resources/bootstrap.yml

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.10:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置