Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vehicle-quality-review
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王飞
vehicle-quality-review
Commits
18dfb4b1
Commit
18dfb4b1
authored
Jun 05, 2024
by
王飞
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wangfei' into 'dev'
1、配置新测试环境的相关地址与端口 See merge request
!351
parents
c30cdd26
02e631a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
application-druid.yml
ruoyi-admin/src/main/resources/application-druid.yml
+6
-6
application.yml
ruoyi-admin/src/main/resources/application.yml
+4
-4
No files found.
ruoyi-admin/src/main/resources/application-druid.yml
View file @
18dfb4b1
...
...
@@ -6,16 +6,16 @@ spring:
druid
:
# 主库数据源
master
:
url
:
jdbc:mysql://
49.232.167.247:22030
/vehicle-quality-review?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&sessionVariables=group_concat_max_len=3000
url
:
jdbc:mysql://
106.3.99.64:20011
/vehicle-quality-review?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&sessionVariables=group_concat_max_len=3000
username
:
root
password
:
1qaz@WSX
# 从库数据源
slave
:
# 从数据源开关/默认关闭
enabled
:
false
url
:
username
:
password
:
url
:
username
:
password
:
# 初始连接数
initialSize
:
5
# 最小连接池数量
...
...
@@ -39,7 +39,7 @@ spring:
testWhileIdle
:
true
testOnBorrow
:
false
testOnReturn
:
false
webStatFilter
:
webStatFilter
:
enabled
:
true
statViewServlet
:
enabled
:
true
...
...
@@ -58,4 +58,4 @@ spring:
merge-sql
:
true
wall
:
config
:
multi-statement-allow
:
true
multi-statement-allow
:
true
\ No newline at end of file
ruoyi-admin/src/main/resources/application.yml
View file @
18dfb4b1
...
...
@@ -18,7 +18,7 @@ ruoyi:
# 开发环境配置
server
:
# 服务器的HTTP端口,默认为8080
port
:
220
32
port
:
220
16
servlet
:
# 应用的访问路径
context-path
:
/
...
...
@@ -70,9 +70,9 @@ spring:
# redis 配置
redis
:
# 地址
host
:
49.232.167.247
host
:
106.3.99.64
# 端口,默认为6379
port
:
220
31
port
:
220
12
# 数据库索引
database
:
0
# 密码
...
...
@@ -146,7 +146,7 @@ xss:
urlPatterns
:
/*
minio
:
url
:
http://
49.232.167.247:22038
url
:
http://
106.3.99.64:22013
accessKey
:
lB7WhZYiQwLzhHPutRGn
secretKey
:
7XMWpLm6p4d20OFe9uXKifEyhF3cp4sTCowI2fhJ
bucketName
:
vehicle-quality-review-oss
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment