From bd85b30235b4117fefd53935b9bbda2f578cc2b7 Mon Sep 17 00:00:00 2001
From: zhou-hao <i@hsweb.me>
Date: Sun, 3 Jun 2018 10:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hsweb-core/pom.xml                                            | 1 -
 .../src/main/java/org/hswebframework/web/dict/EnumDict.java   | 2 +-
 .../test/java/org/hswebframework/web/dict/DictDefineTest.java | 4 ++++
 pom.xml                                                       | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hsweb-core/pom.xml b/hsweb-core/pom.xml
index f52591ab3..13d11f87c 100644
--- a/hsweb-core/pom.xml
+++ b/hsweb-core/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/hsweb-core/src/main/java/org/hswebframework/web/dict/EnumDict.java b/hsweb-core/src/main/java/org/hswebframework/web/dict/EnumDict.java
index db42e1f97..8b2f09d94 100644
--- a/hsweb-core/src/main/java/org/hswebframework/web/dict/EnumDict.java
+++ b/hsweb-core/src/main/java/org/hswebframework/web/dict/EnumDict.java
@@ -13,7 +13,7 @@ import java.util.function.Predicate;
  * @author zhouhao
  * @see 3.0
  */
-public interface EnumDict<V> {
+public interface EnumDict<V>{
     /**
      * 枚举选项的值,通常由字母或者数字组成,并且在同一个枚举中值唯一;对应数据库中的值通常也为此值
      *
diff --git a/hsweb-core/src/test/java/org/hswebframework/web/dict/DictDefineTest.java b/hsweb-core/src/test/java/org/hswebframework/web/dict/DictDefineTest.java
index a12ec1db6..73aa0fee6 100644
--- a/hsweb-core/src/test/java/org/hswebframework/web/dict/DictDefineTest.java
+++ b/hsweb-core/src/test/java/org/hswebframework/web/dict/DictDefineTest.java
@@ -22,6 +22,10 @@ public class DictDefineTest {
 
     private DictSupportApi api = new DefaultDictSupportApi(repository);
 
+    public void testJson(){
+        UserCode code=UserCode.CODE0;
+
+    }
     @Test
     public void testEnumDict() {
 
diff --git a/pom.xml b/pom.xml
index d23044463..db65b08fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
         <javassist.version>3.20.0-GA</javassist.version>
         <activiti.version>5.19.0.2</activiti.version>
 
-        <fastjson.version>1.2.32</fastjson.version>
+        <fastjson.version>1.2.47</fastjson.version>
         <h2.version>1.4.191</h2.version>
         <mysql.version>5.1.39</mysql.version>
         <cglib.version>3.2.2</cglib.version>
@@ -325,7 +325,7 @@
             <dependency>
                 <groupId>org.redisson</groupId>
                 <artifactId>redisson</artifactId>
-                <version>3.5.5</version>
+                <version>3.7.0</version>
             </dependency>
 
             <dependency>