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
b47a09f4
Commit
b47a09f4
authored
Mar 18, 2019
by
kevin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#
parent
f29b7fa0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
12 deletions
+4
-12
conf_profile_pub.properties
atms-api/src/main/resources/conf/conf_profile_pub.properties
+3
-3
OperationLogEntryLog.java
...in/java/pwc/taxtech/atms/entity/OperationLogEntryLog.java
+0
-8
conf_profile_pub.properties
atms-web/src/main/resources/conf_profile_pub.properties
+1
-1
No files found.
atms-api/src/main/resources/conf/conf_profile_pub.properties
View file @
b47a09f4
...
...
@@ -15,7 +15,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
mail_jdbc_user
=
sa
mail_jdbc_password
=
atmsunittestSQL
web.url
=
http://
172.20.201.164
:9001
web.url
=
http://
dts.erp.didichuxing.com
:9001
#web.url=*
jwt.base64Secret
=
TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken
=
xxxx
...
...
@@ -23,7 +23,7 @@ jwt.expireSecond=180000
jwt.refreshSecond
=
600
#File Server Config
file.server.url
=
http://
172.20.201.164
:9001
file.server.url
=
http://
dts.erp.didichuxing.com
:9001
file.server.upload
=
/api/v1/upload
#upload
...
...
@@ -33,7 +33,7 @@ max_file_length=104857600
distributed_id_datacenter
=
10
distributed_id_machine
=
15
api.url
=
http://
172.20.201.164
:8180
api.url
=
http://
dts.erp.didichuxing.com
:8180
# Longi config
longi_api_basic_user
=
...
...
atms-dao/src/main/java/pwc/taxtech/atms/entity/OperationLogEntryLog.java
View file @
b47a09f4
...
...
@@ -162,7 +162,6 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
private
String
createTime
;
/**
*
...
...
@@ -582,9 +581,6 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
public
String
getCreateTime
()
{
return
createTime
;
}
/**
* This method was generated by MyBatis Generator.
...
...
@@ -594,9 +590,6 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
*
* @mbg.generated
*/
public
void
setCreateTime
(
String
createTime
)
{
this
.
createTime
=
createTime
==
null
?
null
:
createTime
.
trim
();
}
/**
* This method was generated by MyBatis Generator.
...
...
@@ -674,7 +667,6 @@ public class OperationLogEntryLog extends BaseEntity implements Serializable {
sb
.
append
(
", updateTime="
).
append
(
updateTime
);
sb
.
append
(
", voucherNum="
).
append
(
voucherNum
);
sb
.
append
(
", orgCode="
).
append
(
orgCode
);
sb
.
append
(
", createTime="
).
append
(
createTime
);
sb
.
append
(
", createBy="
).
append
(
createBy
);
sb
.
append
(
", updateBy="
).
append
(
updateBy
);
sb
.
append
(
"]"
);
...
...
atms-web/src/main/resources/conf_profile_pub.properties
View file @
b47a09f4
api.url
=
http://
172.20.201.164
:8180/
api.url
=
http://
dts.erp.didichuxing.com
:8180/
jwt.base64Secret
=
TXppQjFlZFBSbnJzMHc0Tg==
jwt.powerToken
=
xxxx
...
...
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