delete note

527515025 · 527515025 · commit 0fc34ec981f9 · 2019-04-03T17:24:06.000+08:00
diff --git a/springboot-elasticsearch/src/main/java/cn/abel/service/NewsService.java b/springboot-elasticsearch/src/main/java/cn/abel/service/NewsService.java
@@ -3,9 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import cn.abel.config.DynamicDataSource;
-import cn.abel.config.DynamicDataSourceContextHolder;
-import cn.abel.enums.DatabaseTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,29 +15,24 @@ public class NewsService {
     private NewsDao newsDao;
 
     public List<News> getByMap(Map<String, Object> map) {
-        DynamicDataSourceContextHolder.resetDatabaseType();
         return newsDao.getByMap(map);
     }
 
     public News getById(Integer id) {
-        DynamicDataSourceContextHolder.resetDatabaseType();
         return newsDao.getById(id);
     }
 
     public News create(News news) {
-        DynamicDataSourceContextHolder.resetDatabaseType();
         newsDao.create(news);
         return news;
     }
 
     public News update(News news) {
-        DynamicDataSourceContextHolder.resetDatabaseType();
         newsDao.update(news);
         return news;
     }
 
     public int delete(Integer id) {
-        DynamicDataSourceContextHolder.resetDatabaseType();
         return newsDao.delete(id);
     }
 
diff --git a/springboot-elasticsearch/src/main/java/cn/abel/service/UserService.java b/springboot-elasticsearch/src/main/java/cn/abel/service/UserService.java
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import cn.abel.config.DynamicDataSourceContextHolder;
-import cn.abel.enums.DatabaseTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,29 +15,24 @@ public class UserService {
 	private UserDao userDao;
 	
 	public List<User> getByMap(Map<String,Object> map){
-		DynamicDataSourceContextHolder.setDatabaseType(DatabaseTypeEnum.USER);
 		return userDao.getByMap(map);
 	}
 	
 	public User getById(Integer id){
-		DynamicDataSourceContextHolder.setDatabaseType(DatabaseTypeEnum.USER);
 		return userDao.getById(id);
 	}
 	
 	public User create(User user){
-		DynamicDataSourceContextHolder.setDatabaseType(DatabaseTypeEnum.USER);
 		userDao.create(user);
 		return user;
 	}
 	
 	public User update(User user){
-		DynamicDataSourceContextHolder.setDatabaseType(DatabaseTypeEnum.USER);
 		userDao.update(user);
 		return user;
 	}
 	
 	public int delete(Integer id){
-		DynamicDataSourceContextHolder.setDatabaseType(DatabaseTypeEnum.USER);
 		return userDao.delete(id);
 	}
     
