Przeglądaj źródła

2018 年 基础版

wuxw7 8 lat temu
rodzic
commit
2cd53dd690
1 zmienionych plików z 3 dodań i 660 usunięć
  1. 3 660
      .idea/workspace.xml

+ 3 - 660
.idea/workspace.xml

@@ -2,664 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a191bf23-5de1-438a-810e-95cec23d6b25" name="Default" comment="change fastjson dependenciy">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/rest/ServiceConfigServiceRest.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/java110-config/db/service.db" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/java110-service/src/main/java/com/java110/service/smo/IDefaultServiceSMO.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/BaseService/logs/BaseService.log" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/BaseService/target/classes/META-INF/maven/com.java110/config/pom.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/BaseService-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/META-INF/MANIFEST.MF" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/META-INF/maven/com.java110/config/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/META-INF/spring-configuration-metadata.json" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/META-INF/spring.factories" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/application.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/banner.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/cache/ehcache.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/cache/redis.conf" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/AppSpringBootApplication.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/dao/ICommonServiceDao.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/dao/IPrimaryKeyServiceDao.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/dao/impl/CommonServiceDaoImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/dao/impl/PrimaryKeyServiceDaoImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/rest/CommonServiceRest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/rest/PrimaryKeyServiceRest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/smo/ICommonServiceSmo.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/smo/IPrimaryKeyServiceSMO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/smo/impl/CommonServiceSmoImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/base/smo/impl/PrimaryKeyServiceSMOImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/config/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/config/properties/CommonProperties.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/config/properties/CustProperties.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/config/properties/EventProperties.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/com/java110/config/properties/OrderProperties.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/common/common.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/config/event.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/config/order.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/db/db.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/logback.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mapper/common/CommonServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mapper/common/PrimaryKeyServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mapper/listener/ListenerServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mapper/merchant/MerchantMemberServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mapper/merchant/MerchantServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mapper/order/OrderServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mapper/product/ProductServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mapper/rule/RuleDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mapper/user/UserServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/mq/mq.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/spring/application-dev.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/classes/spring/application.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/dependency-maven-plugin-markers/com.java110-config-jar-1.0-SNAPSHOT.marker" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/surefire-reports/TEST-com.java110.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/surefire-reports/com.java110.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/CommonService/target/test-classes/com/java110/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/LOG_PATH_IS_UNDEFINED/error.log" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/MerchantService-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/AppSpringBootApplication.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/dao/IMerchantMemberServiceDao.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/dao/IMerchantServiceDao.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/dao/IProductServiceDao.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/dao/impl/MerchantMemberServiceDaoImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/dao/impl/MerchantServiceDaoImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/dao/impl/ProductServiceDaoImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/rest/MerchantMemberServiceRest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/rest/MerchantServiceRest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/rest/ProductServiceRest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/smo/IMerchantMemberServiceSMO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/smo/IMerchantServiceSMO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/smo/IProductServiceSMO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/smo/impl/MerchantMemberServiceSMOImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/smo/impl/MerchantServiceSMOImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/classes/com/java110/merchant/smo/impl/ProductServiceSMOImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/surefire-reports/TEST-com.java110.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/surefire-reports/TEST-com.java110.merchant.BeanTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/surefire-reports/com.java110.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/surefire-reports/com.java110.merchant.BeanTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/test-classes/com/java110/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/MerchantService/target/test-classes/com/java110/merchant/BeanTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/AnnotationConfigEmbeddedWebApplicationContext.puml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/ApplicationContext.puml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/CreateApplicationContext.puml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/SpringApplicationStart.puml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/OrderService.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/OrderService.jar.original" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/classes/META-INF/maven/com.java110/config/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/classes/META-INF/maven/com.java110/config/pom.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/dependency-maven-plugin-markers/com.java110-config-jar-1.0-SNAPSHOT.marker" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/surefire-reports/TEST-com.java110.order.executor.ExecutorTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/surefire-reports/TEST-com.java110.order.jsonpath.CustIdTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/surefire-reports/TEST-com.java110.order.type.CommonTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/surefire-reports/TEST-com.java110.order.type.TypeTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/surefire-reports/com.java110.order.executor.ExecutorTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/surefire-reports/com.java110.order.jsonpath.CustIdTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/surefire-reports/com.java110.order.type.CommonTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/OrderService/target/surefire-reports/com.java110.order.type.TypeTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/PayService/target/PayService-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/PayService/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/PayService/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/PayService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/PayService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/PayService/target/surefire-reports/TEST-com.java110.pay.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/PayService/target/surefire-reports/com.java110.pay.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/PayService/target/test-classes/com/java110/pay/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/RuleService-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/AppSpringBootApplication.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/common/RuleCommon.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/dao/IRuleDao.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/dao/impl/RuleDaoImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/rest/RuleServiceRest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/service/RuleService.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/smo/IRuleServiceSMO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/smo/impl/RuleServiceSMOImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/thread/RuleCommonThread$1.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/classes/com/java110/rule/thread/RuleCommonThread.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/surefire-reports/TEST-com.java110.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/surefire-reports/com.java110.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/RuleService/target/test-classes/com/java110/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/SimpleListener-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/AppSpringBootApplication.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/bmo/IListenerBmo.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/bmo/impl/ListenerBmoImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/dao/IListenerServiceDao.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/dao/impl/ListenerServiceDaoImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/rest/ListenerRest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/task/DownloadFileFromFtpToFTSThread.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/task/DownloadFileFromFtpToTFS.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/task/DownloadFileFromFtpToTable.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/task/FTPClientTemplate$Charset.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/task/FTPClientTemplate$TransferType.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/task/FTPClientTemplate.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/task/FtpToFileSystemQuartz.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/task/ListenerJob.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/com/java110/listener/task/UploadFileFromTFSToFtp.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/css/bootstrap-theme.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/css/bootstrap-theme.min.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/css/bootstrap.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/css/bootstrap.min.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/css/listener.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/fonts/glyphicons-halflings-regular.eot" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/fonts/glyphicons-halflings-regular.svg" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/fonts/glyphicons-halflings-regular.ttf" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/fonts/glyphicons-halflings-regular.woff" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/fonts/glyphicons-halflings-regular.woff2" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/js/app.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/js/bootstrap-paginator.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/js/bootstrap.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/js/bootstrap.min.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/js/jquery.min.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/js/listener.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/js/npm.js" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/page/listener.html" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/classes/test.css" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/surefire-reports/TEST-com.java110.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/surefire-reports/com.java110.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/SimpleListenerService/target/test-classes/com/java110/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/UserService/target/classes/META-INF/maven/com.java110/config/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/UserService/target/classes/META-INF/maven/com.java110/config/pom.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/UserService/target/dependency-maven-plugin-markers/com.java110-config-jar-1.0-SNAPSHOT.marker" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/Wechat/target/classes/com/java110/entity/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/Wechat/target/classes/com/java110/wechat/AppSpringBootApplication.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/Wechat/target/classes/com/java110/wechat/feign/test/TestController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/Wechat/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/Wechat/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/Wechat/target/test-classes/com/java110/wechat/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/Wechat.iml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/target/Wechat-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/target/classes/application-ribbon.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/target/classes/application.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/target/classes/html/index.html" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/target/surefire-reports/TEST-com.java110.wechat.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/WechatService/target/surefire-reports/com.java110.wechat.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/bean-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/DefaultAttrEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/DefaultBoAttrEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/DefaultBoEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/DefaultEntity.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/listener/FtpTaskLog.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/listener/FtpTaskLogDetail.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/mapping/CodeMapping.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/merchant/BoMerchant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/merchant/BoMerchantAttr.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/merchant/BoMerchantMember.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/merchant/Merchant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/merchant/MerchantAttr.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/merchant/MerchantMember.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/order/BusiOrder.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/order/BusiOrderAttr.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/order/OrderList.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/order/OrderListAttr.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/product/BoProduct.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/product/BoProductAttr.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/product/Product.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/product/ProductAttr.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/protocol/BeanSvcCont.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/protocol/SvcCont.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/protocol/TcpCont.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/rule/ContractRootRule.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/rule/Rule.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/rule/RuleCondCfg.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/rule/RuleEntrance.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/rule/TcpContRule.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/user/BoCust.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/user/BoCustAttr.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/user/BoCustOrder.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/user/Cust.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/user/CustAttr.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/classes/com/java110/entity/user/CustInst.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/surefire-reports/TEST-com.java110.entity.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/surefire-reports/com.java110.entity.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/bean/target/test-classes/com/java110/entity/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/ActionTypeConstant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/AttrCdConstant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/CommonConstant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/DomainContant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/ListenerDomain.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/MerchantTypeConstant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/ProductTypeConstant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/ResponseConstant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/RuleDomain.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/StateConstant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/constant/StatusConstant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/log/LoggerEngine.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/namespace/NameSpaceHandler.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/rule/RuleProtocol.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/Assert.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/CacheUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/CodeMapUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/CommonUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/ConstantUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/DateUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/MyX509TrustManager.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/ProtocolUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/RuleUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/SequenceUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/SerializeUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/SpringBeanInvoker.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/StringJsonDeal.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/StringUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/TransferUtil.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/common/util/WebServiceAxisClient.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/classes/com/java110/entity/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/common-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/surefire-reports/TEST-com.java110.common.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/surefire-reports/com.java110.common.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/common/target/test-classes/com/java110/common/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/META-INF/spring-configuration-metadata.json" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/META-INF/spring.factories" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/cache/ehcache.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/cache/redis.conf" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/com/java110/config/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/com/java110/config/properties/CommonProperties.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/com/java110/config/properties/CustProperties.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/com/java110/config/properties/EventProperties.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/com/java110/config/properties/OrderProperties.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/common/common.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/config/event.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/config/order.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/db/db.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/logback.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mapper/common/CommonServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mapper/common/PrimaryKeyServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mapper/listener/ListenerServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mapper/merchant/MerchantMemberServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mapper/merchant/MerchantServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mapper/order/OrderServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mapper/product/ProductServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mapper/rule/RuleDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mapper/user/UserServiceDaoImplMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/mq/mq.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/spring/application-dev.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/classes/spring/application.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/config-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/surefire-reports/TEST-com.java110.config.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/surefire-reports/com.java110.config.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/config/target/test-classes/com/java110/config/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/aop/service/SmoServiceAspect.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/base/AppBase.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/base/bmo/BaseBMO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/base/controller/BaseController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/base/dao/BaseServiceDao.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/base/smo/BaseServiceSMO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/cache/CacheConfiguration.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/cache/RedisConfiguration.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/context/AppContext.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/classes/com/java110/core/factory/AppFactory.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/core-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/surefire-reports/TEST-com.java110.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/surefire-reports/TEST-com.java110.core.jsonpath.JsonPathTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/surefire-reports/com.java110.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/surefire-reports/com.java110.core.jsonpath.JsonPathTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/test-classes/com/java110/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/test-classes/com/java110/core/cache/TestRedis.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/core/target/test-classes/com/java110/core/jsonpath/JsonPathTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/classes/application-ha.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/classes/application.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/classes/com/java110/entity/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/classes/com/java110/eureka/ConfigServerEurekaApplication.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/eureka-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/surefire-reports/TEST-com.java110.eureka.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/surefire-reports/com.java110.eureka.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/eureka/target/test-classes/com/java110/eureka/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/AppEvent.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/AppEventPublishing$1.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/AppEventPublishing.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/AppListener.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/common/AppCommonEvent.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/cust/AppCustEvent.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/cust/AppDeleteCustEvent.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/merchant/AppMerchantEvent.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/order/Ordered.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/app/pay/AppPayEvent.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/init/SystemStartUpInit.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/listener/common/CommonDispatchListener.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/listener/cust/CustDispatchListener.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/listener/cust/DeleteCustDispatchListener.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/listener/merchant/MerchantDispatchListener.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/classes/com/java110/event/method/CommonDispatchAfterMethod.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/event-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/surefire-reports/TEST-com.java110.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/surefire-reports/com.java110.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/event/target/test-classes/com/java110/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/entity/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/base/CommonServiceFallback.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/base/ICommonService.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/base/IPrimaryKeyService.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/base/PrimaryKeyServiceFallback.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/merchant/IMerchantMemberService.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/merchant/IMerchantService.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/merchant/MerchantMemberServiceFallBack.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/merchant/MerchantServiceFallback.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/product/IProductService.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/product/ProductServiceFallback.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/test/HystrixClientFallback.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/test/TestFeignHystrixClient.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/user/IUserService.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/classes/com/java110/feign/user/UserServiceFallback.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/feign-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/surefire-reports/TEST-com.java110.feign.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/surefire-reports/com.java110.feign.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/feign/target/test-classes/com/java110/feign/AppTest.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/logs/app.log" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/logs/eureka.log" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/classes/META-INF/spring-configuration-metadata.json" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/classes/com/java110/App.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/classes/com/java110/service/MyBatisConfig.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/classes/com/java110/service/MyBatisMapperScannerConfig.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/maven-archiver/pom.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/service-1.0-SNAPSHOT.jar" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/surefire-reports/TEST-com.java110.AppTest.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/surefire-reports/com.java110.AppTest.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/service/target/test-classes/com/java110/AppTest.class" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UserService/target/UserService-1.0-SNAPSHOT.jar" afterPath="$PROJECT_DIR$/UserService/target/UserService-1.0-SNAPSHOT.jar" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/MerchantService/pom.xml" afterPath="$PROJECT_DIR$/MerchantService/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OrderService/pom.xml" afterPath="$PROJECT_DIR$/OrderService/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OrderService/target/surefire-reports/TEST-com.java110.order.AppTest.xml" afterPath="$PROJECT_DIR$/OrderService/target/surefire-reports/TEST-com.java110.order.AppTest.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PayService/pom.xml" afterPath="$PROJECT_DIR$/PayService/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/RuleService/pom.xml" afterPath="$PROJECT_DIR$/RuleService/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UserService/pom.xml" afterPath="$PROJECT_DIR$/UserService/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UserService/target/maven-archiver/pom.properties" afterPath="$PROJECT_DIR$/UserService/target/maven-archiver/pom.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UserService/target/surefire-reports/TEST-com.java110.user.AppTest.xml" afterPath="$PROJECT_DIR$/UserService/target/surefire-reports/TEST-com.java110.user.AppTest.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UserService/target/surefire-reports/TEST-com.java110.user.BoCustCompareTest.xml" afterPath="$PROJECT_DIR$/UserService/target/surefire-reports/TEST-com.java110.user.BoCustCompareTest.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UserService/target/surefire-reports/TEST-com.java110.user.CustIdTest.xml" afterPath="$PROJECT_DIR$/UserService/target/surefire-reports/TEST-com.java110.user.CustIdTest.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UserService/target/surefire-reports/com.java110.user.AppTest.txt" afterPath="$PROJECT_DIR$/UserService/target/surefire-reports/com.java110.user.AppTest.txt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UserService/target/surefire-reports/com.java110.user.CustIdTest.txt" afterPath="$PROJECT_DIR$/UserService/target/surefire-reports/com.java110.user.CustIdTest.txt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/BaseService.iml" afterPath="$PROJECT_DIR$/CommonService/CommonService.iml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/pom.xml" afterPath="$PROJECT_DIR$/CommonService/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/AppSpringBootApplication.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/AppSpringBootApplication.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/dao/ICommonServiceDao.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/dao/ICommonServiceDao.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/dao/IPrimaryKeyServiceDao.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/dao/IPrimaryKeyServiceDao.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/dao/impl/CommonServiceDaoImpl.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/dao/impl/CommonServiceDaoImpl.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/dao/impl/PrimaryKeyServiceDaoImpl.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/dao/impl/PrimaryKeyServiceDaoImpl.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/rest/CommonServiceRest.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/rest/CommonServiceRest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/rest/PrimaryKeyServiceRest.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/rest/PrimaryKeyServiceRest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/smo/ICommonServiceSmo.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/smo/ICommonServiceSmo.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/smo/IPrimaryKeyServiceSMO.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/smo/IPrimaryKeyServiceSMO.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/smo/impl/CommonServiceSmoImpl.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/smo/impl/CommonServiceSmoImpl.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/smo/impl/PrimaryKeyServiceSMOImpl.java" afterPath="$PROJECT_DIR$/CommonService/src/main/java/com/java110/base/smo/impl/PrimaryKeyServiceSMOImpl.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/resources/application.yml" afterPath="$PROJECT_DIR$/CommonService/src/main/resources/application.yml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/main/resources/banner.txt" afterPath="$PROJECT_DIR$/CommonService/src/main/resources/banner.txt" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/BaseService/src/test/java/com/java110/AppTest.java" afterPath="$PROJECT_DIR$/CommonService/src/test/java/com/java110/AppTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/SimpleListener.iml" afterPath="$PROJECT_DIR$/SimpleListenerService/SimpleListenerService.iml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/pom.xml" afterPath="$PROJECT_DIR$/SimpleListenerService/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/App.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/App.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/AppSpringBootApplication.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/AppSpringBootApplication.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/bmo/IListenerBmo.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/bmo/IListenerBmo.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/bmo/impl/ListenerBmoImpl.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/bmo/impl/ListenerBmoImpl.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/dao/IListenerServiceDao.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/dao/IListenerServiceDao.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/dao/impl/ListenerServiceDaoImpl.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/dao/impl/ListenerServiceDaoImpl.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/rest/ListenerRest.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/rest/ListenerRest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/task/DownloadFileFromFtpToFTSThread.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/task/DownloadFileFromFtpToFTSThread.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/task/DownloadFileFromFtpToTFS.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/task/DownloadFileFromFtpToTFS.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/task/DownloadFileFromFtpToTable.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/task/DownloadFileFromFtpToTable.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/task/FTPClientTemplate.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/task/FTPClientTemplate.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/task/FtpToFileSystemQuartz.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/task/FtpToFileSystemQuartz.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/task/ListenerJob.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/task/ListenerJob.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/task/UploadFileFromTFSToFtp.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/java/com/java110/listener/task/UploadFileFromTFSToFtp.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/css/bootstrap-theme.css" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/css/bootstrap-theme.css" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/css/bootstrap-theme.min.css" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/css/bootstrap-theme.min.css" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/css/bootstrap.css" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/css/bootstrap.css" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/css/bootstrap.min.css" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/css/bootstrap.min.css" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/css/listener.css" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/css/listener.css" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/fonts/glyphicons-halflings-regular.eot" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/fonts/glyphicons-halflings-regular.eot" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/fonts/glyphicons-halflings-regular.svg" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/fonts/glyphicons-halflings-regular.svg" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/fonts/glyphicons-halflings-regular.ttf" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/fonts/glyphicons-halflings-regular.ttf" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/fonts/glyphicons-halflings-regular.woff" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/fonts/glyphicons-halflings-regular.woff" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/fonts/glyphicons-halflings-regular.woff2" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/fonts/glyphicons-halflings-regular.woff2" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/js/app.js" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/js/app.js" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/js/bootstrap-paginator.js" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/js/bootstrap-paginator.js" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/js/bootstrap.js" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/js/bootstrap.js" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/js/bootstrap.min.js" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/js/bootstrap.min.js" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/js/jquery.min.js" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/js/jquery.min.js" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/js/listener.js" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/js/listener.js" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/js/npm.js" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/js/npm.js" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/page/listener.html" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/page/listener.html" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/main/resources/test.css" afterPath="$PROJECT_DIR$/SimpleListenerService/src/main/resources/test.css" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/SimpleListener/src/test/java/com/java110/AppTest.java" afterPath="$PROJECT_DIR$/SimpleListenerService/src/test/java/com/java110/AppTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Wechat/pom.xml" afterPath="$PROJECT_DIR$/WechatService/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Wechat/src/main/java/com/java110/wechat/App.java" afterPath="$PROJECT_DIR$/WechatService/src/main/java/com/java110/wechat/App.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Wechat/src/main/java/com/java110/wechat/AppSpringBootApplication.java" afterPath="$PROJECT_DIR$/WechatService/src/main/java/com/java110/wechat/AppSpringBootApplication.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Wechat/src/main/java/com/java110/wechat/feign/test/TestController.java" afterPath="$PROJECT_DIR$/WechatService/src/main/java/com/java110/wechat/feign/test/TestController.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Wechat/src/main/resources/application-ribbon.yml" afterPath="$PROJECT_DIR$/WechatService/src/main/resources/application-ribbon.yml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Wechat/src/main/resources/application.yml" afterPath="$PROJECT_DIR$/WechatService/src/main/resources/application.yml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Wechat/src/main/resources/html/index.html" afterPath="$PROJECT_DIR$/WechatService/src/main/resources/html/index.html" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/Wechat/src/test/java/com/java110/wechat/AppTest.java" afterPath="$PROJECT_DIR$/WechatService/src/test/java/com/java110/wechat/AppTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/README.md" afterPath="$PROJECT_DIR$/java110-bean/README.md" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/bean.iml" afterPath="$PROJECT_DIR$/java110-bean/java110-bean.iml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/pom.xml" afterPath="$PROJECT_DIR$/java110-bean/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/App.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/App.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/DefaultAttrEntity.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/DefaultAttrEntity.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/DefaultBoAttrEntity.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/DefaultBoAttrEntity.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/DefaultBoEntity.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/DefaultBoEntity.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/DefaultEntity.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/DefaultEntity.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/listener/FtpTaskLog.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/listener/FtpTaskLog.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/listener/FtpTaskLogDetail.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/listener/FtpTaskLogDetail.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/mapping/CodeMapping.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/mapping/CodeMapping.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/merchant/BoMerchant.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/merchant/BoMerchantAttr.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchantAttr.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/merchant/BoMerchantMember.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/merchant/BoMerchantMember.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/merchant/Merchant.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/merchant/Merchant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/merchant/MerchantAttr.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/merchant/MerchantAttr.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/merchant/MerchantMember.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/merchant/MerchantMember.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/order/BusiOrder.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/order/BusiOrder.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/order/BusiOrderAttr.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/order/BusiOrderAttr.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/order/OrderList.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/order/OrderList.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/order/OrderListAttr.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/order/OrderListAttr.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/product/BoProduct.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/product/BoProduct.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/product/BoProductAttr.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/product/BoProductAttr.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/product/Product.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/product/Product.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/product/ProductAttr.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/product/ProductAttr.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/protocol/BeanSvcCont.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/protocol/BeanSvcCont.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/protocol/SvcCont.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/protocol/SvcCont.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/protocol/TcpCont.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/protocol/TcpCont.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/rule/ContractRootRule.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/rule/ContractRootRule.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/rule/Rule.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/rule/Rule.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/rule/RuleCondCfg.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/rule/RuleCondCfg.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/rule/RuleEntrance.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/rule/RuleEntrance.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/rule/TcpContRule.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/rule/TcpContRule.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/user/BoCust.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/user/BoCust.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/user/BoCustAttr.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/user/BoCustAttr.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/user/BoCustOrder.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/user/BoCustOrder.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/user/Cust.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/user/Cust.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/user/CustAttr.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/user/CustAttr.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/user/CustInst.java" afterPath="$PROJECT_DIR$/java110-bean/src/main/java/com/java110/entity/user/CustInst.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/bean/src/test/java/com/java110/entity/AppTest.java" afterPath="$PROJECT_DIR$/java110-bean/src/test/java/com/java110/entity/AppTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/README.md" afterPath="$PROJECT_DIR$/java110-common/README.md" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/common.iml" afterPath="$PROJECT_DIR$/java110-common/java110-common.iml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/pom.xml" afterPath="$PROJECT_DIR$/java110-common/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/App.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/App.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/ActionTypeConstant.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/ActionTypeConstant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/AttrCdConstant.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/AttrCdConstant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/CommonConstant.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/CommonConstant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/DomainContant.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/DomainContant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/ListenerDomain.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/ListenerDomain.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/MerchantTypeConstant.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/MerchantTypeConstant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/ProductTypeConstant.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/ProductTypeConstant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/ResponseConstant.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/ResponseConstant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/RuleDomain.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/RuleDomain.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/StateConstant.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/StateConstant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/StatusConstant.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/constant/StatusConstant.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/log/LoggerEngine.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/log/LoggerEngine.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/namespace/NameSpaceHandler.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/namespace/NameSpaceHandler.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/rule/RuleProtocol.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/rule/RuleProtocol.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/Assert.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/Assert.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/CacheUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/CacheUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/CodeMapUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/CodeMapUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/CommonUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/CommonUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/ConstantUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/ConstantUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/DateUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/DateUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/MyX509TrustManager.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/MyX509TrustManager.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/ProtocolUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/ProtocolUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/RuleUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/RuleUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/SequenceUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/SequenceUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/SerializeUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/SerializeUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/SpringBeanInvoker.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/SpringBeanInvoker.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/StringJsonDeal.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/StringJsonDeal.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/StringUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/StringUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/TransferUtil.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/TransferUtil.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/WebServiceAxisClient.java" afterPath="$PROJECT_DIR$/java110-common/src/main/java/com/java110/common/util/WebServiceAxisClient.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/test/java/com/java110/common/AppTest.java" afterPath="$PROJECT_DIR$/java110-common/src/test/java/com/java110/common/AppTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/README.md" afterPath="$PROJECT_DIR$/java110-config/README.md" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/config.iml" afterPath="$PROJECT_DIR$/java110-config/java110-config.iml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/db/CodeMapping.db" afterPath="$PROJECT_DIR$/java110-config/db/CodeMapping.db" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/db/cust.db" afterPath="$PROJECT_DIR$/java110-config/db/cust.db" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/db/merchant.db" afterPath="$PROJECT_DIR$/java110-config/db/merchant.db" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/db/orders.db" afterPath="$PROJECT_DIR$/java110-config/db/orders.db" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/db/product.db" afterPath="$PROJECT_DIR$/java110-config/db/product.db" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/db/rule.db" afterPath="$PROJECT_DIR$/java110-config/db/rule.db" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/pom.xml" afterPath="$PROJECT_DIR$/java110-config/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/java/com/java110/config/App.java" afterPath="$PROJECT_DIR$/java110-config/src/main/java/com/java110/config/App.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/java/com/java110/config/properties/CommonProperties.java" afterPath="$PROJECT_DIR$/java110-config/src/main/java/com/java110/config/properties/CommonProperties.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/java/com/java110/config/properties/CustProperties.java" afterPath="$PROJECT_DIR$/java110-config/src/main/java/com/java110/config/properties/CustProperties.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/java/com/java110/config/properties/EventProperties.java" afterPath="$PROJECT_DIR$/java110-config/src/main/java/com/java110/config/properties/EventProperties.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/java/com/java110/config/properties/OrderProperties.java" afterPath="$PROJECT_DIR$/java110-config/src/main/java/com/java110/config/properties/OrderProperties.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/META-INF/spring.factories" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/META-INF/spring.factories" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/cache/ehcache.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/cache/ehcache.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/cache/redis.conf" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/cache/redis.conf" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/common/common.properties" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/common/common.properties" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/config/event.properties" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/config/event.properties" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/config/order.properties" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/config/order.properties" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/db/db.properties" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/db/db.properties" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/logback.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/logback.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mapper/common/CommonServiceDaoImplMapper.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mapper/common/CommonServiceDaoImplMapper.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mapper/common/PrimaryKeyServiceDaoImplMapper.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mapper/common/PrimaryKeyServiceDaoImplMapper.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mapper/listener/ListenerServiceDaoImplMapper.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mapper/listener/ListenerServiceDaoImplMapper.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mapper/merchant/MerchantMemberServiceDaoImplMapper.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mapper/merchant/MerchantMemberServiceDaoImplMapper.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mapper/merchant/MerchantServiceDaoImplMapper.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mapper/merchant/MerchantServiceDaoImplMapper.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mapper/order/OrderServiceDaoImplMapper.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mapper/order/OrderServiceDaoImplMapper.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mapper/product/ProductServiceDaoImplMapper.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mapper/product/ProductServiceDaoImplMapper.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mapper/rule/RuleDaoImplMapper.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mapper/rule/RuleDaoImplMapper.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/mq/mq.properties" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/mq/mq.properties" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/spring/application-dev.properties" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/spring/application-dev.properties" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/main/resources/spring/application.properties" afterPath="$PROJECT_DIR$/java110-config/src/main/resources/spring/application.properties" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/config/src/test/java/com/java110/config/AppTest.java" afterPath="$PROJECT_DIR$/java110-config/src/test/java/com/java110/config/AppTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/core.iml" afterPath="$PROJECT_DIR$/java110-core/java110-core.iml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/pom.xml" afterPath="$PROJECT_DIR$/java110-core/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/aop/service/SmoServiceAspect.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/aop/service/SmoServiceAspect.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/base/AppBase.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/base/AppBase.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/base/bmo/BaseBMO.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/base/bmo/BaseBMO.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/base/controller/BaseController.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/base/dao/BaseServiceDao.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/base/dao/BaseServiceDao.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/base/smo/BaseServiceSMO.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/cache/CacheConfiguration.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/cache/CacheConfiguration.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/cache/RedisConfiguration.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/cache/RedisConfiguration.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/context/AppContext.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/context/AppContext.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/main/java/com/java110/core/factory/AppFactory.java" afterPath="$PROJECT_DIR$/java110-core/src/main/java/com/java110/core/factory/AppFactory.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/test/java/com/java110/AppTest.java" afterPath="$PROJECT_DIR$/java110-core/src/test/java/com/java110/AppTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/test/java/com/java110/core/cache/TestRedis.java" afterPath="$PROJECT_DIR$/java110-core/src/test/java/com/java110/core/cache/TestRedis.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/core/src/test/java/com/java110/core/jsonpath/JsonPathTest.java" afterPath="$PROJECT_DIR$/java110-core/src/test/java/com/java110/core/jsonpath/JsonPathTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/event.iml" afterPath="$PROJECT_DIR$/java110-event/java110-event.iml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/pom.xml" afterPath="$PROJECT_DIR$/java110-event/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/app/AppEvent.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/app/AppEvent.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/app/AppEventPublishing.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/app/AppEventPublishing.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/app/AppListener.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/app/AppListener.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/app/common/AppCommonEvent.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/app/common/AppCommonEvent.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/app/cust/AppCustEvent.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/app/cust/AppCustEvent.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/app/cust/AppDeleteCustEvent.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/app/cust/AppDeleteCustEvent.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/app/merchant/AppMerchantEvent.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/app/merchant/AppMerchantEvent.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/app/order/Ordered.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/app/order/Ordered.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/app/pay/AppPayEvent.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/app/pay/AppPayEvent.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/init/SystemStartUpInit.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/init/SystemStartUpInit.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/listener/common/CommonDispatchListener.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/listener/common/CommonDispatchListener.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/listener/cust/CustDispatchListener.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/listener/cust/CustDispatchListener.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/listener/cust/DeleteCustDispatchListener.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/listener/cust/DeleteCustDispatchListener.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/listener/merchant/MerchantDispatchListener.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/listener/merchant/MerchantDispatchListener.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/main/java/com/java110/event/method/CommonDispatchAfterMethod.java" afterPath="$PROJECT_DIR$/java110-event/src/main/java/com/java110/event/method/CommonDispatchAfterMethod.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/event/src/test/java/com/java110/AppTest.java" afterPath="$PROJECT_DIR$/java110-event/src/test/java/com/java110/AppTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/feign.iml" afterPath="$PROJECT_DIR$/java110-feign/java110-feign.iml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/pom.xml" afterPath="$PROJECT_DIR$/java110-feign/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/App.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/App.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/base/CommonServiceFallback.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/base/CommonServiceFallback.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/base/ICommonService.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/base/ICommonService.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/base/IPrimaryKeyService.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/base/IPrimaryKeyService.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/base/PrimaryKeyServiceFallback.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/base/PrimaryKeyServiceFallback.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/merchant/IMerchantMemberService.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/merchant/IMerchantMemberService.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/merchant/IMerchantService.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/merchant/IMerchantService.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/merchant/MerchantMemberServiceFallBack.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/merchant/MerchantMemberServiceFallBack.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/merchant/MerchantServiceFallback.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/merchant/MerchantServiceFallback.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/product/IProductService.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/product/IProductService.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/product/ProductServiceFallback.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/product/ProductServiceFallback.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/test/HystrixClientFallback.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/test/HystrixClientFallback.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/test/TestFeignHystrixClient.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/test/TestFeignHystrixClient.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/user/IUserService.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/user/IUserService.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/user/UserServiceFallback.java" afterPath="$PROJECT_DIR$/java110-feign/src/main/java/com/java110/feign/user/UserServiceFallback.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/feign/src/test/java/com/java110/feign/AppTest.java" afterPath="$PROJECT_DIR$/java110-feign/src/test/java/com/java110/feign/AppTest.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/service/pom.xml" afterPath="$PROJECT_DIR$/java110-service/pom.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/service/service.iml" afterPath="$PROJECT_DIR$/java110-service/java110-service.iml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/service/src/main/java/com/java110/App.java" afterPath="$PROJECT_DIR$/java110-service/src/main/java/com/java110/App.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/service/src/main/java/com/java110/service/MyBatisConfig.java" afterPath="$PROJECT_DIR$/java110-service/src/main/java/com/java110/service/MyBatisConfig.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/service/src/main/java/com/java110/service/MyBatisMapperScannerConfig.java" afterPath="$PROJECT_DIR$/java110-service/src/main/java/com/java110/service/MyBatisMapperScannerConfig.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/service/src/test/java/com/java110/AppTest.java" afterPath="$PROJECT_DIR$/java110-service/src/test/java/com/java110/AppTest.java" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -728,7 +71,7 @@
       <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-3572">
+            <state relative-caret-position="-3397">
               <caret line="142" column="36" lean-forward="false" selection-start-line="142" selection-start-column="36" selection-end-line="142" selection-end-column="36" />
               <folding />
             </state>
@@ -1516,7 +859,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="2" width="1378" height="733" extended-state="1" />
+    <frame x="-7" y="2" width="1378" height="733" extended-state="0" />
     <layout>
       <window_info id="PlantUML" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34341908" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -2018,7 +1361,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3572">
+        <state relative-caret-position="-3397">
           <caret line="142" column="36" lean-forward="false" selection-start-line="142" selection-start-column="36" selection-end-line="142" selection-end-column="36" />
           <folding />
         </state>