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 80a8df706b48e60626a4051907048b54fddd8739..9133c24da5db721f2afb251a91b0ab911c61e23e 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 @@ -1,12 +1,10 @@ package com.alibaba.otter.canal.admin.config; +import java.io.PrintWriter; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.alibaba.otter.canal.admin.controller.UserController; -import com.alibaba.otter.canal.admin.model.BaseModel; -import com.alibaba.otter.canal.admin.model.User; -import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -14,7 +12,10 @@ import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import java.io.PrintWriter; +import com.alibaba.otter.canal.admin.controller.UserController; +import com.alibaba.otter.canal.admin.model.BaseModel; +import com.alibaba.otter.canal.admin.model.User; +import com.fasterxml.jackson.databind.ObjectMapper; @Configuration public class WebConfig implements WebMvcConfigurer { @@ -75,42 +76,4 @@ public class WebConfig implements WebMvcConfigurer { } }).addPathPatterns("/api/**").excludePathPatterns("/api/**/user/**"); } - - /** - * 跨域支持 - * - * @param registry - */ - // @Override - // public void addCorsMappings(CorsRegistry registry) { - // registry.addMapping("/api") - // .allowedOrigins("http://127.0.0.1") - // .allowCredentials(true) - // .allowedMethods("*") - // .allowedHeaders("Origin, X-Requested-With, Content-Type, Accept, - // Authorization") - // .maxAge(3600 * 24); - // } - - /** - * 添加静态资源--过滤swagger-api (开源的在线API文档) - * - * @param registry - */ - // @Override - // public void addResourceHandlers(ResourceHandlerRegistry registry) { - // // 过滤swagger - // registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); - // - // registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - // - // registry.addResourceHandler("/swagger-resources/**") - // .addResourceLocations("classpath:/META-INF/resources/swagger-resources/"); - // - // registry.addResourceHandler("/swagger/**").addResourceLocations("classpath:/META-INF/resources/swagger*"); - // - // registry.addResourceHandler("/v2/api-docs/**") - // .addResourceLocations("classpath:/META-INF/resources/v2/api-docs/"); - // - // } } 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 8fea8ba56145bffe23ac29afff6c380c7d86599a..dda495bc8358ca3929733458b0f80a0c9f916338 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 @@ -14,12 +14,12 @@ public class CanalConfigController { @Autowired CanalConfigService canalConfigService; - @RequestMapping(value = "/config", method = RequestMethod.GET) + @GetMapping(value = "/config") public BaseModel canalConfig(@PathVariable String env) { return BaseModel.getInstance(canalConfigService.getCanalConfig()); } - @RequestMapping(value = "/config", method = RequestMethod.PUT) + @PutMapping(value = "/config") public BaseModel updateConfig(@RequestBody CanalConfig canalConfig, @PathVariable String env) { canalConfigService.updateContent(canalConfig); return BaseModel.getInstance("success"); diff --git a/canal-admin/canal-admin-ui/src/layout/components/Sidebar/Logo.vue b/canal-admin/canal-admin-ui/src/layout/components/Sidebar/Logo.vue index 040fab64696f4a2406edc9a0182a234e2619ed3f..167d87d4ba18aa9e29eb5774991e49904975cf5b 100644 --- a/canal-admin/canal-admin-ui/src/layout/components/Sidebar/Logo.vue +++ b/canal-admin/canal-admin-ui/src/layout/components/Sidebar/Logo.vue @@ -24,8 +24,8 @@ export default { }, data() { return { - title: 'Vue Admin Template', - logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png' + title: '', + logo: './logo.png' } } } @@ -55,8 +55,8 @@ export default { width: 100%; & .sidebar-logo { - width: 32px; - height: 32px; + width: 55px; + // height: 32px; vertical-align: middle; margin-right: 12px; } 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 1db246453d6911cb0c1045ffd9b09865160ded4a..05f808ba8733d8b3a7057e0cdcb10535ee3842f0 100644 --- a/canal-admin/canal-admin-ui/src/views/login/index.vue +++ b/canal-admin/canal-admin-ui/src/views/login/index.vue @@ -44,8 +44,8 @@ Login
- username: admin - password: any +
@@ -74,8 +74,8 @@ export default { } return { loginForm: { - username: 'admin', - password: '111111' + username: '', + password: '' }, loginRules: { username: [{ required: true, trigger: 'blur', validator: validateUsername }],