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

代码优化

Browse Source
This commit is contained in:
thinkgem
2022-04-21 18:54:13 +08:00
parent ddc67f0189
commit a0d6ef9097
7 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/src/main/java/com/jeesite/autoconfigure/sys/SysAutoConfiguration.java
View File

@@ -10,6 +10,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.jeesite.common.mybatis.MyBatisFactoryBean; 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.AreaService;
import com.jeesite.modules.sys.service.CompanyService; import com.jeesite.modules.sys.service.CompanyService;
import com.jeesite.modules.sys.service.EmpUserService; import com.jeesite.modules.sys.service.EmpUserService;
@@ -76,4 +77,10 @@ public class SysAutoConfiguration {
return new PostServiceSupport(); return new PostServiceSupport();
} }
@Bean
@ConditionalOnMissingBean
public MsgInnerService msgInnerService(){
return new MsgInnerService();
}
} }

4
modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java
View File

@@ -12,8 +12,6 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired; 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 org.springframework.transaction.annotation.Transactional;
import com.jeesite.common.callback.MethodCallback; import com.jeesite.common.callback.MethodCallback;
@@ -46,9 +44,7 @@ import io.netty.util.concurrent.DefaultThreadFactory;
* @author ThinkGem * @author ThinkGem
* @version 2019-03-12 * @version 2019-03-12
*/ */
@Service
@Transactional(readOnly=true) @Transactional(readOnly=true)
@ConditionalOnBean(MsgInnerDao.class)
public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> { public class MsgInnerService extends CrudService<MsgInnerDao, MsgInner> {
@Autowired @Autowired

2
modules/core/src/main/java/com/jeesite/modules/msg/web/MsgInnerController.java
View File

@@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -36,7 +35,6 @@ import com.jeesite.modules.msg.service.MsgInnerService;
@Controller @Controller
@RequestMapping(value = "${adminPath}/msg/msgInner") @RequestMapping(value = "${adminPath}/msg/msgInner")
@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true) @ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true)
@ConditionalOnBean(MsgInnerService.class)
public class MsgInnerController extends BaseController { public class MsgInnerController extends BaseController {
@Autowired @Autowired

1
modules/core/src/main/resources/config/jeesite-core.yml
View File

@@ -639,6 +639,7 @@ error:
#======== FileUpload settings =========# #======== FileUpload settings =========#
#======================================# #======================================#
# 文件上传
file: file:
enabled: true enabled: true

1
web-api/src/main/resources/config/application.yml
View File

@@ -800,6 +800,7 @@ error:
#======== FileUpload settings =========# #======== FileUpload settings =========#
#======================================# #======================================#
# 文件上传
file: file:
enabled: true enabled: true

10
web/pom.xml
View File

@@ -86,16 +86,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> --> </dependency> -->
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<version>2.5.6</version>
</dependency> -->
</dependencies> </dependencies>
<build> <build>

1
web/src/main/resources/config/application.yml
View File

@@ -800,6 +800,7 @@ error:
#======== FileUpload settings =========# #======== FileUpload settings =========#
#======================================# #======================================#
# 文件上传
file: file:
enabled: true enabled: true