容器换 Jetty

pom.xml

@@ -34,6 +34,18 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <!-- 去除Tomcat容器 -->
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- 增加Jetty容器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
         </dependency>
 
         <dependency>

src/main/java/com/rshy/project/hy/manager/impl/RshyJkManagerImpl.java

@@ -33,6 +33,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -51,20 +52,20 @@ import java.util.stream.Collectors;
 @Slf4j
 @DependsOn("itfwServer")
 public class RshyJkManagerImpl implements RshyJkManager {
-    @Autowired
+    @Resource
     private YituFaceServer yituFaceServer;
-    @Autowired
+    @Resource
     private ItfwServer itfwServer;
     @Autowired
     private VIIDServer viidServer;
-    @Autowired
+    @Resource
     private StringRedisTemplate stringRedisTemplate;
 
     @Override
     @Async("hstTaskExecutor")
     public Future<RshyVo> getRshyInfo(RshyParam rshyParam) {
-        // timeout 转成毫秒 这里考虑到网络传输延时等原因，减去200ms
-        rshyParam.setTimeout((int) TimeUnit.MILLISECONDS.convert(rshyParam.getTimeout(), TimeUnit.SECONDS) - 200);
+        // timeout 转成毫秒 这里考虑到网络传输延时等原因，减去300ms
+        rshyParam.setTimeout(rshyParam.getTimeout() * 1000 - 300);
         int jkmTimeout = rshyParam.getTimeout();
         RshyVo rshyVo = new RshyVo();
         PctgkryDTO gkryDTO = new PctgkryDTO();
@@ -89,10 +90,10 @@ public class RshyJkManagerImpl implements RshyJkManager {
 
         rshyParam.setSfzh(jkmInfo.getId_num());
         rshyVo.setSfzh(jkmInfo.getId_num()).setXm(jkmInfo.getUser_name()).setHealthCode(jkmInfo.getColor_code_label()).setPhone(jkmInfo.getPn());
-        int jkmElapsedTime = (int) DateUtil.between(beginDate, DateTime.now(), DateUnit.MS);
-        System.out.println("健康码接口用时: " + jkmElapsedTime + "毫秒");
+        int jkmUsedTime = (int) DateUtil.between(beginDate, DateTime.now(), DateUnit.MS);
+        System.out.println("健康码接口用时: " + jkmUsedTime + "毫秒");
 
-        rshyParam.setTimeout(rshyParam.getTimeout() - jkmElapsedTime - 50);
+        rshyParam.setTimeout(rshyParam.getTimeout() - jkmUsedTime - 300);
         //剩余时间不到10ms，直接返回
         if (rshyParam.getTimeout() <= 10) {
             return new AsyncResult<>(rshyVo);

src/main/java/com/rshy/project/hy/web/controller/RshyController.java

@@ -19,9 +19,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -41,12 +41,12 @@ import java.util.concurrent.TimeoutException;
 @RequestMapping("/rshy")
 @Slf4j
 public class RshyController {
-    @Autowired
+    @Resource
     private RshyJkManager rshyJkManager;
 
     @GetMapping(value = "/version")
     public String version() {
-        return "1.2.4.220523";
+        return "1.2.4.220524";
     }
 
     @ApiOperation("普通核验模式")