From 984d2dd7b34048e5800715395821ef799bb6886a Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Tue, 13 Nov 2018 10:08:33 +0800
Subject: [PATCH] Merge branch 'master' of
 http://git.estsh.com/i3-IMPP/i3plus-core

# Conflicts:
#	modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java
---
 .gitignore                                                         | 2 +-
 .../core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java      | 7 -------
 pom.xml                                                            | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8884595..838e520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ gen
 target
 .jar
 .class
-.mda
\ No newline at end of file
+.md
\ No newline at end of file
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java
index 21ae540..8d7527d 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DataMoreServiceImpl.java
@@ -1,17 +1,10 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IDataMoreService;
-import cn.estsh.i3plus.core.apiservice.dao.IFactoryStoreDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.annotation.ReadOnlyProperty;
 import org.springframework.stereotype.Service;
 
-import javax.transaction.Transactional;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @Description :
  * @Reference :
diff --git a/pom.xml b/pom.xml
index 7d72f04..015ddda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
-        <log4j2.level>DEBUG</log4j2.level>
+        <log4j2.level>INFO</log4j2.level>
         <log4j2.root.path>E:/i3plus-platform-logs/${project.name}</log4j2.root.path>
         <log4j2.error.path>E:/i3plus-platform-logs/${project.name}-error</log4j2.error.path>
         <log4j2.package.path>E:/i3plus-platform-logs/${project.name}-controller</log4j2.package.path>