Commit d056fa23 authored by 陈家荣's avatar 陈家荣

update

parent 2f816372
......@@ -84,16 +84,16 @@ public class KolonMemberServiceImpl implements KolonMemberService {
kolonMember.email = kolonMemberDTO.email;
flag = true;
}
if (!Util.isNotNull(kolonMember.wechatFirstName)
|| !kolonMember.wechatFirstName
if (!Util.isNotNull(kolonMember.firstName)
|| !kolonMember.firstName
.endsWith(kolonMemberDTO.firstName)) {
kolonMember.wechatFirstName = kolonMemberDTO.firstName;
kolonMember.firstName = kolonMemberDTO.firstName;
flag = true;
}
if (!Util.isNotNull(kolonMember.wechatLastName)
|| !kolonMember.wechatLastName
if (!Util.isNotNull(kolonMember.lastName)
|| !kolonMember.lastName
.endsWith(kolonMemberDTO.lastName)) {
kolonMember.wechatLastName = kolonMemberDTO.lastName;
kolonMember.lastName = kolonMemberDTO.lastName;
flag = true;
}
if (flag) {
......
......@@ -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/
......
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