Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-07-02 d6ca9e548d9c11be3281de1ddae392e276dc2a3d

 ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java

@@ -1,18 +1,18 @@
package com.ruoyi;



import org.springframework.boot.builder.SpringApplicationBuilder;

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



/**

 * web容器中进行部署

 * 
 * @author ruoyi

 */

public class RuoYiServletInitializer extends SpringBootServletInitializer

{

    @Override

    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)

    {

        return application.sources(RuoYiApplication.class);

    }

}

package com.ruoyi;

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

/**
 * web容器中进行部署
 * 
 * @author ruoyi
 */
public class RuoYiServletInitializer extends SpringBootServletInitializer
{
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
    {
        return application.sources(RuoYiApplication.class);
    }
}