finished fsjz function

atms-api/pom.xml

@@ -195,14 +195,16 @@
 			<version>1.10</version>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
+			<version>3.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 
 
+
 		<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
 		<dependency>
 			<groupId>com.alibaba</groupId>

atms-api/src/main/java/pwc/taxtech/atms/common/datasource/DataSourceFactory.java

@@ -9,8 +9,6 @@ import org.apache.commons.pool2.impl.DefaultPooledObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Properties;
-
 public class DataSourceFactory implements KeyedPooledObjectFactory<String, DruidDataSource> {
     private static final Logger logger = LoggerFactory.getLogger(DataSourceFactory.class);
     private DataSourceConfig dataSourceConfig;
@@ -30,11 +28,7 @@ public class DataSourceFactory implements KeyedPooledObjectFactory<String, Druid
         dynamicDataSource.setUrl(url);
         dynamicDataSource.setUsername(dataSourceConfig.getUsername());
         dynamicDataSource.setPassword(dataSourceConfig.getPassword());
-        //dynamicDataSource.init();
-//        Properties properties = new Properties();
-//        properties.setProperty("useUnicode","true");
-//        properties.setProperty("characterEncoding","utf8");
-//        dynamicDataSource.setConnectProperties(properties);
+        dynamicDataSource.init();
         return new DefaultPooledObject<>(dynamicDataSource);
     }
 

atms-api/src/main/resources/conf/conf_profile_dev.properties

-jdbc_url=jdbc:mysql://10.157.107.89:3306/tax_admin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&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_password=tax@Admin2018
 jdbc_admin_db=tax_admin
 
-jdbc_url_demo=jdbc:mysql://10.157.107.89:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&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_user=sa
@@ -14,7 +14,7 @@ web.url=http://localhost:8080
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
 
-ftp.host=cnshaappulv004.asia.pwcinternal.com
+ftp.host=cnshaappulv003.asia.pwcinternal.com
 ftp.port=21
 ftp.user=ftpuser
 ftp.pwd=12345678

atms-api/src/main/resources/conf/conf_profile_staging.properties

-jdbc_url=jdbc:mysql://10.157.107.89:3306/tax_admin?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&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_password=tax@Admin2018
 jdbc_admin_db=tax_admin
 
-jdbc_url_demo=jdbc:mysql://10.157.107.89:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&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_user=sa
@@ -14,7 +14,7 @@ web.url=http://cnshaappulv004:8080
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
 
-ftp.host=cnshaappulv004.asia.pwcinternal.com
+ftp.host=cnshaappulv003.asia.pwcinternal.com
 ftp.port=21
 ftp.user=ftpuser
 ftp.pwd=12345678