From 1debe1d82577bf908a388c7fd7395ec065b40e50 Mon Sep 17 00:00:00 2001
From: admin <570810310@qq.com>
Date: Sat, 27 Feb 2021 14:50:27 +0800
Subject: [PATCH] 1.1.0

---
 .../yulichang/common/support/func/F.java      |  2 +-
 .../yulichang/common/support/func/S.java      | 21 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/github/yulichang/common/support/func/F.java b/src/main/java/com/github/yulichang/common/support/func/F.java
index b074637..85999d7 100644
--- a/src/main/java/com/github/yulichang/common/support/func/F.java
+++ b/src/main/java/com/github/yulichang/common/support/func/F.java
@@ -45,6 +45,6 @@ public class F {
 
     @SuppressWarnings("unchecked")
     public static <T> Class<T> getEntityClass(SFunction<T, ?> fn) {
-        return (Class<T>) com.baomidou.mybatisplus.core.toolkit.LambdaUtils.resolve(fn).getInstantiatedType();
+        return (Class<T>) LambdaUtils.resolve(fn).getInstantiatedType();
     }
 }
diff --git a/src/main/java/com/github/yulichang/common/support/func/S.java b/src/main/java/com/github/yulichang/common/support/func/S.java
index 8b356ce..106f4c5 100644
--- a/src/main/java/com/github/yulichang/common/support/func/S.java
+++ b/src/main/java/com/github/yulichang/common/support/func/S.java
@@ -25,33 +25,32 @@ import java.util.Objects;
 public class S {
 
     public static <T, R> String a(SFunction<T, R> sFunction) {
-        Assert.notNull(sFunction, "function is null");
-        return "a" + StringPool.DOT + getColumn(sFunction);
+        return getStrByAlias("a", sFunction);
     }
 
     public static <T, R> String b(SFunction<T, R> sFunction) {
-        Assert.notNull(sFunction, "function is null");
-        return "b" + StringPool.DOT + getColumn(sFunction);
+        return getStrByAlias("b", sFunction);
     }
 
     public static <T, R> String c(SFunction<T, R> sFunction) {
-        Assert.notNull(sFunction, "function is null");
-        return "c" + StringPool.DOT + getColumn(sFunction);
+        return getStrByAlias("c", sFunction);
     }
 
     public static <T, R> String d(SFunction<T, R> sFunction) {
-        Assert.notNull(sFunction, "function is null");
-        return "d" + StringPool.DOT + getColumn(sFunction);
+        return getStrByAlias("d", sFunction);
     }
 
     public static <T, R> String e(SFunction<T, R> sFunction) {
-        Assert.notNull(sFunction, "function is null");
-        return "e" + StringPool.DOT + getColumn(sFunction);
+        return getStrByAlias("e", sFunction);
     }
 
     public static <T, R> String f(SFunction<T, R> sFunction) {
+        return getStrByAlias("f", sFunction);
+    }
+
+    private static <T, R> String getStrByAlias(String alias, SFunction<T, R> sFunction) {
         Assert.notNull(sFunction, "function is null");
-        return "f" + StringPool.DOT + getColumn(sFunction);
+        return alias + StringPool.DOT + getColumn(sFunction);
     }
 
     /**