gushoubang hace 10 meses
padre
commit
3ed6587fc8

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

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

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

@@ -19,11 +19,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.100.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -39,7 +39,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 192.168.100.30:8848
             dataId: sentinel-onemap-gateway
             groupId: DEFAULT_GROUP
             data-type: json

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

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

+ 2 - 2
onemap-modules/onemap-file - 副本/src/main/resources/bootstrap.yml

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

+ 3 - 5
onemap-modules/onemap-file/src/main/java/com/onemap/file/service/ISysFileService.java

@@ -36,13 +36,11 @@ public interface ISysFileService {
 
     String getShpGeoJson(String shppath);
 
+    String getShpWkt(String shppath);
+
     UploadZipDTO uploadZip(MultipartFile file);
 
     RequestResult uploadZhxzZip(MultipartFile file);
 
-    String splitFileUpload(@RequestParam("file") MultipartFile file,
-                           @RequestParam("chunk") int chunk,
-                           @RequestParam("chunks") int chunks,
-                           @RequestParam("name") String name,
-                           @RequestParam("md5") String md5);
+    String splitFileUpload(@RequestParam("file") MultipartFile file, @RequestParam("chunk") int chunk, @RequestParam("chunks") int chunks, @RequestParam("name") String name, @RequestParam("md5") String md5);
 }

+ 7 - 3
onemap-modules/onemap-file/src/main/java/com/onemap/file/service/LocalSysFileServiceImpl.java → onemap-modules/onemap-file/src/main/java/com/onemap/file/service/impl/LocalSysFileServiceImpl.java

@@ -1,4 +1,4 @@
-package com.onemap.file.service;
+package com.onemap.file.service.impl;
 
 import com.google.common.collect.ImmutableMap;
 import com.onemap.common.core.domain.TgclTypeDTO;
@@ -9,12 +9,11 @@ import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.file.domain.ShpFileDTO;
 import com.onemap.file.domain.ZhxzFileDTO;
 import com.onemap.file.mapper.ZhxzFileMapper;
+import com.onemap.file.service.ISysFileService;
 import com.onemap.file.utils.*;
 import com.onemap.system.api.domain.GhtgCl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -370,6 +369,11 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         return geojson;
     }
 
+    @Override
+    public String getShpWkt(String shppath) {
+        return "";
+    }
+
     @Override
     public UploadZipDTO uploadZip(MultipartFile file) {
         //获得文件名称

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

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

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

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