Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
task-kolon
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
piplus-v3
task-kolon
Commits
d056fa23
Commit
d056fa23
authored
Apr 28, 2016
by
陈家荣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
2f816372
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
KolonMemberServiceImpl.java
...java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java
+6
-6
kolon.properties
src/main/resources/kolon.properties
+8
-3
No files found.
src/main/java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java
View file @
d056fa23
...
...
@@ -84,16 +84,16 @@ public class KolonMemberServiceImpl implements KolonMemberService {
kolonMember
.
email
=
kolonMemberDTO
.
email
;
flag
=
true
;
}
if
(!
Util
.
isNotNull
(
kolonMember
.
wechatF
irstName
)
||
!
kolonMember
.
wechatF
irstName
if
(!
Util
.
isNotNull
(
kolonMember
.
f
irstName
)
||
!
kolonMember
.
f
irstName
.
endsWith
(
kolonMemberDTO
.
firstName
))
{
kolonMember
.
wechatF
irstName
=
kolonMemberDTO
.
firstName
;
kolonMember
.
f
irstName
=
kolonMemberDTO
.
firstName
;
flag
=
true
;
}
if
(!
Util
.
isNotNull
(
kolonMember
.
wechatL
astName
)
||
!
kolonMember
.
wechatL
astName
if
(!
Util
.
isNotNull
(
kolonMember
.
l
astName
)
||
!
kolonMember
.
l
astName
.
endsWith
(
kolonMemberDTO
.
lastName
))
{
kolonMember
.
wechatL
astName
=
kolonMemberDTO
.
lastName
;
kolonMember
.
l
astName
=
kolonMemberDTO
.
lastName
;
flag
=
true
;
}
if
(
flag
)
{
...
...
src/main/resources/kolon.properties
View file @
d056fa23
...
...
@@ -18,10 +18,15 @@ kolon.dubbo.port=21896
kolon.property.variableTypeName
=
KOLON_PROPERTY
kolon.property.variableCode
=
LAST_SEND_TIME
kolon.property.ftp.server
=
kolon-report.emarsyshk.com
#kolon.property.ftp.server = kolon-report.emarsyshk.com
#kolon.property.ftp.port = 21
#kolon.property.ftp.userName = wechat@kolon-report.emarsyshk.com
#kolon.property.ftp.password = p&}e^MLPcNBI
kolon.property.ftp.server
=
112.124.57.138
kolon.property.ftp.port
=
21
kolon.property.ftp.userName
=
wechat@kolon-report.emarsyshk.com
kolon.property.ftp.password
=
p&}e^MLPcNBI
kolon.property.ftp.userName
=
mark
kolon.property.ftp.password
=
yang19821123
kolon.property.ftp.getFileDir
=
/Emarsys/
kolon.property.ftp.getFileHistoryDir
=
/Emarsys/history/
...
...
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