From 3e08a8e1c1ea923035c09af6cf1f802c1f6dd25b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 15 五月 2021 14:34:56 +0800
Subject: [PATCH] update 通用Service接口 增加自定义vo转换函数
---
pom.xml | 122 +++++++++++++++-------------------------
1 files changed, 47 insertions(+), 75 deletions(-)
diff --git a/pom.xml b/pom.xml
index b27f40e..edd8621 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,26 +5,24 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId>
- <artifactId>ruoyi</artifactId>
- <version>3.4.0</version>
+ <artifactId>ruoyi-vue-plus</artifactId>
+ <version>${ruoyi-vue-plus.version}</version>
- <name>ruoyi</name>
- <url>http://www.ruoyi.vip</url>
- <description>鑻ヤ緷绠＄悊绯荤粺</description>
+ <name>RuoYi-Vue-Plus</name>
+ <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
+ <description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi.version>3.4.0</ruoyi.version>
+ <ruoyi-vue-plus.version>2.0.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.3.10.RELEASE</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.4</druid.version>
- <swagger.version>2.9.2</swagger.version>
- <swagger-ui.version>1.9.6</swagger-ui.version>
- <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
+ <knife4j.version>3.0.2</knife4j.version>
+ <swagger-annotations.version>1.5.22</swagger-annotations.version>
<fastjson.version>1.2.75</fastjson.version>
- <oshi.version>5.6.0</oshi.version>
- <jna.version>5.7.0</jna.version>
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
@@ -32,6 +30,7 @@
<hutool.version>5.5.8</hutool.version>
<feign.version>2.2.6.RELEASE</feign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
+ <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -42,7 +41,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.2.13.RELEASE</version>
+ <version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -53,60 +52,23 @@
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
-
- <!-- pagehelper 鍒嗛〉鎻掍欢 -->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper.boot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- 鑾峰彇绯荤粺淇℃伅 -->
- <dependency>
- <groupId>com.github.oshi</groupId>
- <artifactId>oshi-core</artifactId>
- <version>${oshi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${jna.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna-platform</artifactId>
- <version>${jna.version}</version>
- </dependency>
-
- <!-- swagger2-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
- <artifactId>swagger-bootstrap-ui</artifactId>
- <version>${swagger-ui.version}</version>
+ <artifactId>knife4j-spring-boot-starter</artifactId>
+ <version>${knife4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>swagger-annotations</artifactId>
+ <groupId>io.swagger</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger-annotations.version}</version>
</dependency>
<!-- excel宸ュ叿 -->
@@ -121,12 +83,6 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- 闃块噷JSON瑙ｆ瀽鍣� -->
@@ -171,46 +127,62 @@
<version>${feign-okhttp.version}</version>
</dependency>
+ <dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-server</artifactId>
+ <version>${spring-boot-admin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.codecentric</groupId>
+ <artifactId>spring-boot-admin-starter-client</artifactId>
+ <version>${spring-boot-admin.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
- <version>${ruoyi.version}</version>
+ <version>${ruoyi-vue-plus.version}</version>
</dependency>
<!-- 浠ｇ爜鐢熸垚-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
- <version>${ruoyi.version}</version>
+ <version>${ruoyi-vue-plus.version}</version>
</dependency>
<!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
- <version>${ruoyi.version}</version>
+ <version>${ruoyi-vue-plus.version}</version>
</dependency>
<!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
- <version>${ruoyi.version}</version>
+ <version>${ruoyi-vue-plus.version}</version>
</dependency>
<!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>${ruoyi.version}</version>
+ <version>${ruoyi-vue-plus.version}</version>
</dependency>
<!-- demo妯″潡 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-demo</artifactId>
- <version>${ruoyi.version}</version>
+ <version>${ruoyi-vue-plus.version}</version>
</dependency>
</dependencies>
--
Gitblit v1.9.3