diff --git a/canal-admin/canal-admin-server/pom.xml b/canal-admin/canal-admin-server/pom.xml index 3e031738..92b5d038 100644 --- a/canal-admin/canal-admin-server/pom.xml +++ b/canal-admin/canal-admin-server/pom.xml @@ -29,10 +29,6 @@ mysql mysql-connector-java - - commons-dbutils - commons-dbutils - com.github.ben-manes.caffeine caffeine diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ConfigurationException.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ConfigurationException.java deleted file mode 100644 index 617bffc8..00000000 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ConfigurationException.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.alibaba.otter.canal.admin.common.exception; - -public class ConfigurationException extends RuntimeException{ - - public ConfigurationException(String message) { - super(message); - } -} diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ParamValidationException.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ParamValidationException.java deleted file mode 100644 index 96d2edab..00000000 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ParamValidationException.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.otter.canal.admin.common.exception; - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ResponseStatus; - -/** - * Parameter validation failure exception - */ -@ResponseStatus(value = HttpStatus.BAD_REQUEST) -public class ParamValidationException extends SystemException { - - public ParamValidationException(String message) { - super(message); - } -} diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/PermissionDeniedException.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/PermissionDeniedException.java deleted file mode 100644 index d7d1148f..00000000 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/PermissionDeniedException.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.otter.canal.admin.common.exception; - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ResponseStatus; - -/** - * Permission denied exception - */ -@ResponseStatus(value = HttpStatus.UNAUTHORIZED) -public class PermissionDeniedException extends RuntimeException { - - public PermissionDeniedException(String message) { - super(message); - } - - public PermissionDeniedException(String message, Throwable cause) { - super(message, cause); - } - - protected PermissionDeniedException() { - super(); - } -} diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ResourceNotFoundException.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ResourceNotFoundException.java deleted file mode 100644 index 4423966e..00000000 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ResourceNotFoundException.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.otter.canal.admin.common.exception; - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ResponseStatus; - -/** - * Resource not found exception - */ -@ResponseStatus(value = HttpStatus.NOT_FOUND) -public class ResourceNotFoundException extends SystemException { - - public ResourceNotFoundException() { - } - - public ResourceNotFoundException(String message) { - super(message); - } - - public ResourceNotFoundException(String message, Throwable cause) { - super(message, cause); - } - - public ResourceNotFoundException(Throwable cause) { - super(cause); - } - -} diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/SystemException.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/SystemException.java deleted file mode 100644 index 4507dbfa..00000000 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/SystemException.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.otter.canal.admin.common.exception; - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ResponseStatus; - -/** - * System Exception - */ -@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR) -public class SystemException extends RuntimeException { - - public SystemException() { - super(); - } - - public SystemException(String message) { - super(message); - } - - public SystemException(String message, Throwable cause) { - super(message, cause); - } - - public SystemException(Throwable cause) { - super(cause); - } -} diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/VersionValidationException.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/VersionValidationException.java deleted file mode 100644 index f02c8cbc..00000000 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/VersionValidationException.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.alibaba.otter.canal.admin.common.exception; - - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ResponseStatus; - -@ResponseStatus(value = HttpStatus.BAD_REQUEST) -public class VersionValidationException extends SystemException{ - - public VersionValidationException(String message) { - super(message); - } -} diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/Config.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/Config.java deleted file mode 100644 index 1a25bc13..00000000 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/Config.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.alibaba.otter.canal.admin.config; - -import javax.sql.DataSource; - -import io.ebean.EbeanServer; -import org.apache.commons.dbutils.QueryRunner; -import org.springframework.beans.factory.FactoryBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class Config { - - @Bean - public QueryRunner queryRunner(DataSource dataSource) { - return new QueryRunner(dataSource); - } - -// @Bean("ebeanServer") -// public FactoryBean ebeanServer(DataSource dataSource) { -// return new EbeanServerFactory(dataSource); -// } -} diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/WebConfig.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/WebConfig.java index 25fe2e9b..68f906e8 100644 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/WebConfig.java +++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/WebConfig.java @@ -43,37 +43,43 @@ public class WebConfig implements WebMvcConfigurer { } }).addPathPatterns("/api/**"); -// registry.addInterceptor(new HandlerInterceptor() { -// -// @Override -// public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, -// Object o) throws Exception { -// String token = httpServletRequest.getHeader("X-Token"); -// boolean valid = false; -// if (token != null) { -// User user = UserController.loginUsers.getIfPresent(token); -// if (user != null) { -// valid = true; -// } -// } -// if (!valid) { -// BaseModel baseModel = BaseModel.getInstance(null); -// baseModel.setCode(50014); -// baseModel.setMessage("Expired token"); -// ObjectMapper mapper = new ObjectMapper(); -// String json = mapper.writeValueAsString(baseModel); -// try { -// httpServletResponse.setContentType("application/json;charset=UTF-8"); -// PrintWriter out = httpServletResponse.getWriter(); -// out.print(json); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// return false; -// } -// -// return true; -// } -// }).addPathPatterns("/api/**").excludePathPatterns("/api/**/user/**"); + registry.addInterceptor(new HandlerInterceptor() { + + @Override + public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, + Object o) throws Exception { + String token = httpServletRequest.getHeader("X-Token"); + boolean valid = false; + if (token != null) { + User user = UserController.loginUsers.getIfPresent(token); + if (user != null) { + valid = true; + httpServletRequest.setAttribute("user", user); + httpServletRequest.setAttribute("token", token); + } + } + if (!valid) { + BaseModel baseModel = BaseModel.getInstance(null); + baseModel.setCode(50014); + baseModel.setMessage("Expired token"); + ObjectMapper mapper = new ObjectMapper(); + String json = mapper.writeValueAsString(baseModel); + try { + httpServletResponse.setContentType("application/json;charset=UTF-8"); + PrintWriter out = httpServletResponse.getWriter(); + out.print(json); + } catch (Exception e) { + e.printStackTrace(); + } + return false; + } + + return true; + } + }) + .addPathPatterns("/api/**") + .excludePathPatterns("/api/**/user/login") + .excludePathPatterns("/api/**/user/logout") + .excludePathPatterns("/api/**/user/info"); } } diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/UserController.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/UserController.java index c01161a9..8ca61668 100644 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/UserController.java +++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/UserController.java @@ -1,12 +1,15 @@ package com.alibaba.otter.canal.admin.controller; +import com.alibaba.otter.canal.admin.service.UserService; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.alibaba.otter.canal.admin.model.BaseModel; import com.alibaba.otter.canal.admin.model.User; +import javax.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -21,12 +24,16 @@ public class UserController { .expireAfterAccess(10, TimeUnit.MINUTES) .build(key -> null); + @Autowired + UserService userService; + @PostMapping(value = "/login") public BaseModel> login(@RequestBody User user, @PathVariable String env) { - if ("admin".equals(user.getUsername()) && "121212".equals(user.getPassword())) { + User loginUser = userService.find4Login(user.getUsername(), user.getPassword()); + if (loginUser != null) { Map tokenResp = new HashMap<>(); String token = UUID.randomUUID().toString(); - loginUsers.put(token, user); + loginUsers.put(token, loginUser); tokenResp.put("token", token); return BaseModel.getInstance(tokenResp); } else { @@ -50,6 +57,15 @@ public class UserController { } } + @PutMapping(value = "") + public BaseModel update(@RequestBody User user, @PathVariable String env, + HttpServletRequest httpServletRequest) { + userService.update(user); + String token = (String) httpServletRequest.getAttribute("token"); + loginUsers.put(token, user); + return BaseModel.getInstance("success"); + } + @PostMapping(value = "/logout") public BaseModel logout(@PathVariable String env) { return BaseModel.getInstance("success"); diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/NodeServer.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/NodeServer.java index 8b3410f4..cd2f94f1 100644 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/NodeServer.java +++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/NodeServer.java @@ -4,10 +4,12 @@ import java.util.Date; import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.Table; import io.ebean.Finder; @Entity +@Table(name = "canal_node_server") public class NodeServer extends Model { public static final NodeServerFinder find = new NodeServerFinder(); diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/User.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/User.java index 37908174..72b51fc5 100644 --- a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/User.java +++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/model/User.java @@ -1,14 +1,42 @@ package com.alibaba.otter.canal.admin.model; -public class User { +import io.ebean.Finder; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Date; + +@Entity +@Table(name = "canal_user") +public class User extends Model{ + + public static final UserFinder find = new UserFinder(); + + public static class UserFinder extends Finder { + + /** + * Construct using the default EbeanServer. + */ + public UserFinder(){ + super(User.class); + } + + } + + @Id private Long id; private String username; private String password; - private String roles = "admin"; + private String roles; private String introduction; - private String avatar = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif"; - private String name = "Canal Manager"; + private String avatar; + private String name; + private Date creationDate; + + @Transient + private String oldPassword; public Long getId() { return id; @@ -65,4 +93,20 @@ public class User { public void setName(String name) { this.name = name; } + + public Date getCreationDate() { + return creationDate; + } + + public void setCreationDate(Date creationDate) { + this.creationDate = creationDate; + } + + public String getOldPassword() { + return oldPassword; + } + + public void setOldPassword(String oldPassword) { + this.oldPassword = oldPassword; + } } diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/UserService.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/UserService.java new file mode 100644 index 00000000..86f2a087 --- /dev/null +++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/UserService.java @@ -0,0 +1,10 @@ +package com.alibaba.otter.canal.admin.service; + +import com.alibaba.otter.canal.admin.model.User; + +public interface UserService { + + User find4Login(String username, String password); + + void update(User user); +} diff --git a/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/UserServiceImpl.java b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/UserServiceImpl.java new file mode 100644 index 00000000..7a1ee585 --- /dev/null +++ b/canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/UserServiceImpl.java @@ -0,0 +1,34 @@ +package com.alibaba.otter.canal.admin.service.impl; + +import com.alibaba.otter.canal.admin.common.exception.ServiceException; +import com.alibaba.otter.canal.admin.model.User; +import com.alibaba.otter.canal.admin.service.UserService; +import org.apache.commons.lang.StringUtils; +import org.springframework.stereotype.Service; + +@Service +public class UserServiceImpl implements UserService { + + public User find4Login(String username, String password) { + if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) { + return null; + } + User user = User.find.query().where().eq("username", username).eq("password", password).findOne(); + if (user != null) { + user.setPassword(""); + } + return user; + } + + public void update(User user) { + User userTmp = User.find.byId(1L); + if (userTmp == null) { + throw new ServiceException(); + } + if (!userTmp.getPassword().equals(user.getOldPassword())) { + throw new ServiceException("错误的旧密码"); + } + user.setId(1L); + user.update("username", "nn:password"); + } +} diff --git a/canal-admin/canal-admin-ui/public/avatar.gif b/canal-admin/canal-admin-ui/public/avatar.gif new file mode 100644 index 00000000..fdbd32c6 Binary files /dev/null and b/canal-admin/canal-admin-ui/public/avatar.gif differ diff --git a/canal-admin/canal-admin-ui/src/api/user.js b/canal-admin/canal-admin-ui/src/api/user.js index de69f707..70840283 100644 --- a/canal-admin/canal-admin-ui/src/api/user.js +++ b/canal-admin/canal-admin-ui/src/api/user.js @@ -22,3 +22,11 @@ export function logout() { method: 'post' }) } + +export function updateUser(data) { + return request({ + url: '/user', + method: 'put', + data + }) +} diff --git a/canal-admin/canal-admin-ui/src/components/Breadcrumb/index.vue b/canal-admin/canal-admin-ui/src/components/Breadcrumb/index.vue index 29f9a04c..66360cad 100644 --- a/canal-admin/canal-admin-ui/src/components/Breadcrumb/index.vue +++ b/canal-admin/canal-admin-ui/src/components/Breadcrumb/index.vue @@ -33,7 +33,7 @@ export default { const first = matched[0] if (!this.isDashboard(first)) { - matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched) + matched = [{ path: '/dashboard', meta: { title: '主页' }}].concat(matched) } this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) diff --git a/canal-admin/canal-admin-ui/src/layout/components/Navbar.vue b/canal-admin/canal-admin-ui/src/layout/components/Navbar.vue index 4953f36f..a90c68f0 100644 --- a/canal-admin/canal-admin-ui/src/layout/components/Navbar.vue +++ b/canal-admin/canal-admin-ui/src/layout/components/Navbar.vue @@ -7,23 +7,21 @@
- + +
- Home + 主页 - - Github - - - Docs - + + 账号管理 + - Log Out + 退出 @@ -41,6 +39,11 @@ export default { Breadcrumb, Hamburger }, + data() { + return { + avat: './avatar.gif' + } + }, computed: { ...mapGetters([ 'sidebar', diff --git a/canal-admin/canal-admin-ui/src/router/index.js b/canal-admin/canal-admin-ui/src/router/index.js index a5489613..9c4c55c4 100644 --- a/canal-admin/canal-admin-ui/src/router/index.js +++ b/canal-admin/canal-admin-ui/src/router/index.js @@ -49,158 +49,68 @@ export const constantRoutes = [ redirect: '/dashboard', children: [{ path: 'dashboard', - name: 'Dashboard', + name: '主页', component: () => import('@/views/dashboard/index'), - meta: { title: 'Dashboard', icon: 'dashboard' } - }] + meta: { title: '主页', icon: 'dashboard' } + }], + hidden: true + }, + + { + path: '/sys', + component: Layout, + redirect: '/user', + children: [{ + path: 'user', + name: '用户信息', + component: () => import('@/views/sys/UserInfo'), + meta: { title: '用户信息' } + }], + hidden: true }, { path: '/canalServer', component: Layout, - redirect: '/canalServer/config', + redirect: '/canalServer/nodeServers', name: 'Canal Server', meta: { title: 'Canal Server', icon: 'example' }, children: [ { path: 'nodeServers', name: '节点状态', - component: () => import('@/views/canalServer/nodeServer'), + component: () => import('@/views/canalServer/NodeServer'), meta: { title: '节点管理', icon: 'tree' } }, { path: 'config', name: 'Canal主配置', - component: () => import('@/views/canalServer/config'), + component: () => import('@/views/canalServer/Config'), meta: { title: 'Canal主配置', icon: 'form' } }, { path: 'canalInstances', name: '实例管理', - component: () => import('@/views/canalServer/canalInstance'), + component: () => import('@/views/canalServer/CanalInstance'), meta: { title: '实例管理', icon: 'nested' } }, { path: 'canalInstance/add', name: '新建实例配置', - component: () => import('@/views/canalServer/canalInstanceAdd'), + component: () => import('@/views/canalServer/CanalInstanceAdd'), meta: { title: '新建实例配置' }, hidden: true }, { path: 'canalInstance/modify', name: '修改实例配置', - component: () => import('@/views/canalServer/canalInstanceUpdate'), + component: () => import('@/views/canalServer/CanalInstanceUpdate'), meta: { title: '修改实例配置' }, hidden: true } ] }, - { - path: '/example', - component: Layout, - redirect: '/example/table', - name: 'Example', - meta: { title: 'Example', icon: 'example' }, - children: [ - { - path: 'table', - name: 'Table', - component: () => import('@/views/table/index'), - meta: { title: 'Table', icon: 'table' } - }, - { - path: 'tree', - name: 'Tree', - component: () => import('@/views/tree/index'), - meta: { title: 'Tree', icon: 'tree' } - } - ] - }, - - { - path: '/form', - component: Layout, - children: [ - { - path: 'index', - name: 'Form', - component: () => import('@/views/form/index'), - meta: { title: 'Form', icon: 'form' } - } - ] - }, - - { - path: '/nested', - component: Layout, - redirect: '/nested/menu1', - name: 'Nested', - meta: { - title: 'Nested', - icon: 'nested' - }, - children: [ - { - path: 'menu1', - component: () => import('@/views/nested/menu1/index'), // Parent router-view - name: 'Menu1', - meta: { title: 'Menu1' }, - children: [ - { - path: 'menu1-1', - component: () => import('@/views/nested/menu1/menu1-1'), - name: 'Menu1-1', - meta: { title: 'Menu1-1' } - }, - { - path: 'menu1-2', - component: () => import('@/views/nested/menu1/menu1-2'), - name: 'Menu1-2', - meta: { title: 'Menu1-2' }, - children: [ - { - path: 'menu1-2-1', - component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'), - name: 'Menu1-2-1', - meta: { title: 'Menu1-2-1' } - }, - { - path: 'menu1-2-2', - component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'), - name: 'Menu1-2-2', - meta: { title: 'Menu1-2-2' } - } - ] - }, - { - path: 'menu1-3', - component: () => import('@/views/nested/menu1/menu1-3'), - name: 'Menu1-3', - meta: { title: 'Menu1-3' } - } - ] - }, - { - path: 'menu2', - component: () => import('@/views/nested/menu2/index'), - meta: { title: 'menu2' } - } - ] - }, - - { - path: 'external-link', - component: Layout, - children: [ - { - path: 'https://panjiachen.github.io/vue-element-admin-site/#/', - meta: { title: 'External Link', icon: 'link' } - } - ] - }, - // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } ] diff --git a/canal-admin/canal-admin-ui/src/views/dashboard/index.vue b/canal-admin/canal-admin-ui/src/views/dashboard/index.vue index 33e5ab6e..1f0eedbd 100644 --- a/canal-admin/canal-admin-ui/src/views/dashboard/index.vue +++ b/canal-admin/canal-admin-ui/src/views/dashboard/index.vue @@ -1,6 +1,6 @@ @@ -13,6 +13,9 @@ export default { ...mapGetters([ 'name' ]) + }, + mounted() { + this.$router.push('/canalServer') } } diff --git a/canal-admin/canal-admin-ui/src/views/form/index.vue b/canal-admin/canal-admin-ui/src/views/form/index.vue deleted file mode 100644 index 27a4ce63..00000000 --- a/canal-admin/canal-admin-ui/src/views/form/index.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - diff --git a/canal-admin/canal-admin-ui/src/views/login/index.vue b/canal-admin/canal-admin-ui/src/views/login/index.vue index 05f808ba..1a81f8f8 100644 --- a/canal-admin/canal-admin-ui/src/views/login/index.vue +++ b/canal-admin/canal-admin-ui/src/views/login/index.vue @@ -3,7 +3,7 @@