diff --git a/resources/application-local.properties b/resources/application-local.properties
deleted file mode 100644
index e47c289..0000000
--- a/resources/application-local.properties
+++ /dev/null
@@ -1,139 +0,0 @@
-
-server.port=80
-server.session.timeout=10
-
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=20MB
-
-spring.jackson.time-zone=GMT+8
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.mvc.dateFormat = yyyy-MM-dd HH:mm:ss
-spring.gson.serialize-nulls=true
-
-tokenfilter.enable=false
-
-logging.config=classpath:logback-local.xml
-
-
-mail.host=smtp.taover.com
-mail.port=25
-mail.username=taover-robot@taover.com
-mail.password=Lexi@1798
-mail.smtp.auth=true
-mail.smtp.sendFrom=taover-robot@taover.com
-
-spring.mvc.dispatch-options-request=true
-
-#spring.datasource.url=jdbc\:mysql\://192.168.3.189\:3306/8zyun_wxorder?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&zeroDateTimeBehavior\=convertToNull&transformedBitIsBoolean\=true
-#spring.datasource.username=root
-#spring.datasource.password=root
-
-
-spring.datasource.url=jdbc\:mysql\://121.42.142.102\:3306/bzyun_wxorder?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&zeroDateTimeBehavior\=convertToNull&transformedBitIsBoolean\=true
-spring.datasource.username=dev
-spring.datasource.password=taover02
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.max-idle=10
-spring.datasource.max-wait=10000
-spring.datasource.min-idle=5
-spring.datasource.initial-size=5
-
-#zto analysis address url
-#zto.analysisAddress.url=https://localhost/Word_AnalysisAddress
-zto.analysisAddress.url=https://hdgateway.zto.com/Word_AnalysisAddress
-#taover analysis address url
-taover.analysisAddress.url=http://address.taover.com/
-#kuaibao
-kuaibao.analysisAddress.url=https://kop.kuaidihelp.com/api
-kuaibao.analysisAddress.appId=105128
-kuaibao.analysisAddress.appKey=3310236ba4d6296e6e2346a7d9c824662510ff87
-kuaibao.analysisAddress.method=cloud.address.resolve
-kuaibao.analysisAddress.methodSimple=cloud.address.cleanse
-
-#aliyun oss
-accessKeyId=H4fIVB56iHjR6zQw
-accessKeySecret=7bA395UltFp16kWPJT7Pfz0XYXCk4Q
-endpoint=oss-cn-beijing.aliyuncs.com
-bucket_contact=8zyun-oss
-aliyun.mnsEndpoint=http://1225610490807748.mns.cn-hangzhou.aliyuncs.com
-#https://8zyun-oss.oss-cn-beijing.aliyuncs.com
-#mobile message url
-wwltData=sname=dlmzty00&spwd=A6cU4Tyx&scorpid=&sprdid=1012888
-wwltUrl=https://seccf.51welink.com/submitdata/service.asmx/g_Submit
-
-#root ssy callcenter api config
-ssy.callcenter.appid=c2MkSTjT8ghM
-ssy.callcenter.seckey=7105ec065b8bb30fa6e3f13fccf92d0f
-
-pc.callcenter.appid=c2MkSTjT8ghZ
-pc.callcenter.seckey=7105ec065b8bb30fa6e3f13fccf92d0G
-
-ssy.callcenter.subscribePreffixUrl=http://localhost/api/
-ssy.callcenter.subscribeSuffixUrl=/wxagentssymessagesubscribe
-
-
-ssy.callcenter.url.openapiSurrogacyAgent=/api/v2/openapi/surrogacy/agent
-ssy.callcenter.url.openapiSurrogacyQuerycontacts=/api/v2/openapi/surrogacy/querycontacts
-ssy.callcenter.url.openapiSurrogacySendmessage=/api/v2/openapi/surrogacy/sendmessage
-ssy.callcenter.url.openapiSurrogacyRegisteropenapi=/api/v2/openapi/surrogacy/registeropenapi
-ssy.callcenter.url.openapiSurrogacyUnregisteropenapi=/api/v2/openapi/surrogacy/unregisteropenapi
-ssy.callcenter.url.openapiCallcenterapibridgeService=/api/v2/openapi/callcenterapibridge/service
-ssy.callcenter.url.openapiCallGroupMember=/api/v2/openapi/surrogacy/querygroupmember
-
-
-
-
-ssy.upload.url=https://ssep.umsapi.com/api/v1/upload
-
-ssy.callcenter.sendMessage.preffixUrl=https://ssep.umsapi.com
-
-#weixin group text order confirm url
-wxorder.url.grouptextorder.confirm=http://localhost:8100/confirm/
-wxorder.url.express.search=http://localhost:8100/confirm/query-logistics/
-
-#ssy file server domain
-ssy.fileserver.urlpreffix=https://ss0.umsapi.com
-
-wxorder.front.url.host=http://localhost:8100
-
-platform.shop.registerUrl=http://localhost/common/authorization/index
-
-wxorder.platformgoods.matchurl=http://localhost/goods/channelgoods
-wxorder.platformgoods.errororderurl=https://localhost/ordererror/index
-wxorder.url.excellist=http://localhost/groupexcel/index
-
-#pc api
-pc.callcenter.url.openapiSurrogacyRegisteropenapi=http://192.168.3.236:18308/v1/agent
-pc.callcenter.url.openapiSurrogacyQuerycontacts=http://192.168.3.236:18308/v1/contacts/
-pc.callcenter.url.openapiCallGroupMember=http://192.168.3.236:18308/v1/contact/group_members/
-pc.callcenter.url.openapiSurrogacyAgent=http://192.168.3.236:18308/v1/agent
-pc.callcenter.url.openapiSurrogacySendmessage=http://192.168.3.236:18308/v1/message_task
-pc.callcenter.subscribeUrl=http://192.168.3.146/api/wxagentpcmessagesubscribe
-pc.callcenter.url.sendMessageQueueName=oms-pc-msg
-pc.callcenter.url.openapiContactsFeaturesgroup=http://192.168.3.236:18308/v1/contacts/
-
-pc.message.url.messageTaskListUrl=http://192.168.3.236:18308/v1/message_task_list
-pc.message.url.agentMessageTask=http://192.168.3.236:18308/v1/agent_message_task
-
-#cainiao param
-cainiao.link.url=http://link.cainiao.com/gateway/link.do
-cainiao.link.paramFormat=json
-cainiao.link.appKey=650167
-cainiao.link.secretKey=lDO6y26nBJ6b5K96lnA1an447H1L0XK3
-cainiao.link.auth.grantpage=http://lcp.cloud.cainiao.com/permission/isv/grantpage.do
-cainiao.link.auth.tokenUrl=http://lcp.cloud.cainiao.com/api/permission/exchangeToken.do
-cainiao.link.auth.callbackUrl=https://api.oms.8zyun.cn/api/expressprint/auth/cainiao
-
-#fa wang
-fineex.method.addOrder=fineex.wms.trades.add
-fineex.method.cancelOrder=fineex.wms.trade.cancel
-fineex.method.orderProcess=fineex.wms.trade.orderprocess.get
-fineex.apiAddress=http://apicloud.fineex.net/Interface/InterfaceWeb/InterfaceFwWMS.ashx
-fineex.method.goodsInventory=fineex.wms.product.inventory.get
-fineex.method.orderConfirm=fineex.wms.trade.orderdetail.confirm
-fineex.method.returnorderAdd=fineex.wms.trade.returnorder.add
-
-
-qimen.api.appKey=30303007
-qimen.api.appSecret=80c63d1d8cf36a4c68b2df25fb93f703
-qimen.api.url=https://qimen.api.taobao.com/router/qmtest
diff --git a/resources/application-production.properties b/resources/application-production.properties
deleted file mode 100644
index 59dd423..0000000
--- a/resources/application-production.properties
+++ /dev/null
@@ -1,74 +0,0 @@
-
-server.port=8200
-server.session.timeout=10
-server.connection-timeout=120000
-
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=20MB
-
-spring.jackson.time-zone=GMT+8
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.mvc.dateFormat = yyyy-MM-dd HH:mm:ss
-spring.gson.serialize-nulls=true
-
-#email config
-mail.host=smtp.taover.com
-mail.port=25
-mail.username=taover-robot@taover.com
-mail.password=Lexi@1798
-mail.smtp.auth=true
-mail.smtp.sendFrom=taover-robot@taover.com
-
-#logback xml config
-logging.config=classpath:logback-production.xml
-
-#allow http method options
-spring.mvc.dispatch-options-request=true
-spring.mvc.async.request-timeout=200000
-
-#DB info
-spring.datasource.url=jdbc:mysql://rdsifmezqifmezqo.mysql.rds.aliyuncs.com:3306/bzyun_wxorder_prd?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
-spring.datasource.username=tylife
-spring.datasource.password=lexi365
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.max-idle=10
-spring.datasource.max-wait=10000
-spring.datasource.min-idle=5
-spring.datasource.initial-size=5
-
-#zto analysis address url
-zto.analysisAddress.url=https://hdgateway.zto.com/Word_AnalysisAddress
-#taover analysis address url
-taover.analysisAddress.url=http://address.taover.com/
-#kuaibao
-kuaibao.analysisAddress.url=https://kop.kuaidihelp.com/api
-kuaibao.analysisAddress.appId=105128
-kuaibao.analysisAddress.appKey=3310236ba4d6296e6e2346a7d9c824662510ff87
-kuaibao.analysisAddress.method=cloud.address.resolve
-kuaibao.analysisAddress.methodSimple=cloud.address.cleanse
-
-#aliyun oss address
-accessKeyId=H4fIVB56iHjR6zQw
-accessKeySecret=7bA395UltFp16kWPJT7Pfz0XYXCk4Q
-endpoint=oss-cn-beijing.aliyuncs.com
-bucket_contact=8zyun-oss
-aliyun.mnsEndpoint=http://1225610490807748.mns.cn-hangzhou.aliyuncs.com
-#mobile message url
-wwltData=sname=dlmzty00&spwd=A6cU4Tyx&scorpid=&sprdid=1012888
-wwltUrl=https://seccf.51welink.com/submitdata/service.asmx/g_Submit
-
-#pc api
-pc.callcenter.url.openapiSurrogacyRegisteropenapi=https://ws.8zyun.cn:8080/v1/agent
-pc.callcenter.url.openapiSurrogacyQuerycontacts=https://ws.8zyun.cn:8080/v1/contacts/
-pc.callcenter.url.openapiCallGroupMember=https://ws.8zyun.cn:8080/v1/contact/group_members/
-pc.callcenter.url.openapiSurrogacyAgent=https://ws.8zyun.cn:8080/v1/agent
-pc.callcenter.url.openapiSurrogacySendmessage=https://ws.8zyun.cn:8080/v1/message_task
-pc.callcenter.url.openapiContactsFeaturesgroup=https://ws.8zyun.cn:8080/v1/contactsMessageCount
-
-pc.callcenter.appid=c2MkSTjT8ghZ
-pc.callcenter.seckey=7105ec065b8bb30fa6e3f13fccf92d0G
-pc.callcenter.subscribeUrl=https://api.oms.8zyun.cn/api/wxagentpcmessagesubscribe
-pc.callcenter.url.sendMessageQueueName=oms-pc-msg-production
-
-pc.message.url.messageTaskListUrl=https://ws.8zyun.cn:8080/v1/message_task_list
-pc.message.url.agentMessageTask=https://ws.8zyun.cn:8080/v1/agent_message_task
diff --git a/resources/application.properties b/resources/application.properties
deleted file mode 100644
index 2ff6bc9..0000000
--- a/resources/application.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#RUNTIME_ENV=local development production
-spring.profiles.active=local
diff --git a/resources/logback-local.xml b/resources/logback-local.xml
deleted file mode 100644
index fb1e2ef..0000000
--- a/resources/logback-local.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default
-
- %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level[%thread]%logger{56}.%method:%L -%msg %n
-
-
-
-
-
-
-
diff --git a/resources/logback-production.xml b/resources/logback-production.xml
deleted file mode 100644
index 42cf975..0000000
--- a/resources/logback-production.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
- %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level[%thread]%logger{56}.%method:%L -%msg %n
-
-
-
-
- smtp.taover.com
- 465
- true
- taover-robot@taover.com
- Lexi@1798
-
- taover-robot@taover.com
- wangbin@taover.com
- gaoming@taover.com
- liuyunpeng@taover.com
- 八爪云-data-analysis/ERROR:%logger{20}
-
-
-
- ERROR
- ACCEPT
- DENY
-
-
-
- 3
-
-
-
-
- logback-rolling.log
-
-
- logback-roll-%d{yyyy-MM-dd}.%i.log
-
- 100MB
- 60
- 5GB
-
-
- %date{yyyy-MM-dd HH:mm:ss.SSS} %-5level[%thread]%logger{56}.%method:%L -%msg %n
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/com/taover/bazhuayun/analysis/script/goodscollect/GoodsDataFileParser.java b/src/com/taover/bazhuayun/analysis/script/goodscollect/GoodsDataFileParser.java
deleted file mode 100644
index bec9c48..0000000
--- a/src/com/taover/bazhuayun/analysis/script/goodscollect/GoodsDataFileParser.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.taover.bazhuayun.analysis.script.goodscollect;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import com.taover.bazhuayun.analysis.util.ExcelUtil;
-
-public class GoodsDataFileParser {
- private String fileNameIgnorePreffix;
- private StringBuffer logStrBuffer = new StringBuffer();
- private Set rowSet = new HashSet();
-
- private String[] goodsNamePatternArr;
- private String[] goodsSkuNameParrternArr;
- private GroupInfoExcelData groupInfoData;
-
- public GoodsDataFileParser(String[] goodsNamePatternArr, String[] goodsSkuNameParrternArr, GroupInfoExcelData groupInfoData) {
- this.goodsNamePatternArr = goodsNamePatternArr;
- this.goodsSkuNameParrternArr = goodsSkuNameParrternArr;
- this.groupInfoData = groupInfoData;
- }
-
- public void setFileNameIgnorePreffix(String preffix) {
- this.fileNameIgnorePreffix = preffix;
- }
-
- public void parse(GroupInfoExcelData groupInfoData, File[] listFiles) throws Exception {
- for(int i=0; i> data = ExcelUtil.readExcelSheet(item, false);
- if(data.isEmpty()) {
- continue;
- }
-
- //写入set
- GoodsInfoExcelDataHeader header = new GoodsInfoExcelDataHeader(this.goodsNamePatternArr, this.goodsSkuNameParrternArr, data.get(0));
- for(int j=1; j getResult() {
- List data = new ArrayList();
- Iterator rowIter = this.rowSet.iterator();
- while(rowIter.hasNext()) {
- data.add(rowIter.next());
- }
- Collections.sort(data);
- return data;
- }
-
- public String getLogString() {
- return logStrBuffer.toString();
- }
-
-}
diff --git a/src/com/taover/bazhuayun/analysis/script/goodscollect/GoodsInfoExcelDataHeader.java b/src/com/taover/bazhuayun/analysis/script/goodscollect/GoodsInfoExcelDataHeader.java
deleted file mode 100644
index 2a27745..0000000
--- a/src/com/taover/bazhuayun/analysis/script/goodscollect/GoodsInfoExcelDataHeader.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.taover.bazhuayun.analysis.script.goodscollect;
-
-import java.util.List;
-
-import com.taover.bazhuayun.analysis.util.StringTool;
-
-public class GoodsInfoExcelDataHeader {
- private Integer goodsNameIndex;
- private Integer goodsSkuNameIndex;
-
- public GoodsInfoExcelDataHeader(String[] goodsNamePattern, String[] goodsSkuNamePattern, List