From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/resources/application.yml |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 04ecafe..df2bb00 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,9 +45,9 @@
   datasource:
     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://103.135.160.14:5433/langfang?useAffectedRows=true
+    #url: jdbc:postgresql://192.168.11.205:5433/langfang?useAffectedRows=true
+    url: jdbc:postgresql://127.0.0.1:5432/langfang?useAffectedRows=true
     username: postgres
     #password: Postgres!_14_Lf
     password: postgres
@@ -102,11 +102,10 @@
         # 鎷掔粷璁块棶鐨勫湴鍧�锛宒eny浼樺厛浜巃llow
         deny:
 
-# mybatis
-#mybatis:
-#  type-aliases-package: com.lf.server.entity
-#  config-location: classpath:mybatis.xml
-#  mapper-locations: classpath:mapper/**/*.xml
+# mybatis:
+# type-aliases-package: com.lf.server.entity
+# config-location: classpath:mybatis.xml
+# mapper-locations: classpath:mapper/**/*.xml
 
 mybatis-plus:
   type-aliases-package: com.lf.server.entity
@@ -131,23 +130,31 @@
   # 绠＄悊鍛業D
   admin: ad_Lf1122_min
   # IIS鐨勪富鏈哄湴鍧�
-  iisHost: 127.0.0.1
+  iisHost: 192.168.11.205
   # FME鏈嶅姟鍦板潃
-  #fmeUrl: http://103.85.165.99:8051/
-  fmeUrl: http://192.168.20.205:88/
+  #fmeUrl: http://106.120.22.35:8051/
+  fmeUrl: http://192.168.11.205:88/
+  # FME浠ょ墝
+  fmeToken: c36e4f94-dfde-401e-9967-2c4a449f1300
   # 鍑哄浘鏈嶅姟
-  exportServer: http://127.0.0.1/ExportMap
+  exportServer: http://192.168.11.205/ExportMap
+  #exportServer: http://127.0.0.1/ExportMap
   #exportServer: http://103.85.165.99:8050/ExportMap
+  # Turf鏈嶅姟
+  turfServer: http://127.0.0.1/Turf
   # Gdal椹卞姩鐩綍
-  gdal_path: E:\terrait\TianJin\Zip\release-1928-x64-dev\release-1928-x64\bin
+  gdal_path: D:\soft\release-1928-x64-dev\release-1928-x64\bin
   # 鐡︾墖鍦板潃
-  tile_path: E:\data\99.public\soft\LFData\2d\tiles
+  tile_path: D:\other\LFData\2d\tiles
   path:
     # 涓嬭浇鐩綍
-    download: D:\LF\download
+    download: D:\other\LF\download
     # 涓婁紶鐩綍
-    upload: D:\LF\upload
+    upload: D:\other\LF\upload
     # 涓存椂鐩綍
-    temp: D:\LF\temp
+    temp: D:\other\LF\temp
+  cad:
+    exePath: D:/other/MxCAD/mxcadassembly.exe
+    targetPath: D:/other/TsWeb/public/data
   # 涓婁紶闄勪欢琛�
   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