war包配置

pom.xml

@@ -10,10 +10,10 @@
     </parent>
     <groupId>com.skyversation</groupId>
     <artifactId>poiaddr</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.1</version>
     <name>poiaddr</name>
     <description>poiaddr</description>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <url/>
     <licenses>
         <license/>
@@ -35,6 +35,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <!--        本地运行要注释掉，打war包的时候要放开-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version> <!-- 对应Java EE 6+ -->
+            <scope>provided</scope> <!-- 由外部容器提供，不打包到WAR中 -->
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

src/main/java/com/skyversation/poiaddr/PoiAddrApplication.java

@@ -2,12 +2,19 @@ package com.skyversation.poiaddr;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling // 定时任务支持
-public class PoiAddrApplication {
+public class PoiAddrApplication extends SpringBootServletInitializer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(PoiAddrApplication.class);
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(PoiAddrApplication.class, args);
     }
-}
+}

src/main/java/com/skyversation/poiaddr/config/AuthInterceptor.java

@@ -1,27 +1,23 @@
 package com.skyversation.poiaddr.config;
 
 import com.skyversation.poiaddr.util.net.NetTools;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
 
 @Slf4j
 @Component
 public class AuthInterceptor implements HandlerInterceptor {
 
-
-    @Override
+//    @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-
         log.info(">>>AuthInterceptor>>>>>>>在请求处理之前进行调用（Controller方法调用之前)");
         log.info(">>>>>>>>>>>>>>>" + request.getRequestURL() + "<<<<<<<<<<<<<<<<<<<<<<");
-
         //增加响应头缺失代码
         response.addHeader("X-Frame-Options", "SAMEORIGIN");
         response.addHeader("Referrer-Policy", "origin");

src/main/java/com/skyversation/poiaddr/config/GlobalExceptionHandler.java

@@ -1,21 +0,0 @@
-package com.skyversation.poiaddr.config;
-import org.springframework.web.bind.MissingServletRequestParameterException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@ControllerAdvice
-public class GlobalExceptionHandler {
-
-    @ExceptionHandler(MissingServletRequestParameterException.class)
-    @ResponseBody
-    public Map<String, Object> handleMissingParams(MissingServletRequestParameterException ex) {
-        Map<String, Object> result = new HashMap<>();
-        result.put("status", 400);
-        result.put("message", "请求缺少参数：" + ex.getParameterName());
-        return result;
-    }
-}

src/main/java/com/skyversation/poiaddr/controller/CorporateLibraryController.java

@@ -6,13 +6,13 @@ import com.skyversation.poiaddr.addquery.TransfromDataTool;
 import com.skyversation.poiaddr.bean.Address;
 import com.skyversation.poiaddr.bean.AddressResult;
 import com.skyversation.poiaddr.bean.GeoJsonBean;
-import com.skyversation.poiaddr.config.DbConnection;
 import com.skyversation.poiaddr.entity.YyskAddressStandardization;
 import com.skyversation.poiaddr.service.AreaService;
 import com.skyversation.poiaddr.service.impl.YyskAddressStandardizationServiceImpl;
 import com.skyversation.poiaddr.util.*;
 import com.skyversation.poiaddr.util.status.AddressResultEnum;
 import com.skyversation.poiaddr.util.tasks.ScheduledTasks;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.util.StringUtils;
@@ -20,7 +20,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
 

src/main/java/com/skyversation/poiaddr/util/DataExportUtil.java

@@ -1,9 +1,9 @@
 package com.skyversation.poiaddr.util;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.*;
 import java.util.zip.ZipEntry;
@@ -27,7 +27,7 @@ import java.util.zip.ZipOutputStream;
  * 递归删除指定目录及其所有子文件和子目录。
  */
 public class DataExportUtil {
-    public static void exportDataToZip(List<Map<String, Object>> dataList, String filePath, HttpServletResponse response,String outFileType) throws IOException {
+    public static void exportDataToZip(List<Map<String, Object>> dataList, String filePath, HttpServletResponse response, String outFileType) throws IOException {
         // 创建保存 XLSX 文件的目录
         File directory = new File(filePath);
         if (!directory.exists()) {

src/main/java/com/skyversation/poiaddr/util/PYVerify.java

@@ -3,10 +3,9 @@ package com.skyversation.poiaddr.util;
 import com.skyversation.poiaddr.entity.PYToken;
 import com.skyversation.poiaddr.entity.VerifyBean;
 import com.skyversation.poiaddr.util.net.NetTools;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
-
 public class PYVerify {
 
     private static PYVerify instance = new PYVerify();

src/main/java/com/skyversation/poiaddr/util/net/NetTools.java

@@ -8,6 +8,8 @@ import com.skyversation.poiaddr.entity.VerifyBean;
 import com.skyversation.poiaddr.util.Constant;
 import com.skyversation.poiaddr.util.MessageManage;
 import com.skyversation.poiaddr.util.PYVerify;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
@@ -19,9 +21,6 @@ import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;