Fix

@@ -61,6 +61,11 @@
             <artifactId>yoho-datasync-core-base</artifactId>
             <version>${datasync.core.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

@@ -7,12 +7,6 @@ canal:
       dbname: "yh_grass"
       username: ""
       password: ""
-<<<<<<< Updated upstream
-      filter: "yh_grass.grass_article_praise, yh_grass.grass_article_block, yh_grass.grass_article,
-      yh_grass.grass_article_comment, yh_grass.grass_article_label, yh_grass.grass_article_product,
-      yh_grass.grass_comment_praise"
-=======
->>>>>>> Stashed changes
       fetchSize: "1000"
       zkAddress: ""
 

 spring:
   profiles:
-    active: test
+    active: dev
+
+server:
+  port: 8080