From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 23 九月 2021 19:13:58 +0800
Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index 9e03f5d..2460360 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -1,6 +1,6 @@
 package com.ruoyi.generator.domain;
 
-import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.StringUtils;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
@@ -44,6 +44,7 @@
     /**
      * 鍒楁弿杩�
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String columnComment;
 
     /**
@@ -65,36 +66,43 @@
     /**
      * 鏄惁涓婚敭锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isPk;
 
     /**
      * 鏄惁鑷锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isIncrement;
 
     /**
      * 鏄惁蹇呭～锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isRequired;
 
     /**
      * 鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isInsert;
 
     /**
      * 鏄惁缂栬緫瀛楁锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isEdit;
 
     /**
      * 鏄惁鍒楄〃瀛楁锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isList;
 
     /**
      * 鏄惁鏌ヨ瀛楁锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isQuery;
 
     /**
@@ -150,7 +158,7 @@
     private Map<String, Object> params = new HashMap<>();
 
     public String getCapJavaField() {
-        return StrUtil.upperFirst(javaField);
+        return StringUtils.uncapitalize(javaField);
     }
 
     public boolean isPk() {
@@ -158,7 +166,7 @@
     }
 
     public boolean isPk(String isPk) {
-        return isPk != null && StrUtil.equals("1", isPk);
+        return isPk != null && StringUtils.equals("1", isPk);
     }
 
     public boolean isIncrement() {
@@ -166,7 +174,7 @@
     }
 
     public boolean isIncrement(String isIncrement) {
-        return isIncrement != null && StrUtil.equals("1", isIncrement);
+        return isIncrement != null && StringUtils.equals("1", isIncrement);
     }
 
     public boolean isRequired() {
@@ -174,7 +182,7 @@
     }
 
     public boolean isRequired(String isRequired) {
-        return isRequired != null && StrUtil.equals("1", isRequired);
+        return isRequired != null && StringUtils.equals("1", isRequired);
     }
 
     public boolean isInsert() {
@@ -182,7 +190,7 @@
     }
 
     public boolean isInsert(String isInsert) {
-        return isInsert != null && StrUtil.equals("1", isInsert);
+        return isInsert != null && StringUtils.equals("1", isInsert);
     }
 
     public boolean isEdit() {
@@ -190,7 +198,7 @@
     }
 
     public boolean isEdit(String isEdit) {
-        return isEdit != null && StrUtil.equals("1", isEdit);
+        return isEdit != null && StringUtils.equals("1", isEdit);
     }
 
     public boolean isList() {
@@ -198,7 +206,7 @@
     }
 
     public boolean isList(String isList) {
-        return isList != null && StrUtil.equals("1", isList);
+        return isList != null && StringUtils.equals("1", isList);
     }
 
     public boolean isQuery() {
@@ -206,7 +214,7 @@
     }
 
     public boolean isQuery(String isQuery) {
-        return isQuery != null && StrUtil.equals("1", isQuery);
+        return isQuery != null && StringUtils.equals("1", isQuery);
     }
 
     public boolean isSuperColumn() {
@@ -214,7 +222,7 @@
     }
 
     public static boolean isSuperColumn(String javaField) {
-        return StrUtil.equalsAnyIgnoreCase(javaField,
+        return StringUtils.equalsAnyIgnoreCase(javaField,
                 // BaseEntity
                 "createBy", "createTime", "updateBy", "updateTime", "remark",
                 // TreeEntity
@@ -227,15 +235,15 @@
 
     public static boolean isUsableColumn(String javaField) {
         // isSuperColumn()涓殑鍚嶅崟鐢ㄤ簬閬垮厤鐢熸垚澶氫綑Domain灞炴�э紝鑻ユ煇浜涘睘鎬у湪鐢熸垚椤甸潰鏃堕渶瑕佺敤鍒颁笉鑳藉拷鐣ワ紝鍒欐斁鍦ㄦ澶勭櫧鍚嶅崟
-        return StrUtil.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
     }
 
     public String readConverterExp() {
-        String remarks = StrUtil.subBetween(this.columnComment, "锛�", "锛�");
+        String remarks = StringUtils.substringBetween(this.columnComment, "锛�", "锛�");
         StringBuffer sb = new StringBuffer();
-        if (StrUtil.isNotEmpty(remarks)) {
+        if (StringUtils.isNotEmpty(remarks)) {
             for (String value : remarks.split(" ")) {
-                if (StrUtil.isNotEmpty(value)) {
+                if (StringUtils.isNotEmpty(value)) {
                     Object startStr = value.subSequence(0, 1);
                     String endStr = value.substring(1);
                     sb.append("").append(startStr).append("=").append(endStr).append(",");

--
Gitblit v1.9.3