manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
thinkgem
2019-05-17 23:16:01 +08:00
parent 5248cf9a68
commit 2de70e79ae
10 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/main/java/com/jeesite/modules/sys/dao/AreaDao.java
View File

@@ -4,7 +4,6 @@
package com.jeesite.modules.sys.dao; package com.jeesite.modules.sys.dao;
import com.jeesite.common.dao.TreeDao; import com.jeesite.common.dao.TreeDao;
import com.jeesite.common.datasource.DataSourceHolder;
import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.sys.entity.Area; import com.jeesite.modules.sys.entity.Area;
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Area;
* @author ThinkGem * @author ThinkGem
* @version 2017-03-22 * @version 2017-03-22
*/ */
@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT) @MyBatisDao
public interface AreaDao extends TreeDao<Area> { public interface AreaDao extends TreeDao<Area> {
} }

3
modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyDao.java
View File

@@ -4,7 +4,6 @@
package com.jeesite.modules.sys.dao; package com.jeesite.modules.sys.dao;
import com.jeesite.common.dao.TreeDao; import com.jeesite.common.dao.TreeDao;
import com.jeesite.common.datasource.DataSourceHolder;
import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.sys.entity.Company; import com.jeesite.modules.sys.entity.Company;
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Company;
* @author ThinkGem * @author ThinkGem
* @version 2017-03-12 * @version 2017-03-12
*/ */
@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT) @MyBatisDao
public interface CompanyDao extends TreeDao<Company> { public interface CompanyDao extends TreeDao<Company> {
} }

3
modules/core/src/main/java/com/jeesite/modules/sys/dao/CompanyOfficeDao.java
View File

@@ -4,7 +4,6 @@
package com.jeesite.modules.sys.dao; package com.jeesite.modules.sys.dao;
import com.jeesite.common.dao.CrudDao; import com.jeesite.common.dao.CrudDao;
import com.jeesite.common.datasource.DataSourceHolder;
import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.sys.entity.CompanyOffice; import com.jeesite.modules.sys.entity.CompanyOffice;
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.CompanyOffice;
* @author ThinkGem * @author ThinkGem
* @version 2017-03-23 * @version 2017-03-23
*/ */
@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT) @MyBatisDao
public interface CompanyOfficeDao extends CrudDao<CompanyOffice> { public interface CompanyOfficeDao extends CrudDao<CompanyOffice> {
} }

3
modules/core/src/main/java/com/jeesite/modules/sys/dao/EmpUserDao.java
View File

@@ -6,7 +6,6 @@ package com.jeesite.modules.sys.dao;
import java.util.List; import java.util.List;
import com.jeesite.common.dao.CrudDao; import com.jeesite.common.dao.CrudDao;
import com.jeesite.common.datasource.DataSourceHolder;
import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.sys.entity.EmpUser; import com.jeesite.modules.sys.entity.EmpUser;
@@ -15,7 +14,7 @@ import com.jeesite.modules.sys.entity.EmpUser;
* @author ThinkGem * @author ThinkGem
* @version 2017-03-25 * @version 2017-03-25
*/ */
@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT) @MyBatisDao
public interface EmpUserDao extends CrudDao<EmpUser> { public interface EmpUserDao extends CrudDao<EmpUser> {
/** /**

3
modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeeDao.java
View File

@@ -4,7 +4,6 @@
package com.jeesite.modules.sys.dao; package com.jeesite.modules.sys.dao;
import com.jeesite.common.dao.CrudDao; import com.jeesite.common.dao.CrudDao;
import com.jeesite.common.datasource.DataSourceHolder;
import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.sys.entity.Employee; import com.jeesite.modules.sys.entity.Employee;
@@ -14,7 +13,7 @@ import com.jeesite.modules.sys.entity.Employee;
* @version 2017-03-25 * @version 2017-03-25
* 通过 UserUtils.loadRefObj() 加载引用类型对象时，需要给MyBatisDao指定引用entity类型。 * 通过 UserUtils.loadRefObj() 加载引用类型对象时，需要给MyBatisDao指定引用entity类型。
*/ */
@MyBatisDao(entity=Employee.class, dataSourceName=DataSourceHolder.DEFAULT) @MyBatisDao(entity=Employee.class)
public interface EmployeeDao extends CrudDao<Employee> { public interface EmployeeDao extends CrudDao<Employee> {
} }

3
modules/core/src/main/java/com/jeesite/modules/sys/dao/EmployeePostDao.java
View File

@@ -4,7 +4,6 @@
package com.jeesite.modules.sys.dao; package com.jeesite.modules.sys.dao;
import com.jeesite.common.dao.CrudDao; import com.jeesite.common.dao.CrudDao;
import com.jeesite.common.datasource.DataSourceHolder;
import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.sys.entity.EmployeePost; import com.jeesite.modules.sys.entity.EmployeePost;
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.EmployeePost;
* @author ThinkGem * @author ThinkGem
* @version 2017-03-25 * @version 2017-03-25
*/ */
@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT) @MyBatisDao
public interface EmployeePostDao extends CrudDao<EmployeePost> { public interface EmployeePostDao extends CrudDao<EmployeePost> {
} }

3
modules/core/src/main/java/com/jeesite/modules/sys/dao/LogDao.java
View File

@@ -4,7 +4,6 @@
package com.jeesite.modules.sys.dao; package com.jeesite.modules.sys.dao;
import com.jeesite.common.dao.CrudDao; import com.jeesite.common.dao.CrudDao;
import com.jeesite.common.datasource.DataSourceHolder;
import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.sys.entity.Log; import com.jeesite.modules.sys.entity.Log;
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Log;
* @author ThinkGem * @author ThinkGem
* @version 2017-03-19 * @version 2017-03-19
*/ */
@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT) @MyBatisDao
public interface LogDao extends CrudDao<Log> { public interface LogDao extends CrudDao<Log> {
} }

