From ba33f74a1df157f5665e165cec30b860df9599d0 Mon Sep 17 00:00:00 2001
From: "lisai17@sina.com" <lisai17@sina.com>
Date: Fri, 19 Mar 2021 23:58:28 +0800
Subject: [PATCH] .

---
 .../java/com/cowr/local/ssjygl/main/Main.java | 29 +++++++++----------
 .../com/cowr/service/ssjygl/main/Main.java    | 23 ++++++++++++++-
 .../ssjygl/synctask/SyncTaskService.java      |  2 +-
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java
index 521c233..6cbac0a 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java
@@ -50,25 +50,22 @@ public class Main {
             log.info("Running directory: " + path);
 
             // 相关配置见 undertow.txt
-            UndertowServer server = UndertowServer
+            UndertowServer
                     .create(Config.class, Config.ENV + "/undertow.txt")
-                    .addHotSwapClassPrefix("com.cowr.");
-
-            server.onDeploy(new BiConsumer<ClassLoader, DeploymentInfo>() {
-                @Override
-                public void accept(ClassLoader classLoader, DeploymentInfo deploymentInfo) {
-                    deploymentInfo.addInitialHandlerChainWrapper(new HandlerWrapper() {
-
+                    .addHotSwapClassPrefix("com.cowr.")
+                    .onDeploy(new BiConsumer<ClassLoader, DeploymentInfo>() {
                         @Override
-                        public HttpHandler wrap(HttpHandler handler) {
-                            HttpString[] disallowedHttpMethods = {HttpString.tryFromString("TRACE"), HttpString.tryFromString("TRACK")};
-                            return new DisallowedMethodsHandler(handler, disallowedHttpMethods);
-                        }
-                    });
-                }
-            });
+                        public void accept(ClassLoader classLoader, DeploymentInfo deploymentInfo) {
+                            deploymentInfo.addInitialHandlerChainWrapper(new HandlerWrapper() {
 
-            server.start();
+                                @Override
+                                public HttpHandler wrap(HttpHandler handler) {
+                                    HttpString[] disallowedHttpMethods = {HttpString.tryFromString("TRACE"), HttpString.tryFromString("TRACK")};
+                                    return new DisallowedMethodsHandler(handler, disallowedHttpMethods);
+                                }
+                            });
+                        }
+                    }).start();
         }
     }
 }
diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Main.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Main.java
index e8f9103..191f952 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Main.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Main.java
@@ -3,6 +3,13 @@ package com.cowr.service.ssjygl.main;
 import com.jfinal.kit.PathKit;
 import com.jfinal.log.Log;
 import com.jfinal.server.undertow.UndertowServer;
+import io.undertow.server.HandlerWrapper;
+import io.undertow.server.HttpHandler;
+import io.undertow.server.handlers.DisallowedMethodsHandler;
+import io.undertow.servlet.api.DeploymentInfo;
+import io.undertow.util.HttpString;
+
+import java.util.function.BiConsumer;
 
 public class Main {
     private static Log log = Log.getLog(Main.class);
@@ -28,7 +35,21 @@ public class Main {
             log.info("Running directory: " + path);
 
             // 相关配置见 undertow.txt
-            UndertowServer.create(Config.class, Config.ENV + "/undertow.txt").start();
+            UndertowServer
+                    .create(Config.class, Config.ENV + "/undertow.txt")
+                    .onDeploy(new BiConsumer<ClassLoader, DeploymentInfo>() {
+                        @Override
+                        public void accept(ClassLoader classLoader, DeploymentInfo deploymentInfo) {
+                            deploymentInfo.addInitialHandlerChainWrapper(new HandlerWrapper() {
+
+                                @Override
+                                public HttpHandler wrap(HttpHandler handler) {
+                                    HttpString[] disallowedHttpMethods = {HttpString.tryFromString("TRACE"), HttpString.tryFromString("TRACK")};
+                                    return new DisallowedMethodsHandler(handler, disallowedHttpMethods);
+                                }
+                            });
+                        }
+                    }).start();
         }
     }
 }
diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java
index febc40e..7fd1cff 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java
@@ -507,7 +507,7 @@ public class SyncTaskService {
                             }
                         }
 
-                        if (!saveauthlics.isEmpty() && !deleteauthlics.isEmpty()) {
+                        if (!saveauthlics.isEmpty() || !deleteauthlics.isEmpty()) {
                             return recvAuthLicense(saveauthlics, deleteauthlics, current_supermarket_id);
                         }