Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/schedule/SyncSchedule.java

@@ -15,8 +15,8 @@ import java.io.IOException;
 /**
  * 定时购买保险
  */
-//@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
-//@Component
+@ConditionalOnProperty(name = "schedule.gongdan.enable", havingValue = "true", matchIfMissing = true)
+@Component
 public class SyncSchedule {
 
 

mall-server-api/src/main/resources/bootstrap-dev.properties

@@ -8,6 +8,7 @@ express.callback=${sys.url}/${server.servlet.context-path}/common/express/callba
 
 #定时器
 schedule.enable=false
+schedule.gongdan.enable=false
 #分销商城商品接口
 gjmall.goods.url=http://121.43.111.127:10003/goods/outside/list
 

mall-server-api/src/main/resources/bootstrap-prd.properties

@@ -8,6 +8,7 @@ express.callback=${sys.url}/${server.servlet.context-path}/common/express/callba
 
 #定时器
 schedule.enable=true
+schedule.gongdan.enable=false
 #分销商城商品接口
 gjmall.goods.url=https://gjmall.zfire.top/api/goods/outside/list
 

mall-server-api/src/main/resources/bootstrap-test.properties

@@ -8,6 +8,7 @@ express.callback=${sys.url}/${server.servlet.context-path}/common/express/callba
 
 #定时器
 schedule.enable=true
+schedule.gongdan.enable=true
 #分销商城商品接口
 gjmall.goods.url=http://121.43.111.127:10003/goods/outside/list