Skip to content

Commit d36916b

Browse files
committed
#4 nutDao提供关闭功能
1 parent 76052b2 commit d36916b

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4141
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4242
<java.version>1.8</java.version>
43-
<nutz.version>1.r.68-SNAPSHOT</nutz.version>
43+
<nutz.version>[1.r.68.v20191031,)</nutz.version>
4444
</properties>
4545
<repositories>
4646
<repository>

src/main/java/org/nutz/spring/boot/dao/NutzDaoAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.springframework.beans.factory.annotation.Autowired;
2222
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
24+
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
2425
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2526
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
2627
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -33,6 +34,7 @@
3334
*/
3435
@Configuration
3536
@ConditionalOnClass({Dao.class})
37+
@ConditionalOnExpression("${nutz.dao.enabled:false}")
3638
@AutoConfigureAfter({DataSourceAutoConfiguration.class})
3739
@EnableConfigurationProperties(NutzDaoAutoConfigurationProperties.class)
3840
public class NutzDaoAutoConfiguration {

src/main/java/org/nutz/spring/boot/dao/NutzDaoAutoConfigurationProperties.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
@ConfigurationProperties(prefix = "nutz.dao")
1313
public class NutzDaoAutoConfigurationProperties {
1414

15+
boolean enabled = true;
1516
/**
1617
* 运行期配置
1718
*/

src/main/java/org/nutz/spring/boot/dao/NutzDatabaseInitializer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
1111
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
12+
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
1213
import org.springframework.boot.context.properties.EnableConfigurationProperties;
1314
import org.springframework.context.annotation.Configuration;
1415

@@ -18,6 +19,7 @@
1819
*/
1920
@Configuration
2021
@ConditionalOnBean({Dao.class})
22+
@ConditionalOnExpression("${nutz.dao.enabled:false}")
2123
@EnableConfigurationProperties(NutzDaoAutoConfigurationProperties.class)
2224
@AutoConfigureAfter({NutzDaoAutoConfiguration.class})
2325
public class NutzDatabaseInitializer {

0 commit comments

Comments
 (0)