Merge branch 'master' of git.yfzx.zjtys.com.cn:912-system/data/DataSwitchSys

ds-ftp/src/main/java/com/zjty/ftp/controller/FileUploadController.java

@@ -21,4 +21,5 @@ public class FileUploadController {
     public ServerResponse fileUpload(HttpServletRequest httpServletRequest){
         return fileUploadService.fileUpload(httpServletRequest);
     }
+
 }

ds-mq/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ds</artifactId>
+        <groupId>com.zjty.ds</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ds-mq</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-kafka</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

ds-switch/src/main/java/com/zjty/switches/controller/TestController.java

+package com.zjty.switches.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-03-04
+ */
+@RestController
+@RequestMapping("/test")
+public class TestController {
+
+    @GetMapping("/asd")
+    public ResponseEntity test() {
+        return ResponseEntity.ok("success");
+    }
+}

ds-union/src/main/java/com/zjty/ds/union/UnionApplication.java

@@ -2,6 +2,7 @@ package com.zjty.ds.union;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * 项目启动类
@@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author LJJ cnljj1995@gmail.com
  * on 2020-02-26
  */
+@EnableSwagger2
 @SpringBootApplication(scanBasePackages = {
         "com.zjty.ds.misc",
         "com.zjty.ds.union",

ds-union/src/main/resources/application.properties

+logging.file=./log/canalDemo.log
+spring.main.allow-bean-definition-overriding=true
+##连接中心数据库数据库mysql
+spring.datasource.url=jdbc:mysql://localhost:3306/canaltest2?useSSL=false&serverTimezone=UTC&characterEncoding=UTF-8
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.username=root
+spring.datasource.password=ljj123456
+
+##前置数据库
+url=jdbc:mysql://localhost:3306/canaltest?useSSL=false&serverTimezone=UTC&characterEncoding=UTF-8
+driver=com.mysql.jdbc.Driver
+dbusername=root
+dbpassword=ljj123456
+
+###canal
+canal.adderss=127.0.0.1
+canal.port=11111
+destination=example
+username=""
+password=""
+##subscribe.regex=canaltest\\..*
+subscribe.regex=canaltest\\..*,canaltest2\\..*
+
+## ftp config
+spring.servlet.multipart.max-file-size=200MB
+spring.servlet.multipart.max-request-size=200MB