From 47cb9f0fd15b264687eff3992b72150030e99e57 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:16:57 +0800
Subject: [PATCH] 解决druid报错
---
/dev/null | 160 --------------------------
.gitignore | 3
se-system/src/main/resources/bootstrap.yml | 6
se-gateway/src/main/resources/bootstrap.yml | 4
se-system/pom.xml | 163 ++++++++++++++++++---------
5 files changed, 117 insertions(+), 219 deletions(-)
diff --git a/.gitignore b/.gitignore
index 09bdfea..59c6667 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,4 +43,5 @@
!*/build/*.java
!*/build/*.html
-!*/build/*.xml
\ No newline at end of file
+!*/build/*.xml
+/doc
diff --git a/se-gateway/src/main/resources/bootstrap.yml b/se-gateway/src/main/resources/bootstrap.yml
index 589c109..82114fb 100644
--- a/se-gateway/src/main/resources/bootstrap.yml
+++ b/se-gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
# Tomcat
server:
- port: 8080
+ port: 8001
# Spring
spring:
@@ -29,6 +29,8 @@
shared-configs:
- data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
group: JHS_GROUP
+ # 鍏佽鍒锋柊
+ refresh-enabled: true
sentinel:
# 鍙栨秷鎺у埗鍙版噿鍔犺浇
eager: true
diff --git a/se-system/pom.xml b/se-system/pom.xml
index 6463c8f..3b6dee6 100644
--- a/se-system/pom.xml
+++ b/se-system/pom.xml
@@ -40,12 +40,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
-
- <!-- Mysql Connector -->
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- </dependency>
@@ -55,30 +49,18 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
+ <!--lombok-->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
+
<!--mybatis-plus-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.1</version>
- </dependency>
-
- <!--war:servlet-->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <!--websocket-->
- <dependency>
- <groupId>javax.websocket</groupId>
- <artifactId>javax.websocket-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!--redis-->
@@ -98,11 +80,84 @@
<artifactId>commons-pool2</artifactId>
</dependency>
- <!--lombok-->
+ <!--aop-->
<dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <optional>true</optional>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
+
+ <!--fastjson-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.47</version>
+ </dependency>
+
+ <!--鏁村悎druid鏁版嵁婧�-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid</artifactId>
+ <version>1.1.22</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid-spring-boot-starter</artifactId>
+ <version>1.1.22</version>
+ </dependency>
+
+ <!--text-->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <!--swagger-->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ <version>2.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ <version>2.9.2</version>
+ </dependency>
+
+ <!--httpclient-->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
+ <!--websocket-->
+ <dependency>
+ <groupId>javax.websocket</groupId>
+ <artifactId>javax.websocket-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-websocket</artifactId>
+ </dependency>
+
+ <!--oshi-->
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core</artifactId>
+ <version>4.4.2</version>
+ </dependency>
+
+ <!--commons-fileupload-->
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.11.0</version>
</dependency>
<!--gdal-->
@@ -126,16 +181,33 @@
<version>2.2.10</version>
</dependency>
- <!--commons-fileupload-->
+ <!--servlet-->
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.4</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
</dependency>
+
+ <!--apache.poi-->
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.11.0</version>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.16</version>
+ </dependency>
+
+ <!--SQLite-->
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.36.0.3</version>
+ </dependency>
+
+ <!--proj4j-->
+ <dependency>
+ <groupId>org.osgeo</groupId>
+ <artifactId>proj4j</artifactId>
+ <version>0.1.0</version>
</dependency>
<!--JTS-->
@@ -145,25 +217,6 @@
<version>1.19.0</version>
</dependency>
- <!--oshi-->
- <dependency>
- <groupId>com.github.oshi</groupId>
- <artifactId>oshi-core</artifactId>
- <version>4.4.2</version>
- </dependency>
-
- <!--swagger-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.9.2</version>
- </dependency>
-
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.9.2</version>
- </dependency>
</dependencies>
<build>
diff --git a/se-system/src/main/resources/application-dev.yml b/se-system/src/main/resources/application-dev.yml
deleted file mode 100644
index f0a7368..0000000
--- a/se-system/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,160 +0,0 @@
-server:
- tomcat:
- uri-encoding: UTF-8
- max-connections: 5000
- max-http-form-post-size: 50MB
- threads:
- max: 2000
- port: 12316
- servlet:
- context-path: /server
-
-spring:
- application:
- name: server
- # redis
- redis:
- database: 0
- host: 127.0.0.1
- port: 6369
- password: rediS_5L#F4_Server
- timeout: 10000 # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
- lettuce:
- pool:
- max-active: 1000 # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1 # 杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-idle: 10 # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- min-idle: 5 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- # session
- session:
- timeout: PT20M # 20鍒嗛挓
- # 璁剧疆涓婁紶鏂囦欢澶у皬
- servlet:
- multipart:
- enabled: true
- max-file-size: 204800MB
- max-request-size: 1048576MB
- # jackson
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
- locale: zh_CN
- thymeleaf:
- cache: false
- # datasource
- datasource:
- name: prod
- # JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
- #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:5433/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
- # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛宻tat:鐩戞帶缁熻銆乴og4j锛氭棩蹇楄褰曘�亀all锛氶槻寰ql娉ㄥ叆
- filters: stat,wall,log4j
- # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
- connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
- # 瓒呰繃鏃堕棿闄愬埗鏄惁鍥炴敹
- removeAbandoned: true
- # 瓒呮椂鏃堕棿锛涘崟浣嶄负绉掋��180绉�=3鍒嗛挓
- removeAbandonedTimeout: 180
- # 鍏抽棴 abanded 杩炴帴鏃惰緭鍑洪敊璇棩蹇�
- logAbandoned: true
- # 閰嶇疆杩炴帴姹犱俊鎭�
- druid:
- ## 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
- initial-size: 5
- min-idle: 5
- max-active: 100
- ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝ms
- max-wait: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- time-between-eviction-runs-millis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- min-evictable-idle-time-millis: 300000
- max-pool-prepared-statement-per-connection-size: 50
- pool-prepared-statements: true
- # 鐢ㄦ潵娴嬭瘯杩炴帴鏄惁鍙敤鐨凷QL璇彞
- validation-query: SELECT 1
- # 搴旂敤鍚戣繛鎺ユ睜鐢宠杩炴帴锛屽苟涓攖estOnBorrow涓篺alse鏃讹紝杩炴帴姹犲皢浼氬垽鏂繛鎺ユ槸鍚﹀浜庣┖闂茬姸鎬侊紝濡傛灉鏄紝鍒欓獙璇佽繖鏉¤繛鎺ユ槸鍚﹀彲鐢�
- test-while-idle: true
- # 濡傛灉涓簍rue锛岄粯璁ゆ槸false锛屽簲鐢ㄥ悜杩炴帴姹犵敵璇疯繛鎺ユ椂锛岃繛鎺ユ睜浼氬垽鏂繖鏉¤繛鎺ユ槸鍚︽槸鍙敤鐨�
- test-on-borrow: false
- # 濡傛灉涓簍rue锛堥粯璁alse锛夛紝褰撳簲鐢ㄤ娇鐢ㄥ畬杩炴帴锛岃繛鎺ユ睜鍥炴敹杩炴帴鐨勬椂鍊欎細鍒ゆ柇璇ヨ繛鎺ユ槸鍚﹁繕鍙敤
- test-on-return: false
- # servlet閰嶇疆
- stat-view-servlet:
- # sql鐩戞帶寮�鍏�
- enabled: true
- # 璁块棶鍐呯疆鐩戞帶椤甸潰鐨勮矾寰勶紝鍐呯疆鐩戞帶椤甸潰鐨勯椤垫槸/druid/index.html
- url-pattern: /druid/*
- # 鏄惁鍏佽娓呯┖缁熻鏁版嵁锛岄噸鏂拌绠� true:鍏佽 false:涓嶅厑璁�
- reset-enable: false
- # 閰嶇疆鐩戞帶椤甸潰璁块棶璐﹀彿瀵嗙爜
- #login-username: admin
- #login-password: ad_!Druid!_min
- # 鍏佽璁块棶鐨勫湴鍧�锛屽鏋渁llow娌℃湁閰嶇疆鎴栬�呬负绌猴紝鍒欏厑璁告墍鏈夎闂�
- allow:
- # 鎷掔粷璁块棶鐨勫湴鍧�锛宒eny浼樺厛浜巃llow
- deny:
-
-# mybatis
-#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
- config-location: classpath:mybatis.xml
- mapper-locations: classpath:mapper/**/*.xml
-
-# logging
-logging:
- config: classpath:logback-spring.xml
-
-# RestTemplate config
-remote:
- maxTotalConnect: 0
- maxConnectPerRoute: 1000
- connectTimeout: 30000
- readTimeout: -1
-
-# 绯荤粺閰嶇疆
-sys:
- # 鑷姩鏌ヨ
- autoQuery: 0
- # 绠＄悊鍛業D
- admin: ad_Lf1122_min
- # IIS鐨勪富鏈哄湴鍧�
- iisHost: 127.0.0.1
- # FME鏈嶅姟鍦板潃
- #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://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
- # 鐡︾墖鍦板潃
- tile_path: E:\data\99.public\soft\LFData\2d\tiles
- path:
- # 涓嬭浇鐩綍
- download: D:\LF\download
- # 涓婁紶鐩綍
- upload: D:\LF\upload
- # 涓存椂鐩綍
- temp: D:\LF\temp
- cad:
- exePath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/Bin/MxCAD/Release/mxcadassembly.exe
- targetPath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/SRC/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
diff --git a/se-system/src/main/resources/bootstrap.yml b/se-system/src/main/resources/bootstrap.yml
index 3c54846..24730b9 100644
--- a/se-system/src/main/resources/bootstrap.yml
+++ b/se-system/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
# Tomcat
server:
- port: 9201
+ port: 8002
# Spring
spring:
@@ -18,12 +18,14 @@
# 鏈嶅姟娉ㄥ唽鍦板潃
server-addr: 127.0.0.1:8848
config:
+ group: JHS_GROUP
# 閰嶇疆涓績鍦板潃
server-addr: 127.0.0.1:8848
# 閰嶇疆鏂囦欢鏍煎紡
file-extension: yml
# 鍏变韩閰嶇疆
shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ - data-id: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ group: JHS_GROUP
# 鍏佽鍒锋柊
refresh-enabled: true
--
Gitblit v1.9.3