Jelajahi Sumber

补充配置

DESKTOP-6LTVLN7\Liumouren 4 minggu lalu
induk
melakukan
dd57f22374

+ 2 - 8
pom.xml

@@ -36,18 +36,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <!--        本地运行要注释掉,打war包的时候要放开-->
-            <exclusions>
+            <!--<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中 -->
+            </exclusions>-->
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

+ 5 - 4
src/main/java/com/skyversation/poiaddr/config/AuthInterceptor.java

@@ -1,20 +1,21 @@
 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() + "<<<<<<<<<<<<<<<<<<<<<<");

+ 1 - 1
src/main/java/com/skyversation/poiaddr/controller/CorporateLibraryController.java

@@ -12,7 +12,6 @@ import com.skyversation.poiaddr.service.impl.YyskAddressStandardizationServiceIm
 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,6 +19,7 @@ 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.*;
 

+ 2 - 2
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;

+ 2 - 1
src/main/java/com/skyversation/poiaddr/util/PYVerify.java

@@ -3,9 +3,10 @@ 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();

+ 3 - 2
src/main/java/com/skyversation/poiaddr/util/net/NetTools.java

@@ -8,8 +8,6 @@ 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;
@@ -21,6 +19,9 @@ 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.*;