fix: 去除DictBean实现Dict，导致json序列化时勿将DictBean序列化成code

luo-zhan · Jan 22, 2024 · 90aee13 · 90aee13
1 parent f40cf9d
commit 90aee13
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -193,13 +193,13 @@ wrapper.eq(Student::sex, SexEnum.MALE);
 ```
 > 源码参考：DictMybatisConfiguration
 ## 使用方式
-导入依赖即自动生效（项目中必须已经依赖SpringBoot，但没有使用Mybatis不会有影响）
+导入依赖即自动生效
    ```xml
-    <!-- Spring开发支持（含核心功能、Json、Mybatis、SpringConverter） -->
+    <!-- Spring开发支持，含核心功能、Json、SpringConverter（项目须依赖springWeb）和Mybatis（项目须依赖mybatis）） -->
     <dependency>
         <groupId>io.github.luo-zhan</groupId>
         <artifactId>easy-enum-for-spring</artifactId>
-        <version>1.3.0-RELEASE</version>
+        <version>1.3.1-RELEASE</version>
     </dependency>
    ```
 如果你不需要Spring和Mybatis的支持，只需要Dict枚举的工具方法，可以只引入以下依赖
@@ -208,7 +208,7 @@ wrapper.eq(Student::sex, SexEnum.MALE);
 <dependency>
    <groupId>io.github.luo-zhan</groupId>
    <artifactId>easy-enum</artifactId>
-   <version>1.3.0-RELEASE</version>
+   <version>1.3.1-RELEASE</version>
 </dependency>
 ```
 ## 交流

diff --git a/easy-enum-demo/pom.xml b/easy-enum-demo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.luo-zhan</groupId>
         <artifactId>EasyEnum</artifactId>
-        <version>1.3.0-RELEASE</version>
+        <version>1.3.1-RELEASE</version>
     </parent>
 
     <artifactId>easy-enum-demo</artifactId>
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>io.github.luo-zhan</groupId>
             <artifactId>easy-enum</artifactId>
-            <version>1.3.0-RELEASE</version>
+            <version>1.3.1-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>io.github.luo-zhan</groupId>
             <artifactId>easy-enum-for-spring</artifactId>
-            <version>1.3.0-RELEASE</version>
+            <version>1.3.1-RELEASE</version>
         </dependency>
 
         <dependency>
@@ -31,13 +31,40 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>2.7.14</version>
+            <version>2.4.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>3.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>2.7.14</version>
+            <version>2.4.13</version>
         </dependency>
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.5</version>
+                <executions>
+                    <execution>
+                        <id>report-aggregate</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/easy-enum-for-spring/pom.xml b/easy-enum-for-spring/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.luo-zhan</groupId>
         <artifactId>EasyEnum</artifactId>
-        <version>1.3.0-RELEASE</version>
+        <version>1.3.1-RELEASE</version>
     </parent>
 
     <artifactId>easy-enum-for-spring</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>io.github.luo-zhan</groupId>
             <artifactId>easy-enum</artifactId>
-            <version>1.3.0-RELEASE</version>
+            <version>1.3.1-RELEASE</version>
         </dependency>
 
         <dependency>

diff --git a/easy-enum/pom.xml b/easy-enum/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.luo-zhan</groupId>
         <artifactId>EasyEnum</artifactId>
-        <version>1.3.0-RELEASE</version>
+        <version>1.3.1-RELEASE</version>
     </parent>
 
     <artifactId>easy-enum</artifactId>

diff --git a/easy-enum/src/main/java/com/robot/dict/DictBean.java b/easy-enum/src/main/java/com/robot/dict/DictBean.java
@@ -6,7 +6,7 @@
  *
  * @author R
  */
-public class DictBean implements Dict<Object> {
+public class DictBean {
     /**
      * 字典code
      */
@@ -34,17 +34,17 @@ public DictBean(Object code, String text, boolean isDeprecated) {
         this.isDeprecated = isDeprecated;
     }
 
-    @Override
+
     public Object getCode() {
         return code;
     }
 
-    @Override
+
     public String getText() {
         return text;
     }
 
-    public boolean getIsDeprecated() {
+    public boolean isDeprecated() {
         return isDeprecated;
     }
 

diff --git a/easy-enum/src/main/java/com/robot/dict/DictPool.java b/easy-enum/src/main/java/com/robot/dict/DictPool.java
@@ -56,7 +56,7 @@ static List<DictBean> getAll(Class<? extends Dict<?>> clazz, boolean isExcludeDe
         clazz.getEnumConstants();
         List<DictBean> dictBeans = DICT_CLASS_ITEMS_MAP.get(clazz);
         if (isExcludeDeprecated) {
-            return dictBeans.stream().filter(dictBean -> !dictBean.getIsDeprecated()).collect(Collectors.toList());
+            return dictBeans.stream().filter(dictBean -> !dictBean.isDeprecated()).collect(Collectors.toList());
         }
         return dictBeans;
     }

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>io.github.luo-zhan</groupId>
     <artifactId>EasyEnum</artifactId>
-    <version>1.3.0-RELEASE</version>
+    <version>1.3.1-RELEASE</version>
     <name>EasyEnum</name>
     <modules>
         <module>easy-enum</module>