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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/DataController.java

@@ -7,11 +7,13 @@ import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.PostConstruct;
 import java.util.*;
 
 /**
@@ -20,10 +22,16 @@ import java.util.*;
  * @description
  * @data 2019/7/24 15:11
  */
+@ConditionalOnProperty(prefix = "data.clean", name = "enable",havingValue = "true")
 @RestController
 @RequestMapping("/app/unauth/user_data")
 public class DataController {
 
+    @PostConstruct
+    public void init(){
+        System.out.println("启动了****************************");
+    }
+
     @Autowired
     private AppUserLoginBiz appUserLoginBiz;