Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Eladmin
Commits
029a932f
Commit
029a932f
authored
Sep 14, 2020
by
Elune
Committed by
Gitee
Sep 14, 2020
Browse files
!17 配置文件增加环境变量的支持,有环境变量则使用,没有则使用默认
Merge pull request !17 from suanyun/master
parents
babebdee
d992e9e9
Changes
4
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
029a932f
...
...
@@ -3,3 +3,4 @@
*.iml
*/target/*
*/*.iml
/.gradle/
eladmin-system/src/main/resources/config/application-dev.yml
View file @
029a932f
...
...
@@ -4,9 +4,9 @@ spring:
druid
:
db-type
:
com.alibaba.druid.pool.DruidDataSource
driverClassName
:
net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url
:
jdbc:log4jdbc:mysql://
localhost:3306/
eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username
:
root
password
:
123456
url
:
jdbc:log4jdbc:mysql://
${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:
eladmin
}
?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username
:
${DB_USER:
root
}
password
:
${DB_PWD:
123456
}
# 初始连接数
initial-size
:
5
# 最小连接数
...
...
eladmin-system/src/main/resources/config/application-prod.yml
View file @
029a932f
...
...
@@ -4,9 +4,9 @@ spring:
druid
:
db-type
:
com.alibaba.druid.pool.DruidDataSource
driverClassName
:
net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url
:
jdbc:log4jdbc:mysql://
localhost:3306/
eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username
:
root
password
:
123456
url
:
jdbc:log4jdbc:mysql://
${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:
eladmin
}
?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username
:
${DB_USER:
root
}
password
:
${DB_PWD:
123456
}
# 初始连接数
initial-size
:
5
# 最小连接数
...
...
eladmin-system/src/main/resources/config/application.yml
View file @
029a932f
...
...
@@ -23,10 +23,10 @@ spring:
redis
:
#数据库索引
database
:
0
host
:
127.0.0.1
port
:
6379
password
:
database
:
${REDIS_DB:0}
host
:
${REDIS_HOST:
127.0.0.1
}
port
:
${REDIS_PORT:
6379
}
password
:
${REDIS_PWD:}
#连接超时时间
timeout
:
5000
...
...
Write
Preview
Supports
Markdown
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