Commit 5d9063c5 authored by lenboo's avatar lenboo
Browse files

Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev-up 

# Conflicts:
#	escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java
#	escheduler-alert/src/main/resources/alert.properties
#	escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java
#	escheduler-api/src/main/java/cn/escheduler/api/controller/TenantController.java
#	escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
parents 06e93980 b03ac225

escheduler-alert/pom.xml

+0 −4
Original line number Diff line number Diff line
@@ -90,10 +90,6 @@ 
            <artifactId>commons-io</artifactId>

        </dependency>



        <dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-collections4</artifactId>

        </dependency>



        <!--excel poi-->

        <dependency>

escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import java.io.*; 
import java.security.Security;

import java.util.*;



import static cn.escheduler.alert.utils.PropertyUtils.getBoolean;

import static cn.escheduler.alert.utils.PropertyUtils.getInt;

import static cn.escheduler.alert.utils.PropertyUtils.getString;
@@ -57,6 +58,10 @@ public class MailUtils { 


    public static final String mailPasswd = getString(Constants.MAIL_PASSWD);



    public static final Boolean mailUseStartTLS = getBoolean(Constants.MAIL_SMTP_STARTTLS_ENABLE);



    public static final Boolean mailUseSSL = getBoolean(Constants.MAIL_SMTP_SSL_ENABLE);



    public static final String xlsFilePath = getString(Constants.XLS_FILE_PATH);



    public static final String starttlsEnable = getString(Constants.MAIL_SMTP_STARTTLS_ENABLE);

escheduler-api/pom.xml

+23 −20
Original line number Diff line number Diff line 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

  <modelVersion>4.0.0</modelVersion>

  <parent>

    <groupId>cn.analysys</groupId>
@@ -10,13 +11,10 @@ 


  <dependencies>





    <dependency>

      <groupId>cn.analysys</groupId>

      <artifactId>escheduler-dao</artifactId>

    </dependency>

    <dependency>

      <groupId>cn.analysys</groupId>

      <artifactId>escheduler-common</artifactId>

      <artifactId>escheduler-server</artifactId>

      <exclusions>

        <exclusion>

          <groupId>io.netty</groupId>
@@ -42,14 +40,6 @@ 
    </dependency>



    <!--springboot-->

    <dependency>

      <groupId>org.springframework.boot</groupId>

      <artifactId>spring-boot-starter-parent</artifactId>

      <version>${spring.boot.version}</version>

      <type>pom</type>

      <scope>import</scope>

    </dependency>



    <dependency>

      <groupId>org.springframework.boot</groupId>

      <artifactId>spring-boot-starter-web</artifactId>
@@ -58,10 +48,6 @@ 
          <groupId>org.springframework.boot</groupId>

          <artifactId>spring-boot-starter-tomcat</artifactId>

        </exclusion>

        <exclusion>

          <groupId>org.springframework.boot</groupId>

          <artifactId>spring-boot-starter</artifactId>

        </exclusion>

      </exclusions>

    </dependency>
@@ -157,6 +143,24 @@ 
      <artifactId>quartz-jobs</artifactId>

    </dependency>



    <dependency>

      <groupId>io.springfox</groupId>

      <artifactId>springfox-swagger2</artifactId>

      <version>2.9.2</version>

    </dependency>



    <dependency>

      <groupId>io.springfox</groupId>

      <artifactId>springfox-swagger-ui</artifactId>

      <version>2.9.2</version>

    </dependency>



    <dependency>

      <groupId>com.github.xiaoymin</groupId>

      <artifactId>swagger-bootstrap-ui</artifactId>

      <version>1.9.3</version>

    </dependency>



    <dependency>

      <groupId>cn.analysys</groupId>

      <artifactId>escheduler-rpc</artifactId>
@@ -168,7 +172,6 @@ 
      <version>4.12</version>

      <scope>test</scope>

    </dependency>



  </dependencies>

  <build>

    <plugins>

escheduler-api/src/main/java/cn/escheduler/api/ApiApplicationServer.java

+7 −1
Original line number Diff line number Diff line
@@ -19,13 +19,19 @@ package cn.escheduler.api; 
import org.springframework.boot.SpringApplication;

import org.springframework.boot.autoconfigure.SpringBootApplication;

import org.springframework.boot.web.servlet.ServletComponentScan;

import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;

import org.springframework.context.annotation.ComponentScan;

import springfox.documentation.swagger2.annotations.EnableSwagger2;



@SpringBootApplication

@ServletComponentScan

@ComponentScan("cn.escheduler")

public class ApiApplicationServer {

@EnableSwagger2

public class ApiApplicationServer extends SpringBootServletInitializer {



  public static void main(String[] args) {

    SpringApplication.run(ApiApplicationServer.class, args);

  }





}

escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java

+55 −9
Original line number Diff line number Diff line
@@ -19,31 +19,73 @@ package cn.escheduler.api.configuration; 
import cn.escheduler.api.interceptor.LoginHandlerInterceptor;

import org.springframework.context.annotation.Bean;

import org.springframework.context.annotation.Configuration;

import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;

import org.springframework.web.servlet.config.annotation.CorsRegistry;

import org.springframework.web.servlet.config.annotation.InterceptorRegistry;

import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;

import org.springframework.web.servlet.LocaleResolver;

import org.springframework.web.servlet.config.annotation.*;

import org.springframework.web.servlet.i18n.CookieLocaleResolver;

import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;



import java.util.Locale;





/**

 * application configuration

 */

@Configuration

public class AppConfiguration extends WebMvcConfigurerAdapter {

public class AppConfiguration implements WebMvcConfigurer {



  public static final String LOGIN_INTERCEPTOR_PATH_PATTERN = "/**/*";

  public static final String LOGIN_PATH_PATTERN = "/login";

  public static final String PATH_PATTERN = "/**";

  public static final String LOCALE_LANGUAGE_COOKIE = "language";

  public static final int COOKIE_MAX_AGE = 3600;



  @Override

  public void addInterceptors(InterceptorRegistry registry) {

    registry.addInterceptor(loginInterceptor()).addPathPatterns(LOGIN_INTERCEPTOR_PATH_PATTERN).excludePathPatterns(LOGIN_PATH_PATTERN);

  }



  @Bean

  public LoginHandlerInterceptor loginInterceptor() {

    return new LoginHandlerInterceptor();

  }





  /**

   * Cookie

   */

  @Bean(name = "localeResolver")

  public LocaleResolver localeResolver() {

    CookieLocaleResolver localeResolver = new CookieLocaleResolver();

    localeResolver.setCookieName(LOCALE_LANGUAGE_COOKIE);

    /** set default locale **/

    localeResolver.setDefaultLocale(Locale.US);

    /** set cookie max age **/

    localeResolver.setCookieMaxAge(COOKIE_MAX_AGE);

    return localeResolver;

  }



  @Bean

  public LocaleChangeInterceptor localeChangeInterceptor() {

    LocaleChangeInterceptor lci = new LocaleChangeInterceptor();

    /**  **/

    lci.setParamName("language");



    return lci;

  }





  @Override

  public void addInterceptors(InterceptorRegistry registry) {

    //i18n

    registry.addInterceptor(localeChangeInterceptor());



    registry.addInterceptor(loginInterceptor()).addPathPatterns(LOGIN_INTERCEPTOR_PATH_PATTERN).excludePathPatterns(LOGIN_PATH_PATTERN,"/swagger-resources/**", "/webjars/**", "/v2/**", "/doc.html", "*.html");

  }





  @Override

  public void addResourceHandlers(ResourceHandlerRegistry registry) {

    registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");

    registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");

    registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");

  }



  @Override

  public void addCorsMappings(CorsRegistry registry) {

    registry.addMapping(PATH_PATTERN).allowedOrigins("*").allowedMethods("*");
@@ -59,4 +101,8 @@ public class AppConfiguration extends WebMvcConfigurerAdapter { 
  public void configureContentNegotiation(final ContentNegotiationConfigurer configurer) {

    configurer.favorPathExtension(false);

  }









}