diff --git a/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java index dcb57d98..0dbfb9d5 100644 --- a/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java +++ b/modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java @@ -10,6 +10,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import com.jeesite.common.mybatis.MyBatisFactoryBean; +import com.jeesite.modules.msg.service.MsgInnerService; import com.jeesite.modules.sys.service.AreaService; import com.jeesite.modules.sys.service.CompanyService; import com.jeesite.modules.sys.service.EmpUserService; @@ -76,4 +77,10 @@ public class SysAutoConfiguration { return new PostServiceSupport(); } + @Bean + @ConditionalOnMissingBean + public MsgInnerService msgInnerService(){ + return new MsgInnerService(); + } + } 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 6ee63a28..8a413051 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,8 +12,6 @@ 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; import com.jeesite.common.callback.MethodCallback; @@ -46,9 +44,7 @@ import io.netty.util.concurrent.DefaultThreadFactory; * @author ThinkGem * @version 2019-03-12 */ -@Service @Transactional(readOnly=true) -@ConditionalOnBean(MsgInnerDao.class) public class MsgInnerService extends CrudService { @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 03bd0dad..0a01de86 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,7 +9,6 @@ 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; @@ -36,7 +35,6 @@ 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/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 60156779..7c4f0825 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -639,6 +639,7 @@ error: #======== FileUpload settings =========# #======================================# +# 文件上传 file: enabled: true diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index aec2690b..f470aaaa 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -800,6 +800,7 @@ error: #======== FileUpload settings =========# #======================================# +# 文件上传 file: enabled: true diff --git a/web/pom.xml b/web/pom.xml index fb80758d..d41099a1 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -86,16 +86,6 @@ provided --> - - diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 7540a035..9a4ca92e 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -800,6 +800,7 @@ error: #======== FileUpload settings =========# #======================================# +# 文件上传 file: enabled: true