更改地址

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

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

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

@@ -0,0 +1,46 @@
+# Tomcat
+server:
+  port: 8080
+  ssl:
+    key-store: classpath:ssl.keystore
+    key-store-password: 123456
+    enabled: false
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: onemap-gateway
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        namespace: model
+        # 服务注册地址
+        server-addr: 127.0.0.1:8848
+      config:
+        namespace: model
+        # 配置中心地址
+        server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
+      transport:
+        # 控制台地址
+        dashboard: 127.0.0.1:8718
+      # nacos配置持久化
+      datasource:
+        ds1:
+          nacos:
+            server-addr: 127.0.0.1:8848
+            dataId: sentinel-onemap-gateway
+            groupId: DEFAULT_GROUP
+            data-type: json
+            rule-type: flow

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/FzssController.java

@@ -105,7 +105,7 @@ public class FzssController extends BaseController {
     }
 
     @GetMapping("/DownloadReport")
-    public void fileDownload(String fileName, HttpServletResponse response, HttpServletRequest request) {
+    public void fileDownload(String filePath, HttpServletResponse response, HttpServletRequest request) {
         try {
             String path = tempWin;
             // windows 使用 tempWin, linux 使用 tempLinux
@@ -113,12 +113,12 @@ public class FzssController extends BaseController {
                 path = tempLinux;
             }
 
-            String realFileName = path + fileName;
+            String realFileName = path + filePath;
             response.setCharacterEncoding("utf-8");
             response.setContentType("multipart/form-data");
             response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
 
-            String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
+            String fileType = filePath.substring(filePath.lastIndexOf(".") + 1);
             String time = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
             String downloadName = time + "." + fileType;
 

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzReport.java

@@ -8,12 +8,10 @@ import java.util.List;
 public class FzxzReport {
     private String message = "检查完成";/// 消息内容
     private String reportfile;/// 选址报告文件
-    // private String simplefile;/// 选址简报文件
-    // private String zipfile;/// 文件
-    private String rootPath;/// 根目录
+    // private String rootPath;/// 根目录
 
     private String bsm;
-    private String fxbg;
+    // private String fxbg;
     private String jsdw;
     private String xmmc;
     private List<SelectionResDTO> items;

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/ReportServiceImpl.java

@@ -75,19 +75,21 @@ public class ReportServiceImpl implements IReportService {
         if (res != null) {
             // 文件硬盘真实路径
             String timeStamp = new Date().getTime() + "";
-            String rootPath = temp + File.separator + "智能选址报告" + File.separator + res.getBsm();
-            File f = new File(rootPath);
+            String rootDir = temp;
+            String filePath = "/智能选址报告/" + res.getBsm();
+            String allPath = rootDir + filePath;
+
+            File f = new File(allPath);
             if (!f.exists()) {
                 f.mkdirs();
             }
             String reportPath = res.getXmmc() + "（选址报告）_" + timeStamp + ".docx";
             // ###选址报告###
-            createReport(res, rootPath + File.separator + reportPath, xzbsmList);
+            createReport(res, allPath + "/" + reportPath, xzbsmList);
             // 生成返回结果
-            fzxzReport.setRootPath(StringUtils.getFileStaticPath(rootPath));
-            fzxzReport.setReportfile(StringUtils.getFileStaticPath(rootPath + File.separator + reportPath));
+            fzxzReport.setReportfile(filePath + "/" + reportPath);
             fzxzReport.setBsm(bsm);
-            fzxzReport.setFxbg(fzxzReport.getReportfile());
+            // fzxzReport.setFxbg(fzxzReport.getReportfile());
             fzxzReport.setJsdw(res.getJsdw());
             fzxzReport.setXmmc(res.getXmmc());
             // 查询分析结果图斑信息

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

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

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

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

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

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