Skip to content

Commit 4a9eda4

Browse files
Merge pull request #5567 from EightMonth/spring3
更新jeecg-boot-starter3依赖
2 parents a93998d + 2416c8b commit 4a9eda4

File tree

6 files changed

+26
-348
lines changed

6 files changed

+26
-348
lines changed

jeecg-server-cloud/jeecg-cloud-nacos/docs/spring boot 3.X.sql

-330
This file was deleted.

jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@ spring:
77
cloud:
88
nacos:
99
config:
10-
server-addr: localhost:8848
11-
# username: @config.username@
12-
# password: @config.password@
10+
server-addr: @config.server-addr@
11+
group: @config.group@
12+
namespace: @config.namespace@
13+
username: @config.username@
14+
password: @config.password@
1315
discovery:
1416
server-addr: ${spring.cloud.nacos.config.server-addr}
15-
# username: @config.username@
16-
# password: @config.password@
17+
group: @config.group@
18+
namespace: @config.namespace@
19+
username: @config.username@
20+
password: @config.password@
1721
config:
1822
import:
1923
- optional:nacos:jeecg.yaml
20-
- optional:nacos:jeecg-dev.yaml
24+
- optional:nacos:jeecg-@profile.name@.yaml

jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@ spring:
77
cloud:
88
nacos:
99
config:
10-
server-addr: localhost:8848
11-
# username: @config.username@
12-
# password: @config.password@
10+
server-addr: @config.server-addr@
11+
group: @config.group@
12+
namespace: @config.namespace@
13+
username: @config.username@
14+
password: @config.password@
1315
discovery:
1416
server-addr: ${spring.cloud.nacos.config.server-addr}
15-
# username: @config.username@
16-
# password: @config.password@
17+
group: @config.group@
18+
namespace: @config.namespace@
19+
username: @config.username@
20+
password: @config.password@
1721
config:
1822
import:
1923
- optional:nacos:jeecg.yaml
20-
- optional:nacos:jeecg-dev.yaml
24+
- optional:nacos:jeecg-@profile.name@.yaml

jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/jeecg/jeecg_database.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#mysql
22
diver_name=com.mysql.jdbc.Driver
3-
url=jdbc:mysql://172.16.10.227:3306/jeecg-boot2?useUnicode=true&characterEncoding=UTF-8
3+
url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
44
username=root
5-
password=Whdsj@redis0523
6-
database_name=jeecg-boot2
5+
password=root
6+
database_name=jeecg-boot
77

88
#oracle
99
#diver_name=oracle.jdbc.driver.OracleDriver

jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/resources/application.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spring:
1919
cloud:
2020
nacos:
2121
discovery:
22-
server-addr: localhost:8848
22+
server-addr: @config.server-addr@
2323
metadata:
2424
user.name: ${spring.security.user.name}
2525
user.password: ${spring.security.user.password}

jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/application.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ server:
55
#数据源配置
66
spring:
77
datasource:
8-
url: jdbc:mysql://172.16.10.227:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
8+
url: jdbc:mysql://jeecg-boot-mysql:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
99
username: ${MYSQL-USER:root}
10-
password: ${MYSQL-PWD:root@2023}
10+
password: ${MYSQL-PWD:root}
1111
driver-class-name: com.mysql.jdbc.Driver
1212
type: com.zaxxer.hikari.HikariDataSource
1313
hikari:

0 commit comments

Comments
 (0)