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 {
}
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 {
}
\ 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 {
}
\ 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 {
/**
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 {
}
\ 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 {
}
\ 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 {
}
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 {
}
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 {
}
\ 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 @@
+