diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalConfigController.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalConfigController.java
index 9342cea3..8fea8ba5 100644
--- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalConfigController.java
+++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/CanalConfigController.java
@@ -2,10 +2,7 @@ package com.alibaba.otter.canal.admin.controller;
 
 import com.alibaba.otter.canal.admin.model.BaseModel;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.alibaba.otter.canal.admin.model.CanalConfig;
 import com.alibaba.otter.canal.admin.service.CanalConfigService;
@@ -21,4 +18,10 @@ public class CanalConfigController {
     public BaseModel<CanalConfig> canalConfig(@PathVariable String env) {
         return BaseModel.getInstance(canalConfigService.getCanalConfig());
     }
+
+    @RequestMapping(value = "/config", method = RequestMethod.PUT)
+    public BaseModel<String> updateConfig(@RequestBody CanalConfig canalConfig, @PathVariable String env) {
+        canalConfigService.updateContent(canalConfig);
+        return BaseModel.getInstance("success");
+    }
 }
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalConfigService.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalConfigService.java
index 92c69705..fa5b635a 100644
--- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalConfigService.java
+++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/CanalConfigService.java
@@ -7,4 +7,6 @@ public interface CanalConfigService {
     CanalConfig getCanalConfig();
 
     CanalConfig getAdapterConfig();
+
+    void updateContent(CanalConfig canalConfig);
 }
diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalConfigServiceImpl.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalConfigServiceImpl.java
index 3af022e2..3e7f2538 100644
--- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalConfigServiceImpl.java
+++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/CanalConfigServiceImpl.java
@@ -6,6 +6,7 @@ import org.springframework.stereotype.Service;
 import com.alibaba.otter.canal.admin.dao.CanalConfigDao;
 import com.alibaba.otter.canal.admin.model.CanalConfig;
 import com.alibaba.otter.canal.admin.service.CanalConfigService;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class CanalConfigServiceImpl implements CanalConfigService {
@@ -22,6 +23,6 @@ public class CanalConfigServiceImpl implements CanalConfigService {
     }
 
     public void updateContent(CanalConfig canalConfig) {
-        canalConfigDao.findById(canalConfig.getId());
+        canalConfigDao.updateContent(canalConfig);
     }
 }
diff --git a/canal-admin/canal-admin-ui/src/api/canalConfig.js b/canal-admin/canal-admin-ui/src/api/canalConfig.js
index 8407369b..f05af9c9 100644
--- a/canal-admin/canal-admin-ui/src/api/canalConfig.js
+++ b/canal-admin/canal-admin-ui/src/api/canalConfig.js
@@ -6,3 +6,11 @@ export function getCanalConfig() {
     method: 'get'
   })
 }
+
+export function updateCanalConfig(data) {
+  return request({
+    url: '/canal/config',
+    method: 'put',
+    data
+  })
+}
diff --git a/canal-admin/canal-admin-ui/src/views/canalServer/config.vue b/canal-admin/canal-admin-ui/src/views/canalServer/config.vue
index 2e3e5772..e9712e5c 100644
--- a/canal-admin/canal-admin-ui/src/views/canalServer/config.vue
+++ b/canal-admin/canal-admin-ui/src/views/canalServer/config.vue
@@ -3,9 +3,9 @@
     <el-form ref="form" :model="form">
       <div style="padding-left: 10px;padding-top: 20px;">
         <el-form-item>
-          canal.properties&nbsp;&nbsp;&nbsp;&nbsp;
+          {{ form.name }}&nbsp;&nbsp;&nbsp;&nbsp;
           <el-button type="primary" @click="onSubmit">修改</el-button>
-          <el-button @click="onCancel">取消</el-button>
+          <el-button @click="onCancel">重置</el-button>
         </el-form-item>
       </div>
       <editor v-model="form.content" lang="properties" theme="chrome" width="100%" :height="800" @init="editorInit" />
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { getCanalConfig } from '@/api/canalConfig'
+import { getCanalConfig, updateCanalConfig } from '@/api/canalConfig'
 
 export default {
   components: {
@@ -23,6 +23,7 @@ export default {
   data() {
     return {
       form: {
+        id: null,
         name: '',
         content: ''
       }
@@ -44,17 +45,40 @@ export default {
     },
     loadCanalConfig() {
       getCanalConfig().then(response => {
-        this.form.content = response.data.content
+        const data = response.data
+        this.form.id = data.id
+        this.form.name = data.name
+        this.form.content = data.content
       })
     },
     onSubmit() {
-      this.$message('submit!')
+      this.$confirm(
+        '修改Canal主配置可能会导致Server重启，是否继续？',
+        '确定修改',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        updateCanalConfig(this.form).then(response => {
+          if (response.data === 'success') {
+            this.$message({
+              message: '修改成功',
+              type: 'success'
+            })
+            this.loadCanalConfig()
+          } else {
+            this.$message({
+              message: '修改失败',
+              type: 'error'
+            })
+          }
+        })
+      })
     },
     onCancel() {
-      this.$message({
-        message: 'cancel!',
-        type: 'warning'
-      })
+      this.loadCanalConfig()
     }
   }
 }