!19 合并master

Merge pull request !19 from lcg0124/master
jiaocc · Mar 15, 2018 · 8cad813 · 8cad813
2 parents e3534d1 + 40fc200
commit 8cad813
Show file tree

Hide file tree

Showing 11 changed files with 1,116 additions and 1,090 deletions.
diff --git a/bootdo/pom.xml b/bootdo/pom.xml
diff --git a/bootdo/src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java b/bootdo/src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java
@@ -0,0 +1,22 @@
+//package com.bootdo.common.config;
+//
+//import com.bootdo.BootdoApplication;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.boot.builder.SpringApplicationBuilder;
+//import org.springframework.boot.web.support.SpringBootServletInitializer;
+//
+///**
+// * war包部署需要
+// * 修改启动类，继承 SpringBootServletInitializer 并重写 configure 方法
+// */
+//public class SpringBootSampleApplication extends SpringBootServletInitializer{
+//
+//    private static final Logger logger = LoggerFactory.getLogger(SpringBootSampleApplication.class);
+//
+//    @Override
+//    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+//        return builder.sources(this.getClass());
+//    }
+//
+//}
diff --git a/bootdo/src/main/java/com/bootdo/common/controller/FileController.java b/bootdo/src/main/java/com/bootdo/common/controller/FileController.java
@@ -4,7 +4,7 @@
 import com.bootdo.common.domain.FileDO;
 import com.bootdo.common.service.FileService;
 import com.bootdo.common.utils.*;
-import org.apache.catalina.servlet4preview.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;