Skip to content

T
task-kolon
Commit 0fc65ba4 authored by 刘文胜's avatar 刘文胜
Browse files
Options

修改配置

parent 4ba74664
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 59 deletions
src/main/java/com/hdp/pi/utils/kolon/FtpMemberUtil.java
View file @ 0fc65ba4
...@@ -45,7 +45,7 @@ public class FtpMemberUtil { ...@@ -45,7 +45,7 @@ public class FtpMemberUtil {
@Value("${kolon.property.member.ftp.getFileDir}") @Value("${kolon.property.member.ftp.getFileDir}")
private String getFileDir; private String getFileDir;
@Value("${kolon.property.member.ftp.getFileName}") @Value("${kolon.property.member.ftp.fileName}")
private String fileNameFormat; private String fileNameFormat;
/** /**
......
src/main/java/com/hdp/pi/utils/kolon/FtpScheduledTask.java
View file @ 0fc65ba4
...@@ -36,9 +36,6 @@ public class FtpScheduledTask { ...@@ -36,9 +36,6 @@ public class FtpScheduledTask {
@Value("${kolon.property.variableCode}") @Value("${kolon.property.variableCode}")
private String variableCode; private String variableCode;
@Autowired
private FtpUtil ftpUtil;
// 每天上午10:30触发 // 每天上午10:30触发
@Scheduled(cron = "0 30 10 * * ?") @Scheduled(cron = "0 30 10 * * ?")
public void scheduledReadTask() { public void scheduledReadTask() {
......
src/main/resources/META-INF/spring/applicationContext.xml
View file @ 0fc65ba4
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
<bean id="kolonMemberService" class="com.hdp.pi.service.kolon.KolonMemberServiceImpl" /> <bean id="kolonMemberService" class="com.hdp.pi.service.kolon.KolonMemberServiceImpl" />
<bean id="ftpUtil" class="com.hdp.pi.utils.kolon.FtpUtil" /> <bean id="ftpMemberUtil" class="com.hdp.pi.utils.kolon.FtpMemberUtil" />
<bean id="ftpProductUtil" class="com.hdp.pi.utils.kolon.FtpProductUtil" />
<bean id="ftpSaleUtil" class="com.hdp.pi.utils.kolon.FtpSaleUtil" />
<dubbo:reference interface="com.hdp.pi.service.baseservice.GlobalVariableService" <dubbo:reference interface="com.hdp.pi.service.baseservice.GlobalVariableService"
id="globalVariableService" version="1.0.0" /> id="globalVariableService" version="1.0.0" />
......
src/main/resources/kolon.dev.properties
View file @ 0fc65ba4
...@@ -14,13 +14,26 @@ dubbo.register=172.18.5.201:3181 ...@@ -14,13 +14,26 @@ dubbo.register=172.18.5.201:3181
kolon.property.businessCode = 100001 kolon.property.businessCode = 100001
kolon.property.member.ftp.server = 112.124.57.138 #kolon.property.member.ftp.server = 112.124.57.138
#kolon.property.member.ftp.port = 21
#kolon.property.member.ftp.userName = mark
#kolon.property.member.ftp.password = yang19821123
#kolon.property.member.ftp.getFileDir = /SCRM/export/
#kolon.property.member.ftp.getFileHistoryDir = /SCRM/history/
#kolon.property.member.ftp.fileName = Wechat_export
#kolon.property.member.ftp.tempFileDir = /temp
#kolon.property.member.ftp.tempAddFileName = /temp/tempAddContact.csv
#kolon.property.member.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv
#kolon.property.member.ftp.putFileDir = /SCRM/
#kolon.property.member.ftp.putAddFileName = newContact_YYYY-MM-dd.csv
#kolon.property.member.ftp.putUpdateFileName = updateContact_YYYY-MM-dd.csv
kolon.property.member.ftp.server = kolon-report.emarsyshk.com
kolon.property.member.ftp.port = 21 kolon.property.member.ftp.port = 21
kolon.property.member.ftp.userName = mark kolon.property.member.ftp.userName = wechat2@kolon-report.emarsyshk.com
kolon.property.member.ftp.password = yang19821123 kolon.property.member.ftp.password = RkcsTFO*g7xM
kolon.property.member.ftp.getFileDir = /SCRM/export/ kolon.property.member.ftp.getFileDir = /export/
kolon.property.member.ftp.getFileHistoryDir = /SCRM/history/ kolon.property.member.ftp.getFileHistoryDir = /export/history/
kolon.property.member.ftp.getFileName = Wechat_export kolon.property.member.ftp.fileName = Wechat_export
kolon.property.member.ftp.tempFileDir = /temp kolon.property.member.ftp.tempFileDir = /temp
kolon.property.member.ftp.tempAddFileName = /temp/tempAddContact.csv kolon.property.member.ftp.tempAddFileName = /temp/tempAddContact.csv
kolon.property.member.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv kolon.property.member.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv
...@@ -28,18 +41,18 @@ kolon.property.member.ftp.putFileDir = /SCRM/ ...@@ -28,18 +41,18 @@ kolon.property.member.ftp.putFileDir = /SCRM/
kolon.property.member.ftp.putAddFileName = newContact_YYYY-MM-dd.csv kolon.property.member.ftp.putAddFileName = newContact_YYYY-MM-dd.csv
kolon.property.member.ftp.putUpdateFileName = updateContact_YYYY-MM-dd.csv kolon.property.member.ftp.putUpdateFileName = updateContact_YYYY-MM-dd.csv
kolon.property.product.ftp.server = 112.124.57.138 kolon.property.product.ftp.server = exchange.si.emarsys.net
kolon.property.product.ftp.port = 21 kolon.property.product.ftp.port = 21
kolon.property.product.ftp.userName = mark kolon.property.product.ftp.userName = kolon
kolon.property.product.ftp.password = yang19821123 kolon.property.product.ftp.password = UQzxqi5vbahgIARwVfKz
kolon.property.product.ftp.getFileDir = /SCRM/export/ kolon.property.product.ftp.getFileDir = /
kolon.property.product.ftp.getFileHistoryDir = /SCRM/history/ kolon.property.product.ftp.getFileHistoryDir = /history/
kolon.property.product.ftp.getFileName = products kolon.property.product.ftp.fileName = products
kolon.property.sale.ftp.server = 112.124.57.138 kolon.property.sale.ftp.server = exchange.si.emarsys.net
kolon.property.sale.ftp.port = 21 kolon.property.sale.ftp.port = 21
kolon.property.sale.ftp.userName = mark kolon.property.sale.ftp.userName = kolon
kolon.property.sale.ftp.password = yang19821123 kolon.property.sale.ftp.password = UQzxqi5vbahgIARwVfKz
kolon.property.sale.ftp.getFileDir = /SCRM/export/ kolon.property.sale.ftp.getFileDir = /
kolon.property.sale.ftp.getFileHistoryDir = /SCRM/history/ kolon.property.sale.ftp.getFileHistoryDir = /history/
kolon.property.sale.ftp.getFileName = sales kolon.property.sale.ftp.fileName = sales
\ No newline at end of file \ No newline at end of file
src/main/resources/kolon.prod.properties
View file @ 0fc65ba4
...@@ -13,13 +13,13 @@ dubbo.register=10.173.227.160:2181,10.173.224.92:2181,10.173.226.96:2181 ...@@ -13,13 +13,13 @@ dubbo.register=10.173.227.160:2181,10.173.224.92:2181,10.173.226.96:2181
kolon.property.businessCode = 100073 kolon.property.businessCode = 100073
kolon.property.member.ftp.server = 112.124.57.138 kolon.property.member.ftp.server = kolon-report.emarsyshk.com
kolon.property.member.ftp.port = 21 kolon.property.member.ftp.port = 21
kolon.property.member.ftp.userName = mark kolon.property.member.ftp.userName = wechat2@kolon-report.emarsyshk.com
kolon.property.member.ftp.password = yang19821123 kolon.property.member.ftp.password = RkcsTFO*g7xM
kolon.property.member.ftp.getFileDir = /SCRM/export/ kolon.property.member.ftp.getFileDir = /export/
kolon.property.member.ftp.getFileHistoryDir = /SCRM/history/ kolon.property.member.ftp.getFileHistoryDir = /export/history/
kolon.property.member.ftp.getFileName = Wechat_export kolon.property.member.ftp.fileName = Wechat_export
kolon.property.member.ftp.tempFileDir = /temp kolon.property.member.ftp.tempFileDir = /temp
kolon.property.member.ftp.tempAddFileName = /temp/tempAddContact.csv kolon.property.member.ftp.tempAddFileName = /temp/tempAddContact.csv
kolon.property.member.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv kolon.property.member.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv
...@@ -27,18 +27,18 @@ kolon.property.member.ftp.putFileDir = /SCRM/ ...@@ -27,18 +27,18 @@ kolon.property.member.ftp.putFileDir = /SCRM/
kolon.property.member.ftp.putAddFileName = newContact_YYYY-MM-dd.csv kolon.property.member.ftp.putAddFileName = newContact_YYYY-MM-dd.csv
kolon.property.member.ftp.putUpdateFileName = updateContact_YYYY-MM-dd.csv kolon.property.member.ftp.putUpdateFileName = updateContact_YYYY-MM-dd.csv
kolon.property.product.ftp.server = 112.124.57.138 kolon.property.product.ftp.server = exchange.si.emarsys.net
kolon.property.product.ftp.port = 21 kolon.property.product.ftp.port = 21
kolon.property.product.ftp.userName = mark kolon.property.product.ftp.userName = kolon
kolon.property.product.ftp.password = yang19821123 kolon.property.product.ftp.password = UQzxqi5vbahgIARwVfKz
kolon.property.product.ftp.getFileDir = /SCRM/export/ kolon.property.product.ftp.getFileDir = /
kolon.property.product.ftp.getFileHistoryDir = /SCRM/history/ kolon.property.product.ftp.getFileHistoryDir = /history/
kolon.property.product.ftp.getFileName = products kolon.property.product.ftp.fileName = products
kolon.property.sale.ftp.server = 112.124.57.138 kolon.property.sale.ftp.server = exchange.si.emarsys.net
kolon.property.sale.ftp.port = 21 kolon.property.sale.ftp.port = 21
kolon.property.sale.ftp.userName = mark kolon.property.sale.ftp.userName = kolon
kolon.property.sale.ftp.password = yang19821123 kolon.property.sale.ftp.password = UQzxqi5vbahgIARwVfKz
kolon.property.sale.ftp.getFileDir = /SCRM/export/ kolon.property.sale.ftp.getFileDir = /
kolon.property.sale.ftp.getFileHistoryDir = /SCRM/history/ kolon.property.sale.ftp.getFileHistoryDir = /history/
kolon.property.sale.ftp.getFileName = sales kolon.property.sale.ftp.fileName = sales
\ No newline at end of file
src/main/resources/kolon.sandbox.properties
View file @ 0fc65ba4
...@@ -14,13 +14,13 @@ dubbo.register=115.29.165.17:2181 ...@@ -14,13 +14,13 @@ dubbo.register=115.29.165.17:2181
kolon.property.businessCode = 100051 kolon.property.businessCode = 100051
kolon.property.member.ftp.server = 112.124.57.138 kolon.property.member.ftp.server = kolon-report.emarsyshk.com
kolon.property.member.ftp.port = 21 kolon.property.member.ftp.port = 21
kolon.property.member.ftp.userName = mark kolon.property.member.ftp.userName = wechat2@kolon-report.emarsyshk.com
kolon.property.member.ftp.password = yang19821123 kolon.property.member.ftp.password = RkcsTFO*g7xM
kolon.property.member.ftp.getFileDir = /SCRM/export/ kolon.property.member.ftp.getFileDir = /export/
kolon.property.member.ftp.getFileHistoryDir = /SCRM/history/ kolon.property.member.ftp.getFileHistoryDir = /export/history/
kolon.property.member.ftp.getFileName = Wechat_export kolon.property.member.ftp.fileName = Wechat_export
kolon.property.member.ftp.tempFileDir = /temp kolon.property.member.ftp.tempFileDir = /temp
kolon.property.member.ftp.tempAddFileName = /temp/tempAddContact.csv kolon.property.member.ftp.tempAddFileName = /temp/tempAddContact.csv
kolon.property.member.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv kolon.property.member.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv
...@@ -28,18 +28,18 @@ kolon.property.member.ftp.putFileDir = /SCRM/ ...@@ -28,18 +28,18 @@ kolon.property.member.ftp.putFileDir = /SCRM/
kolon.property.member.ftp.putAddFileName = newContact_YYYY-MM-dd.csv kolon.property.member.ftp.putAddFileName = newContact_YYYY-MM-dd.csv
kolon.property.member.ftp.putUpdateFileName = updateContact_YYYY-MM-dd.csv kolon.property.member.ftp.putUpdateFileName = updateContact_YYYY-MM-dd.csv
kolon.property.product.ftp.server = 112.124.57.138 kolon.property.product.ftp.server = exchange.si.emarsys.net
kolon.property.product.ftp.port = 21 kolon.property.product.ftp.port = 21
kolon.property.product.ftp.userName = mark kolon.property.product.ftp.userName = kolon
kolon.property.product.ftp.password = yang19821123 kolon.property.product.ftp.password = UQzxqi5vbahgIARwVfKz
kolon.property.product.ftp.getFileDir = /SCRM/export/ kolon.property.product.ftp.getFileDir = /
kolon.property.product.ftp.getFileHistoryDir = /SCRM/history/ kolon.property.product.ftp.getFileHistoryDir = /history/
kolon.property.product.ftp.getFileName = products kolon.property.product.ftp.fileName = products
kolon.property.sale.ftp.server = 112.124.57.138 kolon.property.sale.ftp.server = exchange.si.emarsys.net
kolon.property.sale.ftp.port = 21 kolon.property.sale.ftp.port = 21
kolon.property.sale.ftp.userName = mark kolon.property.sale.ftp.userName = kolon
kolon.property.sale.ftp.password = yang19821123 kolon.property.sale.ftp.password = UQzxqi5vbahgIARwVfKz
kolon.property.sale.ftp.getFileDir = /SCRM/export/ kolon.property.sale.ftp.getFileDir = /
kolon.property.sale.ftp.getFileHistoryDir = /SCRM/history/ kolon.property.sale.ftp.getFileHistoryDir = /history/
kolon.property.sale.ftp.getFileName = sales kolon.property.sale.ftp.fileName = sales
\ No newline at end of file
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