From 2de70e79ae724058c4a40947648344d05fc5b946 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 17 May 2019 23:16:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E6=84=8F=EF=BC=9A@MyBatisDao=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E8=AE=BE=E7=BD=AEdataSourceName=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E4=B8=BAdefault=E9=BB=98=E8=AE=A4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=EF=BC=8C=E5=A6=82=E6=9E=9C=E9=9C=80=E8=A6=81=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8DataSourceHolder.setDataSourceName=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E8=AF=B7=E5=B0=86=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=AF=A5=E6=B3=A8=E8=A7=A3=E5=B1=9E=E6=80=A7=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BAdataSourceName=3DDataSourceHolder.EMPTY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jeesite/modules/sys/dao/AreaDao.java     | 3 +--
 .../src/main/java/com/jeesite/modules/sys/dao/CompanyDao.java  | 3 +--
 .../java/com/jeesite/modules/sys/dao/CompanyOfficeDao.java     | 3 +--
 .../src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java  | 3 +--
 .../src/main/java/com/jeesite/modules/sys/dao/EmployeeDao.java | 3 +--
 .../main/java/com/jeesite/modules/sys/dao/EmployeePostDao.java | 3 +--
 .../core/src/main/java/com/jeesite/modules/sys/dao/LogDao.java | 3 +--
 .../src/main/java/com/jeesite/modules/sys/dao/OfficeDao.java   | 3 +--
 .../src/main/java/com/jeesite/modules/sys/dao/PostDao.java     | 3 +--
 modules/core/src/main/resources/config/logger-core.xml         | 1 +
 10 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/AreaDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/AreaDao.java
index 6a100187..9abe58da 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/AreaDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/AreaDao.java
@@ -4,7 +4,6 @@
 package com.jeesite.modules.sys.dao;
 
 import com.jeesite.common.dao.TreeDao;
-import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.sys.entity.Area;
 
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Area;
  * @author ThinkGem
  * @version 2017-03-22
  */
-@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
+@MyBatisDao
 public interface AreaDao extends TreeDao<Area> {
 	
 }
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyDao.java
index 8e9fc3bf..a46c9122 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyDao.java
@@ -4,7 +4,6 @@
 package com.jeesite.modules.sys.dao;
 
 import com.jeesite.common.dao.TreeDao;
-import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.sys.entity.Company;
 
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Company;
  * @author ThinkGem
  * @version 2017-03-12
  */
-@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
+@MyBatisDao
 public interface CompanyDao extends TreeDao<Company> {
 	
 }
\ No newline at end of file
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyOfficeDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyOfficeDao.java
index 2f899430..298336ce 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyOfficeDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyOfficeDao.java
@@ -4,7 +4,6 @@
 package com.jeesite.modules.sys.dao;
 
 import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.sys.entity.CompanyOffice;
 
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.CompanyOffice;
  * @author ThinkGem
  * @version 2017-03-23
  */
-@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
+@MyBatisDao
 public interface CompanyOfficeDao extends CrudDao<CompanyOffice> {
 	
 }
\ No newline at end of file
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java
index d26eac69..7abe3498 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java
@@ -6,7 +6,6 @@ package com.jeesite.modules.sys.dao;
 import java.util.List;
 
 import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.sys.entity.EmpUser;
 
@@ -15,7 +14,7 @@ import com.jeesite.modules.sys.entity.EmpUser;
  * @author ThinkGem
  * @version 2017-03-25
  */
-@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
+@MyBatisDao
 public interface EmpUserDao extends CrudDao<EmpUser> {
 
 	/**
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeeDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeeDao.java
index 762b3a94..90e3a242 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeeDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeeDao.java
@@ -4,7 +4,6 @@
 package com.jeesite.modules.sys.dao;
 
 import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.sys.entity.Employee;
 
@@ -14,7 +13,7 @@ import com.jeesite.modules.sys.entity.Employee;
  * @version 2017-03-25
  * 通过 UserUtils.loadRefObj() 加载引用类型对象时，需要给MyBatisDao指定引用entity类型。
  */
-@MyBatisDao(entity=Employee.class, dataSourceName=DataSourceHolder.DEFAULT)
+@MyBatisDao(entity=Employee.class)
 public interface EmployeeDao extends CrudDao<Employee> {
 
 }
\ No newline at end of file
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeePostDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeePostDao.java
index a95c992d..078af4ce 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeePostDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeePostDao.java
@@ -4,7 +4,6 @@
 package com.jeesite.modules.sys.dao;
 
 import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.sys.entity.EmployeePost;
 
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.EmployeePost;
  * @author ThinkGem
  * @version 2017-03-25
  */
-@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
+@MyBatisDao
 public interface EmployeePostDao extends CrudDao<EmployeePost> {
 	
 }
\ No newline at end of file
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/LogDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/LogDao.java
index fcf30348..c95a55c8 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/LogDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/LogDao.java
@@ -4,7 +4,6 @@
 package com.jeesite.modules.sys.dao;
 
 import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.sys.entity.Log;
 
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Log;
  * @author ThinkGem
  * @version 2017-03-19
  */
-@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
+@MyBatisDao
 public interface LogDao extends CrudDao<Log> {
 	
 }
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/OfficeDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/OfficeDao.java
index 06644144..dc5bbfaf 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/OfficeDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/OfficeDao.java
@@ -4,7 +4,6 @@
 package com.jeesite.modules.sys.dao;
 
 import com.jeesite.common.dao.TreeDao;
-import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.sys.entity.Office;
 
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Office;
  * @author ThinkGem
  * @version 2017-03-23
  */
-@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
+@MyBatisDao
 public interface OfficeDao extends TreeDao<Office> {
 	
 }
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/dao/PostDao.java b/modules/core/src/main/java/com/jeesite/modules/sys/dao/PostDao.java
index 0a7f3a52..0a837a00 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/dao/PostDao.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/dao/PostDao.java
@@ -4,7 +4,6 @@
 package com.jeesite.modules.sys.dao;
 
 import com.jeesite.common.dao.CrudDao;
-import com.jeesite.common.datasource.DataSourceHolder;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
 import com.jeesite.modules.sys.entity.Post;
 
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Post;
  * @author ThinkGem
  * @version 2017-03-25
  */
-@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT)
+@MyBatisDao
 public interface PostDao extends CrudDao<Post> {
 	
 }
\ No newline at end of file
diff --git a/modules/core/src/main/resources/config/logger-core.xml b/modules/core/src/main/resources/config/logger-core.xml
index 1e6e07d6..f7d2feea 100644
--- a/modules/core/src/main/resources/config/logger-core.xml
+++ b/modules/core/src/main/resources/config/logger-core.xml
@@ -14,6 +14,7 @@
 	<logger name="com.atomikos.icatch.provider.imp.AssemblerImp" level="ERROR" />
 	<logger name="com.atomikos.jdbc.AbstractDataSourceBean" level="ERROR" />
 	<logger name="com.atomikos.jdbc.AtomikosConnectionProxy" level="ERROR" />
+	<logger name="com.atomikos.recovery.xa.XaResourceRecoveryManager" level="ERROR" />
 <!-- 	<logger name="org.springframework.transaction.support.TransactionSynchronizationManager" level="TRACE" /> -->
 	
 	<logger name="springfox.documentation.spring.web.readers.parameter.ParameterDataTypeReader" level="ERROR" />