Commit 882f0444 authored by eddie.woo's avatar eddie.woo

fix

parent 0f67a6e0
...@@ -195,14 +195,16 @@ ...@@ -195,14 +195,16 @@
<version>1.10</version> <version>1.10</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>2.5</version> <version>3.1.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson --> <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
......
...@@ -28,6 +28,7 @@ public class DataSourceFactory implements KeyedPooledObjectFactory<String, Druid ...@@ -28,6 +28,7 @@ public class DataSourceFactory implements KeyedPooledObjectFactory<String, Druid
dynamicDataSource.setUrl(url); dynamicDataSource.setUrl(url);
dynamicDataSource.setUsername(dataSourceConfig.getUsername()); dynamicDataSource.setUsername(dataSourceConfig.getUsername());
dynamicDataSource.setPassword(dataSourceConfig.getPassword()); dynamicDataSource.setPassword(dataSourceConfig.getPassword());
dynamicDataSource.init();
return new DefaultPooledObject<>(dynamicDataSource); return new DefaultPooledObject<>(dynamicDataSource);
} }
......
jdbc_url=jdbc:mysql://10.157.107.89:3306/tax_admin?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true jdbc_url=jdbc:mysql://10.157.107.89:3306/tax_admin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
jdbc_user=root jdbc_user=root
jdbc_password=tax@Admin2018 jdbc_password=tax@Admin2018
jdbc_admin_db=tax_admin jdbc_admin_db=tax_admin
jdbc_url_demo=jdbc:mysql://10.157.107.89:3306/demo_db_name?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true jdbc_url_demo=jdbc:mysql://10.157.107.89:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
mail_jdbc_user=sa mail_jdbc_user=sa
...@@ -14,7 +14,7 @@ web.url=http://localhost:8080 ...@@ -14,7 +14,7 @@ web.url=http://localhost:8080
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg== jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx jwt.powerToken=xxxx
ftp.host=cnshaappulv004.asia.pwcinternal.com ftp.host=cnshaappulv003.asia.pwcinternal.com
ftp.port=21 ftp.port=21
ftp.user=ftpuser ftp.user=ftpuser
ftp.pwd=12345678 ftp.pwd=12345678
......
jdbc_url=jdbc:mysql://10.157.107.89:3306/tax_admin?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true jdbc_url=jdbc:mysql://10.157.107.89:3306/tax_admin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
jdbc_user=root jdbc_user=root
jdbc_password=tax@Admin2018 jdbc_password=tax@Admin2018
jdbc_admin_db=tax_admin jdbc_admin_db=tax_admin
jdbc_url_demo=jdbc:mysql://10.157.107.89:3306/demo_db_name?useUnicode=true&amp;characterEncoding=utf-8&amp;zeroDateTimeBehavior=convertToNull&amp;allowMultiQueries=true jdbc_url_demo=jdbc:mysql://10.157.107.89:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
mail_jdbc_user=sa mail_jdbc_user=sa
...@@ -14,7 +14,7 @@ web.url=http://cnshaappulv004:8080 ...@@ -14,7 +14,7 @@ web.url=http://cnshaappulv004:8080
jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg== jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken=xxxx jwt.powerToken=xxxx
ftp.host=cnshaappulv004.asia.pwcinternal.com ftp.host=cnshaappulv003.asia.pwcinternal.com
ftp.port=21 ftp.port=21
ftp.user=ftpuser ftp.user=ftpuser
ftp.pwd=12345678 ftp.pwd=12345678
......
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