Skip to content

A
admin
Commit 75e83dcd authored by zhangyong's avatar zhangyong
Browse files
Options

Merge branch 'master' of http://zhangyong@gitlab.egolm.com/key/admin.git

parents 6c948840 ebc2d876
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
src/main/resources/application-pro.properties
View file @ 75e83dcd
server.tomcat.max-threads=1000 server.tomcat.max-threads=1000
server.tomcat.min-spare-threads=30 server.tomcat.min-spare-threads=30
server.port=8090 server.port=30001
server.context-path=/ server.context-path=/admin
server.session.timeout=90000 server.session.timeout=90000
server.tomcat.uri-encoding=utf-8 server.tomcat.uri-encoding=utf-8
...@@ -21,10 +21,11 @@ spring.datasource.config.validationQuery=SELECT 1 ...@@ -21,10 +21,11 @@ spring.datasource.config.validationQuery=SELECT 1
spring.datasource.config.timeBetweenEvictionRunsMillis=3600000 spring.datasource.config.timeBetweenEvictionRunsMillis=3600000
spring.datasource.shop.username=sa spring.datasource.shop.username=ERP
spring.datasource.shop.password=qiyang spring.datasource.shop.password=qiyang@2013
spring.datasource.shop.url=jdbc:sqlserver://10.10.0.51:56443;instanceName=SQLSERVER;DatabaseName=EGOLMSAAS spring.datasource.shop.url=jdbc:sqlserver://10.10.0.22:1433;instanceName=SQLSERVER;DatabaseName=EGOLMDEV
spring.datasource.shop.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver spring.datasource.shop.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
spring.datasource.shop.testWhileIdle=true spring.datasource.shop.testWhileIdle=true
spring.datasource.shop.validationQueryTimeout=5
spring.datasource.shop.validationQuery=SELECT 1 spring.datasource.shop.validationQuery=SELECT 1
spring.datasource.shop.timeBetweenEvictionRunsMillis=3600000 spring.datasource.shop.timeBetweenEvictionRunsMillis=3600000
\ No newline at end of file
src/main/resources/application-test.properties
View file @ 75e83dcd
server.tomcat.max-threads=1000 server.tomcat.max-threads=1000
server.tomcat.min-spare-threads=30 server.tomcat.min-spare-threads=30
server.port=8090 server.port=30001
server.context-path=/ server.context-path=/admin
server.session.timeout=90000 server.session.timeout=90000
server.tomcat.uri-encoding=utf-8 server.tomcat.uri-encoding=utf-8
...@@ -21,10 +21,11 @@ spring.datasource.config.validationQuery=SELECT 1 ...@@ -21,10 +21,11 @@ spring.datasource.config.validationQuery=SELECT 1
spring.datasource.config.timeBetweenEvictionRunsMillis=3600000 spring.datasource.config.timeBetweenEvictionRunsMillis=3600000
spring.datasource.shop.username=sa spring.datasource.shop.username=ERP
spring.datasource.shop.password=qiyang spring.datasource.shop.password=qiyang@2013
spring.datasource.shop.url=jdbc:sqlserver://10.10.0.51:56443;instanceName=SQLSERVER;DatabaseName=EGOLMSAAS spring.datasource.shop.url=jdbc:sqlserver://10.10.0.22:1433;instanceName=SQLSERVER;DatabaseName=EGOLMDEV
spring.datasource.shop.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver spring.datasource.shop.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
spring.datasource.shop.testWhileIdle=true spring.datasource.shop.testWhileIdle=true
spring.datasource.shop.validationQueryTimeout=5
spring.datasource.shop.validationQuery=SELECT 1 spring.datasource.shop.validationQuery=SELECT 1
spring.datasource.shop.timeBetweenEvictionRunsMillis=3600000 spring.datasource.shop.timeBetweenEvictionRunsMillis=3600000
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment