diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java
index 5b605d2b..6ee63a28 100644
--- a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java
+++ b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java
@@ -12,6 +12,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -47,6 +48,7 @@ import io.netty.util.concurrent.DefaultThreadFactory;
  */
 @Service
 @Transactional(readOnly=true)
+@ConditionalOnBean(MsgInnerDao.class)
 public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> {
 	
 	@Autowired
diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java b/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java
index df0e66d0..03bd0dad 100644
--- a/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java
@@ -9,6 +9,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.annotation.Validated;
@@ -33,6 +35,8 @@ import com.jeesite.modules.msg.service.MsgInnerService;
  */
 @Controller
 @RequestMapping(value = "${adminPath}/msg/msgInner")
+@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true)
+@ConditionalOnBean(MsgInnerService.class)
 public class MsgInnerController extends BaseController {
 
 	@Autowired
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
index c0be9928..0385d700 100644
Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