From 62072ea9ab3cd88596668c4e56b198408be742ba Mon Sep 17 00:00:00 2001 From: mcy Date: Sun, 14 Jul 2019 00:06:25 +0800 Subject: [PATCH] modify --- canal-admin/canal-admin-server/pom.xml | 4 - .../exception/ConfigurationException.java | 25 ---- .../exception/ParamValidationException.java | 31 ---- .../exception/PermissionDeniedException.java | 39 ----- .../exception/ResourceNotFoundException.java | 43 ------ .../common/exception/SystemException.java | 43 ------ .../exception/VersionValidationException.java | 30 ---- .../otter/canal/admin/config/Config.java | 23 --- .../otter/canal/admin/config/WebConfig.java | 70 ++++----- .../admin/controller/UserController.java | 20 ++- .../otter/canal/admin/model/NodeServer.java | 2 + .../alibaba/otter/canal/admin/model/User.java | 52 ++++++- .../canal/admin/service/UserService.java | 10 ++ .../admin/service/impl/UserServiceImpl.java | 34 +++++ canal-admin/canal-admin-ui/public/avatar.gif | Bin 0 -> 6334 bytes canal-admin/canal-admin-ui/src/api/user.js | 8 ++ .../src/components/Breadcrumb/index.vue | 2 +- .../src/layout/components/Navbar.vue | 21 +-- .../canal-admin-ui/src/router/index.js | 136 +++--------------- .../src/views/dashboard/index.vue | 5 +- .../canal-admin-ui/src/views/form/index.vue | 113 --------------- .../canal-admin-ui/src/views/login/index.vue | 2 +- .../src/views/nested/menu1/index.vue | 7 - .../src/views/nested/menu1/menu1-1/index.vue | 7 - .../src/views/nested/menu1/menu1-2/index.vue | 7 - .../nested/menu1/menu1-2/menu1-2-1/index.vue | 5 - .../nested/menu1/menu1-2/menu1-2-2/index.vue | 5 - .../src/views/nested/menu1/menu1-3/index.vue | 5 - .../src/views/nested/menu2/index.vue | 5 - .../canal-admin-ui/src/views/sys/UserInfo.vue | 84 +++++++++++ .../canal-admin-ui/src/views/table/index.vue | 79 ---------- .../canal-admin-ui/src/views/tree/index.vue | 78 ---------- canal-admin/pom.xml | 5 - 33 files changed, 283 insertions(+), 717 deletions(-) delete mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ConfigurationException.java delete mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ParamValidationException.java delete mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/PermissionDeniedException.java delete mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/ResourceNotFoundException.java delete mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/SystemException.java delete mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/common/exception/VersionValidationException.java delete mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/config/Config.java create mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/UserService.java create mode 100644 canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/service/impl/UserServiceImpl.java create mode 100644 canal-admin/canal-admin-ui/public/avatar.gif delete mode 100644 canal-admin/canal-admin-ui/src/views/form/index.vue delete mode 100644 canal-admin/canal-admin-ui/src/views/nested/menu1/index.vue delete mode 100644 canal-admin/canal-admin-ui/src/views/nested/menu1/menu1-1/index.vue delete mode 100644 canal-admin/canal-admin-ui/src/views/nested/menu1/menu1-2/index.vue delete mode 100644 canal-admin/canal-admin-ui/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue delete mode 100644 canal-admin/canal-admin-ui/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue delete mode 100644 canal-admin/canal-admin-ui/src/views/nested/menu1/menu1-3/index.vue delete mode 100644 canal-admin/canal-admin-ui/src/views/nested/menu2/index.vue create mode 100644 canal-admin/canal-admin-ui/src/views/sys/UserInfo.vue delete mode 100644 canal-admin/canal-admin-ui/src/views/table/index.vue delete mode 100644 canal-admin/canal-admin-ui/src/views/tree/index.vue 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 0000000000000000000000000000000000000000..fdbd32c675f85af4ed57021ac0638a21a3c6cad3 GIT binary patch literal 6334 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 literal 0 HcmV?d00001 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 @@