Skip to content

Commit 33bae58

Browse files
committed
🐛 conditional 写反了
1 parent d36916b commit 33bae58

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

demo/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</repositories>
3434
<properties>
3535
<java.version>1.8</java.version>
36-
<nutz.version>1.r.68-SNAPSHOT</nutz.version>
36+
<nutz.version>[1.r.68.v20191031,)</nutz.version>
3737
</properties>
3838

3939
<dependencies>

demo/src/main/java/org/nutz/demo/DemoApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
@SpringBootApplication
77
public class DemoApplication {
8-
98
public static void main(String[] args) {
109
SpringApplication.run(DemoApplication.class, args);
1110
}

demo/src/main/resources/application.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
server:
2-
port: 8080
2+
port: 0
33
management:
44
info:
55
git:
@@ -61,7 +61,7 @@ logging:
6161
org.nutz: debug
6262
springfox: off
6363
io.swagger: off
64-
nutz:
64+
nutz:
6565
ngrok:
6666
port: 8080
6767
token: 2lu19cqqf2hciq1hoti37uvjo2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
@Configuration
3636
@ConditionalOnClass({Dao.class})
37-
@ConditionalOnExpression("${nutz.dao.enabled:false}")
37+
@ConditionalOnExpression("${nutz.dao.enabled:true}")
3838
@AutoConfigureAfter({DataSourceAutoConfiguration.class})
3939
@EnableConfigurationProperties(NutzDaoAutoConfigurationProperties.class)
4040
public class NutzDaoAutoConfiguration {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
@Configuration
2121
@ConditionalOnBean({Dao.class})
22-
@ConditionalOnExpression("${nutz.dao.enabled:false}")
22+
@ConditionalOnExpression("${nutz.dao.enabled:true}")
2323
@EnableConfigurationProperties(NutzDaoAutoConfigurationProperties.class)
2424
@AutoConfigureAfter({NutzDaoAutoConfiguration.class})
2525
public class NutzDatabaseInitializer {

src/main/java/org/nutz/spring/boot/json/NutzJsonMessageConverterAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
public class NutzJsonMessageConverterAutoConfiguration {
2424

2525
@Bean
26-
@ConditionalOnExpression("${nutz.json.enabled:false}")
26+
@ConditionalOnExpression("${nutz.json.enabled:true}")
2727
public HttpMessageConverter<Object> nutzJsonHttpMessageConverter(NutzJsonAutoConfigurationProperties properties) {
2828
JsonFormat format = null;
2929
if (properties.getMode() != null) {// 直接模式设置

0 commit comments

Comments
 (0)