guolong
/
conflux-nft
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

解决项目jar包冲突导致代码生成失败

master
long 3 years ago
parent
0cc0258e96
commit
5c65b40e06
2 changed files with 3 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      conflux-admin/pom.xml
  2. 6
      conflux-generator/src/main/java/com/conflux/generator/controller/GenController.java

51
conflux-admin/pom.xml
Unescape View File

@ -59,28 +59,12 @@
<dependency> <dependency>
<groupId>com.conflux</groupId> <groupId>com.conflux</groupId>
<artifactId>conflux-quartz</artifactId> <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>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>com.conflux</groupId> <groupId>com.conflux</groupId>
<artifactId>conflux-generator</artifactId> <artifactId>conflux-generator</artifactId>
<exclusions>
<exclusion>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
@ -90,31 +74,12 @@
<groupId>org.web3j</groupId> <groupId>org.web3j</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>4.5.11</version> <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>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.57</version> <version>1.2.57</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
@ -130,27 +95,11 @@
<artifactId>bitcoinj-core</artifactId> <artifactId>bitcoinj-core</artifactId>
<version>0.15.3</version> <version>0.15.3</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.github.conflux-chain</groupId> <groupId>io.github.conflux-chain</groupId>
<artifactId>conflux.web3j</artifactId> <artifactId>conflux.web3j</artifactId>
<version>1.1.0</version> <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>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>

6
conflux-generator/src/main/java/com/conflux/generator/controller/GenController.java
Unescape View File

@ -48,11 +48,11 @@ public class GenController extends BaseController
*/ */
@PreAuthorize("@ss.hasPermi('tool:gen:list')") @PreAuthorize("@ss.hasPermi('tool:gen:list')")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult genList(GenTable genTable) public TableDataInfo genList(GenTable genTable)
{ {
//startPage(); startPage();
List<GenTable> list = genTableService.selectGenTableList(genTable); List<GenTable> list = genTableService.selectGenTableList(genTable);
return AjaxResult.success(list); return getDataTable(list);
} }
/** /**

Write Preview
Loading…
Cancel
Save