注意：@MyBatisDao如果不设置dataSourceName，则为default默认数据源，如果需要使用DataSourceHolder.setDataSourceName设置数据源，请将设置该注解属性设置为dataSourceName=DataSourceHolder.EMPTY

2019-05-17 23:16:01 +08:00
parent 5248cf9a68
commit 2de70e79ae
10 changed files with 10 additions and 18 deletions
--- 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> {
 	
 }
--- 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> {
 	
 }
--- 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> {
 	
 }
--- 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> {

 	/**
--- 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> {

 }
--- 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> {
 	
 }
--- 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> {
 	
 }
--- 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> {
 	
 }
--- 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> {
 	
 }
--- 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" />