更新v1.4.2

yzcheng90 · Feb 25, 2023 · bc22a06 · bc22a06
1 parent b8ad936
commit bc22a06
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@
 <dependency>
   <groupId>com.github.yzcheng90</groupId>
   <artifactId>autofull-spring-boot-starter</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2</version>
 </dependency>
 ```
 

diff --git a/autofull-spring-boot-starter-example/pom.xml b/autofull-spring-boot-starter-example/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yzcheng90</groupId>
             <artifactId>autofull-spring-boot-starter</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.2</version>
         </dependency>
     </dependencies>
 

diff --git a/autofull-spring-boot-starter/pom.xml b/autofull-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.yzcheng90</groupId>
     <artifactId>autofull-spring-boot-starter</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <url>https://github.com/yzcheng90/zhjg-common-autofull</url>
     <name>autofull-spring-boot-starter</name>
     <description>一个填充字段属性框架</description>

diff --git a/...ing-boot-starter/src/main/java/com/suke/zhjg/common/autofull/entity/ConfigProperties.java b/...ing-boot-starter/src/main/java/com/suke/zhjg/common/autofull/entity/ConfigProperties.java
@@ -14,27 +14,46 @@
 @ConfigurationProperties(prefix = "autofull")
 public class ConfigProperties {
 
-    // 是否显示日志
+    /**
+     * 是否显示日志
+     **/
     @Setter
     @Getter
     public boolean showLog = true;
 
-    // 最大填充层级
+    /**
+     * 字段规则
+     *  true ：默认使用驼峰 支持通过mybatis-plus.configuration.map-underscore-to-camel-case 配置
+     *  false ：自定义 实体类中写的是什么就是什么不会自动转换
+     **/
+    @Setter
+    @Getter
+    public boolean fieldRule = true;
+
+    /**
+     * 最大填充层级
+     **/
     @Setter
     @Getter
     public int maxLevel = 1;
 
-    // 当前层级
+    /**
+     * 当前层级
+     **/
     @Setter
     @Getter
     public int currLevel = 0;
 
-    // 加密分隔标志
+    /**
+     * 加密分隔标志
+     **/
     @Setter
     @Getter
     public String encryptFlag = "@autofull@";
 
-    // 加密密钥  16位
+    /**
+     * 加密密钥  16位
+     **/
     @Setter
     @Getter
     public String encryptKeys = "abcdefg123456789";

diff --git a/...ring-boot-starter/src/main/java/com/suke/zhjg/common/autofull/handler/DefaultHandler.java b/...ring-boot-starter/src/main/java/com/suke/zhjg/common/autofull/handler/DefaultHandler.java
@@ -121,16 +121,21 @@ public Class<?> getClassType(Field field) {
     }
 
     public String getConditionField(String field) {
-        MybatisPlusProperties bean = ApplicationContextRegister.getApplicationContext().getBean(MybatisPlusProperties.class);
-        MybatisConfiguration configuration = bean.getConfiguration();
-        if (configuration == null || configuration.isMapUnderscoreToCamelCase()) {
-            if (field.contains("_")) {
-                return FieldCaseUtil.toCamelCase(field);
+        boolean fieldRule = configProperties.isFieldRule();
+        if (fieldRule) {
+            MybatisPlusProperties bean = ApplicationContextRegister.getApplicationContext().getBean(MybatisPlusProperties.class);
+            MybatisConfiguration configuration = bean.getConfiguration();
+            if (configuration == null || configuration.isMapUnderscoreToCamelCase()) {
+                if (field.contains("_")) {
+                    return FieldCaseUtil.toCamelCase(field);
+                } else {
+                    return FieldCaseUtil.toUnderScoreCase(field);
+                }
             } else {
                 return FieldCaseUtil.toUnderScoreCase(field);
             }
-        }else {
-            return FieldCaseUtil.toUnderScoreCase(field);
+        } else {
+            return field;
         }
     }
 

diff --git a/doc/update.md b/doc/update.md
@@ -1,5 +1,16 @@
 ### 功能
 >
+>v1.4.2
+>- 新增字段规则配置
+```yaml
+# autofull 配置
+autofull:
+  # 字段规则
+  #  true ：默认使用驼峰 支持通过mybatis-plus.configuration.map-underscore-to-camel-case 配置
+  #  false ：自定义 实体类中写的是什么就是什么不会自动转换
+  fieldRule: true
+```
+>
 >v1.4.1
 >- 新增使用@AutoFullOssUrl时bucketName 可以不用
 >