From a93af74539163e6bbff46238b8fb4f29cc761160 Mon Sep 17 00:00:00 2001
From: rewerma <rewerma@163.com>
Date: Thu, 11 Jul 2019 00:20:56 +0800
Subject: [PATCH] modify

---
 canal-admin/canal-admin-server/pom.xml        | 14 ++++++
 .../otter/canal/admin/dao/CanalConfigDao.java | 43 +++++++++++++++++
 .../otter/canal/admin/model/CanalConfig.java  | 46 +++++++++++++++++++
 .../otter/canal/admin/model/Person.java       |  7 +++
 .../src/main/resources/application.yml        |  9 ++++
 canal-admin/pom.xml                           |  5 ++
 6 files changed, 124 insertions(+)
 create mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/dao/CanalConfigDao.java
 create mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalConfig.java
 create mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/Person.java

diff --git a/canal-admin/canal-admin-server/pom.xml b/canal-admin/canal-admin-server/pom.xml
index f4fb3dea..be47435d 100644
--- a/canal-admin/canal-admin-server/pom.xml
+++ b/canal-admin/canal-admin-server/pom.xml
@@ -16,11 +16,25 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.javalite</groupId>
             <artifactId>activejdbc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-dbutils</groupId>
+            <artifactId>commons-dbutils</artifactId>
+            <version>1.6</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/dao/CanalConfigDao.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/dao/CanalConfigDao.java
new file mode 100644
index 00000000..ca4ae033
--- /dev/null
+++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/dao/CanalConfigDao.java
@@ -0,0 +1,43 @@
+package com.alibaba.otter.canal.admin.dao;
+
+import com.alibaba.otter.canal.admin.model.CanalConfig;
+import com.alibaba.otter.canal.admin.model.Person;
+import org.apache.commons.dbutils.QueryRunner;
+import org.apache.commons.dbutils.handlers.BeanHandler;
+import org.javalite.activejdbc.Base;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.PostConstruct;
+import javax.sql.DataSource;
+import java.sql.SQLException;
+
+@Repository
+public class CanalConfigDao {
+    @Autowired
+    private DataSource dataSource;
+//    public void open() {
+//        Base.open(dataSource);
+//    }
+
+    @PostConstruct
+    public void init() {
+//        CanalConfig canalConfig = new CanalConfig();
+//        canalConfig.setId(1L);
+        UpdateContent(1L);
+    }
+
+    public void UpdateContent(Long id) {
+        QueryRunner runner = new QueryRunner(dataSource);
+        try {
+            CanalConfig canalConfig = runner.query("select * from canal_config where id=1", new BeanHandler<>(CanalConfig.class));
+            canalConfig = canalConfig;
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+//        Base.open(dataSource);
+//        Person.where("id=?", id);
+//        Base.close();
+    }
+}
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalConfig.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalConfig.java
new file mode 100644
index 00000000..8ecac1da
--- /dev/null
+++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/CanalConfig.java
@@ -0,0 +1,46 @@
+package com.alibaba.otter.canal.admin.model;
+
+import org.javalite.activejdbc.Model;
+import org.javalite.activejdbc.annotations.Table;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+public class CanalConfig {
+    private Long id;
+    private String name;
+    private String content;
+    private Timestamp modifiedTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Timestamp getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Timestamp modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/Person.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/Person.java
new file mode 100644
index 00000000..496a1643
--- /dev/null
+++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/Person.java
@@ -0,0 +1,7 @@
+package com.alibaba.otter.canal.admin.model;
+
+import org.javalite.activejdbc.Model;
+
+public class Person extends Model {
+
+}
\ No newline at end of file
diff --git a/canal-admin/canal-admin-server/src/main/resources/application.yml b/canal-admin/canal-admin-server/src/main/resources/application.yml
index 3f23c206..d241e35a 100644
--- a/canal-admin/canal-admin-server/src/main/resources/application.yml
+++ b/canal-admin/canal-admin-server/src/main/resources/application.yml
@@ -4,3 +4,12 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
+
+spring.datasource:
+    url: jdbc:mysql://127.0.0.1:3306/canal_manager?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    username: root
+    password: 121212
+    driver-class-name: com.mysql.jdbc.Driver
+    hikari:
+      maximum-pool-size: 10
+      minimum-idle: 1
diff --git a/canal-admin/pom.xml b/canal-admin/pom.xml
index 984470b7..b997eafe 100644
--- a/canal-admin/pom.xml
+++ b/canal-admin/pom.xml
@@ -38,6 +38,11 @@
                 <artifactId>activejdbc</artifactId>
                 <version>2.3</version>
             </dependency>
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>5.1.40</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>