From a55fb5ff1c9901568e618df44e67912961a0d705 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 20:17:12 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/UploadService.java |    4 ++--
 src/main/java/com/lf/server/config/PropertiesConfig.java    |   14 --------------
 src/main/resources/application.yml                          |   12 ++++--------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/lf/server/config/PropertiesConfig.java b/src/main/java/com/lf/server/config/PropertiesConfig.java
index e24cf98..4d53702 100644
--- a/src/main/java/com/lf/server/config/PropertiesConfig.java
+++ b/src/main/java/com/lf/server/config/PropertiesConfig.java
@@ -28,12 +28,6 @@
     // @Value("${spring.datasource.druid.stat-view-servlet.login-password}")
     private String druidPwd;
 
-    @Value("${sys.path.publishMpt}")
-    private String publishMptPath;
-
-    @Value("${sys.path.publish3dml}")
-    private String publish3dmlPath;
-
     @Value("${sys.tile_path}")
     private String tilePath;
 
@@ -59,14 +53,6 @@
 
     public String getDruidPwd() {
         return druidPwd;
-    }
-
-    public String getPublishMptPath() {
-        return publishMptPath;
-    }
-
-    public String getPublish3dmlPath() {
-        return publish3dmlPath;
     }
 
     public String getTilePath() {
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index d94d80e..d85d9b5 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -471,10 +471,10 @@
             }
             switch (mf.getExtName()) {
                 case StaticData.MPT:
-                    linkFiles(mf, StaticData.MPT_EXT, pathHelper.getConfig().getPublishMptPath());
+                    linkFiles(mf, StaticData.MPT_EXT, pathHelper.getConfig().getUploadPath() + File.separator + "SG");
                     break;
                 case StaticData.D3DML:
-                    linkFiles(mf, null, pathHelper.getConfig().getPublish3dmlPath());
+                    linkFiles(mf, null, pathHelper.getConfig().getUploadPath() + File.separator + "SG");
                     break;
                 default:
                     break;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ee74c40..da0adfb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,11 +42,11 @@
     name: prod
     # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
     #url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
-    url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
-    #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
+    #url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+    url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
     username : postgres
-    password: Postgres!_14_Lf
-    #password: postgres
+    #password: Postgres!_14_Lf
+    password: postgres
     driver-class-name: org.postgresql.Driver
     paltform: POSTGRESQL
     type: com.alibaba.druid.pool.DruidDataSource
@@ -162,9 +162,5 @@
     share: D:\LF\share
     # 涓存椂鐩綍锛堜复鏃朵笂浼犳枃浠讹級
     temp: D:\LF\temp
-    # 鍙戝竷Mpt鐩綍
-    publishMpt: D:\LF\publishMpt
-    # 鍙戝竷3DML鐩綍
-    publish3dml: D:\LF\publish3dml
   # 涓婁紶闄勪欢琛�
   attachTabs: bd.b_pac_hydrogeology,bd.b_pac_frozensoil,bd.b_pac_geologic_hazard,bd.b_pac_marine_meteorological,bd.b_pac_meteorological,bs.m_equipment_nameplate,bs.m_hydraulic_protection,bs.m_marker,bs.s_explorationpoint,bs.u_sectionline
\ No newline at end of file

--
Gitblit v1.9.3