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 |   66 +++++++++++++++++++-------------
 1 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9c3042f..df2bb00 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,10 @@
 server:
   tomcat:
     uri-encoding: UTF-8
-    max-connections: 1000
+    max-connections: 5000
+    max-http-form-post-size: 50MB
+    threads:
+      max: 2000
   port: 12316
   servlet:
     context-path: /server
@@ -15,7 +18,7 @@
     host: 127.0.0.1
     port: 6369
     password: rediS_5L#F4_Server
-    timeout: 90000  # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
+    timeout: 10000  # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
     lettuce:
       pool:
         max-active: 1000  # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -42,12 +45,12 @@
   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
-    username : postgres
-    password: Postgres!_14_Lf
-    #password: postgres
+    #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
     driver-class-name: org.postgresql.Driver
     platform: POSTGRESQL
     type: com.alibaba.druid.pool.DruidDataSource
@@ -67,10 +70,10 @@
       initial-size: 5
       min-idle: 5
       max-active: 100
-      ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
-      max-wait: 6000
+      ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝ms
+      max-wait: 60000
       # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
-      time-between-eviction-runs-millis: 90000
+      time-between-eviction-runs-millis: 60000
       # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
       min-evictable-idle-time-millis: 300000
       max-pool-prepared-statement-per-connection-size: 50
@@ -99,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
@@ -118,31 +120,41 @@
 remote:
   maxTotalConnect: 0
   maxConnectPerRoute: 1000
-  connectTimeout: 5000
-  readTimeout: 1800000
+  connectTimeout: 30000
+  readTimeout: -1
 
 # 绯荤粺閰嶇疆
 sys:
+  # 鑷姩鏌ヨ
+  autoQuery: 0
   # 绠＄悊鍛業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