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 | 118 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 56 insertions(+), 62 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2e59a86..df2bb00 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,26 +1,30 @@
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
- application:
- name: server
spring:
+ application:
+ name: server
# redis
redis:
database: 0
host: 127.0.0.1
port: 6369
password: rediS_5L#F4_Server
- timeout: 30000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
- pool:
- max-active: 1000 # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1 # 杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-idle: 10 # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- min-idle: 5 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ timeout: 10000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
+ lettuce:
+ pool:
+ max-active: 1000 # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1 # 杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-idle: 10 # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ min-idle: 5 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
# session
session:
timeout: PT20M # 20鍒嗛挓
@@ -41,19 +45,19 @@
datasource:
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=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
- paltform: POSTGRESQL
+ platform: POSTGRESQL
type: com.alibaba.druid.pool.DruidDataSource
# 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛宻tat:鐩戞帶缁熻銆乴og4j锛氭棩蹇楄褰曘�亀all锛氶槻寰ql娉ㄥ叆
filters: stat,wall,log4j
# 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
- connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
+ connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
# 瓒呰繃鏃堕棿闄愬埗鏄惁鍥炴敹
removeAbandoned: true
# 瓒呮椂鏃堕棿锛涘崟浣嶄负绉掋��180绉�=3鍒嗛挓
@@ -65,8 +69,8 @@
## 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
initial-size: 5
min-idle: 5
- max-active: 50
- ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ max-active: 100
+ ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝ms
max-wait: 60000
# 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
time-between-eviction-runs-millis: 60000
@@ -95,38 +99,15 @@
#login-password: ad_!Druid!_min
# 鍏佽璁块棶鐨勫湴鍧�锛屽鏋渁llow娌℃湁閰嶇疆鎴栬�呬负绌猴紝鍒欏厑璁告墍鏈夎闂�
allow:
- # 鎷掔粷璁块棶鐨勫湴鍧�锛宒eny浼樺厛浜巃llow锛屽鏋滃湪deny鍒楄〃涓紝灏辩畻鍦╝llow鍒楄〃涓紝涔熶細琚嫆缁�
+ # 鎷掔粷璁块棶鐨勫湴鍧�锛宒eny浼樺厛浜巃llow
deny:
- # 閰嶇疆WebStatFilter锛岀敤浜庨噰闆唚eb鍏宠仈鐩戞帶鐨勬暟鎹�
- web-stat-filter:
- # web url鐩戞帶
- enabled: true
- # session鐩戞帶
- session-stat-enable: true
- # session鐨勬渶澶т釜鏁帮紝榛樿100
- session-stat-max-count: 1000
- # 杩囨护鎵�鏈塽rl
- url-pattern: /*
- # 鎺掗櫎涓�浜涗笉蹇呰鐨剈rl
- exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
- # 鑷繁閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilter
- filter:
- # 寮�鍚疍ruidDataSource鐨勭姸鎬佺洃鎺�
- stat:
- enabled: true
- db-type: postgresql
- # 寮�鍚參sql鐩戞帶锛岃秴杩�2s 灏辫涓烘槸鎱ql锛岃褰曞埌鏃ュ織涓�
- log-slow-sql: true
- slow-sql-millis: 2000
-# 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:
- map-underscore-to-camel-case: true
type-aliases-package: com.lf.server.entity
config-location: classpath:mybatis.xml
mapper-locations: classpath:mapper/**/*.xml
@@ -139,28 +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: 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
- # 涓婁紶鐩綍锛堝ぇ鏁版嵁涓婁紶锛�
- upload: D:\LF\upload
- # 鍏变韩鐩綍锛堟暟鎹彂甯冿級
- share: D:\LF\share
- # 涓存椂鐩綍锛堜复鏃朵笂浼犳枃浠讹級
- temp: D:\LF\temp
+ # 涓嬭浇鐩綍
+ download: D:\other\LF\download
+ # 涓婁紶鐩綍
+ upload: D:\other\LF\upload
+ # 涓存椂鐩綍
+ 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