3
modules/core/src/main/java/com/jeesite/modules/sys/dao/OfficeDao.java
View File

@@ -4,7 +4,6 @@
package com.jeesite.modules.sys.dao; package com.jeesite.modules.sys.dao;
import com.jeesite.common.dao.TreeDao; import com.jeesite.common.dao.TreeDao;
import com.jeesite.common.datasource.DataSourceHolder;
import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.entity.Office;
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Office;
* @author ThinkGem * @author ThinkGem
* @version 2017-03-23 * @version 2017-03-23
*/ */
@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT) @MyBatisDao
public interface OfficeDao extends TreeDao<Office> { public interface OfficeDao extends TreeDao<Office> {
} }

3
modules/core/src/main/java/com/jeesite/modules/sys/dao/PostDao.java
View File

@@ -4,7 +4,6 @@
package com.jeesite.modules.sys.dao; package com.jeesite.modules.sys.dao;
import com.jeesite.common.dao.CrudDao; import com.jeesite.common.dao.CrudDao;
import com.jeesite.common.datasource.DataSourceHolder;
import com.jeesite.common.mybatis.annotation.MyBatisDao; import com.jeesite.common.mybatis.annotation.MyBatisDao;
import com.jeesite.modules.sys.entity.Post; import com.jeesite.modules.sys.entity.Post;
@@ -13,7 +12,7 @@ import com.jeesite.modules.sys.entity.Post;
* @author ThinkGem * @author ThinkGem
* @version 2017-03-25 * @version 2017-03-25
*/ */
@MyBatisDao(dataSourceName=DataSourceHolder.DEFAULT) @MyBatisDao
public interface PostDao extends CrudDao<Post> { public interface PostDao extends CrudDao<Post> {
} }

1
modules/core/src/main/resources/config/logger-core.xml
View File

@@ -14,6 +14,7 @@
<logger name="com.atomikos.icatch.provider.imp.AssemblerImp" level="ERROR" /> <logger name="com.atomikos.icatch.provider.imp.AssemblerImp" level="ERROR" />
<logger name="com.atomikos.jdbc.AbstractDataSourceBean" level="ERROR" /> <logger name="com.atomikos.jdbc.AbstractDataSourceBean" level="ERROR" />
<logger name="com.atomikos.jdbc.AtomikosConnectionProxy" 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="org.springframework.transaction.support.TransactionSynchronizationManager" level="TRACE" /> -->
<logger name="springfox.documentation.spring.web.readers.parameter.ParameterDataTypeReader" level="ERROR" /> <logger name="springfox.documentation.spring.web.readers.parameter.ParameterDataTypeReader" level="ERROR" />