Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
882f0444
Commit
882f0444
authored
Jul 05, 2018
by
eddie.woo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
0f67a6e0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
8 deletions
+11
-8
pom.xml
atms-api/pom.xml
+4
-2
DataSourceFactory.java
...pwc/taxtech/atms/common/datasource/DataSourceFactory.java
+1
-0
conf_profile_dev.properties
atms-api/src/main/resources/conf/conf_profile_dev.properties
+3
-3
conf_profile_staging.properties
...i/src/main/resources/conf/conf_profile_staging.properties
+3
-3
No files found.
atms-api/pom.xml
View file @
882f0444
...
...
@@ -195,14 +195,16 @@
<version>
1.10
</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency>
<groupId>
javax.servlet
</groupId>
<artifactId>
servlet-api
</artifactId>
<version>
2.5
</version>
<artifactId>
javax.
servlet-api
</artifactId>
<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
View file @
882f0444
...
...
@@ -28,6 +28,7 @@ public class DataSourceFactory implements KeyedPooledObjectFactory<String, Druid
dynamicDataSource
.
setUrl
(
url
);
dynamicDataSource
.
setUsername
(
dataSourceConfig
.
getUsername
());
dynamicDataSource
.
setPassword
(
dataSourceConfig
.
getPassword
());
dynamicDataSource
.
init
();
return
new
DefaultPooledObject
<>(
dynamicDataSource
);
}
...
...
atms-api/src/main/resources/conf/conf_profile_dev.properties
View file @
882f0444
jdbc_url
=
jdbc:mysql://10.157.107.89:3306/tax_admin?useUnicode=true&
amp;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&
amp;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
=
cnshaappulv00
4
.asia.pwcinternal.com
ftp.host
=
cnshaappulv00
3
.asia.pwcinternal.com
ftp.port
=
21
ftp.user
=
ftpuser
ftp.pwd
=
12345678
...
...
atms-api/src/main/resources/conf/conf_profile_staging.properties
View file @
882f0444
jdbc_url
=
jdbc:mysql://10.157.107.89:3306/tax_admin?useUnicode=true&
amp;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&
amp;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
=
cnshaappulv00
4
.asia.pwcinternal.com
ftp.host
=
cnshaappulv00
3
.asia.pwcinternal.com
ftp.port
=
21
ftp.user
=
ftpuser
ftp.pwd
=
12345678
...
...
Write
Preview
Markdown
is supported
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