Skip to content

Commit 2b5975d

Browse files
houkohouko
committed
Merge remote-tracking branch 'origin/master'
2 parents 4859b54 + 4322888 commit 2b5975d

5 files changed

Lines changed: 5 additions & 0 deletions

File tree

‎admin/src/main/resources/config/application.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8080
3+
server.session.timeout=1800
34
#datasource
45
spring.datasource.url=jdbc:mysql://115.29.137.34/xiaomo?useUnicode=true&characterEncoding=UTF-8
56
spring.datasource.username=xiaomo

‎admin/src/test/resources/config/application.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8080
3+
server.session.timeout=1800
34
#datasource
45
spring.datasource.url=jdbc:mysql://115.29.137.34/xiaomo?useUnicode=true&characterEncoding=UTF-8
56
spring.datasource.username=xiaomo

‎core/src/main/resources/config/application.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=80
3+
server.session.timeout=1800
34
#datasource
45
spring.datasource.url=jdbc:mysql://115.29.137.34/xiaomo?useUnicode=true&characterEncoding=UTF-8
56
spring.datasource.username=xiaomo

‎web/src/main/resources/config/application.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8888
3+
server.session.timeout=1800
34
#datasource
45
spring.datasource.url=jdbc:mysql://115.29.137.34/xiaomo?useUnicode=true&characterEncoding=UTF-8
56
spring.datasource.username=xiaomo

‎web/src/test/resources/config/application.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
logging.config=classpath:config/logback-dev.xml
22
server.port=8888
3+
server.session.timeout=1800
34
#datasource
45
spring.datasource.url=jdbc:mysql://115.29.137.34/xiaomo?useUnicode=true&characterEncoding=UTF-8
56
spring.datasource.username=xiaomo

0 commit comments

Comments
 (0)