Adapt web configurations for UI next (#8639)
This commit is contained in:
parent
f256f3ec6e
commit
e04bdba22f
|
|
@ -21,7 +21,6 @@ import java.util.TimeZone;
|
|||
|
||||
import javax.annotation.PostConstruct;
|
||||
|
||||
import org.quartz.SchedulerException;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
|
|
|||
|
|
@ -17,12 +17,10 @@
|
|||
|
||||
package org.apache.dolphinscheduler.api.configuration;
|
||||
|
||||
import java.util.Locale;
|
||||
import org.apache.dolphinscheduler.api.interceptor.LocaleChangeInterceptor;
|
||||
import org.apache.dolphinscheduler.api.interceptor.LoginHandlerInterceptor;
|
||||
import org.apache.dolphinscheduler.api.interceptor.RateLimitInterceptor;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
|
@ -104,7 +102,7 @@ public class AppConfiguration implements WebMvcConfigurer {
|
|||
.addPathPatterns(LOGIN_INTERCEPTOR_PATH_PATTERN)
|
||||
.excludePathPatterns(LOGIN_PATH_PATTERN, REGISTER_PATH_PATTERN,
|
||||
"/swagger-resources/**", "/webjars/**", "/v2/**",
|
||||
"/doc.html", "/swagger-ui.html", "*.html", "/ui/**");
|
||||
"/doc.html", "/swagger-ui.html", "*.html", "/ui/**", "/error");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
* 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 org.apache.dolphinscheduler.api.controller;
|
||||
|
||||
import javax.servlet.RequestDispatcher;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import org.springframework.boot.web.servlet.error.ErrorController;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
||||
@Controller
|
||||
public class DsErrorController implements ErrorController {
|
||||
@RequestMapping("/error")
|
||||
public ModelAndView handleError(HttpServletRequest request) {
|
||||
Object status = request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE);
|
||||
ModelAndView modelAndView = new ModelAndView();
|
||||
|
||||
if (status != null) {
|
||||
Integer statusCode = Integer.valueOf(status.toString());
|
||||
|
||||
if (statusCode == HttpStatus.NOT_FOUND.value()) {
|
||||
modelAndView.setStatus(HttpStatus.OK);
|
||||
modelAndView.setViewName("forward:/ui/index.html");
|
||||
return modelAndView;
|
||||
}
|
||||
|
||||
modelAndView.setStatus(HttpStatus.valueOf(statusCode));
|
||||
}
|
||||
return modelAndView;
|
||||
}
|
||||
}
|
||||
|
|
@ -59,7 +59,6 @@ public class LoginHandlerInterceptor implements HandlerInterceptor {
|
|||
*/
|
||||
@Override
|
||||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
|
||||
|
||||
// get token
|
||||
String token = request.getHeader("token");
|
||||
User user;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ import java.util.TimeZone;
|
|||
|
||||
import javax.annotation.PostConstruct;
|
||||
|
||||
import org.quartz.SchedulerException;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
|
|
|||
Loading…
Reference in New Issue