lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-01 10:21:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化配置

Browse Source
This commit is contained in:
zhouhao
2016-10-20 11:32:55 +08:00
parent ade0a7f2fb
commit 1d97e4f343
4 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hsweb-web-dao/hsweb-web-dao-mybatis/src/main/java/org/hsweb/web/mybatis/MyBatisAutoConfiguration.java
View File

@@ -23,6 +23,7 @@ import org.hsweb.web.mybatis.dynamic.DynamicDataSourceSqlSessionFactoryBuilder;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@ -51,7 +52,7 @@ public class MyBatisAutoConfiguration {
private DatabaseIdProvider databaseIdProvider;
@Bean(name = "sqlSessionFactory")
public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws Exception {
SqlSessionFactoryBean factory = new SqlSessionFactoryBean();
if (properties.isDynamicDatasource())
factory.setSqlSessionFactoryBuilder(new DynamicDataSourceSqlSessionFactoryBuilder());

1
hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/SchedulerProperties.java
View File

@@ -31,6 +31,7 @@ public class SchedulerProperties {
private boolean waitOnShutdown = true;
private int startupDelay = 0;
private Properties properties;
public boolean isAutoStartup() {

47
hsweb-web-service/hsweb-web-service-simple/src/main/resources/META-INF/spring-configuration-metadata.json Normal file
View File

@@ -0,0 +1,47 @@
{
"groups": [
{
"name": "scheduler",
"type": "org.hsweb.web.service.impl.SchedulerProperties",
"sourceType": "org.hsweb.web.service.impl.SchedulerProperties"
}
],
"properties": [
{
"name": "scheduler.auto-startup",
"type": "java.lang.Boolean",
"sourceType": "org.hsweb.web.service.impl.SchedulerProperties",
"defaultValue": true
},
{
"name": "scheduler.overwrite-existing-jobs",
"type": "java.lang.Boolean",
"sourceType": "org.hsweb.web.service.impl.SchedulerProperties",
"defaultValue": true
},
{
"name": "scheduler.beanName",
"type": "java.lang.String",
"sourceType": "org.hsweb.web.service.impl.SchedulerProperties"
"defaultValue": "scheduler"
},
{
"name": "scheduler.wait-on-shutdown",
"type": "java.lang.Boolean",
"sourceType": "org.hsweb.web.service.impl.SchedulerProperties"
"defaultValue": true
},
{
"name": "scheduler.startup-delay",
"type": "java.lang.Integer",
"sourceType": "org.hsweb.web.service.impl.SchedulerProperties",
"defaultValue": 0
},
{
"name": "scheduler.properties",
"type": "java.util.Properties",
"sourceType": "org.hsweb.web.service.impl.SchedulerProperties"
}
],
"hints": []
}

1
hsweb-web-service/hsweb-web-service-simple/src/test/java/org/hsweb/web/service/impl/user/UserServiceImplTest.java
View File

@@ -22,7 +22,6 @@ import org.hsweb.web.bean.common.UpdateParam;
import org.hsweb.web.bean.po.user.User;
import org.hsweb.web.dao.role.UserRoleMapper;
import org.hsweb.web.dao.user.UserMapper;
import org.hsweb.web.service.impl.AbstractTestCase;
import org.hsweb.web.service.module.ModuleService;
import org.hsweb.web.service.user.UserService;
import org.junit.Assert;