From 0d17bd2444c4768784409b4795b2665d6fbae10a Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Wed, 22 Mar 2023 21:52:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E8=8E=B7=E5=8F=96=E6=B3=9B=E5=9E=8B?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../top/charles7c/cnadmin/common/base/BaseMapper.java  |  5 +++--
 .../charles7c/cnadmin/common/base/BaseServiceImpl.java | 10 ++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseMapper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseMapper.java
index 631176fa..0b79e4a4 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseMapper.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseMapper.java
@@ -18,7 +18,6 @@ package top.charles7c.cnadmin.common.base;
 
 import java.util.Collection;
 
-import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
@@ -26,6 +25,8 @@ import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers;
 import com.baomidou.mybatisplus.extension.toolkit.Db;
 
+import cn.hutool.core.util.ClassUtil;
+
 /**
  * Mapper 基类
  *
@@ -111,6 +112,6 @@ public interface BaseMapper<T> extends com.baomidou.mybatisplus.core.mapper.Base
      * @return 实体类 Class 对象
      */
     default Class<T> currentEntityClass() {
-        return (Class<T>)ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapper.class, 0);
+        return (Class<T>)ClassUtil.getTypeArgument(this.getClass(), 0);
     }
 }
diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
index 8d8f299d..8244af02 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
@@ -28,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
@@ -82,11 +81,10 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseDO,
     private final Class<V> voClass;
     private final Class<D> detailVoClass;
 
-    public BaseServiceImpl() {
-        this.entityClass = (Class<T>)ReflectionKit.getSuperClassGenericType(this.getClass(), BaseServiceImpl.class, 1);
-        this.voClass = (Class<V>)ReflectionKit.getSuperClassGenericType(this.getClass(), BaseServiceImpl.class, 2);
-        this.detailVoClass =
-            (Class<D>)ReflectionKit.getSuperClassGenericType(this.getClass(), BaseServiceImpl.class, 3);
+    protected BaseServiceImpl() {
+        this.entityClass = (Class<T>)ClassUtil.getTypeArgument(this.getClass(), 1);
+        this.voClass = (Class<V>)ClassUtil.getTypeArgument(this.getClass(), 2);
+        this.detailVoClass = (Class<D>)ClassUtil.getTypeArgument(this.getClass(), 3);
     }
 
     @Override