From 0f65031aea13d5ba54cf8bb4e8352766fb5e7f6e Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Tue, 25 Jan 2022 11:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hsweb-core/pom.xml                                | 15 +++++++++++++++
 .../web/starter/jackson/CustomTypeFactory.java    |  9 +++++----
 .../hsweb-system-authorization-api/pom.xml        |  6 ++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/hsweb-core/pom.xml b/hsweb-core/pom.xml
index 4b139f724..a52747697 100644
--- a/hsweb-core/pom.xml
+++ b/hsweb-core/pom.xml
@@ -20,18 +20,22 @@
             <artifactId>javassist</artifactId>
             <version>3.28.0-GA</version>
         </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.hswebframework</groupId>
             <artifactId>hsweb-utils</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -106,5 +110,16 @@
             <artifactId>reactor-extra</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <artifactId>jctools-core</artifactId>
+            <groupId>org.jctools</groupId>
+            <version>2.1.2</version>
+        </dependency>
+
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/hsweb-starter/src/main/java/org/hswebframework/web/starter/jackson/CustomTypeFactory.java b/hsweb-starter/src/main/java/org/hswebframework/web/starter/jackson/CustomTypeFactory.java
index 16036ece2..5813e1df9 100644
--- a/hsweb-starter/src/main/java/org/hswebframework/web/starter/jackson/CustomTypeFactory.java
+++ b/hsweb-starter/src/main/java/org/hswebframework/web/starter/jackson/CustomTypeFactory.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.type.*;
 import com.fasterxml.jackson.databind.util.ArrayBuilders;
 import com.fasterxml.jackson.databind.util.LRUMap;
+import com.fasterxml.jackson.databind.util.LookupCache;
 import org.hswebframework.web.api.crud.entity.EntityFactory;
 
 public class CustomTypeFactory extends TypeFactory {
@@ -11,18 +12,18 @@ public class CustomTypeFactory extends TypeFactory {
     private EntityFactory entityFactory;
 
     public CustomTypeFactory(EntityFactory factory) {
-        super(new LRUMap<>(64, 1024));
+        super((LookupCache)new LRUMap<>(64, 1024));
         this.entityFactory = factory;
     }
 
-    protected CustomTypeFactory(LRUMap<Object, JavaType> typeCache, TypeParser p,
+    protected CustomTypeFactory(LookupCache<Object, JavaType> typeCache, TypeParser p,
                                 TypeModifier[] mods, ClassLoader classLoader) {
         super(typeCache, p, mods, classLoader);
     }
 
 
     @Override
-    public TypeFactory withCache(LRUMap<Object, JavaType> cache) {
+    public TypeFactory withCache(LookupCache<Object, JavaType> cache) {
         return new CustomTypeFactory(cache, _parser, _modifiers, _classLoader);
     }
 
@@ -33,7 +34,7 @@ public class CustomTypeFactory extends TypeFactory {
 
     @Override
     public TypeFactory withModifier(TypeModifier mod) {
-        LRUMap<Object, JavaType> typeCache = _typeCache;
+        LookupCache<Object, JavaType> typeCache = _typeCache;
         TypeModifier[] mods;
         if (mod == null) { // mostly for unit tests
             mods = null;
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml
index 09ea0ad14..ea917461f 100644
--- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml
+++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml
@@ -34,6 +34,12 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hswebframework.web</groupId>
+            <artifactId>hsweb-commons-crud</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file