Merge remote-tracking branch 'upstream/main' into main

xuehui-Z · xuehui-Z · commit 97bce2d47f70 · 2020-11-19T19:20:38.000+08:00
diff --git a/04fx/springboot01/src/main/resources/application.yml b/04fx/springboot01/src/main/resources/application.yml
@@ -23,9 +23,15 @@ spring:
     enabled: true
     max-connections: 10   #连接池最大连接数
     idle-timeout: 30000   #空闲的连接过期时间，默认为30秒
+    
+    
+    
   data:
     mongodb:
       uri: mongodb://localhost:27017/mydb
+  
+  profiles:
+    active: true
 
 # jms:
 #   pub-sub-domain: true  #默认情况下activemq提供的是queue模式，若要使用topic模式需要配置下面配置
