Skip to content

更新jeecg-boot-starter3依赖 #5567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 13, 2023
Merged

更新jeecg-boot-starter3依赖 #5567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b056f9
更新jeecg-boot-starter3依赖
Nov 13, 2023
2416c8b
更新jeecg-boot-starter3依赖
Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
330 changes: 0 additions & 330 deletions jeecg-server-cloud/jeecg-cloud-nacos/docs/spring boot 3.X.sql
View file
Open in desktop

This file was deleted.

16 changes: 10 additions & 6 deletions jeecg-server-cloud/jeecg-demo-cloud-start/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@ spring:
cloud:
nacos:
config:
server-addr: localhost:8848
# username: @config.username@
# password: @config.password@
server-addr: @config.server-addr@
group: @config.group@
namespace: @config.namespace@
username: @config.username@
password: @config.password@
discovery:
server-addr: ${spring.cloud.nacos.config.server-addr}
# username: @config.username@
# password: @config.password@
group: @config.group@
namespace: @config.namespace@
username: @config.username@
password: @config.password@
config:
import:
- optional:nacos:jeecg.yaml
- optional:nacos:jeecg-dev.yaml
- optional:nacos:jeecg-@profile.name@.yaml
16 changes: 10 additions & 6 deletions jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@ spring:
cloud:
nacos:
config:
server-addr: localhost:8848
# username: @config.username@
# password: @config.password@
server-addr: @config.server-addr@
group: @config.group@
namespace: @config.namespace@
username: @config.username@
password: @config.password@
discovery:
server-addr: ${spring.cloud.nacos.config.server-addr}
# username: @config.username@
# password: @config.password@
group: @config.group@
namespace: @config.namespace@
username: @config.username@
password: @config.password@
config:
import:
- optional:nacos:jeecg.yaml
- optional:nacos:jeecg-dev.yaml
- optional:nacos:jeecg-@profile.name@.yaml
6 changes: 3 additions & 3 deletions ...-server-cloud/jeecg-system-cloud-start/src/main/resources/jeecg/jeecg_database.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#mysql
diver_name=com.mysql.jdbc.Driver
url=jdbc:mysql://172.16.10.227:3306/jeecg-boot2?useUnicode=true&characterEncoding=UTF-8
url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
username=root
password=Whdsj@redis0523
database_name=jeecg-boot2
password=root
database_name=jeecg-boot

#oracle
#diver_name=oracle.jdbc.driver.OracleDriver
Expand Down
2 changes: 1 addition & 1 deletion jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spring:
cloud:
nacos:
discovery:
server-addr: localhost:8848
server-addr: @config.server-addr@
metadata:
user.name: ${spring.security.user.name}
user.password: ${spring.security.user.password}
Expand Down
4 changes: 2 additions & 2 deletions jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ server:
#数据源配置
spring:
datasource:
url: jdbc:mysql://172.16.10.227:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
url: jdbc:mysql://jeecg-boot-mysql:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
username: ${MYSQL-USER:root}
password: ${MYSQL-PWD:root@2023}
password: ${MYSQL-PWD:root}
driver-class-name: com.mysql.jdbc.Driver
type: com.zaxxer.hikari.HikariDataSource
hikari:
Expand Down