From 5c65b40e069ddb428ab37ea0e92b1cbe848fb82a Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Wed, 1 Jun 2022 23:23:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AEjar?=
 =?UTF-8?q?=E5=8C=85=E5=86=B2=E7=AA=81=E5=AF=BC=E8=87=B4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conflux-admin/pom.xml                         | 51 -------------------
 .../generator/controller/GenController.java   |  6 +--
 2 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/conflux-admin/pom.xml b/conflux-admin/pom.xml
index 63a36d3..507d0f0 100644
--- a/conflux-admin/pom.xml
+++ b/conflux-admin/pom.xml
@@ -59,28 +59,12 @@
         <dependency>
             <groupId>com.conflux</groupId>
             <artifactId>conflux-quartz</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-codec</artifactId>
-                    <groupId>commons-codec</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-lang3</artifactId>
-                    <groupId>org.apache.commons</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- 代码生成-->
         <dependency>
             <groupId>com.conflux</groupId>
             <artifactId>conflux-generator</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-lang3</artifactId>
-                    <groupId>org.apache.commons</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -90,31 +74,12 @@
             <groupId>org.web3j</groupId>
             <artifactId>core</artifactId>
             <version>4.5.11</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                    <groupId>org.bouncycastle</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jnr-constants</artifactId>
-                    <groupId>com.github.jnr</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jnr-ffi</artifactId>
-                    <groupId>com.github.jnr</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.57</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.4</version>
-        </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
@@ -130,27 +95,11 @@
             <artifactId>bitcoinj-core</artifactId>
             <version>0.15.3</version>
             <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.github.conflux-chain</groupId>
             <artifactId>conflux.web3j</artifactId>
             <version>1.1.0</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>core</artifactId>
-                    <groupId>org.web3j</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/conflux-generator/src/main/java/com/conflux/generator/controller/GenController.java b/conflux-generator/src/main/java/com/conflux/generator/controller/GenController.java
index c48e7b9..8361d55 100644
--- a/conflux-generator/src/main/java/com/conflux/generator/controller/GenController.java
+++ b/conflux-generator/src/main/java/com/conflux/generator/controller/GenController.java
@@ -48,11 +48,11 @@ public class GenController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('tool:gen:list')")
     @GetMapping("/list")
-    public AjaxResult genList(GenTable genTable)
+    public TableDataInfo genList(GenTable genTable)
     {
-        //startPage();
+        startPage();
         List<GenTable> list = genTableService.selectGenTableList(genTable);
-        return AjaxResult.success(list);
+        return getDataTable(list);
     }
 
     /**