浏览代码

升级版本

zhou-hao 7 年之前
父节点
当前提交
bd85b30235

+ 0 - 1
hsweb-core/pom.xml

@@ -38,7 +38,6 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>

+ 1 - 1
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>{
     /**
      * 枚举选项的值,通常由字母或者数字组成,并且在同一个枚举中值唯一;对应数据库中的值通常也为此值
      *

+ 4 - 0
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() {
 

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